---

yaml
---
r: 8015
b: refs/heads/snap-stage3
c: 9c33f2c
h: refs/heads/master
i:
  8013: e1862a5
  8011: 0b418a9
  8007: 1b34384
  7999: 80cca77
v: v3

Author: brson

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: cd774fc5fab0791c3463ab192de9e0900904b460
+refs/heads/snap-stage3: 9c33f2c561c77567738ee949d0c39122daec063b
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rt/sync/lock_and_signal.cpp

@@ -68,50 +68,17 @@ void lock_and_signal::unlock() {
  * Wait indefinitely until condition is signaled.
  */
 void lock_and_signal::wait() {
-    timed_wait(0);
-}
-
-bool lock_and_signal::timed_wait(size_t timeout_in_ms) {
     assert(lock_held_by_current_thread());
     _holding_thread = INVALID_THREAD;
-    bool rv = true;
 #if defined(__WIN32__)
     LeaveCriticalSection(&_cs);
-    DWORD timeout = timeout_in_ms == 0 ? INFINITE : timeout_in_ms;
-    rv = WaitForSingleObject(_event, timeout) != WAIT_TIMEOUT;
+    WaitForSingleObject(_event, INFINITE);
     EnterCriticalSection(&_cs);
     _holding_thread = GetCurrentThreadId();
 #else
-    if (timeout_in_ms == 0) {
-        CHECKED(pthread_cond_wait(&_cond, &_mutex));
-    } else {
-        timeval time_val;
-        gettimeofday(&time_val, NULL);
-        timespec time_spec;
-        time_spec.tv_sec = time_val.tv_sec + 0;
-        time_spec.tv_nsec = time_val.tv_usec * 1000 + timeout_in_ms * 1000000;
-        if(time_spec.tv_nsec >= 1000000000) {
-            time_spec.tv_sec++;
-            time_spec.tv_nsec -= 1000000000;
-        }
-        int cond_wait_status
-            = pthread_cond_timedwait(&_cond, &_mutex, &time_spec);
-        switch(cond_wait_status) {
-        case 0:
-            // successfully grabbed the lock.
-            break;
-        case ETIMEDOUT:
-            // Oops, we timed out.
-            rv = false;
-            break;
-        default:
-            // Error
-            CHECKED(cond_wait_status);
-        }
-    }
+    CHECKED(pthread_cond_wait(&_cond, &_mutex));
     _holding_thread = pthread_self();
 #endif
-    return rv;
 }
 
 /**

branches/snap-stage3/src/rt/sync/lock_and_signal.h

@@ -21,7 +21,6 @@ class lock_and_signal {
     void lock();
     void unlock();
     void wait();
-    bool timed_wait(size_t timeout_in_ns);
     void signal();
     void signal_all();