From: Bart Van Assche Date: Wed, 22 Jul 2009 19:33:26 +0000 (+0000) Subject: Make the regression tests pass again on Linux. X-Git-Tag: svn/VALGRIND_3_5_0~313 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41d168161621d6bb5218b8485b939794d017e1fd;p=thirdparty%2Fvalgrind.git Make the regression tests pass again on Linux. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10535 --- diff --git a/drd/drd_pthread_intercepts.c b/drd/drd_pthread_intercepts.c index 154ee66d4e..4be2e7e5bf 100644 --- a/drd/drd_pthread_intercepts.c +++ b/drd/drd_pthread_intercepts.c @@ -633,7 +633,7 @@ PTH_FUNC(int, pthreadZucondZusignal, // pthread_cond_signal return ret; } -PTH_FUNC(int, pthreadZucondZusignalZu_2Za, // pthread_cond_signal_2* +PTH_FUNC(int, pthreadZucondZusignalZAZa, // pthread_cond_signal@* pthread_cond_t* cond) { int ret; diff --git a/drd/tests/pth_cond_race.stderr.exp b/drd/tests/pth_cond_race.stderr.exp index 815f508cc0..f07dddaef7 100644 --- a/drd/tests/pth_cond_race.stderr.exp +++ b/drd/tests/pth_cond_race.stderr.exp @@ -1,7 +1,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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: thread_func (pth_cond_race.c:?) by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) cond 0x........ was first observed at: diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 index 092585eef6..595dc3ea1c 100644 --- a/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 +++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 @@ -16,7 +16,7 @@ mutex 0x........ was first observed at: Thread 1: 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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: main (pth_inconsistent_cond_wait.c:?) cond 0x........ was first observed at: at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?) @@ -26,7 +26,7 @@ mutex 0x........ was first observed at: by 0x........: main (pth_inconsistent_cond_wait.c:?) 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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: main (pth_inconsistent_cond_wait.c:?) cond 0x........ was first observed at: at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?) diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 index 98e4c4e649..7391bdc48a 100644 --- a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 +++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 @@ -16,7 +16,7 @@ mutex 0x........ was first observed at: Thread 1: 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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: main (pth_inconsistent_cond_wait.c:?) cond 0x........ was first observed at: at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?) @@ -26,7 +26,7 @@ mutex 0x........ was first observed at: by 0x........: main (pth_inconsistent_cond_wait.c:?) 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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: main (pth_inconsistent_cond_wait.c:?) cond 0x........ was first observed at: at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?) diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-linux b/drd/tests/tc23_bogus_condwait.stderr.exp-linux index 7a1962670c..2efe5485a9 100644 --- a/drd/tests/tc23_bogus_condwait.stderr.exp-linux +++ b/drd/tests/tc23_bogus_condwait.stderr.exp-linux @@ -9,7 +9,7 @@ The object at address 0x........ is not a mutex. 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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: rescue_me (tc23_bogus_condwait.c:26) by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) cond 0x........ was first observed at: @@ -26,7 +26,7 @@ mutex 0x........ was first observed at: 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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: rescue_me (tc23_bogus_condwait.c:30) by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) cond 0x........ was first observed at: @@ -53,7 +53,7 @@ rwlock 0x........ was first observed at: 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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: rescue_me (tc23_bogus_condwait.c:34) by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) cond 0x........ was first observed at: @@ -73,7 +73,7 @@ mutex 0x........ was first observed at: 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:?) + at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?) by 0x........: rescue_me (tc23_bogus_condwait.c:38) by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) cond 0x........ was first observed at: