Changes in src/libcfa/concurrency/monitor.c [cb0e6de:17af7d1]

File:

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

src/libcfa/concurrency/monitor.c

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