Renamed vg_thread_wrapper() into DRD_(thread_wrapper)().

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

diff --git a/drd/drd_pthread_intercepts.c b/drd/drd_pthread_intercepts.c
index e16845d106a22934dc5410a67d314f935055d16e..8a661b7f6193ffd64c6bd9e5962fb05cce3ca491 100644 (file)
--- a/drd/drd_pthread_intercepts.c
+++ b/drd/drd_pthread_intercepts.c
@@ -54,6 +54,7 @@
 #include <stdlib.h>
 #include <unistd.h>         // confstr()
 #include "config.h"
+#include "drd_basics.h"
 #include "drd_clientreq.h"
 #include "pub_tool_redir.h"
 
@@ -166,7 +167,7 @@ static void vg_set_joinable(const pthread_t tid, const int joinable)
                              tid, joinable, 0, 0, 0);
 }
 
-static void* vg_thread_wrapper(void* arg)
+static void* DRD_(thread_wrapper)(void* arg)
 {
   int res;
 
@@ -292,7 +293,7 @@ PTH_FUNC(int, pthreadZucreateZa, // pthread_create*
   /* Suppress NPTL-specific conflicts between creator and created thread. */
   VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__DRD_STOP_RECORDING,
                              0, 0, 0, 0, 0);
-  CALL_FN_W_WWWW(ret, fn, thread, attr, vg_thread_wrapper, &vgargs);
+  CALL_FN_W_WWWW(ret, fn, thread, attr, DRD_(thread_wrapper), &vgargs);
   VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__DRD_START_RECORDING,
                              0, 0, 0, 0, 0);
 #if 0

diff --git a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1 b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1
index 1f881b21ce9a3b63f564ecaa88450672796611f6..09948055f1897d34f988038102f9bf291127c399 100644 (file)
--- a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1
+++ b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1
@@ -3,7 +3,7 @@ Start of test.
 Thread 2:
 Conflicting load by thread 2/3 at 0x........ size 4
    at 0x........: thread_func_2 (atomic_var.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_y"

diff --git a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2 b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2
index 012b8bb2608e6480af837f5a89f5de037cc6836f..2f82e10f87c1ed12f239cc25dd7fe0d4a4113a63 100644 (file)
--- a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2
+++ b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2
@@ -3,7 +3,7 @@ Start of test.
 Thread 3:
 Conflicting load by thread 3/3 at 0x........ size 4
    at 0x........: thread_func_2 (atomic_var.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_y"

diff --git a/drd/tests/hg03_inherit.stderr.exp b/drd/tests/hg03_inherit.stderr.exp
index 79f0241150ea9fc73719612aa7c13e8d6f5efa85..dd69bd6b45cf58a55b0256d6cf4f09491b3cba12 100644 (file)
--- a/drd/tests/hg03_inherit.stderr.exp
+++ b/drd/tests/hg03_inherit.stderr.exp
@@ -2,7 +2,7 @@
 Thread 3:
 Conflicting store by thread 3/3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:28)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
@@ -10,7 +10,7 @@ declared at hg03_inherit.c:11, in frame #? of thread 3
 
 Conflicting store by thread 3/3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:29)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],

diff --git a/drd/tests/hg04_race.stderr.exp b/drd/tests/hg04_race.stderr.exp
index e9ad4351a8d93ce6a5a4d2de47b945a6b8846804..54f71736626818d9751aea3da66634d9e8ed1498 100644 (file)
--- a/drd/tests/hg04_race.stderr.exp
+++ b/drd/tests/hg04_race.stderr.exp
@@ -2,7 +2,7 @@
 Thread 2:
 Conflicting load by thread 2/3 at 0x........ size 4
    at 0x........: th (hg04_race.c:10)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "shared"
@@ -14,7 +14,7 @@ Other segment end (thread 0/2)
 
 Conflicting store by thread 2/3 at 0x........ size 4
    at 0x........: th (hg04_race.c:10)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "shared"

diff --git a/drd/tests/hg05_race2.stderr.exp b/drd/tests/hg05_race2.stderr.exp
index 876b30205e8bff4538e2b97e21383c35daa3fa79..3201a05c4c6cacef3e79d84e228f653975b4d29a 100644 (file)
--- a/drd/tests/hg05_race2.stderr.exp
+++ b/drd/tests/hg05_race2.stderr.exp
@@ -2,7 +2,7 @@
 Thread 2:
 Conflicting load by thread 2/3 at 0x........ size 4
    at 0x........: th (hg05_race2.c:17)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside foo.poot[5].plop[11],
@@ -14,7 +14,7 @@ Other segment end (thread 0/2)
 
 Conflicting store by thread 2/3 at 0x........ size 4
    at 0x........: th (hg05_race2.c:17)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside foo.poot[5].plop[11],

diff --git a/drd/tests/hg05_race2.stderr.exp-powerpc b/drd/tests/hg05_race2.stderr.exp-powerpc
index f1a5c03390d4951e7facc5459632f1ec8776dcc5..579648ec4f52bfe05c39f7f9305ad89ffb52a4b3 100644 (file)
--- a/drd/tests/hg05_race2.stderr.exp-powerpc
+++ b/drd/tests/hg05_race2.stderr.exp-powerpc
@@ -2,7 +2,7 @@
 Thread 2:
 Conflicting load by thread 2/3 at 0x........ size 4
    at 0x........: th (hg05_race2.c:17)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Allocation context: unknown.
@@ -13,7 +13,7 @@ Other segment end (thread 0/2)
 
 Conflicting store by thread 2/3 at 0x........ size 4
    at 0x........: th (hg05_race2.c:17)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Allocation context: unknown.

diff --git a/drd/tests/pth_cond_race.stderr.exp b/drd/tests/pth_cond_race.stderr.exp
index e428656b5511cab48c5c465559005b61538a21bb..a4743f9130bd00ce7973fac84196a919259414dd 100644 (file)
--- a/drd/tests/pth_cond_race.stderr.exp
+++ b/drd/tests/pth_cond_race.stderr.exp
@@ -3,7 +3,7 @@ Thread 2:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
    at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: thread_func (pth_cond_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 cond 0x........ was first observed at:

diff --git a/drd/tests/pth_create_chain.stderr.exp-ppc b/drd/tests/pth_create_chain.stderr.exp-ppc
index 7d3b54c6c0d294d4ebc46d4540e43d620ac439e2..ae36f4eec5bc705462d6e6ed2df392458f2142fd 100644 (file)
--- a/drd/tests/pth_create_chain.stderr.exp-ppc
+++ b/drd/tests/pth_create_chain.stderr.exp-ppc
@@ -2,7 +2,7 @@
 Emulation fatal error -- Valgrind cannot continue:
   PPC64 function redirection stack overflow
    at 0x........: ???
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 

diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
index f08e28aea9ee03b9c0f449b1054bf13f086fd7f3..db4c68fa152bcd4ff2ba661666265b0a8c6e33e4 100644 (file)
--- a/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
+++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
@@ -3,7 +3,7 @@ Thread 3:
 Inconsistent association of condition variable and mutex: condition variable 0x........, mutexes 0x........ and 0x........
    at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: thread2 (pth_inconsistent_cond_wait.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 cond 0x........ was first observed at:

diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
index 83ea73e0f150843282623f7b611cf91c9af4816e..f6962c7c03f0d238eb77186d67437384edaec309 100644 (file)
--- a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
+++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
@@ -3,7 +3,7 @@ Thread 2:
 Inconsistent association of condition variable and mutex: condition variable 0x........, mutexes 0x........ and 0x........
    at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: thread1 (pth_inconsistent_cond_wait.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 cond 0x........ was first observed at:

diff --git a/drd/tests/rwlock_race.stderr.exp b/drd/tests/rwlock_race.stderr.exp
index ec4d8b9dbefd63beb1244602bdd56d99702e1c86..39e5ebc522423ec6062617aa087969f992e45c29 100644 (file)
--- a/drd/tests/rwlock_race.stderr.exp
+++ b/drd/tests/rwlock_race.stderr.exp
@@ -2,7 +2,7 @@
 Thread 3:
 Conflicting load by thread 3/3 at 0x........ size 4
    at 0x........: thread_func (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_racy"
@@ -10,19 +10,19 @@ declared at rwlock_race.c:18, in frame #? of thread 3
 Other segment start (thread 2/2)
    at 0x........: pthread_rwlock_rdlock* (drd_pthread_intercepts.c:?)
    by 0x........: thread_func (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Other segment end (thread 2/2)
    at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: thread_func (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Conflicting store by thread 3/3 at 0x........ size 4
    at 0x........: thread_func (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_racy"
@@ -30,13 +30,13 @@ declared at rwlock_race.c:18, in frame #? of thread 3
 Other segment start (thread 2/2)
    at 0x........: pthread_rwlock_rdlock* (drd_pthread_intercepts.c:?)
    by 0x........: thread_func (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Other segment end (thread 2/2)
    at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: thread_func (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Result: 2

diff --git a/drd/tests/rwlock_race.stderr.exp2 b/drd/tests/rwlock_race.stderr.exp2
index 1423a6c0a72996b499421916638a5a7b5bb64da9..98699a4fd8a90fbcc853b95fa4275192d638ccc4 100644 (file)
--- a/drd/tests/rwlock_race.stderr.exp2
+++ b/drd/tests/rwlock_race.stderr.exp2
@@ -2,7 +2,7 @@
 Thread 3:
 Conflicting load by thread 3/3 at 0x........ size 4
    at 0x........: thread (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_racy"
@@ -14,7 +14,7 @@ Other segment end (thread 0/2)
 
 Conflicting store by thread 3/3 at 0x........ size 4
    at 0x........: thread (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_racy"

diff --git a/drd/tests/tc09_bad_unlock.stderr.exp b/drd/tests/tc09_bad_unlock.stderr.exp
index 549544e5bf55ee17c236caee14894d86408b71c5..b8bf909daec64f051935dbd93d99825e21230417 100644 (file)
--- a/drd/tests/tc09_bad_unlock.stderr.exp
+++ b/drd/tests/tc09_bad_unlock.stderr.exp
@@ -12,7 +12,7 @@ Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: child_fn (tc09_bad_unlock.c:11)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 mutex 0x........ was first observed at:
@@ -44,7 +44,7 @@ Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: child_fn (tc09_bad_unlock.c:11)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 mutex 0x........ was first observed at:

diff --git a/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8 b/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
index 6991e84d5a87f673b6ddc2a6970b282f09e51af7..293a6cf6634f7b0a59d4919b961dd0e9ead54980 100644 (file)
--- a/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
+++ b/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
@@ -12,7 +12,7 @@ Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: child_fn (tc09_bad_unlock.c:11)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 mutex 0x........ was first observed at:
@@ -44,7 +44,7 @@ Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: child_fn (tc09_bad_unlock.c:11)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 mutex 0x........ was first observed at:

diff --git a/drd/tests/tc22_exit_w_lock.stderr.exp-64bit b/drd/tests/tc22_exit_w_lock.stderr.exp-64bit
index 217757ce2edde1aeea4b53d3e385d0152d111b7b..5f09567332b9fbbf85bffb81cd3b8e646bb3e8ea 100644 (file)
--- a/drd/tests/tc22_exit_w_lock.stderr.exp-64bit
+++ b/drd/tests/tc22_exit_w_lock.stderr.exp-64bit
@@ -5,7 +5,7 @@ Mutex still locked at thread exit: mutex 0x........, recursion count 1, owner 3.
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
    by 0x........: child_fn1 (tc22_exit_w_lock.c:18)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 

diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp b/drd/tests/tc23_bogus_condwait.stderr.exp
index 1f7bde6cd5a28e5e18062c6809d98c1a60325bbc..9f6eb2cb5452893aea3386bec57189c03e584399 100644 (file)
--- a/drd/tests/tc23_bogus_condwait.stderr.exp
+++ b/drd/tests/tc23_bogus_condwait.stderr.exp
@@ -11,7 +11,7 @@ Thread 3:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
    at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:20)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 cond 0x........ was first observed at:
@@ -30,7 +30,7 @@ Thread 3:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
    at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:24)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 cond 0x........ was first observed at:
@@ -59,7 +59,7 @@ Thread 3:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
    at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:28)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 cond 0x........ was first observed at:
@@ -81,7 +81,7 @@ Thread 3:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
    at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:32)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 cond 0x........ was first observed at:
@@ -96,7 +96,7 @@ Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 2, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: grab_the_lock (tc23_bogus_condwait.c:42)
-   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 mutex 0x........ was first observed at: