Changeset 447bf833 for src/libcfa/concurrency/monitor.c

Timestamp:

May 24, 2017, 4:16:20 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a8e64c4, cf0b892

Parents:

7f623d6f (diff), 8bcaf21 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/monitor.c

@@ -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);
                         ScheduleInternal( &this->lock );
 
@@ -97 +98 @@
                 unlock( &this->lock );
 
+                LIB_DEBUG_PRINT_SAFE("Next owner is %p\n", new_owner);
+
                 //We need to wake-up the thread
                 ScheduleThread( new_owner );
@@ -149 +152 @@
         assertf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
         assertf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
+        assertf( this->monitor_count < 32u, "Excessive monitor count (%i)", this->monitor_count );
 
         unsigned short count = this->monitor_count;
@@ -184 +188 @@
         }
 
-        debug_break();
-
         for( int i = 0; i < count; i++) {
                 thread_desc * new_owner = next_thread( this->monitors[i] );
@@ -191 +193 @@
         }
 
-        debug_break();
-
         LIB_DEBUG_PRINT_SAFE("Will unblock: ");
         for(int i = 0; i < thread_count; i++) {
@@ -202 +202 @@
         ScheduleInternal( locks, count, threads, thread_count );
 
-
+        debug_break();
         //WE WOKE UP
 
@@ -224 +224 @@
         unsigned short count = this->monitor_count;
         
+        //Some more checking in debug
         LIB_DEBUG_DO(
                 thread_desc * this_thrd = this_thread();
@@ -237 +238 @@
         );
 
+        //Lock all the monitors
         lock_all( this->monitors, NULL, count );
         LIB_DEBUG_PRINT_SAFE("Signalling");
 
+        //Pop the head of the waiting queue
         __condition_node_t * node = pop_head( &this->blocked );
+
+        //Add the thread to the proper AS stack
         for(int i = 0; i < count; i++) {
                 __condition_criterion_t * crit = &node->criteria[i];
@@ -250 +255 @@
         LIB_DEBUG_PRINT_SAFE("\n");
 
+        //Release
         unlock_all( this->monitors, count );
+}
+
+void signal_block( condition * this ) {
+        if( !this->blocked.head ) {
+                LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
+                return;
+        }
+
+        //Check that everything is as expected
+        assertf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
+        assertf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
+
+        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 ScheduleInternal
+
+        lock_all( this->monitors, locks, count );
+
+        //create creteria
+        __condition_node_t waiter;
+        waiter.waiting_thread = this_thread();
+        waiter.count = count;
+        waiter.next = NULL;
+
+        __condition_criterion_t criteria[count];
+        for(int i = 0; i < count; i++) {
+                LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
+                criteria[i].ready  = false;
+                criteria[i].owner  = &waiter;
+                criteria[i].next   = NULL;
+                criteria[i].target = this->monitors[i];
+                push( &criteria[i].target->signal_stack, &criteria[i] );
+        }
+
+        waiter.criteria = criteria;
+
+        //save contexts
+        save_recursion( this->monitors, recursions, count );
+
+        //Find the thread to run
+        thread_desc * signallee = pop_head( &this->blocked )->waiting_thread;
+        for(int i = 0; i < count; i++) {
+                set_owner( this->monitors[i], signallee );
+        }
+
+        LIB_DEBUG_PRINT_SAFE( "Waiting on signal block\n" );
+        debug_break();
+
+        //Everything is ready to go to sleep
+        ScheduleInternal( locks, count, &signallee, 1 );
+
+        debug_break();
+        LIB_DEBUG_PRINT_SAFE( "Back from signal block\n" );
+
+        //We are back, restore the owners and recursions
+        lock_all( locks, count );
+        restore_recursion( this->monitors, recursions, count );
+        unlock_all( locks, count );
 }
 
@@ -335 +399 @@
 
         for(    int i = 0; i < count; i++ ) {
+
                 LIB_DEBUG_PRINT_SAFE( "Checking %p for %p\n", &criteria[i], target );
                 if( &criteria[i] == target ) {