Changeset d672350 for libcfa/src/concurrency/locks.hfa

Timestamp:

Mar 21, 2022, 1:44:06 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

a76202d

Parents:

ef3c383 (diff), dbe2533 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/concurrency/locks.hfa

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