From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 30 Mar 2008 08:39:51 +0000 (+0000)
Subject: Bug fix: DRD no longer complains that a mutex was not locked by the calling thread... 
X-Git-Tag: svn/VALGRIND_3_4_0~780
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b730e77cf71fbd7cff7a15aeea006538b03645d;p=thirdparty%2Fvalgrind.git

Bug fix: DRD no longer complains that a mutex was not locked by the calling thread when unlocking a mutex after a call to pthread_cond_timedwait() that timed out.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7815
---

diff --git a/exp-drd/drd_pthread_intercepts.c b/exp-drd/drd_pthread_intercepts.c
index a69eada91a..b52d5ed3c8 100644
--- a/exp-drd/drd_pthread_intercepts.c
+++ b/exp-drd/drd_pthread_intercepts.c
@@ -459,7 +459,7 @@ PTH_FUNC(int, pthreadZucondZuwaitZa, // pthread_cond_wait*
                              cond, mutex, mutex_type(mutex), 0, 0);
   CALL_FN_W_WW(ret, fn, cond, mutex);
   VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__POST_COND_WAIT,
-                             cond, mutex, ret == 0, 0, 0);
+                             cond, mutex, 1, 0, 0);
   return ret;
 }
 
@@ -477,7 +477,7 @@ PTH_FUNC(int, pthreadZucondZutimedwaitZa, // pthread_cond_timedwait*
                              cond, mutex, mutex_type(mutex), 0, 0);
   CALL_FN_W_WWW(ret, fn, cond, mutex, abstime);
   VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__POST_COND_WAIT,
-                             cond, mutex, ret == 0, 0, 0);
+                             cond, mutex, 1, 0, 0);
   return ret;
 }