Changeset 223a633 for libcfa/src/concurrency/monitor.cfa

Timestamp:

Oct 15, 2020, 3:41:38 PM (5 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:

b9537e6

Parents:

33c3ded (diff), 0b18db7 (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/monitor.cfa (modified) (8 diffs)

libcfa/src/concurrency/monitor.cfa

@@ -122 +122 @@
 
                 unlock( this->lock );
-                park( __cfaabi_dbg_ctx );
+                park();
 
                 __cfaabi_dbg_print_safe( "Kernel : %10p Entered  mon %p\n", thrd, this);
@@ -201 +201 @@
                 // Release the next thread
                 /* paranoid */ verifyf( urgent->owner->waiting_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
-                unpark( urgent->owner->waiting_thread __cfaabi_dbg_ctx2 );
+                unpark( urgent->owner->waiting_thread );
 
                 // Park current thread waiting
-                park( __cfaabi_dbg_ctx );
+                park();
 
                 // Some one was waiting for us, enter
@@ -222 +222 @@
 
                 // Park current thread waiting
-                park( __cfaabi_dbg_ctx );
+                park();
 
                 /* paranoid */ verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
@@ -264 +264 @@
         //We need to wake-up the thread
         /* paranoid */ verifyf( !new_owner || new_owner == this->owner, "Expected owner to be %p, got %p (m: %p)", new_owner, this->owner, this );
-        unpark( new_owner __cfaabi_dbg_ctx2 );
+        unpark( new_owner );
 }
 
@@ -493 +493 @@
         // Wake the threads
         for(int i = 0; i < thread_count; i++) {
-                unpark( threads[i] __cfaabi_dbg_ctx2 );
+                unpark( threads[i] );
         }
 
         // Everything is ready to go to sleep
-        park( __cfaabi_dbg_ctx );
+        park();
 
         // We are back, restore the owners and recursions
@@ -575 +575 @@
 
         // unpark the thread we signalled
-        unpark( signallee __cfaabi_dbg_ctx2 );
+        unpark( signallee );
 
         //Everything is ready to go to sleep
-        park( __cfaabi_dbg_ctx );
+        park();
 
 
@@ -679 +679 @@
 
                                 // unpark the thread we signalled
-                                unpark( next __cfaabi_dbg_ctx2 );
+                                unpark( next );
 
                                 //Everything is ready to go to sleep
-                                park( __cfaabi_dbg_ctx );
+                                park();
 
                                 // We are back, restore the owners and recursions
@@ -724 +724 @@
 
         //Everything is ready to go to sleep
-        park( __cfaabi_dbg_ctx );
+        park();