Changeset b580bcc for libcfa/src/concurrency/locks.cfa

Timestamp:

Apr 1, 2021, 4:20:00 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

fd1f65e

Parents:

3bd2464 (diff), 198e335 (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.cfa (modified) (9 diffs)

libcfa/src/concurrency/locks.cfa

@@ -134 +134 @@
         lock( lock __cfaabi_dbg_ctx2 );
         /* paranoid */ verifyf( owner != 0p, "Attempt to release lock %p that isn't held", &this );
-        /* paranoid */ verifyf( owner == active_thread() || !strict_owner, "Thread %p other than the owner %p attempted to release owner lock %p", owner, active_thread(), &this );
+        /* paranoid */ verifyf( owner == active_thread() || !strict_owner , "Thread %p other than the owner %p attempted to release owner lock %p", owner, active_thread(), &this );
+        /* paranoid */ verifyf( recursion_count == 1 || multi_acquisition, "Thread %p attempted to release owner lock %p which is not recursive but has a recursive count of %zu", active_thread(), &this, recursion_count );
 
         // if recursion count is zero release lock and set new owner if one is waiting
@@ -146 +147 @@
 size_t wait_count( blocking_lock & this ) with( this ) {
         return wait_count;
-}
-
-void set_recursion_count( blocking_lock & this, size_t recursion ) with( this ) {
-        recursion_count = recursion;
-}
-
-size_t get_recursion_count( blocking_lock & this ) with( this ) {
-        return recursion_count;
 }
 
@@ -173 +166 @@
 }
 
-void on_wait( blocking_lock & this ) with( this ) {
+size_t on_wait( blocking_lock & this ) with( this ) {
         lock( lock __cfaabi_dbg_ctx2 );
         /* paranoid */ verifyf( owner != 0p, "Attempt to release lock %p that isn't held", &this );
         /* paranoid */ verifyf( owner == active_thread() || !strict_owner, "Thread %p other than the owner %p attempted to release owner lock %p", owner, active_thread(), &this );
 
+        size_t ret = recursion_count;
+
         pop_and_set_new_owner( this );
         unlock( lock );
+        return ret;
+}
+
+void on_wakeup( blocking_lock & this, size_t recursion ) with( this ) {
+        recursion_count = recursion;
 }
 
@@ -274 +274 @@
         }
 
-        bool empty( condition_variable(L) & this ) with(this) { return empty(blocked_threads); }
+        bool empty( condition_variable(L) & this ) with(this) {
+                lock( lock __cfaabi_dbg_ctx2 );
+                bool ret = empty(blocked_threads);
+                unlock( lock );
+                return ret;
+        }
 
         int counter( condition_variable(L) & this ) with(this) { return count; }
@@ -285 +290 @@
                 if (i->lock) {
                         // if lock was passed get recursion count to reset to after waking thread
-                        recursion_count = get_recursion_count(*i->lock);
-                        on_wait( *i->lock );
+                        recursion_count = on_wait( *i->lock );
                 }
                 return recursion_count;
@@ -301 +305 @@
 
                 // resets recursion count here after waking
-                if (i.lock) set_recursion_count(*i.lock, recursion_count);
+                if (i.lock) on_wakeup(*i.lock, recursion_count);
         }
 
@@ -323 +327 @@
 
                 // resets recursion count here after waking
-                if (info.lock) set_recursion_count(*info.lock, recursion_count);
+                if (info.lock) on_wakeup(*info.lock, recursion_count);
         }
 
@@ -373 +377 @@
 }
 
-bool V(semaphore & this) with( this ) {
+$thread * V (semaphore & this, const bool doUnpark ) with( this ) {
         $thread * thrd = 0p;
         lock( lock __cfaabi_dbg_ctx2 );
@@ -385 +389 @@
 
         // make new owner
-        unpark( thrd );
-
+        if( doUnpark ) unpark( thrd );
+
+        return thrd;
+}
+
+bool V(semaphore & this) with( this ) {
+        $thread * thrd = V(this, true);
         return thrd != 0p;
 }