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

Timestamp:

Jul 25, 2022, 2:23:28 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (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) (6 diffs)

libcfa/src/concurrency/locks.hfa

@@ -478 +478 @@
         #endif
         lock( lock, node );
-        while(held) Pause();
-        held = true;
-        // printf("locked\n");
+        while(__atomic_load_n(&held, __ATOMIC_SEQ_CST)) Pause();
+        __atomic_store_n(&held, true, __ATOMIC_SEQ_CST);
         unlock( lock, node );
         #ifdef __CFA_DEBUG__
@@ -488 +487 @@
 
 static inline void unlock(spin_queue_lock & this) with(this) {
-        // printf("unlocked\n");
         #ifdef __CFA_DEBUG__
         owner = 0p;
         #endif
-        held = false;
+        __atomic_store_n(&held, false, __ATOMIC_RELEASE);
 }
 
@@ -535 +533 @@
         #endif
         lock( lock, node );
-        while(held) Pause();
-        held = true;
+        while(__atomic_load_n(&held, __ATOMIC_SEQ_CST)) Pause();
+        __atomic_store_n(&held, true, __ATOMIC_SEQ_CST);
         unlock( lock, node );
         #ifdef __CFA_DEBUG__
@@ -547 +545 @@
         owner = 0p;
         #endif
-        held = false;
+        __atomic_store_n(&held, false, __ATOMIC_SEQ_CST);
 }
 
@@ -588 +586 @@
         #endif
         lock( lock );
-        while(held) Pause();
-        held = true;
+        while(__atomic_load_n(&held, __ATOMIC_SEQ_CST)) Pause();
+        __atomic_store_n(&held, true, __ATOMIC_RELEASE);
         unlock( lock );
         #ifdef __CFA_DEBUG__
@@ -600 +598 @@
         owner = 0p;
         #endif
-        held = false;
+        __atomic_store_n(&held, false, __ATOMIC_RELEASE);
 }