|
From: <sv...@va...> - 2005-11-04 16:49:43
|
Author: tom
Date: 2005-11-04 16:49:39 +0000 (Fri, 04 Nov 2005)
New Revision: 5004
Log:
Fix up references to log files names containing "pid" in them and
a few other related items. Patch from James Begley <ja...@ha...>.
Modified:
trunk/coregrind/m_main.c
trunk/coregrind/m_replacemalloc/replacemalloc_core.c
trunk/none/tests/cmdline1.stdout.exp
trunk/none/tests/cmdline2.stdout.exp
Modified: trunk/coregrind/m_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_main.c 2005-11-04 16:46:19 UTC (rev 5003)
+++ trunk/coregrind/m_main.c 2005-11-04 16:49:39 UTC (rev 5004)
@@ -872,7 +872,7 @@
" --track-fds=3Dno|yes track open file descriptors? [no]\n"
" --time-stamp=3Dno|yes add timestamps to log messages? [no]\n"
" --log-fd=3D<number> log messages to file descriptor [2=3Dst=
derr]\n"
-" --log-file=3D<file> log messages to <file>.pid<pid>\n"
+" --log-file=3D<file> log messages to <file>.<pid>\n"
" --log-file-exactly=3D<file> log messages to <file>\n"
" --log-file-qualifier=3D<VAR> incorporate $VAR in logfile name [none=
]\n"
" --log-socket=3Dipaddr:port log messages to socket ipaddr:port\n"
@@ -1148,11 +1148,6 @@
VG_(clo_log_name) =3D &arg[11];
}
=20
- else if (VG_CLO_STREQN(11, arg, "--log-file=3D")) {
- log_to =3D VgLogTo_File;
- VG_(clo_log_name) =3D &arg[11];
- }
-
else if (VG_CLO_STREQN(21, arg, "--log-file-qualifier=3D")) {
VG_(clo_log_file_qualifier) =3D &arg[21];
}
@@ -1372,7 +1367,7 @@
// was some other file error, we give up.
if (sres.val !=3D VKI_EEXIST) {
VG_(message)(Vg_UserMsg,=20
- "Can't create/open log file '%s.pid%d'; giving up!",=20
+ "Can't create/open log file '%s.%d'; giving up!",=20
VG_(clo_log_name), pid);
VG_(bad_option)(
"--log-file=3D<file> (didn't work out for some reason.)");
Modified: trunk/coregrind/m_replacemalloc/replacemalloc_core.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_replacemalloc/replacemalloc_core.c 2005-11-04 16:46=
:19 UTC (rev 5003)
+++ trunk/coregrind/m_replacemalloc/replacemalloc_core.c 2005-11-04 16:49=
:39 UTC (rev 5004)
@@ -77,7 +77,7 @@
void VG_(replacement_malloc_print_usage)(void)
{
VG_(printf)(
-" --alignment=3D<number> set minimum alignment of allocations [%=
d]\n",
+" --alignment=3D<number> set minimum alignment of allocat=
ions [%d]\n",
VG_MIN_MALLOC_SZB
);
}
Modified: trunk/none/tests/cmdline1.stdout.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/cmdline1.stdout.exp 2005-11-04 16:46:19 UTC (rev 500=
3)
+++ trunk/none/tests/cmdline1.stdout.exp 2005-11-04 16:49:39 UTC (rev 500=
4)
@@ -11,7 +11,7 @@
--track-fds=3Dno|yes track open file descriptors? [no]
--time-stamp=3Dno|yes add timestamps to log messages? [no]
--log-fd=3D<number> log messages to file descriptor [2=3Dstd=
err]
- --log-file=3D<file> log messages to <file>.pid<pid>
+ --log-file=3D<file> log messages to <file>.<pid>
--log-file-exactly=3D<file> log messages to <file>
--log-file-qualifier=3D<VAR> incorporate $VAR in logfile name [none]
--log-socket=3Dipaddr:port log messages to socket ipaddr:port
Modified: trunk/none/tests/cmdline2.stdout.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/cmdline2.stdout.exp 2005-11-04 16:46:19 UTC (rev 500=
3)
+++ trunk/none/tests/cmdline2.stdout.exp 2005-11-04 16:49:39 UTC (rev 500=
4)
@@ -11,7 +11,7 @@
--track-fds=3Dno|yes track open file descriptors? [no]
--time-stamp=3Dno|yes add timestamps to log messages? [no]
--log-fd=3D<number> log messages to file descriptor [2=3Dstd=
err]
- --log-file=3D<file> log messages to <file>.pid<pid>
+ --log-file=3D<file> log messages to <file>.<pid>
--log-file-exactly=3D<file> log messages to <file>
--log-file-qualifier=3D<VAR> incorporate $VAR in logfile name [none]
--log-socket=3Dipaddr:port log messages to socket ipaddr:port
|