Changeset 34c6c767 for src/libcfa/concurrency/monitor.c

Timestamp:

Nov 9, 2017, 2:01:44 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:

65d6de4, 6d2386e

Parents:

ea7d2b0

Message:

Added CFA_LOCK_NO_YIELD to toggle yielding when locking for performance measuring

File:

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

src/libcfa/concurrency/monitor.c

@@ -54 +54 @@
 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
@@ -84 +90 @@
         // Enter single monitor
         static void __enter_monitor_desc( monitor_desc * this, const __monitor_group_t & group ) {
-                // Lock the monitor spinlock, lock_yield to reduce contention
-                lock_yield( this->lock DEBUG_CTX2 );
+                // Lock the monitor spinlock
+                DO_LOCK( this->lock DEBUG_CTX2 );
                 thread_desc * thrd = this_thread;
 
@@ -132 +138 @@
 
         static void __enter_monitor_dtor( monitor_desc * this, fptr_t func ) {
-                // Lock the monitor spinlock, lock_yield to reduce contention
-                lock_yield( this->lock DEBUG_CTX2 );
+                // Lock the monitor spinlock
+                DO_LOCK( this->lock DEBUG_CTX2 );
                 thread_desc * thrd = this_thread;
 
@@ -196 +202 @@
         // Leave single monitor
         void __leave_monitor_desc( monitor_desc * this ) {
-                // Lock the monitor spinlock, lock_yield to reduce contention
-                lock_yield( this->lock DEBUG_CTX2 );
+                // Lock the monitor spinlock, DO_LOCK to reduce contention
+                DO_LOCK( this->lock DEBUG_CTX2 );
 
                 LIB_DEBUG_PRINT_SAFE("Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
@@ -243 +249 @@
 
                 // Lock the monitor now
-                lock_yield( this->lock DEBUG_CTX2 );
+                DO_LOCK( this->lock DEBUG_CTX2 );
 
                 disable_interrupts();
@@ -732 +738 @@
 static inline void lock_all( __spinlock_t * locks [], __lock_size_t count ) {
         for( __lock_size_t i = 0; i < count; i++ ) {
-                lock_yield( *locks[i] DEBUG_CTX2 );
+                DO_LOCK( *locks[i] DEBUG_CTX2 );
         }
 }
@@ -739 +745 @@
         for( __lock_size_t i = 0; i < count; i++ ) {
                 __spinlock_t * l = &source[i]->lock;
-                lock_yield( *l DEBUG_CTX2 );
+                DO_LOCK( *l DEBUG_CTX2 );
                 if(locks) locks[i] = l;
         }