From: Bart Van Assche Date: Sat, 14 Feb 2009 11:54:42 +0000 (+0000) Subject: Renamed vg_thread_wrapper() into DRD_(thread_wrapper)(). X-Git-Tag: svn/VALGRIND_3_5_0~998 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99249d56d640f49567610a9530ddab61c6258ab8;p=thirdparty%2Fvalgrind.git 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 e16845d106..8a661b7f61 100644 --- a/drd/drd_pthread_intercepts.c +++ b/drd/drd_pthread_intercepts.c @@ -54,6 +54,7 @@ #include #include // 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 1f881b21ce..09948055f1 100644 --- 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 012b8bb260..2f82e10f87 100644 --- 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 79f0241150..dd69bd6b45 100644 --- 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 e9ad4351a8..54f7173662 100644 --- 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 876b30205e..3201a05c4c 100644 --- 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 f1a5c03390..579648ec4f 100644 --- 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 e428656b55..a4743f9130 100644 --- 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 7d3b54c6c0..ae36f4eec5 100644 --- 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 f08e28aea9..db4c68fa15 100644 --- 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 83ea73e0f1..f6962c7c03 100644 --- 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 ec4d8b9dbe..39e5ebc522 100644 --- 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 1423a6c0a7..98699a4fd8 100644 --- 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 549544e5bf..b8bf909dae 100644 --- 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 6991e84d5a..293a6cf663 100644 --- 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 217757ce2e..5f09567332 100644 --- 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 1f7bde6cd5..9f6eb2cb54 100644 --- 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: