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

Timestamp:

Mar 21, 2017, 2:29:25 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

9c31349

Parents:

e04b636

Message:

Threads now use monitor semantics to wait until completion

File:

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

src/libcfa/concurrency/monitor.c

@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(monitor_desc * this) {
-        lock( &this->lock );
-        thread_desc * thrd = this_thread();
+extern "C" {
+        void __enter_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
+                thread_desc * 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;
-        }
-        else {
-                //Some one else has the monitor, wait in line for it
-                append( &this->entry_queue, thrd );
-                ScheduleInternal( &this->lock );
+                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 );
 
-                //ScheduleInternal will unlock spinlock, no need to unlock ourselves
-                return; 
+                        //ScheduleInternal will unlock spinlock, no need to unlock ourselves
+                        return; 
+                }
+
+                unlock( &this->lock );
         }
 
-        unlock( &this->lock );
-}
+        void __leave_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
 
-void leave(monitor_desc * this) {
-        lock( &this->lock );
+                thread_desc * thrd = this_thread();
+                assert( thrd == this->owner );
 
-        thread_desc * thrd = this_thread();
-        assert( thrd == this->owner );
+                //Leaving a recursion level, decrement the counter
+                this->recursion -= 1;
 
-        //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_desc * new_owner = 0;
+                if( this->recursion == 0) {
+                        //Get the next thread in the list
+                        new_owner = this->owner = pop_head( &this->entry_queue );
 
-        //If we left the last level of recursion it means we are changing who owns the monitor
-        thread_desc * 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;
+                }       
 
-                //We are passing the monitor to someone else, which means recursion level is not 0
-                this->recursion = new_owner ? 1 : 0;
-        }       
+                unlock( &this->lock );
 
-        unlock( &this->lock );
-
-        //If we have a new owner, we need to wake-up the thread
-        if( new_owner ) {
-                ScheduleThread( new_owner );
+                //If we have a new owner, we need to wake-up the thread
+                if( new_owner ) {
+                        ScheduleThread( new_owner );
+                }
         }
 }
@@ -74 +76 @@
 void enter(monitor_desc ** monitors, int count) {
         for(int i = 0; i < count; i++) {
-                enter( monitors[i] );
+                __enter_monitor_desc( monitors[i] );
         }
 }
@@ -80 +82 @@
 void leave(monitor_desc ** monitors, int count) {
         for(int i = count - 1; i >= 0; i--) {
-                leave( monitors[i] );
+                __leave_monitor_desc( monitors[i] );
         }
 }