Changes in src/libcfa/concurrency/monitor.c [1c273d0:4aa2fb2]

File:

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

src/libcfa/concurrency/monitor.c

@@ -44 +44 @@
 
 extern "C" {
-        void __enter_monitor_desc( monitor_desc * this ) {
-                lock( &this->lock, __PRETTY_FUNCTION__ );
-                thread_desc * thrd = this_thread;
-
-                // LIB_DEBUG_PRINT_SAFE("%p Entering %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
+        void __enter_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
+                thread_desc * thrd = this_thread();
+
+                LIB_DEBUG_PRINT_SAFE("%p Entering %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
 
                 if( !this->owner ) {
@@ -62 +62 @@
                         //Some one else has the monitor, wait in line for it
                         append( &this->entry_queue, thrd );
-                        // LIB_DEBUG_PRINT_SAFE("%p Blocking on entry\n", thrd);
-                        BlockInternal( &this->lock );
-
-                        //BlockInternal will unlock spinlock, no need to unlock ourselves
+                        LIB_DEBUG_PRINT_SAFE("%p Blocking on entry\n", thrd);
+                        ScheduleInternal( &this->lock );
+
+                        //ScheduleInternal will unlock spinlock, no need to unlock ourselves
                         return; 
                 }
@@ -75 +75 @@
         // leave pseudo code :
         //      TODO
-        void __leave_monitor_desc( monitor_desc * this ) {
-                lock( &this->lock, __PRETTY_FUNCTION__ );
-
-                // LIB_DEBUG_PRINT_SAFE("%p Leaving %p (o: %p, r: %i). ", this_thread, this, this->owner, this->recursion);
-                verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread, this->owner, this->recursion );
+        void __leave_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
+
+                LIB_DEBUG_PRINT_SAFE("%p Leaving %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
+                verifyf( this_thread() == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread(), this->owner, this->recursion );
 
                 //Leaving a recursion level, decrement the counter
@@ -96 +96 @@
                 unlock( &this->lock );
 
-                // LIB_DEBUG_PRINT_SAFE("Next owner is %p\n", new_owner);
+                LIB_DEBUG_PRINT_SAFE("Next owner is %p\n", new_owner);
 
                 //We need to wake-up the thread
-                WakeThread( new_owner );
-        }
-
-        void __leave_thread_monitor( thread_desc * thrd ) {
-                monitor_desc * this = &thrd->mon;
-                lock( &this->lock, __PRETTY_FUNCTION__ );
-
-                disable_interrupts();
-
-                thrd->cor.state = Halted;
-
-                verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i)", thrd, this->owner, this->recursion );
-
-                //Leaving a recursion level, decrement the counter
-                this->recursion -= 1;
-
-                //If we haven't left the last level of recursion
-                //it means we don't need to do anything
-                if( this->recursion != 0) {
-                        unlock( &this->lock );
-                        return;
-                }
-
-                thread_desc * new_owner = next_thread( this );
-
-                //We can now let other threads in safely
-                unlock( &this->lock );
-
-                //We need to wake-up the thread
-                if( new_owner) ScheduleThread( new_owner );
+                ScheduleThread( new_owner );
         }
 }
@@ -150 +121 @@
         enter( this->m, this->count );
 
-        this->prev_mntrs = this_thread->current_monitors;
-        this->prev_count = this_thread->current_monitor_count;
-
-        this_thread->current_monitors      = m;
-        this_thread->current_monitor_count = count;
+        this->prev_mntrs = this_thread()->current_monitors;
+        this->prev_count = this_thread()->current_monitor_count;
+
+        this_thread()->current_monitors      = m;
+        this_thread()->current_monitor_count = count;
 }
 
@@ -160 +131 @@
         leave( this->m, this->count );
 
-        this_thread->current_monitors      = this->prev_mntrs;
-        this_thread->current_monitor_count = this->prev_count;
+        this_thread()->current_monitors      = this->prev_mntrs;
+        this_thread()->current_monitor_count = this->prev_count;
 }
 
@@ -199 +170 @@
         unsigned short count = this->monitor_count;
         unsigned int recursions[ count ];               //Save the current recursion levels to restore them later
-        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to BlockInternal
+        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to ScheduleInternal
 
         LIB_DEBUG_PRINT_SAFE("count %i\n", count);
 
-        __condition_node_t waiter = { (thread_desc*)this_thread, count, user_info };
+        __condition_node_t waiter = { this_thread(), count, user_info };
 
         __condition_criterion_t criteria[count];
@@ -237 +208 @@
 
         // Everything is ready to go to sleep
-        BlockInternal( locks, count, threads, thread_count );
+        ScheduleInternal( locks, count, threads, thread_count );
 
 
@@ -263 +234 @@
         //Some more checking in debug
         LIB_DEBUG_DO(
-                thread_desc * this_thrd = this_thread;
+                thread_desc * this_thrd = this_thread();
                 if ( this->monitor_count != this_thrd->current_monitor_count ) {
                         abortf( "Signal on condition %p made with different number of monitor(s), expected %i got %i", this, this->monitor_count, this_thrd->current_monitor_count );
@@ -310 +281 @@
         unsigned short count = this->monitor_count;
         unsigned int recursions[ count ];               //Save the current recursion levels to restore them later
-        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to BlockInternal
+        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to ScheduleInternal
 
         lock_all( this->monitors, locks, count );
 
         //create creteria
-        __condition_node_t waiter = { (thread_desc*)this_thread, count, 0 };
+        __condition_node_t waiter = { this_thread(), count, 0 };
 
         __condition_criterion_t criteria[count];
@@ -338 +309 @@
 
         //Everything is ready to go to sleep
-        BlockInternal( locks, count, &signallee, 1 );
+        ScheduleInternal( locks, count, &signallee, 1 );
 
 
@@ -364 +335 @@
 // Internal scheduling
 void __accept_internal( unsigned short count, __acceptable_t * acceptables, void (*func)(void) ) {
-        // thread_desc * this = this_thread;
+        // thread_desc * this = this_thread();
 
         // unsigned short count = this->current_monitor_count;
         // unsigned int recursions[ count ];            //Save the current recursion levels to restore them later
-        // spinlock *   locks     [ count ];            //We need to pass-in an array of locks to BlockInternal
+        // spinlock *   locks     [ count ];            //We need to pass-in an array of locks to ScheduleInternal
 
         // lock_all( this->current_monitors, locks, count );
@@ -377 +348 @@
 
         // // // Everything is ready to go to sleep
-        // // BlockInternal( locks, count, threads, thread_count );
+        // // ScheduleInternal( locks, count, threads, thread_count );
 
 
@@ -422 +393 @@
 static inline void lock_all( spinlock ** locks, unsigned short count ) {
         for( int i = 0; i < count; i++ ) {
-                lock( locks[i], __PRETTY_FUNCTION__ );
+                lock( locks[i] );
         }
 }
@@ -429 +400 @@
         for( int i = 0; i < count; i++ ) {
                 spinlock * l = &source[i]->lock;
-                lock( l, __PRETTY_FUNCTION__ );
+                lock( l );
                 if(locks) locks[i] = l;
         }
@@ -486 +457 @@
 
 static inline void brand_condition( condition * this ) {
-        thread_desc * thrd = this_thread;
+        thread_desc * thrd = this_thread();
         if( !this->monitors ) {
                 LIB_DEBUG_PRINT_SAFE("Branding\n");