Hook libpthread.so's .init section to start up Valgrind too.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@262

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index df895171a3eec24b6bce74a5ffd0fc831a733b9e..5e6e14c61ca9232265676fc86a5070e556a6d9ec 100644 (file)
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -107,6 +107,13 @@ void ensure_valgrind ( char* caller )
    VG_(startup)();
 }
 
+/* While we're at it ... hook our own startup function into this
+   game. */
+__asm__ (
+   ".section .init\n"
+   "\tcall vgPlain_startup"
+);
+
 
 static
 __attribute__((noreturn))
@@ -703,9 +710,7 @@ int __pthread_atfork ( void (*prepare)(void),
 __attribute__((weak)) 
 void __pthread_initialize ( void )
 {
-   static int moans = N_MOANS;
-   if (moans-- > 0) 
-      ignored("__pthread_initialize");
+   ensure_valgrind("__pthread_initialize");
 }
 
 

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index df895171a3eec24b6bce74a5ffd0fc831a733b9e..5e6e14c61ca9232265676fc86a5070e556a6d9ec 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -107,6 +107,13 @@ void ensure_valgrind ( char* caller )
    VG_(startup)();
 }
 
+/* While we're at it ... hook our own startup function into this
+   game. */
+__asm__ (
+   ".section .init\n"
+   "\tcall vgPlain_startup"
+);
+
 
 static
 __attribute__((noreturn))
@@ -703,9 +710,7 @@ int __pthread_atfork ( void (*prepare)(void),
 __attribute__((weak)) 
 void __pthread_initialize ( void )
 {
-   static int moans = N_MOANS;
-   if (moans-- > 0) 
-      ignored("__pthread_initialize");
+   ensure_valgrind("__pthread_initialize");
 }
 
 

diff --git a/vg_libpthread.c b/vg_libpthread.c
index df895171a3eec24b6bce74a5ffd0fc831a733b9e..5e6e14c61ca9232265676fc86a5070e556a6d9ec 100644 (file)
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -107,6 +107,13 @@ void ensure_valgrind ( char* caller )
    VG_(startup)();
 }
 
+/* While we're at it ... hook our own startup function into this
+   game. */
+__asm__ (
+   ".section .init\n"
+   "\tcall vgPlain_startup"
+);
+
 
 static
 __attribute__((noreturn))
@@ -703,9 +710,7 @@ int __pthread_atfork ( void (*prepare)(void),
 __attribute__((weak)) 
 void __pthread_initialize ( void )
 {
-   static int moans = N_MOANS;
-   if (moans-- > 0) 
-      ignored("__pthread_initialize");
+   ensure_valgrind("__pthread_initialize");
 }