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

Timestamp:

Jul 4, 2017, 9:40:16 AM (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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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' into references

File:

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

src/libcfa/concurrency/monitor.c

@@ -56 +56 @@
                 else if( this->owner == thrd) {
                         //We already have the monitor, just not how many times we took it
-                        assert( this->recursion > 0 );
+                        verify( this->recursion > 0 );
                         this->recursion += 1;
                 }
@@ -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 );
 
@@ -77 +78 @@
                 lock( &this->lock );
 
-                thread_desc * thrd = this_thread();
-
                 LIB_DEBUG_PRINT_SAFE("%p Leaving %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
-                assertf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i)", thrd, 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
@@ -97 +96 @@
                 unlock( &this->lock );
 
+                LIB_DEBUG_PRINT_SAFE("Next owner is %p\n", new_owner);
+
                 //We need to wake-up the thread
                 ScheduleThread( new_owner );
@@ -134 +135 @@
 }
 
-void debug_break() __attribute__(( noinline ))
-{
-        
+void ?{}(__condition_node_t * this, thread_desc * waiting_thread, unsigned short count, uintptr_t user_info ) {
+        this->waiting_thread = waiting_thread;
+        this->count = count;
+        this->next = NULL;
+        this->user_info = user_info;
+}
+
+void ?{}(__condition_criterion_t * this ) {
+        this->ready  = false;
+        this->target = NULL;
+        this->owner  = NULL;
+        this->next   = NULL;
+}
+
+void ?{}(__condition_criterion_t * this, monitor_desc * target, __condition_node_t * owner ) {
+        this->ready  = false;
+        this->target = target;
+        this->owner  = owner;
+        this->next   = NULL;
 }
 
 //-----------------------------------------------------------------------------
 // Internal scheduling
-void wait( condition * this ) {
+void wait( condition * this, uintptr_t user_info = 0 ) {
         LIB_DEBUG_PRINT_SAFE("Waiting\n");
 
@@ -148 +165 @@
         //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 );
+        verifyf( this->monitor_count != 0, "Waiting with 0 monitors (%i)", this->monitor_count );
+        verifyf( this->monitor_count < 32u, "Excessive monitor count (%i)", this->monitor_count );
 
         unsigned short count = this->monitor_count;
@@ -156 +174 @@
         LIB_DEBUG_PRINT_SAFE("count %i\n", count);
 
-        __condition_node_t waiter;
-        waiter.waiting_thread = this_thread();
-        waiter.count = count;
-        waiter.next = NULL;
+        __condition_node_t waiter = { this_thread(), count, user_info };
 
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
-                criteria[i].ready  = false;
-                criteria[i].target = this->monitors[i];
-                criteria[i].owner  = &waiter;
-                criteria[i].next   = NULL;
+                (&criteria[i]){ this->monitors[i], &waiter };
                 LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
         }
@@ -184 +196 @@
         }
 
-        debug_break();
-
         for( int i = 0; i < count; i++) {
                 thread_desc * new_owner = next_thread( this->monitors[i] );
                 thread_count = insert_unique( threads, thread_count, new_owner );
         }
-
-        debug_break();
 
         LIB_DEBUG_PRINT_SAFE("Will unblock: ");
@@ -212 +220 @@
 }
 
-void signal( condition * this ) {
-        if( !this->blocked.head ) {
+bool signal( condition * this ) {
+        if( is_empty( this ) ) {
                 LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
-                return;
+                return false;
         }
 
         //Check that everything is as expected
-        assert( this->monitors );
-        assert( this->monitor_count != 0 );
+        verify( this->monitors );
+        verify( this->monitor_count != 0 );
 
         unsigned short count = this->monitor_count;
         
+        //Some more checking in debug
         LIB_DEBUG_DO(
                 thread_desc * this_thrd = this_thread();
@@ -237 +246 @@
         );
 
+        //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 +263 @@
         LIB_DEBUG_PRINT_SAFE("\n");
 
+        //Release
         unlock_all( this->monitors, count );
+
+        return true;
+}
+
+bool signal_block( condition * this ) {
+        if( !this->blocked.head ) {
+                LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
+                return false;
+        }
+
+        //Check that everything is as expected
+        verifyf( this->monitors != NULL, "Waiting with no monitors (%p)", this->monitors );
+        verifyf( 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 = { this_thread(), count, 0 };
+
+        __condition_criterion_t criteria[count];
+        for(int i = 0; i < count; i++) {
+                (&criteria[i]){ this->monitors[i], &waiter };
+                LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[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" );
+
+        //Everything is ready to go to sleep
+        ScheduleInternal( locks, count, &signallee, 1 );
+
+
+
+
+        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 );
+
+        return true;
+}
+
+uintptr_t front( condition * this ) {
+        verifyf( !is_empty(this), 
+                "Attempt to access user data on an empty condition.\n"
+                "Possible cause is not checking if the condition is empty before reading stored data."
+        );
+        return this->blocked.head->user_info;
+}
+
+//-----------------------------------------------------------------------------
+// Internal scheduling
+void __accept_internal( unsigned short count, __acceptable_t * acceptables, void (*func)(void) ) {
+        // 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 ScheduleInternal
+
+        // lock_all( this->current_monitors, locks, count );
+
+
+
+
+
+        // // // Everything is ready to go to sleep
+        // // ScheduleInternal( locks, count, threads, thread_count );
+
+
+        // //WE WOKE UP
+
+
+        // //We are back, restore the owners and recursions
+        // lock_all( locks, count );
+        // restore_recursion( this->monitors, recursions, count );
+        // unlock_all( locks, count );
 }
 
@@ -335 +442 @@
 
         for(    int i = 0; i < count; i++ ) {
+
                 LIB_DEBUG_PRINT_SAFE( "Checking %p for %p\n", &criteria[i], target );
                 if( &criteria[i] == target ) {
@@ -379 +487 @@
 
 void append( __condition_blocked_queue_t * this, __condition_node_t * c ) {
-        assert(this->tail != NULL);
+        verify(this->tail != NULL);
         *this->tail = c;
         this->tail = &c->next;