Author: sewardj
Date: 2007-11-05 02:46:08 +0000 (Mon, 05 Nov 2007)
New Revision: 7093
Log:
More output changes and expected-output changes pertaining to mutex
checking for pthread_cond_wait.
Modified:
branches/THRCHECK/thrcheck/tc_main.c
branches/THRCHECK/thrcheck/tests/tc20_verifywrap.c
branches/THRCHECK/thrcheck/tests/tc20_verifywrap.stderr.exp-glibc25-amd64
branches/THRCHECK/thrcheck/tests/tc23_bogus_condwait.stderr.exp-glibc25-amd64
Modified: branches/THRCHECK/thrcheck/tc_main.c
===================================================================
--- branches/THRCHECK/thrcheck/tc_main.c 2007-11-05 02:26:31 UTC (rev
7092)
+++ branches/THRCHECK/thrcheck/tc_main.c 2007-11-05 02:46:08 UTC (rev
7093)
@@ -6058,25 +6058,25 @@
lk_valid = False;
record_error_Misc(
thr,
- "pthread_cond_wait called with invalid mutex" );
+ "pthread_cond_{timed}wait called with invalid mutex" );
} else {
tl_assert( is_sane_LockN(lk) );
if (lk->kind == LK_rdwr) {
lk_valid = False;
record_error_Misc(
- thr, "pthread_cond_wait called with mutex "
+ thr, "pthread_cond_{timed}wait called with mutex "
"of type pthread_rwlock_t*" );
} else
if (lk->heldBy == NULL) {
lk_valid = False;
record_error_Misc(
- thr, "pthread_cond_wait called with un-held mutex");
+ thr, "pthread_cond_{timed}wait called with un-held mutex");
} else
if (lk->heldBy != NULL
&& TC_(elemBag)( lk->heldBy, (Word)thr ) == 0) {
lk_valid = False;
record_error_Misc(
- thr, "pthread_cond_wait called with mutex "
+ thr, "pthread_cond_{timed}wait called with mutex "
"held by a different thread" );
}
}
Modified: branches/THRCHECK/thrcheck/tests/tc20_verifywrap.c
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc20_verifywrap.c 2007-11-05 02:26:31 UTC
(rev 7092)
+++ branches/THRCHECK/thrcheck/tests/tc20_verifywrap.c 2007-11-05 02:46:08 UTC
(rev 7093)
@@ -255,7 +255,6 @@
/* At this point it should complain about deallocation
of memory containing locked locks:
- mx4
rwl3
*/
Modified:
branches/THRCHECK/thrcheck/tests/tc20_verifywrap.stderr.exp-glibc25-amd64
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc20_verifywrap.stderr.exp-glibc25-amd64
2007-11-05 02:26:31 UTC (rev 7092)
+++ branches/THRCHECK/thrcheck/tests/tc20_verifywrap.stderr.exp-glibc25-amd64
2007-11-05 02:46:08 UTC (rev 7093)
@@ -69,12 +69,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)
@@ -87,6 +84,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:...)
@@ -152,10 +153,4 @@
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: 20 errors from 20 contexts (suppressed: 0 from 0)
Modified:
branches/THRCHECK/thrcheck/tests/tc23_bogus_condwait.stderr.exp-glibc25-amd64
===================================================================
---
branches/THRCHECK/thrcheck/tests/tc23_bogus_condwait.stderr.exp-glibc25-amd64
2007-11-05 02:26:31 UTC (rev 7092)
+++
branches/THRCHECK/thrcheck/tests/tc23_bogus_condwait.stderr.exp-glibc25-amd64
2007-11-05 02:46:08 UTC (rev 7093)
@@ -1,15 +1,15 @@
Thread #1 is the program's root thread
-Thread #1: pthread_cond_wait called with invalid mutex
+Thread #1: pthread_cond_{timed}wait called with invalid mutex
at 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc23_bogus_condwait.c:62)
-Thread #1: pthread_cond_wait called with un-held mutex
+Thread #1: pthread_cond_{timed}wait called with un-held mutex
at 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc23_bogus_condwait.c:65)
-Thread #1: pthread_cond_wait called with mutex of type pthread_rwlock_t*
+Thread #1: pthread_cond_{timed}wait called with mutex of type pthread_rwlock_t*
at 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc23_bogus_condwait.c:68)
@@ -24,7 +24,7 @@
at 0x........: start_thread (in /lib/libpthread...)
by 0x........: ...
-Thread #1: pthread_cond_wait called with mutex held by a different thread
+Thread #1: pthread_cond_{timed}wait called with mutex held by a different
thread
at 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc23_bogus_condwait.c:73)
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
