Merge commit 'adae78ea9940f4d44382967d1296e7db0b54a4de' into leveldb-squashed

2013-07-01 08:36:32 -07:00
parent 28bcf3b7ef adae78ea99
commit fb1da62318
18 changed files with 190 additions and 59 deletions
--- a/src/leveldb/port/port_win.cc
+++ b/src/leveldb/port/port_win.cc
@@ -109,12 +109,10 @@ void CondVar::Signal() {

 void CondVar::SignalAll() {
  wait_mtx_.Lock();
-  for(long i = 0; i < waiting_; ++i) {
-    ::ReleaseSemaphore(sem1_, 1, NULL);
-    while(waiting_ > 0) {
-      --waiting_;
-      ::WaitForSingleObject(sem2_, INFINITE);
-    }
+  ::ReleaseSemaphore(sem1_, waiting_, NULL);
+  while(waiting_ > 0) {
+    --waiting_;
+    ::WaitForSingleObject(sem2_, INFINITE);
  }
  wait_mtx_.Unlock();
 }