Changeset 660665f for libcfa/src/concurrency/locks.hfa

Timestamp:

Jun 29, 2021, 5:35:19 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

dcad80a

Parents:

5a46e09 (diff), d02e547 (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) (4 diffs)

libcfa/src/concurrency/locks.hfa

@@ -24 +24 @@
 #include "containers/list.hfa"
 
+#include "limits.hfa"
 #include "thread.hfa"
 
@@ -87 +88 @@
         bool tryP(BinaryBenaphore & this) {
                 ssize_t c = this.counter;
+                /* paranoid */ verify( c > MIN );
                 return (c >= 1) && __atomic_compare_exchange_n(&this.counter, &c, c-1, false, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
         }
@@ -94 +96 @@
                 ssize_t c = 0;
                 for () {
+                        /* paranoid */ verify( this.counter < MAX );
                         if (__atomic_compare_exchange_n(&this.counter, &c, c+1, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
                                 if (c == 0) return true;
@@ -173 +176 @@
         ThreadBenaphore sem;
 };
+
+static inline void ?{}(fast_lock & this) { this.owner = 0p; }
 
 static inline bool $try_lock(fast_lock & this, $thread * thrd) {