From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 7 Jul 2008 18:36:45 +0000 (+0000)
Subject: Added support for Qt4 QMutex::tryLock(int).
X-Git-Tag: svn/VALGRIND_3_4_0~352
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd539c7a7599cbabab02330a1a7ac103463af601;p=thirdparty%2Fvalgrind.git

Added support for Qt4 QMutex::tryLock(int).

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

diff --git a/drd/drd_qtcore_intercepts.c b/drd/drd_qtcore_intercepts.c
index 763e3112f8..b3950a4a0d 100644
--- a/drd/drd_qtcore_intercepts.c
+++ b/drd/drd_qtcore_intercepts.c
@@ -180,10 +180,18 @@ QT4CORE_FUNC(int, _ZN6QMutex7tryLockEv,
 // QMutex::tryLock(int) -- _ZN6QMutex7tryLockEi
 QT4CORE_FUNC(int, _ZN6QMutex7tryLockEi,
              void* mutex,
-             int timeout)
+             int timeout_ms)
 {
-  // Not yet implemented.
-  assert(0);
+  int    ret;
+  int    res;
+  OrigFn fn;
+  VALGRIND_GET_ORIG_FN(fn);
+  VALGRIND_DO_CLIENT_REQUEST(res, 0, VG_USERREQ__PRE_MUTEX_LOCK,
+                             mutex, mutex_type(mutex), 1, 0, 0);
+  CALL_FN_W_WW(ret, fn, mutex, timeout_ms);
+  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__POST_MUTEX_LOCK,
+                             mutex, ret, 0, 0, 0);
+  return ret;
 }
 
 // QMutex::unlock() -- _ZN6QMutex6unlockEv