Changeset a14926b for libcfa/src/concurrency

Timestamp:

Jan 5, 2023, 8:48:09 AM (23 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

3d4b7cc7

Parents:

a7662b8 (diff), d99a716 (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

Location:

libcfa/src/concurrency

Files:

• invoke.h (modified) (1 diff)
• locks.hfa (modified) (2 diffs)

libcfa/src/concurrency/invoke.h

@@ -215 +215 @@
                 struct __thread_user_link cltr_link;
 
-                // used to store state between clh lock/unlock
-                volatile bool * clh_prev;
-
                 // used to point to this thd's current clh node
                 volatile bool * clh_node;

libcfa/src/concurrency/locks.hfa

@@ -228 +228 @@
 struct clh_lock {
         volatile bool * volatile tail;
+    volatile bool * volatile head;
 };
 
@@ -237 +238 @@
         *(curr_thd->clh_node) = false;
         volatile bool * prev = __atomic_exchange_n((bool **)(&l.tail), (bool *)(curr_thd->clh_node), __ATOMIC_SEQ_CST);
-        while(!__atomic_load_n(prev, __ATOMIC_ACQUIRE)) Pause();
-        curr_thd->clh_prev = prev;
+        while(!__atomic_load_n(prev, __ATOMIC_SEQ_CST)) Pause();
+    __atomic_store_n((bool **)(&l.head), (bool *)curr_thd->clh_node, __ATOMIC_SEQ_CST);
+    curr_thd->clh_node = prev;
 }
 
 static inline void unlock(clh_lock & l) {
-        thread$ * curr_thd = active_thread();
-        __atomic_store_n(curr_thd->clh_node, true, __ATOMIC_RELEASE);
-        curr_thd->clh_node = curr_thd->clh_prev;
+        __atomic_store_n((bool *)(l.head), true, __ATOMIC_SEQ_CST);
 }