Changes in src/libcfa/concurrency/monitor.c [cc7f4b1:51f3798]

File:

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

src/libcfa/concurrency/monitor.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// __monitor_t.c --
+// monitor.c --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(__monitor_t * this) {
+void enter(monitor * this) {
         lock( &this->lock );
         thread * thrd = this_thread();
 
-        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;
+        if( this->holder ) {
+                append( &this->entry_queue, thrd );
+                ScheduleInternal( &this->lock );
+                return;
         }
         else {
-                //Some one else has the monitor, wait in line for it
-                append( &this->entry_queue, thrd );
-                ScheduleInternal( &this->lock );
-
-                //ScheduleInternal will unlock spinlock, no need to unlock ourselves
-                return; 
+                this->holder = thrd;
         }
 
@@ -45 +35 @@
 }
 
-void leave(__monitor_t * this) {
+void leave(monitor * this) {
         lock( &this->lock );
 
         thread * thrd = this_thread();
-        assert( thrd == this->owner );
+        assert( thrd == this->holder );
 
-        //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;
-        }       
+        this->holder = pop_head( &this->entry_queue );
 
         unlock( &this->lock );
 
-        //If we have a new owner, we need to wake-up the thread
-        if( new_owner ) {
-                ScheduleThread( new_owner );
-        }
+        if( this->holder ) ScheduleThread( this->holder );
 }