---

yaml
---
r: 7977
b: refs/heads/snap-stage3
c: f76e6c3
h: refs/heads/master
i:
  7975: a113df9
v: v3

Author: brson

[refs]

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

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

@@ -1,3 +1,4 @@
+#include <assert.h>
 #include "../globals.h"
 
 /*
@@ -9,8 +10,13 @@
 
 #include "lock_and_signal.h"
 
+// FIXME: This is not a portable way of specifying an invalid pthread_t
+#define INVALID_THREAD 0
+
+
 #if defined(__WIN32__)
 lock_and_signal::lock_and_signal()
+    : _holding_thread(INVALID_THREAD)
 {
     // FIXME: In order to match the behavior of pthread_cond_broadcast on
     // Windows, we create manual reset events. This however breaks the
@@ -23,7 +29,7 @@ lock_and_signal::lock_and_signal()
 
 #else
 lock_and_signal::lock_and_signal()
-    : _locked(false)
+    : _holding_thread(INVALID_THREAD)
 {
     CHECKED(pthread_cond_init(&_cond, NULL));
     CHECKED(pthread_mutex_init(&_mutex, NULL));
@@ -47,11 +53,10 @@ void lock_and_signal::lock() {
     CHECKED(pthread_mutex_lock(&_mutex));
     _holding_thread = pthread_self();
 #endif
-    _locked = true;
 }
 
 void lock_and_signal::unlock() {
-    _locked = false;
+    _holding_thread = INVALID_THREAD;
 #if defined(__WIN32__)
     LeaveCriticalSection(&_cs);
 #else
@@ -67,7 +72,8 @@ void lock_and_signal::wait() {
 }
 
 bool lock_and_signal::timed_wait(size_t timeout_in_ms) {
-    _locked = false;
+    assert(lock_held_by_current_thread());
+    _holding_thread = INVALID_THREAD;
     bool rv = true;
 #if defined(__WIN32__)
     LeaveCriticalSection(&_cs);
@@ -105,7 +111,6 @@ bool lock_and_signal::timed_wait(size_t timeout_in_ms) {
     }
     _holding_thread = pthread_self();
 #endif
-    _locked = true;
     return rv;
 }
 
@@ -134,9 +139,9 @@ void lock_and_signal::signal_all() {
 bool lock_and_signal::lock_held_by_current_thread()
 {
 #if defined(__WIN32__)
-    return _locked && _holding_thread == GetCurrentThreadId();
+    return _holding_thread == GetCurrentThreadId();
 #else
-    return _locked && _holding_thread == pthread_self();
+    return pthread_equal(_holding_thread, pthread_self());
 #endif
 }
 

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

@@ -13,7 +13,6 @@ class lock_and_signal {
 
     pthread_t _holding_thread;
 #endif
-    bool _locked;
 
 public:
     lock_and_signal();