|
From: <sv...@va...> - 2005-08-25 22:54:02
|
Author: njn
Date: 2005-08-25 23:53:57 +0100 (Thu, 25 Aug 2005)
New Revision: 4514
Log:
Rename vg_preload_core.so to vgpreload_core.so to be consistent with
tool preload modules, which are called vgpreload_<tool>.so. Also
fixed a couple of comments relating to this.
(This need not be merged into 3_0_X.)
Modified:
trunk/coregrind/Makefile.am
trunk/coregrind/m_libcproc.c
trunk/coregrind/m_main.c
trunk/coregrind/m_syswrap/syswrap-generic.c
trunk/coregrind/pub_core_redir.h
trunk/include/pub_tool_redir.h
Modified: trunk/coregrind/Makefile.am
=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/Makefile.am 2005-08-25 01:52:52 UTC (rev 4513)
+++ trunk/coregrind/Makefile.am 2005-08-25 22:53:57 UTC (rev 4514)
@@ -30,7 +30,7 @@
=20
val_PROGRAMS =3D \
stage2 \
- vg_preload_core.so
+ vgpreload_core.so
=20
noinst_HEADERS =3D \
coregrind.h \
@@ -171,12 +171,12 @@
stage2_LDADD=3D $(stage2_extra) \
-ldl
=20
-vg_preload_core_so_SOURCES =3D vg_preloaded.c
-vg_preload_core_so_CFLAGS =3D $(AM_CFLAGS) -fpic
-vg_preload_core_so_LDADD =3D -ldl
-vg_preload_core_so_LDFLAGS =3D \
+vgpreload_core_so_SOURCES =3D vg_preloaded.c
+vgpreload_core_so_CFLAGS =3D $(AM_CFLAGS) -fpic
+vgpreload_core_so_LDADD =3D -ldl
+vgpreload_core_so_LDFLAGS =3D \
-shared \
- -Wl,--soname,vg_preload_core.so \
+ -Wl,--soname,vgpreload_core.so \
-Wl,-z,initfirst
=20
# Extract ld's default linker script and hack it to our needs.
Modified: trunk/coregrind/m_libcproc.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_libcproc.c 2005-08-25 01:52:52 UTC (rev 4513)
+++ trunk/coregrind/m_libcproc.c 2005-08-25 22:53:57 UTC (rev 4514)
@@ -206,7 +206,7 @@
buf =3D VG_(arena_malloc)(VG_AR_CORE, VG_(strlen)(VG_(libdir)) + 20);
=20
// Remove Valgrind-specific entries from LD_*.
- VG_(sprintf)(buf, "%s*/vg_preload_core.so", VG_(libdir));
+ VG_(sprintf)(buf, "%s*/vgpreload_core.so", VG_(libdir));
mash_colon_env(ld_preload_str, buf);
VG_(sprintf)(buf, "%s*/vgpreload_*.so", VG_(libdir));
mash_colon_env(ld_preload_str, buf);
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-08-25 01:52:52 UTC (rev 4513)
+++ trunk/coregrind/m_main.c 2005-08-25 22:53:57 UTC (rev 4514)
@@ -561,7 +561,7 @@
=20
/* Prepare the client's environment. This is basically a copy of our
environment, except:
- LD_PRELOAD=3D$VALGRINDLIB/vg_preload_core.so:($VALGRINDLIB/vgpreloa=
d_TOOL.so:)?$LD_PRELOAD
+ LD_PRELOAD=3D$VALGRINDLIB/vgpreload_core.so:($VALGRINDLIB/vgpreload=
_TOOL.so:)?$LD_PRELOAD
=20
If this is missing, then it is added.
=20
@@ -572,7 +572,7 @@
*/
static char **fix_environment(char **origenv, const char *preload)
{
- static const char preload_core_so[] =3D "vg_preload_core.so";
+ static const char preload_core_so[] =3D "vgpreload_core.so";
static const char ld_preload[] =3D "LD_PRELOAD=3D";
static const char valgrind_clo[] =3D VALGRINDCLO "=3D";
static const int ld_preload_len =3D sizeof(ld_preload)-1;
@@ -586,8 +586,7 @@
int envc;
const int preloadlen =3D (preload =3D=3D NULL) ? 0 : strlen(preload);
=20
- /* Find the vg_preload_core.so; also make room for the tool preload
- library */
+ // Find the vgpreload_core.so; also make room for the tool preload li=
brary
preload_core_path_len =3D sizeof(preload_core_so) + vgliblen + preloa=
dlen + 16;
preload_core_path =3D malloc(preload_core_path_len);
vg_assert(preload_core_path);
Modified: trunk/coregrind/m_syswrap/syswrap-generic.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_syswrap/syswrap-generic.c 2005-08-25 01:52:52 UTC (=
rev 4513)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2005-08-25 22:53:57 UTC (=
rev 4514)
@@ -2329,7 +2329,7 @@
VG_(reap_threads)(tid);
=20
// Remove the valgrind-specific stuff from the environment so the
- // child doesn't get vg_preload_core.so, vg_preload_TOOL.so, etc. =20
+ // child doesn't get vgpreload_core.so, vgpreload_<tool>.so, etc. =20
// This is done unconditionally, since if we are tracing the child,
// stage1/2 will set up the appropriate client environment.
// Nb: we make a copy of the environment before trying to mangle it
Modified: trunk/coregrind/pub_core_redir.h
=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/pub_core_redir.h 2005-08-25 01:52:52 UTC (rev 4513)
+++ trunk/coregrind/pub_core_redir.h 2005-08-25 22:53:57 UTC (rev 4514)
@@ -85,7 +85,7 @@
replacement.
=20
Functions named with this macro should be in client space, ie. in
- vg_preload_<tool>.h or vg_preload_core.h. */
+ vgpreload_<tool>.h or vgpreload_core.h. */
=20
#define VG_NOTIFY_ON_LOAD(name) _vgw_##name
#define VG_NOTIFY_ON_LOAD_PREFIX "_vgw_"
Modified: trunk/include/pub_tool_redir.h
=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/include/pub_tool_redir.h 2005-08-25 01:52:52 UTC (rev 4513)
+++ trunk/include/pub_tool_redir.h 2005-08-25 22:53:57 UTC (rev 4514)
@@ -64,7 +64,8 @@
=20
Note also that the replacement function should probably (must be?) in
client space, so it runs on the simulated CPU. So it must be in
- either vg_preload_<tool>.so or vg_preload_core.so.
+ either vgpreload_<tool>.so or vgpreload_core.so. It also only works
+ with functions in shared objects, I think.
=20
It is important that the Z-encoded soname contains no unencoded=20
underscores, since the intercept-handlers in vg_symtab2.c detect
|