|
From: <sv...@va...> - 2009-07-22 19:52:17
|
Author: bart
Date: 2009-07-22 20:33:26 +0100 (Wed, 22 Jul 2009)
New Revision: 10535
Log:
Make the regression tests pass again on Linux.
Modified:
trunk/drd/drd_pthread_intercepts.c
trunk/drd/tests/pth_cond_race.stderr.exp
trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux
Modified: trunk/drd/drd_pthread_intercepts.c
===================================================================
--- trunk/drd/drd_pthread_intercepts.c 2009-07-22 19:17:05 UTC (rev 10534)
+++ trunk/drd/drd_pthread_intercepts.c 2009-07-22 19:33:26 UTC (rev 10535)
@@ -633,7 +633,7 @@
return ret;
}
-PTH_FUNC(int, pthreadZucondZusignalZu_2Za, // pthread_cond_signal_2*
+PTH_FUNC(int, pthreadZucondZusignalZAZa, // pthread_cond_signal@*
pthread_cond_t* cond)
{
int ret;
Modified: trunk/drd/tests/pth_cond_race.stderr.exp
===================================================================
--- trunk/drd/tests/pth_cond_race.stderr.exp 2009-07-22 19:17:05 UTC (rev 10534)
+++ trunk/drd/tests/pth_cond_race.stderr.exp 2009-07-22 19:33:26 UTC (rev 10535)
@@ -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:
Modified: trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
===================================================================
--- trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 2009-07-22 19:17:05 UTC (rev 10534)
+++ trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 2009-07-22 19:33:26 UTC (rev 10535)
@@ -16,7 +16,7 @@
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 @@
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:?)
Modified: trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
===================================================================
--- trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 2009-07-22 19:17:05 UTC (rev 10534)
+++ trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 2009-07-22 19:33:26 UTC (rev 10535)
@@ -16,7 +16,7 @@
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 @@
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:?)
Modified: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux
===================================================================
--- trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux 2009-07-22 19:17:05 UTC (rev 10534)
+++ trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux 2009-07-22 19:33:26 UTC (rev 10535)
@@ -9,7 +9,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:?)
+ 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 @@
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 @@
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 @@
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:
|