Renamed drd_intercepts.c into drd_pthread_intercepts.c.

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

diff --git a/exp-drd/Makefile.am b/exp-drd/Makefile.am
index 9f336ab043f76dd58027ebf778739db61bfe169a..651bac4c69522e2cea014a68c6c579ac2e314462 100644 (file)
--- a/exp-drd/Makefile.am
+++ b/exp-drd/Makefile.am
@@ -20,7 +20,7 @@ if VGP_PPC64_AIX5
   noinst_PROGRAMS += exp-drd-ppc64-aix5 vgpreload_exp-drd-ppc64-aix5.so
 endif
 
-VGPRELOAD_DRD_SOURCES_COMMON = drd_intercepts.c
+VGPRELOAD_DRD_SOURCES_COMMON = drd_pthread_intercepts.c
 
 vgpreload_exp_drd_x86_linux_so_SOURCES      = $(VGPRELOAD_DRD_SOURCES_COMMON)
 vgpreload_exp_drd_x86_linux_so_CPPFLAGS     = $(AM_CPPFLAGS_X86_LINUX)

diff --git a/exp-drd/drd_intercepts.c b/exp-drd/drd_pthread_intercepts.c
similarity index 100%
rename from exp-drd/drd_intercepts.c
rename to exp-drd/drd_pthread_intercepts.c

diff --git a/exp-drd/tests/hg03_inherit.stderr.exp b/exp-drd/tests/hg03_inherit.stderr.exp
index 7849f0bfe15e6879312cd7cebea71280db6d74fd..681579ead20b090c8b1e2dd2fcedf1d5c8566d93 100644 (file)
--- a/exp-drd/tests/hg03_inherit.stderr.exp
+++ b/exp-drd/tests/hg03_inherit.stderr.exp
@@ -2,32 +2,32 @@
 Thread 3:
 Conflicting store by thread 3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:28)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
 declared at hg03_inherit.c:11, in frame #? of thread 3
 Other segment start (thread 1)
-   at 0x........: pthread_join (drd_intercepts.c:?)
+   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:49)
 Other segment end (thread 1)
    at 0x........: (within libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:63)
 
 Conflicting store by thread 3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:29)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
 declared at hg03_inherit.c:11, in frame #? of thread 3
 Other segment start (thread 1)
-   at 0x........: pthread_join (drd_intercepts.c:?)
+   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:49)
 Other segment end (thread 1)
    at 0x........: (within libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:63)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/hg03_inherit.stderr.exp2 b/exp-drd/tests/hg03_inherit.stderr.exp2
index 2d580ea911c1e768d73d5a857254ef1d82614d0e..e809a5324935d0db902d3b68a41648cbedb9f018 100644 (file)
--- a/exp-drd/tests/hg03_inherit.stderr.exp2
+++ b/exp-drd/tests/hg03_inherit.stderr.exp2
@@ -2,32 +2,32 @@
 Thread 3:
 Conflicting store by thread 3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:28)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
 declared at hg03_inherit.c:11, in frame #? of thread 3
 Other segment start (thread 1)
-   at 0x........: pthread_join (drd_intercepts.c:?)
+   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:49)
 Other segment end (thread 1)
    at 0x........: (within ld-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:63)
 
 Conflicting store by thread 3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:29)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
 declared at hg03_inherit.c:11, in frame #? of thread 3
 Other segment start (thread 1)
-   at 0x........: pthread_join (drd_intercepts.c:?)
+   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:49)
 Other segment end (thread 1)
    at 0x........: (within ld-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:63)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/hg04_race.stderr.exp b/exp-drd/tests/hg04_race.stderr.exp
index c0dd806540fd9030590f4f845d0403b2ab492aaa..dd7b91f11d60b1a2655bd0b87bc379d0dfd5c69f 100644 (file)
--- a/exp-drd/tests/hg04_race.stderr.exp
+++ b/exp-drd/tests/hg04_race.stderr.exp
@@ -2,7 +2,7 @@
 Thread 2:
 Conflicting load by thread 2 at 0x........ size 4
    at 0x........: th (hg04_race.c:10)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_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 2)
 
 Conflicting store by thread 2 at 0x........ size 4
    at 0x........: th (hg04_race.c:10)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_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/exp-drd/tests/hg05_race2.stderr.exp b/exp-drd/tests/hg05_race2.stderr.exp
index acf95304e02056b19723db96f6921f58d1774e57..02910761f81082e940d32b2383922016b0176ef8 100644 (file)
--- a/exp-drd/tests/hg05_race2.stderr.exp
+++ b/exp-drd/tests/hg05_race2.stderr.exp
@@ -2,7 +2,7 @@
 Thread 2:
 Conflicting load by thread 2 at 0x........ size 4
    at 0x........: th (hg05_race2.c:17)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_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 2)
 
 Conflicting store by thread 2 at 0x........ size 4
    at 0x........: th (hg05_race2.c:17)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_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/exp-drd/tests/omp_prime.c b/exp-drd/tests/omp_prime.c
index 8c1b854923cd6a3dd73699f49271cc07af3eb043..5fd7804d8e775fdfa3315dbc3f85bcd45e65a688 100644 (file)
--- a/exp-drd/tests/omp_prime.c
+++ b/exp-drd/tests/omp_prime.c
@@ -9,6 +9,7 @@
 #include <omp.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "../drd_clientreq.h"
 
 
 static int is_prime(int* const pflag, int v)
@@ -50,6 +51,14 @@ int main(int argc, char **argv)
   omp_set_num_threads(num_threads);
   omp_set_dynamic(0);
 
+#if 1
+  {
+    int res;
+    VALGRIND_DO_CLIENT_REQUEST(res, 0, VG_USERREQ__DRD_TRACE_ADDR,
+                               &total, 0, 0, 0, 0);
+  }
+#endif
+
   for (i = 0; i < n; i++) {
     pflag[i] = 1;
   }

diff --git a/exp-drd/tests/pth_cond_race.stderr.exp b/exp-drd/tests/pth_cond_race.stderr.exp
index 00746c9dbb25bb42ef4fa14d21b6049879686c4b..cfaf6397c1fc486ea0237c04db181028a97c536f 100644 (file)
--- a/exp-drd/tests/pth_cond_race.stderr.exp
+++ b/exp-drd/tests/pth_cond_race.stderr.exp
@@ -1,9 +1,9 @@
 
 Thread 2:
 Race condition: condition variable 0x........ has been signalled but the associated mutex 0x........ is not locked by the signalling thread
-   at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: thread_func (pth_cond_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 

diff --git a/exp-drd/tests/recursive_mutex.stderr.exp b/exp-drd/tests/recursive_mutex.stderr.exp
index 8369d7be354718f9253e8f6da803ce620cd9d4b0..f9488fbec8c83f68554115dd1ce648c1ed668ac2 100644 (file)
--- a/exp-drd/tests/recursive_mutex.stderr.exp
+++ b/exp-drd/tests/recursive_mutex.stderr.exp
@@ -1,16 +1,16 @@
 
 Recursive locking not allowed: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_lock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
    by 0x........: lock_twice (recursive_mutex.c:?)
    by 0x........: main (recursive_mutex.c:?)
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: lock_twice (recursive_mutex.c:?)
    by 0x........: main (recursive_mutex.c:?)
 
 Recursive locking not allowed: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_lock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
    by 0x........: lock_twice (recursive_mutex.c:?)
    by 0x........: main (recursive_mutex.c:?)
 

diff --git a/exp-drd/tests/rwlock_race.stderr.exp b/exp-drd/tests/rwlock_race.stderr.exp
index 211b727e5e1add1183697d9aa7de057dbd58aee2..7e73726e73bd2d9098b00c828fa4138074ec292b 100644 (file)
--- a/exp-drd/tests/rwlock_race.stderr.exp
+++ b/exp-drd/tests/rwlock_race.stderr.exp
@@ -2,7 +2,7 @@
 Thread 2:
 Conflicting load by thread 2 at 0x........ size 4
    at 0x........: thread (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_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 2)
 
 Conflicting store by thread 2 at 0x........ size 4
    at 0x........: thread (rwlock_race.c:?)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_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/exp-drd/tests/tc09_bad_unlock.stderr.exp b/exp-drd/tests/tc09_bad_unlock.stderr.exp
index ef78d36814264040352f085ae3da3384523dc516..e90f3cd8daa7210084c66b947b57a64610da0b20 100644 (file)
--- a/exp-drd/tests/tc09_bad_unlock.stderr.exp
+++ b/exp-drd/tests/tc09_bad_unlock.stderr.exp
@@ -1,20 +1,20 @@
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (tc09_bad_unlock.c:27)
    by 0x........: main (tc09_bad_unlock.c:49)
 
 Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: child_fn (tc09_bad_unlock.c:11)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
 Not a mutex
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (tc09_bad_unlock.c:41)
    by 0x........: main (tc09_bad_unlock.c:49)
 
@@ -23,21 +23,21 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    by 0x........: main (tc09_bad_unlock.c:49)
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (tc09_bad_unlock.c:27)
    by 0x........: main (tc09_bad_unlock.c:50)
 
 Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: child_fn (tc09_bad_unlock.c:11)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
 Not a mutex
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (tc09_bad_unlock.c:41)
    by 0x........: main (tc09_bad_unlock.c:50)
 

diff --git a/exp-drd/tests/tc09_bad_unlock.stderr.exp-linuxthreads b/exp-drd/tests/tc09_bad_unlock.stderr.exp-linuxthreads
index 3379037d89f1952f43f9221f4405d5404f946598..b0a0affc6f358e41f4e8a0fba191a0862ae926fe 100644 (file)
--- a/exp-drd/tests/tc09_bad_unlock.stderr.exp-linuxthreads
+++ b/exp-drd/tests/tc09_bad_unlock.stderr.exp-linuxthreads
@@ -1,6 +1,6 @@
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (../../helgrind/tests/tc09_bad_unlock.c:27)
    by 0x........: main (../../helgrind/tests/tc09_bad_unlock.c:49)
 Detected the LinuxThreads threading library. Sorry, but DRD only supports

diff --git a/exp-drd/tests/tc10_rec_lock.stderr.exp b/exp-drd/tests/tc10_rec_lock.stderr.exp
index 43adfac0f85c815cbcb7320a987eb74fbcf80353..186510ef2cd6b76973c22c31eaa05ac40a3b3a8e 100644 (file)
--- a/exp-drd/tests/tc10_rec_lock.stderr.exp
+++ b/exp-drd/tests/tc10_rec_lock.stderr.exp
@@ -7,7 +7,7 @@ before unlock #2
 before unlock #3
 before unlock #4
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (tc10_rec_lock.c:42)
    by 0x........: main (tc10_rec_lock.c:47)
 

diff --git a/exp-drd/tests/tc10_rec_lock.stderr.exp-linuxthreads b/exp-drd/tests/tc10_rec_lock.stderr.exp-linuxthreads
index f931f83ddc7efcabec5621dd1aea32978d90b354..fce10307b8bfa439d3eba9301b53545d41d7f0be 100644 (file)
--- a/exp-drd/tests/tc10_rec_lock.stderr.exp-linuxthreads
+++ b/exp-drd/tests/tc10_rec_lock.stderr.exp-linuxthreads
@@ -7,7 +7,7 @@ before unlock #2
 before unlock #3
 before unlock #4
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (../../helgrind/tests/tc10_rec_lock.c:42)
    by 0x........: main (../../helgrind/tests/tc10_rec_lock.c:47)
 

diff --git a/exp-drd/tests/tc12_rwl_trivial.stderr.exp b/exp-drd/tests/tc12_rwl_trivial.stderr.exp
index b4e22cf1c565ce432f78397cd2d26fa413a7acfa..4e34a104b04d4a28fb642adff13f352691493acf 100644 (file)
--- a/exp-drd/tests/tc12_rwl_trivial.stderr.exp
+++ b/exp-drd/tests/tc12_rwl_trivial.stderr.exp
@@ -1,6 +1,6 @@
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc12_rwl_trivial.c:29)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc12_rwl_trivial.stderr.exp-linuxthreads b/exp-drd/tests/tc12_rwl_trivial.stderr.exp-linuxthreads
index 28241881b73a744235b7fd5557f3d53779782c64..8aa486f1486ab96994372e12dd7ab85ba1fc768f 100644 (file)
--- a/exp-drd/tests/tc12_rwl_trivial.stderr.exp-linuxthreads
+++ b/exp-drd/tests/tc12_rwl_trivial.stderr.exp-linuxthreads
@@ -1,6 +1,6 @@
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (../../helgrind/tests/tc12_rwl_trivial.c:29)
 tc12_rwl_trivial: ../../helgrind/tests/tc12_rwl_trivial.c:29: main: Assertion `r == 0' failed.
 

diff --git a/exp-drd/tests/tc18_semabuse.stderr.exp b/exp-drd/tests/tc18_semabuse.stderr.exp
index 764a3a508888a252388133c64a57e2199b6b837c..7b21919cab44424498ee57f2bf2f02be36405173 100644 (file)
--- a/exp-drd/tests/tc18_semabuse.stderr.exp
+++ b/exp-drd/tests/tc18_semabuse.stderr.exp
@@ -1,6 +1,6 @@
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_intercepts.c:?)
+   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc18_semabuse.c:34)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp b/exp-drd/tests/tc20_verifywrap.stderr.exp
index 1ea635c29b25ff938c8aca190fb41001c6554572..1efc93fe233f3d391c1a6ac30b309a540e7fec94 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp
@@ -18,34 +18,34 @@ Other segment end (thread 2)
 
 
 Not a mutex
-   at 0x........: pthread_mutex_init (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:92)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_destroy (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:102)
 
 Not a mutex
-   at 0x........: pthread_mutex_lock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:108)
 
 Not a mutex
-   at 0x........: pthread_mutex_trylock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:116)
 
 Not a mutex
-   at 0x........: pthread_mutex_timedlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:121)
 
 Not a mutex
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 
 ---------------- pthread_cond_wait et al ----------------
 
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:147)
 
 FIXME: can't figure out how to verify wrap of pthread_cond_signal
@@ -55,25 +55,25 @@ FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_timedwait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_timedwait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:165)
 
 ---------------- pthread_rwlock_* ----------------
 
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:179)
 (1) no error on next line
 (2) no error on next line
 (3)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:196)
 
 Reader-writer lock reinitialization: rwlock 0x.........
-   at 0x........: pthread_rwlock_init* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:199)
 (4) no error on next line
 (5) no error on next line
@@ -82,7 +82,7 @@ Reader-writer lock reinitialization: rwlock 0x.........
 (8)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:212)
 
 ---------------- sem_* ----------------
@@ -92,7 +92,7 @@ FIXME: can't figure out how to verify wrap of sem_destroy
 
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_intercepts.c:?)
+   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:242)
 
 FIXME: can't figure out how to verify wrap of sem_post

diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 b/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
index 742203fa587adc8c2ceae031a5dcf2547b16c3d1..5b3c6336c8c200651840ffc727a30b0a567f2b4e 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
@@ -18,33 +18,33 @@ Other segment end (thread 2)
 
 
 Not a mutex
-   at 0x........: pthread_mutex_init (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:92)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_destroy (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:102)
 
 make pthread_mutex_lock fail: skipped on glibc < 2.4
 
 
 Not a mutex
-   at 0x........: pthread_mutex_trylock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:116)
 
 Not a mutex
-   at 0x........: pthread_mutex_timedlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:121)
 
 Not a mutex
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 
 ---------------- pthread_cond_wait et al ----------------
 
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:147)
 
 FIXME: can't figure out how to verify wrap of pthread_cond_signal
@@ -54,25 +54,25 @@ FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_timedwait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_timedwait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:165)
 
 ---------------- pthread_rwlock_* ----------------
 
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:179)
 (1) no error on next line
 (2) no error on next line
 (3)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:196)
 
 Reader-writer lock reinitialization: rwlock 0x.........
-   at 0x........: pthread_rwlock_init* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:199)
 (4) no error on next line
 (5) no error on next line
@@ -81,7 +81,7 @@ Reader-writer lock reinitialization: rwlock 0x.........
 (8)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:212)
 
 ---------------- sem_* ----------------
@@ -91,7 +91,7 @@ FIXME: can't figure out how to verify wrap of sem_destroy
 
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_intercepts.c:?)
+   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:242)
 
 FIXME: can't figure out how to verify wrap of sem_post

diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp b/exp-drd/tests/tc20_verifywrap2.stderr.exp
index f7fe3a5dfb91a7758385ccbbd014bd794ef7ddb3..a6f2970701f5133807c2a0a7f6db4bd83667e9d4 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp
@@ -19,7 +19,7 @@ Other segment end (thread 2)
 [1/1] mutex_init      invalid mutex 0x........
 
 Not a mutex
-   at 0x........: pthread_mutex_init (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:92)
 [1/1] mutex_init      mutex 0x........
 [1/1] pre_mutex_lock  mutex 0x........ rc 0 owner 0
@@ -27,30 +27,30 @@ Not a mutex
 [1/1] mutex_destroy   mutex 0x........
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_destroy (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:102)
 [1/1] pre_mutex_lock  (?) 0x........ rc 0 owner 0
 
 Not a mutex
-   at 0x........: pthread_mutex_lock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:108)
 [1/1] post_mutex_lock (?) 0x........ rc 0 owner 0
 [1/1] pre_mutex_lock  (?) 0x........ rc 0 owner 0
 
 Not a mutex
-   at 0x........: pthread_mutex_trylock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:116)
 [1/1] post_mutex_lock (?) 0x........ rc 0 owner 0
 [1/1] pre_mutex_lock  (?) 0x........ rc 0 owner 0
 
 Not a mutex
-   at 0x........: pthread_mutex_timedlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:121)
 [1/1] post_mutex_lock (?) 0x........ rc 0 owner 0
 [1/1] mutex_unlock    ? 0x........ rc 0
 
 Not a mutex
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 
 ---------------- pthread_cond_wait et al ----------------
@@ -60,7 +60,7 @@ Not a mutex
 [1/1] mutex_unlock    error checking mutex 0x........ rc 0
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:147)
 [1/1] cond_pre_wait 0x........
 [1/1] cond_post_wait 0x........
@@ -76,7 +76,7 @@ FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 [1/1] mutex_unlock    error checking mutex 0x........ rc 0
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_timedwait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_timedwait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:165)
 [1/1] cond_pre_wait 0x........
 [1/1] cond_post_wait 0x........
@@ -86,18 +86,18 @@ Mutex not locked: mutex 0x........, recursion count 0, owner 0.
 
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:179)
 (1) no error on next line
 (2) no error on next line
 (3)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:196)
 
 Reader-writer lock reinitialization: rwlock 0x.........
-   at 0x........: pthread_rwlock_init* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:199)
 (4) no error on next line
 (5) no error on next line
@@ -106,7 +106,7 @@ Reader-writer lock reinitialization: rwlock 0x.........
 (8)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:212)
 
 ---------------- sem_* ----------------
@@ -119,7 +119,7 @@ FIXME: can't figure out how to verify wrap of sem_destroy
 [1/1] semaphore_post_wait 0x........
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_intercepts.c:?)
+   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:242)
 [1/1] semaphore_post 0x........
 

diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
index eaac4f3a2c04d8af7fdc890937cddfb66ff34cea..465c78176a892aca70795e52a2ac8deb1c00b246 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
@@ -19,7 +19,7 @@ Other segment end (thread 2)
 [1/1] mutex_init      invalid mutex 0x........
 
 Not a mutex
-   at 0x........: pthread_mutex_init (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:92)
 [1/1] mutex_init      mutex 0x........
 [1/1] pre_mutex_lock  mutex 0x........ rc 0 owner 0
@@ -27,7 +27,7 @@ Not a mutex
 [1/1] mutex_destroy   mutex 0x........
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_destroy (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:102)
 
 make pthread_mutex_lock fail: skipped on glibc < 2.4
@@ -35,19 +35,19 @@ make pthread_mutex_lock fail: skipped on glibc < 2.4
 [1/1] pre_mutex_lock  (?) 0x........ rc 0 owner 0
 
 Not a mutex
-   at 0x........: pthread_mutex_trylock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:116)
 [1/1] post_mutex_lock (?) 0x........ rc 0 owner 0
 [1/1] pre_mutex_lock  (?) 0x........ rc 0 owner 0
 
 Not a mutex
-   at 0x........: pthread_mutex_timedlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:121)
 [1/1] post_mutex_lock (?) 0x........ rc 0 owner 0
 [1/1] mutex_unlock    ? 0x........ rc 0
 
 Not a mutex
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 
 ---------------- pthread_cond_wait et al ----------------
@@ -57,7 +57,7 @@ Not a mutex
 [1/1] mutex_unlock    error checking mutex 0x........ rc 0
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:147)
 [1/1] cond_pre_wait 0x........
 [1/1] cond_post_wait 0x........
@@ -73,7 +73,7 @@ FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 [1/1] mutex_unlock    error checking mutex 0x........ rc 0
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_timedwait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_timedwait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:165)
 [1/1] cond_pre_wait 0x........
 [1/1] cond_post_wait 0x........
@@ -83,18 +83,18 @@ Mutex not locked: mutex 0x........, recursion count 0, owner 0.
 
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:179)
 (1) no error on next line
 (2) no error on next line
 (3)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:196)
 
 Reader-writer lock reinitialization: rwlock 0x.........
-   at 0x........: pthread_rwlock_init* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:199)
 (4) no error on next line
 (5) no error on next line
@@ -103,7 +103,7 @@ Reader-writer lock reinitialization: rwlock 0x.........
 (8)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:212)
 
 ---------------- sem_* ----------------
@@ -116,7 +116,7 @@ FIXME: can't figure out how to verify wrap of sem_destroy
 [1/1] semaphore_post_wait 0x........
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_intercepts.c:?)
+   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:242)
 [1/1] semaphore_post 0x........
 

diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
index 91047728e4bcd34e28c297b012efbb00426122af..39f95f5cc899b332f3e78a49d46db59fd1160282 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
@@ -19,7 +19,7 @@ Other segment end (thread 2)
 [1/1] mutex_init      invalid mutex 0x........
 
 Not a mutex
-   at 0x........: pthread_mutex_init (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:92)
 [1/1] mutex_init      mutex 0x........
 [1/1] pre_mutex_lock  mutex 0x........ rc 0 owner 0
@@ -27,7 +27,7 @@ Not a mutex
 [1/1] mutex_destroy   mutex 0x........
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_destroy (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:102)
 
 make pthread_mutex_lock fail: skipped on glibc < 2.4
@@ -35,19 +35,19 @@ make pthread_mutex_lock fail: skipped on glibc < 2.4
 [1/1] pre_mutex_lock  (?) 0x........ rc 0 owner 0
 
 Not a mutex
-   at 0x........: pthread_mutex_trylock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:116)
 [1/1] post_mutex_lock (?) 0x........ rc 0 owner 0
 [1/1] pre_mutex_lock  (?) 0x........ rc 0 owner 0
 
 Not a mutex
-   at 0x........: pthread_mutex_timedlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:121)
 [1/1] post_mutex_lock (?) 0x........ rc 0 owner 0
 [1/1] mutex_unlock    ? 0x........ rc 0
 
 Not a mutex
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 
 ---------------- pthread_cond_wait et al ----------------
@@ -57,7 +57,7 @@ Not a mutex
 [1/1] mutex_unlock    error checking mutex 0x........ rc 0
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:147)
 [1/1] cond_pre_wait 0x........
 [1/1] cond_post_wait 0x........
@@ -73,7 +73,7 @@ FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 [1/1] mutex_unlock    error checking mutex 0x........ rc 0
 
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_timedwait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_timedwait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:165)
 [1/1] cond_pre_wait 0x........
 [1/1] cond_post_wait 0x........
@@ -83,18 +83,18 @@ Mutex not locked: mutex 0x........, recursion count 0, owner 0.
 
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:179)
 (1) no error on next line
 (2) no error on next line
 (3)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:196)
 
 Reader-writer lock reinitialization: rwlock 0x.........
-   at 0x........: pthread_rwlock_init* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:199)
 (4) no error on next line
 (5) no error on next line
@@ -103,7 +103,7 @@ Reader-writer lock reinitialization: rwlock 0x.........
 (8)    ERROR on next line
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
-   at 0x........: pthread_rwlock_unlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_unlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:212)
 
 ---------------- sem_* ----------------
@@ -116,7 +116,7 @@ FIXME: can't figure out how to verify wrap of sem_destroy
 [1/1] semaphore_post_wait 0x........
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_intercepts.c:?)
+   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:242)
 [1/1] semaphore_post 0x........
 

diff --git a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit b/exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit
index aa416a4aad0662c97070219df93456fa077c1f11..2577eeb4f6d93c744a2f40c64bcbd5bcfca4aeda 100644 (file)
--- a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit
+++ b/exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit
@@ -3,7 +3,7 @@ Conflicting load by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS
 Other segment start (thread 2)
@@ -15,7 +15,7 @@ Conflicting store by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS
 Other segment start (thread 2)
@@ -27,7 +27,7 @@ Conflicting store by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_used (offset 4, size 8) in libpthread-?.?.so, libpthread.so.0:Data
 Other segment start (thread 2)
@@ -39,7 +39,7 @@ Conflicting store by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_used (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data
 Other segment start (thread 2)
@@ -51,7 +51,7 @@ Conflicting load by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data
 Other segment start (thread 2)
@@ -63,7 +63,7 @@ Conflicting store by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache (offset 4, size 8) in libpthread-?.?.so, libpthread.so.0:Data
 Other segment start (thread 2)
@@ -75,7 +75,7 @@ Conflicting load by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache_actsize (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS
 Other segment start (thread 2)
@@ -87,7 +87,7 @@ Conflicting store by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data
 Other segment start (thread 2)
@@ -99,7 +99,7 @@ Conflicting store by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache_actsize (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS
 Other segment start (thread 2)
@@ -111,7 +111,7 @@ Conflicting load by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS
 Other segment start (thread 2)
@@ -123,7 +123,7 @@ Conflicting store by thread 1 at 0x........ size 4
    at 0x........: __deallocate_stack (in libpthread-?.?.so)
    by 0x........: __free_tcb (in libpthread-?.?.so)
    by 0x........: pthread_join (in libpthread-?.?.so)
-   by 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS
 Other segment start (thread 2)
@@ -132,7 +132,7 @@ Other segment end (thread 2)
    (thread finished, call stack no longer available)
 
 Mutex still locked at thread exit: address 0x........, recursion count 1, owner 3.
-   at 0x........: pthread_join (drd_intercepts.c:?)
+   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 
 ERROR SUMMARY: 12 errors from 12 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit b/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit
index d567ae4bfa29996c7247d76929d8e1bab1f0abfc..df2d4c10be9d1063efca765e40c021e1d06209dd 100644 (file)
--- a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit
+++ b/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit
@@ -1,6 +1,6 @@
 
 Mutex still locked at thread exit: mutex 0x........, recursion count 1, owner 3.
-   at 0x........: pthread_join (drd_intercepts.c:?)
+   at 0x........: pthread_join (drd_pthread_intercepts.c:?)
    by 0x........: main (tc22_exit_w_lock.c:43)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc23_bogus_condwait.stderr.exp b/exp-drd/tests/tc23_bogus_condwait.stderr.exp
index 7b6853eec4bee9d1cece4ab24684ad99f9137ace..f82ce01c13ad26a794038290c264d38702eed78c 100644 (file)
--- a/exp-drd/tests/tc23_bogus_condwait.stderr.exp
+++ b/exp-drd/tests/tc23_bogus_condwait.stderr.exp
@@ -1,61 +1,61 @@
 
 Not a mutex
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc23_bogus_condwait.c:69)
 
 Thread 3:
 Race condition: condition variable 0x........ has been signalled but the associated mutex 0x........ is not locked by the signalling thread
-   at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:20)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
 Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc23_bogus_condwait.c:72)
 
 Thread 3:
 Race condition: condition variable 0x........ has been signalled but the associated mutex 0x........ is not locked by the signalling thread
-   at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:24)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
 Not a mutex
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc23_bogus_condwait.c:75)
 
 Thread 3:
 Race condition: condition variable 0x........ has been signalled but the associated mutex 0x........ is not locked by the signalling thread
-   at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:28)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 2.
-   at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc23_bogus_condwait.c:78)
 
 Thread 3:
 Race condition: condition variable 0x........ has been signalled but the associated mutex 0x........ is not locked by the signalling thread
-   at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
+   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:32)
-   by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 The impossible happened: mutex 0x........ is locked simultaneously by two threads (recursion count 1, owners 2 and 1) !
 
 Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 2, owner 1.
-   at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+   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_intercepts.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 

diff --git a/exp-drd/tests/trylock.stderr.exp b/exp-drd/tests/trylock.stderr.exp
index e49782834b6d225267ad9e4a5cae64aded787e5d..cd9c7dd021788788f22b513c413f6fcd905c44da 100644 (file)
--- a/exp-drd/tests/trylock.stderr.exp
+++ b/exp-drd/tests/trylock.stderr.exp
@@ -7,7 +7,7 @@ Locking rwlock via pthread_rwlock_tryrdlock().
 Locking rwlock via pthread_rwlock_timedrdlock().
 Attempt to lock for writing recursively (not allowed).
 Recursive writer locking not allowed: rwlock 0x.........
-   at 0x........: pthread_rwlock_wrlock* (drd_intercepts.c:?)
+   at 0x........: pthread_rwlock_wrlock* (drd_pthread_intercepts.c:?)
    by 0x........: main (trylock.c:?)
 Locking mutex via pthread_mutex_trylock().
 Locking mutex via pthread_mutex_lock().