Changeset 7a70fb2 for libcfa/src/concurrency/locks.cfa

Timestamp:

Dec 17, 2020, 10:34:27 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

852ae0ea

Parents:

72a3aff (diff), 28e88d7 (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) (5 diffs)

libcfa/src/concurrency/locks.cfa

@@ -29 +29 @@
 
         void ^?{}( info_thread(L) & this ){ }
+
+        info_thread(L) *& Back( info_thread(L) * this ) {
+                return (info_thread(L) *)Back( (Seqable *)this );
+        }
+
+        info_thread(L) *& Next( info_thread(L) * this ) {
+                return (info_thread(L) *)Next( (Colable *)this );
+        }
+
+        bool listed( info_thread(L) * this ) {
+                return Next( (Colable *)this ) != 0p;
+        }
 }
 
@@ -58 +70 @@
                 abort("A single acquisition lock holder attempted to reacquire the lock resulting in a deadlock.");
         } else if ( owner != 0p && owner != active_thread() ) {
-                append( blocked_threads, active_thread() );
+                addTail( blocked_threads, *active_thread() );
                 wait_count++;
                 unlock( lock );
@@ -96 +108 @@
 
 void pop_and_set_new_owner( blocking_lock & this ) with( this ) {
-        $thread * t = pop_head( blocked_threads );
+        $thread * t = &dropHead( blocked_threads );
         owner = t;
         recursion_count = ( t ? 1 : 0 );
@@ -128 +140 @@
     lock( lock __cfaabi_dbg_ctx2 );
         if ( owner != 0p ) {
-                append( blocked_threads, t );
+                addTail( blocked_threads, *t );
                 wait_count++;
                 unlock( lock );
@@ -257 +269 @@
                 size_t recursion_count = 0;
                 if (i->lock) {
-                        i->t->link.next = 1p;
                         recursion_count = get_recursion_count(*i->lock);
                         remove_( *i->lock );