From: Bart Van Assche Date: Mon, 27 Jul 2009 08:30:52 +0000 (+0000) Subject: Updated expected output of tc23_bogus_condwait for Darwin because the test program... X-Git-Tag: svn/VALGRIND_3_5_0~217 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb1b7c8a7e83dfb5b8b064bd471746d9dd26c684;p=thirdparty%2Fvalgrind.git Updated expected output of tc23_bogus_condwait for Darwin because the test program has been modified (r10623). git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10631 --- diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin index 3770f6e67b..6cbd844d08 100644 --- a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin +++ b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin @@ -1,73 +1,73 @@ -Thread 2: -Invalid semaphore: semaphore 0x........ - at 0x........: sem_wait* (drd_pthread_intercepts.c:?) - by 0x........: grab_the_lock (tc23_bogus_condwait.c:47) - by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -semaphore 0x........ was first observed at: - at 0x........: sem_init* (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:65) - -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) + by 0x........: main (tc23_bogus_condwait.c:69) 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) + by 0x........: main (tc23_bogus_condwait.c:69) 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:78) + 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:57) + 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:26) + 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:62) + 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:57) + 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:81) + 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:63) + by 0x........: main (tc23_bogus_condwait.c:57) 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:81) + 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:63) + by 0x........: main (tc23_bogus_condwait.c:57) -Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 2. +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:84) + 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:59) + 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:30) + 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:62) + 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:59) + by 0x........: main (tc23_bogus_condwait.c:53) ERROR SUMMARY: 9 errors from 9 contexts (suppressed: 0 from 0)