Changeset fd061ed3 for src/libcfa/concurrency/monitor.c

Timestamp:

Feb 28, 2017, 1:49:12 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

14f6bb39

Parents:

31868da (diff), cc7f4b1 (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:

• src/libcfa/concurrency/monitor.c (modified) (3 diffs)

src/libcfa/concurrency/monitor.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// monitor.c --
+// __monitor_t.c --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(monitor * this) {
+void enter(__monitor_t * this) {
         lock( &this->lock );
         thread * thrd = this_thread();
 
-        if( this->holder ) {
+        if( !this->owner ) {
+                //No one has the monitor, just take it
+                this->owner = thrd;
+                this->recursion = 1;
+        }
+        else if( this->owner == thrd) {
+                //We already have the monitor, just not how many times we took it
+                assert( this->recursion > 0 );
+                this->recursion += 1;
+        }
+        else {
+                //Some one else has the monitor, wait in line for it
                 append( &this->entry_queue, thrd );
                 ScheduleInternal( &this->lock );
-                return;
-        }
-        else {
-                this->holder = thrd;
+
+                //ScheduleInternal will unlock spinlock, no need to unlock ourselves
+                return; 
         }
 
@@ -35 +45 @@
 }
 
-void leave(monitor * this) {
+void leave(__monitor_t * this) {
         lock( &this->lock );
 
         thread * thrd = this_thread();
-        assert( thrd == this->holder );
+        assert( thrd == this->owner );
 
-        this->holder = pop_head( &this->entry_queue );
+        //Leaving a recursion level, decrement the counter
+        this->recursion -= 1;
+
+        //If we left the last level of recursion it means we are changing who owns the monitor
+        thread * new_owner = 0;
+        if( this->recursion == 0) {
+                //Get the next thread in the list
+                new_owner = this->owner = pop_head( &this->entry_queue );
+
+                //We are passing the monitor to someone else, which means recursion level is not 0
+                this->recursion = new_owner ? 1 : 0;
+        }       
 
         unlock( &this->lock );
 
-        if( this->holder ) ScheduleThread( this->holder );
+        //If we have a new owner, we need to wake-up the thread
+        if( new_owner ) {
+                ScheduleThread( new_owner );
+        }
 }