Changeset 6a5be52 for src/libcfa/concurrency/monitor.c

Timestamp:

Oct 27, 2017, 5:54:56 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:

af0c8da

Parents:

9f0b975

Message:

Modified waitfor to sort monitors

File:

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

src/libcfa/concurrency/monitor.c

@@ -95 +95 @@
                 else if( this->owner == thrd) {
                         // We already have the monitor, just note how many times we took it
-                        verify( this->recursion > 0 );
                         this->recursion += 1;
 
@@ -207 +206 @@
                 // it means we don't need to do anything
                 if( this->recursion != 0) {
+                        LIB_DEBUG_PRINT_SAFE("Kernel :  recursion still %d\n", this->recursion);
                         unlock( &this->lock );
                         return;
@@ -536 +536 @@
         short actual_count = aggregate( mon_storage, mask );
 
-        LIB_DEBUG_PRINT_SAFE("Kernel : waitfor %d (s: %d, m: %d)\n", actual_count, mask.size, (short)max);
+        LIB_DEBUG_PRINT_BUFFER_DECL( "Kernel : waitfor %d (s: %d, m: %d)\n", actual_count, mask.size, (short)max);
 
         if(actual_count == 0) return;
 
-        LIB_DEBUG_PRINT_SAFE("Kernel : waitfor internal proceeding\n");
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : waitfor internal proceeding\n");
 
         // Create storage for monitor context
@@ -556 +556 @@
                         *mask.accepted = index;
                         if( mask.clauses[index].is_dtor ) {
-                                LIB_DEBUG_PRINT_SAFE("Kernel : dtor already there\n");
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : dtor already there\n");
                                 verifyf( mask.clauses[index].size == 1        , "ERROR: Accepted dtor has more than 1 mutex parameter." );
 
@@ -568 +568 @@
                         }
                         else {
-                                LIB_DEBUG_PRINT_SAFE("Kernel : thread present, baton-passing\n");
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : thread present, baton-passing\n");
 
                                 // Create the node specific to this wait operation
@@ -576 +576 @@
                                 monitor_save;
 
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel :  baton of %d monitors : ", count );
+                                #ifdef __CFA_DEBUG_PRINT__
+                                        for( int i = 0; i < count; i++) {
+                                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "%p %p ", monitors[i], monitors[i]->signal_stack.top );
+                                        }
+                                #endif
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "\n");
+
                                 // Set the owners to be the next thread
                                 set_owner( monitors, count, next );
@@ -585 +593 @@
                                 monitor_restore;
 
-                                LIB_DEBUG_PRINT_SAFE("Kernel : thread present, returned\n");
+                                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : thread present, returned\n");
                         }
 
-                        LIB_DEBUG_PRINT_SAFE("Kernel : accepted %d\n", *mask.accepted);
+                        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : accepted %d\n", *mask.accepted);
 
                         return;
@@ -596 +604 @@
 
         if( duration == 0 ) {
-                LIB_DEBUG_PRINT_SAFE("Kernel : non-blocking, exiting\n");
+                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : non-blocking, exiting\n");
 
                 unlock_all( locks, count );
 
-                LIB_DEBUG_PRINT_SAFE("Kernel : accepted %d\n", *mask.accepted);
+                LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : accepted %d\n", *mask.accepted);
                 return;
         }
@@ -607 +615 @@
         verifyf( duration < 0, "Timeout on waitfor statments not supported yet.");
 
-        LIB_DEBUG_PRINT_SAFE("Kernel : blocking waitfor\n");
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : blocking waitfor\n");
 
         // Create the node specific to this wait operation
@@ -629 +637 @@
         monitor_restore;
 
-        LIB_DEBUG_PRINT_SAFE("Kernel : exiting\n");
-
-        LIB_DEBUG_PRINT_SAFE("Kernel : accepted %d\n", *mask.accepted);
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : exiting\n");
+
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : accepted %d\n", *mask.accepted);
 }
 
@@ -648 +656 @@
 
 static inline void set_owner( monitor_desc ** monitors, short count, thread_desc * owner ) {
-        for( int i = 0; i < count; i++ ) {
-                set_owner( monitors[i], owner );
+        monitors[0]->owner     = owner;
+        monitors[0]->recursion = 1;
+        for( int i = 1; i < count; i++ ) {
+                monitors[i]->owner     = owner;
+                monitors[i]->recursion = 0;
         }
 }
@@ -667 +678 @@
 static inline thread_desc * next_thread( monitor_desc * this ) {
         //Check the signaller stack
+        LIB_DEBUG_PRINT_SAFE("Kernel :  mon %p AS-stack top %p\n", this, this->signal_stack.top);
         __condition_criterion_t * urgent = pop( &this->signal_stack );
         if( urgent ) {
@@ -718 +730 @@
         for(int i = 0; i < count; i++) {
                 (criteria[i]){ monitors[i], waiter };
+                LIB_DEBUG_PRINT_SAFE( "Kernel :  target %p = %p\n", criteria[i].target, &criteria[i] );
                 push( &criteria[i].target->signal_stack, &criteria[i] );
         }
@@ -788 +801 @@
         }
 
-        // LIB_DEBUG_PRINT_SAFE( "Runing %i\n", ready2run );
+        LIB_DEBUG_PRINT_SAFE( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : NULL );
         return ready2run ? node->waiting_thread : NULL;
 }
@@ -856 +869 @@
         short size = 0;
         for( int i = 0; i < mask.size; i++ ) {
+                qsort( mask.clauses[i].list, mask.clauses[i].size );
                 for( int j = 0; j < mask.clauses[i].size; j++) {
                         insert_unique( storage, size, mask.clauses[i].list[j] );
                 }
         }
+        // TODO insertion sort instead of this
         qsort( storage, size );
         return size;