|
From: <sv...@va...> - 2010-01-04 10:49:55
|
Author: bart Date: 2010-01-04 10:49:48 +0000 (Mon, 04 Jan 2010) New Revision: 11010 Log: Merged tc23_bogus_condwait.stderr.exp-linux-x86 and -ppc. Added: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux Removed: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 Modified: trunk/drd/tests/Makefile.am Modified: trunk/drd/tests/Makefile.am =================================================================== --- trunk/drd/tests/Makefile.am 2010-01-04 10:47:25 UTC (rev 11009) +++ trunk/drd/tests/Makefile.am 2010-01-04 10:49:48 UTC (rev 11010) @@ -227,8 +227,7 @@ tc22_exit_w_lock.stderr.exp-32bit \ tc22_exit_w_lock.stderr.exp-64bit \ tc22_exit_w_lock.vgtest \ - tc23_bogus_condwait.stderr.exp-linux-x86 \ - tc23_bogus_condwait.stderr.exp-linux-ppc \ + tc23_bogus_condwait.stderr.exp-linux \ tc23_bogus_condwait.stderr.exp-darwin \ tc23_bogus_condwait.vgtest \ tc24_nonzero_sem.stderr.exp \ Copied: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux (from rev 11006, trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc) =================================================================== --- trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux (rev 0) +++ trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux 2010-01-04 10:49:48 UTC (rev 11010) @@ -0,0 +1,13 @@ + +The object at address 0x........ is not a mutex. + at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) + by 0x........: main (tc23_bogus_condwait.c:69) + + +Process terminating with default action of signal 7 (SIGBUS) + Invalid address alignment at address 0x........ + at 0x........: (within libpthread-?.?.so) + by 0x........: pthread_cond_wait@@GLIBC_2.3.2(within libpthread-?.?.so) + by 0x........: main (tc23_bogus_condwait.c:69) + +ERROR SUMMARY: 2 errors from 1 contexts (suppressed: 0 from 0) Deleted: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc =================================================================== --- trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc 2010-01-04 10:47:25 UTC (rev 11009) +++ trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc 2010-01-04 10:49:48 UTC (rev 11010) @@ -1,13 +0,0 @@ - -The object at address 0x........ is not a mutex. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:69) - - -Process terminating with default action of signal 7 (SIGBUS) - Invalid address alignment at address 0x........ - at 0x........: (within libpthread-?.?.so) - by 0x........: pthread_cond_wait@@GLIBC_2.3.2(within libpthread-?.?.so) - by 0x........: main (tc23_bogus_condwait.c:69) - -ERROR SUMMARY: 2 errors from 1 contexts (suppressed: 0 from 0) Deleted: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 =================================================================== --- trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 2010-01-04 10:47:25 UTC (rev 11009) +++ trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 2010-01-04 10:49:48 UTC (rev 11010) @@ -1,86 +0,0 @@ - -The object at address 0x........ is not a mutex. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:69) - -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........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -cond 0x........ was first observed at: - at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:56) - -Thread 1: -Mutex not locked: mutex 0x........, recursion count 0, owner 0. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:72) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:51) - -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........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -cond 0x........ was first observed at: - at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:56) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:51) - -Thread 1: -The object at address 0x........ is not a mutex. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:75) -rwlock 0x........ was first observed at: - at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:57) - -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........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -cond 0x........ was first observed at: - at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:56) -rwlock 0x........ was first observed at: - at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:57) - -Thread 1: -Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 2. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:78) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:53) - -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........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -cond 0x........ was first observed at: - at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:56) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:53) - -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_pthread_intercepts.c:?) - by 0x........: grab_the_lock (tc23_bogus_condwait.c:42) - by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:53) - - -ERROR SUMMARY: 11 errors from 9 contexts (suppressed: 0 from 0) |