commit 00344642510c48809f2eba353777e4a274e6d2f1
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Mar 01 15:27:41 2008 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Mar 01 15:27:41 2008 +0000
tree 070439ed3cd447c65f005fc4c45c028425be1cd6
parent 0adf47fe2c9f66dd73b798443c16019e52753c23

Converted double mutex error messages into single error messages.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7524 a5019735-40e9-0310-863c-91ae7b9d1cf9

exp-drd/drd_clientreq.c

diff --git a/exp-drd/drd_clientreq.c b/exp-drd/drd_clientreq.c
index 3eb9598..6ca6f7e 100644
--- a/exp-drd/drd_clientreq.c
+++ b/exp-drd/drd_clientreq.c
@@ -60,12 +60,12 @@
    cond_pre_wait(cond, cond_size, mutex);
 }
 
-static void drd_post_cond_wait(const Addr cond, const Addr mutex,
-                               const SizeT size, const MutexT mutex_type,
+static void drd_post_cond_wait(const Addr cond,
+                               const Addr mutex,
                                const Bool took_lock)
 {
    cond_post_wait(cond);
-   mutex_post_lock(mutex, size, mutex_type, took_lock);
+   mutex_post_lock(mutex, took_lock);
 }
 
 static void drd_pre_cond_signal(const Addr cond)
@@ -133,16 +133,15 @@
       break;
 
    case VG_USERREQ__PRE_PTHREAD_MUTEX_LOCK:
-      drd_pre_mutex_lock(thread_get_running_tid(), arg[1], arg[2], arg[3]);
+      drd_pre_mutex_lock(arg[1], arg[2], arg[3]);
       break;
 
    case VG_USERREQ__POST_PTHREAD_MUTEX_LOCK:
-      drd_post_mutex_lock(thread_get_running_tid(),
-                          arg[1], arg[2], arg[3], arg[4]);
+      drd_post_mutex_lock(arg[1], arg[2]);
       break;
 
    case VG_USERREQ__PRE_PTHREAD_MUTEX_UNLOCK:
-      drd_pre_mutex_unlock(thread_get_running_tid(), arg[1], arg[3]);
+      drd_pre_mutex_unlock(arg[1], arg[3]);
       break;
 
    case VG_USERREQ__SPIN_INIT_OR_UNLOCK:
@@ -163,9 +162,7 @@
       break;
 
    case VG_USERREQ__POST_PTHREAD_COND_WAIT:
-      drd_post_cond_wait(arg[1]/*cond*/, arg[2]/*mutex*/,
-                         arg[3]/*mutex_size*/, arg[4]/*mutex_type*/,
-                         arg[5]/*took_lock*/);
+      drd_post_cond_wait(arg[1]/*cond*/, arg[2]/*mutex*/, arg[3]/*took_lock*/);
       break;
 
    case VG_USERREQ__PRE_PTHREAD_COND_SIGNAL:
@@ -216,6 +213,27 @@
       drd_barrier_post_wait(thread_get_running_tid(), arg[1], arg[2]);
       break;
 
+   case VG_USERREQ__PRE_RWLOCK_INIT:
+      break;
+
+   case VG_USERREQ__POST_RWLOCK_DESTROY:
+      break;
+
+   case VG_USERREQ__PRE_RWLOCK_RDLOCK:
+      break;
+
+   case VG_USERREQ__POST_RWLOCK_RDLOCK:
+      break;
+
+   case VG_USERREQ__PRE_RWLOCK_WRLOCK:
+      break;
+
+   case VG_USERREQ__POST_RWLOCK_WRLOCK:
+      break;
+
+   case VG_USERREQ__POST_RWLOCK_UNLOCK:
+      break;
+
    default:
       VG_(message)(Vg_DebugMsg, "Unrecognized client request 0x%lx 0x%lx",
                    arg[0], arg[1]);