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

Timestamp:

Jan 31, 2018, 5:50:34 PM (6 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:

295e5071

Parents:

bc6f918 (diff), 281806b (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

@@ -53 +53 @@
 static inline __lock_size_t aggregate    ( monitor_desc * storage [], const __waitfor_mask_t & mask );
 
-#ifndef __CFA_LOCK_NO_YIELD
-#define DO_LOCK lock_yield
-#else
-#define DO_LOCK lock
-#endif
-
 //-----------------------------------------------------------------------------
 // Useful defines
@@ -90 +84 @@
         static void __enter_monitor_desc( monitor_desc * this, const __monitor_group_t & group ) {
                 // Lock the monitor spinlock
-                DO_LOCK( this->lock __cfaabi_dbg_ctx2 );
+                lock( this->lock __cfaabi_dbg_ctx2 );
                 thread_desc * thrd = this_thread;
+
+                verify( disable_preempt_count > 0 );
 
                 __cfaabi_dbg_print_safe("Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
@@ -121 +117 @@
                         // Some one else has the monitor, wait in line for it
                         append( this->entry_queue, thrd );
+
+                        verify( disable_preempt_count > 0 );
+
                         BlockInternal( &this->lock );
 
@@ -138 +137 @@
         static void __enter_monitor_dtor( monitor_desc * this, fptr_t func ) {
                 // Lock the monitor spinlock
-                DO_LOCK( this->lock __cfaabi_dbg_ctx2 );
+                lock( this->lock __cfaabi_dbg_ctx2 );
                 thread_desc * thrd = this_thread;
 
@@ -201 +200 @@
         // Leave single monitor
         void __leave_monitor_desc( monitor_desc * this ) {
-                // Lock the monitor spinlock, DO_LOCK to reduce contention
-                DO_LOCK( this->lock __cfaabi_dbg_ctx2 );
+                // Lock the monitor spinlock
+                lock( this->lock __cfaabi_dbg_ctx2 );
 
                 __cfaabi_dbg_print_safe("Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
@@ -248 +247 @@
 
                 // Lock the monitor now
-                DO_LOCK( this->lock __cfaabi_dbg_ctx2 );
+                lock( this->lock __cfaabi_dbg_ctx2 );
 
                 disable_interrupts();
@@ -397 +396 @@
         append( this.blocked, &waiter );
 
+        verify( disable_preempt_count == 0 );
+
         // Lock all monitors (aggregates the locks as well)
         lock_all( monitors, locks, count );
+
+        // verifyf( disable_preempt_count == count, "Got %d, expected %d\n", disable_preempt_count, count );
+        if(disable_preempt_count != count) { __cfaabi_dbg_print_buffer_decl("----------Gonna crash\n"); }
 
         // Find the next thread(s) to run
@@ -473 +477 @@
         monitor_ctx( this.monitors, this.monitor_count );
 
+        verify( disable_preempt_count == 0 );
+
         // Lock all monitors (aggregates the locks them as well)
         lock_all( monitors, locks, count );
+
+        // verify( disable_preempt_count == count );
+        if(disable_preempt_count != count) { __cfaabi_dbg_print_buffer_decl("----------Gonna crash\n"); }
+
 
         // Create the node specific to this wait operation
@@ -737 +747 @@
 static inline void lock_all( __spinlock_t * locks [], __lock_size_t count ) {
         for( __lock_size_t i = 0; i < count; i++ ) {
-                DO_LOCK( *locks[i] __cfaabi_dbg_ctx2 );
+                lock( *locks[i] __cfaabi_dbg_ctx2 );
         }
 }
@@ -744 +754 @@
         for( __lock_size_t i = 0; i < count; i++ ) {
                 __spinlock_t * l = &source[i]->lock;
-                DO_LOCK( *l __cfaabi_dbg_ctx2 );
+                lock( *l __cfaabi_dbg_ctx2 );
                 if(locks) locks[i] = l;
         }