Author: sewardj
Date: 2007-11-05 12:59:31 +0000 (Mon, 05 Nov 2007)
New Revision: 7102

Log:
More glibc-2.3 fixes.

Modified:
   branches/THRCHECK/glibc-2.X-thrcheck.supp
   branches/THRCHECK/thrcheck/tests/filter_stderr
   branches/THRCHECK/thrcheck/tests/tc20_verifywrap.stderr.exp-glibc23-amd64
   branches/THRCHECK/thrcheck/tests/tc23_bogus_condwait.c


Modified: branches/THRCHECK/glibc-2.X-thrcheck.supp
===================================================================
--- branches/THRCHECK/glibc-2.X-thrcheck.supp   2007-11-05 11:10:29 UTC (rev 
7101)
+++ branches/THRCHECK/glibc-2.X-thrcheck.supp   2007-11-05 12:59:31 UTC (rev 
7102)
@@ -281,20 +281,38 @@
    obj:/lib*/libc-2.3.*so
 }
 {
+   thrcheck-glibc23-008
+   Thrcheck:Race
+   obj:/lib*/libpthread-2.3.*so
+   obj:/lib*/libc-2.3.*so
+}
+{
    thrcheck-glibc23-009
    Thrcheck:Race
    obj:/lib*/libc-2.3.*so
    obj:/lib*/ld-2.3.*so
    obj:/lib*/libc-2.3.*so
 }
-
 {
+   thrcheck-glibc23-011
+   Thrcheck:Race
+   obj:/lib*/libc-2.3.*so
+   obj:/lib*/libpthread-2.3.*so
+}
+{
    thrcheck-glibc23-012
    Thrcheck:Race
    obj:/lib*/ld-2.3.*so
    obj:/lib*/ld-2.3.*so
    obj:/lib*/libc-2.3.*so
 }
+{
+   thrcheck-glibc23-014
+   Thrcheck:Race
+   obj:/lib*/ld-2.3.*so
+   obj:/lib*/ld-2.3.*so
+   obj:/lib*/libpthread-2.3.*so
+}
 
 {
    thrcheck-glibc23-100

Modified: branches/THRCHECK/thrcheck/tests/filter_stderr
===================================================================
--- branches/THRCHECK/thrcheck/tests/filter_stderr      2007-11-05 11:10:29 UTC 
(rev 7101)
+++ branches/THRCHECK/thrcheck/tests/filter_stderr      2007-11-05 12:59:31 UTC 
(rev 7102)
@@ -25,6 +25,6 @@
 # been built with debugging information, hence source locs are present
 sed "s/(createthread.c:[0-9]*)/(in \/lib\/libpthread...)/g" |
 sed "s/(clone.S:[0-9]*)/(in \/...libc...)/g" |
-sed "s/start_thread (pthread_create.c:[0-9]*)$/.../g" |
+sed "s/start_thread (pthread_create.c:[0-9]*)$/start_thread (in 
\/lib\/libpthread...)/g" |
 
 $dir/../../tests/filter_test_paths

Modified: 
branches/THRCHECK/thrcheck/tests/tc20_verifywrap.stderr.exp-glibc23-amd64
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc20_verifywrap.stderr.exp-glibc23-amd64   
2007-11-05 11:10:29 UTC (rev 7101)
+++ branches/THRCHECK/thrcheck/tests/tc20_verifywrap.stderr.exp-glibc23-amd64   
2007-11-05 12:59:31 UTC (rev 7102)
@@ -47,12 +47,9 @@
 ---------------- pthread_cond_wait et al ----------------
 
 
-Thread #1 unlocked a not-locked lock at 0x........ 
+Thread #1: pthread_cond_{timed}wait called with un-held mutex
    at 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
    by 0x........: main (tc20_verifywrap.c:147)
-  Lock at 0x........ was first observed
-   at 0x........: pthread_mutex_init (tc_intercepts.c:...)
-   by 0x........: main (tc20_verifywrap.c:145)
 
 Thread #1's call to pthread_cond_wait failed
    with error code 1 (EPERM: Operation not permitted)
@@ -65,6 +62,10 @@
 FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 
 
+Thread #1: pthread_cond_{timed}wait called with un-held mutex
+   at 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
+   by 0x........: main (tc20_verifywrap.c:165)
+
 Thread #1's call to pthread_cond_timedwait failed
    with error code 22 (EINVAL: Invalid argument)
    at 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
@@ -125,15 +126,9 @@
 
 
 Thread #1 deallocated location 0x........ containing a locked lock
-   at 0x........: main (tc20_verifywrap.c:263)
+   at 0x........: main (tc20_verifywrap.c:262)
   Lock at 0x........ was first observed
    at 0x........: pthread_rwlock_init (tc_intercepts.c:...)
    by 0x........: main (tc20_verifywrap.c:216)
 
-Thread #1 deallocated location 0x........ containing a locked lock
-   at 0x........: main (tc20_verifywrap.c:263)
-  Lock at 0x........ was first observed
-   at 0x........: pthread_mutex_init (tc_intercepts.c:...)
-   by 0x........: main (tc20_verifywrap.c:145)
-
 ERROR SUMMARY: 15 errors from 15 contexts (suppressed: 0 from 0)

Modified: branches/THRCHECK/thrcheck/tests/tc23_bogus_condwait.c
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc23_bogus_condwait.c      2007-11-05 
11:10:29 UTC (rev 7101)
+++ branches/THRCHECK/thrcheck/tests/tc23_bogus_condwait.c      2007-11-05 
12:59:31 UTC (rev 7102)
@@ -1,7 +1,7 @@
 
 /* Expect 5 errors total (4 re cvs, 1 re exiting w/lock.).
    Tests passing bogus mutexes to pthread_cond_wait. */
-
+#define _GNU_SOURCE 1 /* needed by glibc <= 2.3 for pthread_rwlock_* */
 #include <pthread.h>
 #include <assert.h>
 #include <unistd.h>


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers

Reply via email to