Changeset 447bf833 for src

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

Location:

src

Files:

• libcfa/concurrency/monitor (modified) (1 diff)
• libcfa/concurrency/monitor.c (modified) (10 diffs)
• libcfa/concurrency/thread (modified) (1 diff)
• libcfa/concurrency/thread.c (modified) (1 diff)
• libcfa/gmp (modified) (2 diffs)
• tests/.expect/64/gmp.txt (modified) (2 diffs)
• tests/.expect/concurrent/sched-int-block.txt (added)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/gmp.c (modified) (5 diffs)
• tests/sched-int-block.c (added)

src/libcfa/concurrency/monitor

@@ -87 +87 @@
 void wait( condition * this );
 void signal( condition * this );
+void signal_block( condition * this );
 #endif //MONITOR_H

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 ) {

src/libcfa/concurrency/thread

@@ -82 +82 @@
 
 void yield();
+void yield( unsigned times );
 
 #endif //THREADS_H

src/libcfa/concurrency/thread.c

@@ -87 +87 @@
 }
 
+void yield( unsigned times ) {
+        for( unsigned i = 0; i < times; i++ ) {
+                yield();
+        }
+}
+
 void ThreadCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
         // set state of current coroutine to inactive

src/libcfa/gmp

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:43:43 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 14 23:47:36 2017
-// Update Count     : 9
+// Last Modified On : Mon May 22 08:32:39 2017
+// Update Count     : 13
 // 
 
@@ -35 +35 @@
 Int ?=?( Int * lhs, long int rhs ) { mpz_set_si( lhs->mpz, rhs ); return *lhs; }
 Int ?=?( Int * lhs, unsigned long int rhs ) { mpz_set_ui( lhs->mpz, rhs ); return *lhs; }
-//Int ?=?( Int * lhs, const char * rhs ) { if ( mpq_set_str( lhs->mpz, rhs, 0 ) ) abort(); return *lhs; }
+Int ?=?( Int * lhs, const char * rhs ) { if ( mpz_set_str( lhs->mpz, rhs, 0 ) ) { printf( "invalid string conversion\n" ); abort(); } return *lhs; }
 
 char ?=?( char * lhs, Int rhs ) { char val = mpz_get_si( rhs.mpz ); *lhs = val; return val; }

src/tests/.expect/64/gmp.txt

@@ -4 +4 @@
 conversions
 y:97
+y:12345678901234567890123456789
 y:3
 y:-3
@@ -24 +25 @@
 z:150000000000000000000
 z:16666666666666666666
+16666666666666666666, 2 16666666666666666666, 2
 x:16666666666666666666 y:2
 

src/tests/Makefile.am

@@ -22 +22 @@
 concurrent=yes
 quick_test+= coroutine thread monitor
-concurrent_test=coroutine thread monitor multi-monitor sched-int-disjoint sched-int-barge sched-int-wait sched-ext sched-ext-multi preempt
+concurrent_test=coroutine thread monitor multi-monitor sched-int-barge sched-int-block sched-int-disjoint sched-int-wait sched-ext sched-ext-multi preempt
 else
 concurrent=no

src/tests/Makefile.in

@@ -230 +230 @@
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
 @BUILD_CONCURRENCY_FALSE@concurrent_test = 
-@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-disjoint sched-int-barge sched-int-wait sched-ext sched-ext-multi preempt
+@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-barge sched-int-block sched-int-disjoint sched-int-wait sched-ext sched-ext-multi preempt
 
 # applies to both programs

src/tests/gmp.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 14 14:46:50 2017
-// Update Count     : 530
+// Last Modified On : Mon May 22 09:05:09 2017
+// Update Count     : 538
 // 
 
 #include <gmp>
 
-int main() {
+int main( void ) {
         sout | "constructors" | endl;
         short int si = 3;
@@ -25 +25 @@
         sout | "conversions" | endl;
         y = 'a';
+        sout | "y:" | y | endl;
+        y = "12345678901234567890123456789";
         sout | "y:" | y | endl;
         y = si;
@@ -62 +64 @@
         z = x / 3;
         sout | "z:" | z | endl;
+        sout | div( x, 3 ) | x / 3 | "," | x % 3 | endl;
         [ x, y ] = div( x, 3 );
         sout | "x:" | x | "y:" | y | endl;
-//      sout | div( x, 3 ) | x / 3 | "," | x % 3 | endl;
 
         sout | endl;
@@ -72 +74 @@
         fn = (Int){0}; fn1 = fn;                                                        // 1st case
         sout | (int)0 | fn | endl;
-        fn = (Int){1}; fn2 = fn1; fn1 = fn;                                     // 2nd case
+        fn = 1; fn2 = fn1; fn1 = fn;                                            // 2nd case
         sout | 1 | fn | endl;
-        for ( int i = 2; i <= 200; i += 1 ) {
+        for ( unsigned int i = 2; i <= 200; i += 1 ) {
                 fn = fn1 + fn2; fn2 = fn1; fn1 = fn;                    // general case
                 sout | i | fn | endl;
@@ -83 +85 @@
         sout | "Factorial Numbers" | endl;
         Int fact;
-        fact = (Int){1};                                                                        // 1st case
+        fact = 1;                                                                                       // 1st case
         sout | (int)0 | fact | endl;
-        for ( int i = 1; i <= 40; i += 1 ) {
+        for ( unsigned int i = 1; i <= 40; i += 1 ) {
                 fact = fact * i;                                                                // general case
                 sout | i | fact | endl;