commit 7aa707a5d654b7af67b133955c454c8e23a12abc
author The Android Open Source Project <initial-contribution@android.com> Tue Mar 03 14:04:24 2009 -0800
committer Alex Ray <aray@google.com> Tue Jul 30 13:56:49 2013 -0700
tree bf445487740866dcc015ab85001f00573db0fc7e
parent c739660fb7c06a845f829a86302bd4a91641318f

auto import from //depot/cupcake/@132589

libs/utils/Threads.cpp

diff --git a/libs/utils/Threads.cpp b/libs/utils/Threads.cpp
index 5f407a9..74271ba 100644
--- a/libs/utils/Threads.cpp
+++ b/libs/utils/Threads.cpp
@@ -896,7 +896,6 @@
 {
     mLock.lock();
     if (mNumReaders == 0) {
-        mLock.unlock();
         LOG(LOG_WARN, "thread",
             "WARNING: unlockForRead requested, but not locked\n");
         return;
@@ -962,7 +961,6 @@
 {
     mLock.lock();
     if (mNumWriters == 0) {
-        mLock.unlock();
         LOG(LOG_WARN, "thread",
             "WARNING: unlockForWrite requested, but not locked\n");
         return;
@@ -974,7 +972,7 @@
     //printf(" wrlk held %.3f msec\n",
     //    (double) mDebugTimer.durationUsecs() / 1000.0);
 #endif
-    mWriteWaiter.signal();         // should other writers get first dibs?
+    // mWriteWaiter.signal();       // should other writers get first dibs?
     //printf("+++ signaling readers (if any)\n");
     mReadWaiter.broadcast();        // wake all readers (if any)
     mLock.unlock();