Changes in libcfa/src/concurrency/locks.hfa [0d4f954:0fc447c]

File:

• libcfa/src/concurrency/locks.hfa (modified) (3 diffs)

libcfa/src/concurrency/locks.hfa

@@ -164 +164 @@
 }
 
-static inline void lock(linear_backoff_then_block_lock & this) with(this) {
+static inline bool lock(linear_backoff_then_block_lock & this) with(this) {
         // if owner just return
-        if (active_thread() == owner) return;
+        if (active_thread() == owner) return true;
         size_t compare_val = 0;
         int spin = spin_start;
@@ -172 +172 @@
         for( ;; ) {
                 compare_val = 0;
-                if (internal_try_lock(this, compare_val)) return;
+                if (internal_try_lock(this, compare_val)) return true;
                 if (2 == compare_val) break;
                 for (int i = 0; i < spin; i++) Pause();
@@ -179 +179 @@
         }
 
-        if(2 != compare_val && try_lock_contention(this)) return;
+        if(2 != compare_val && try_lock_contention(this)) return true;
         // block until signalled
-        while (block(this)) if(try_lock_contention(this)) return;
+        while (block(this)) if(try_lock_contention(this)) return true;
+
+        // this should never be reached as block(this) always returns true
+        return false;
 }