commit 980ffb0243a1840ad0a93cfa06dfc02ca6f2d01c
author Carl Shapiro <cshapiro@google.com> Sat Mar 13 22:34:01 2010 -0800
committer Carl Shapiro <cshapiro@google.com> Tue Mar 16 00:34:57 2010 -0700
tree ee89971ebec8447fafc0aeb8216fe9e0c30cf3d5
parent 3ea36bc0c9a7a034139263f1adf46ef5f05816fe

Replace free calls to the pthread mutex lock, unlock, and trylock
functions with calls to the error checked wrapper functions.  This
ensures that all mutex operations are checked in debug builds.

Change-Id: I4a5f181e025a2974f3325bcd9efa861eb6a92978

vm/Thread.h

diff --git a/vm/Thread.h b/vm/Thread.h
index e2af253..082c7d3 100644
--- a/vm/Thread.h
+++ b/vm/Thread.h
@@ -22,6 +22,7 @@
 
 #include "jni.h"
 
+#include <errno.h>
 #include <cutils/sched_policy.h>
 
 
@@ -387,7 +388,9 @@
  */
 INLINE int dvmTryLockMutex(pthread_mutex_t* pMutex)
 {
-    return pthread_mutex_trylock(pMutex);
+    int cc = pthread_mutex_trylock(pMutex);
+    assert(cc == 0 || cc == EBUSY);
+    return cc;
 }
 
 /*