Changes in / [2b78949:6ece306]

Location:

libcfa/src/concurrency

Files:

• channel.hfa (modified) (14 diffs)
• locks.hfa (modified) (3 diffs)

libcfa/src/concurrency/channel.hfa

@@ -62 +62 @@
     bool closed;                      // indicates channel close/open
     #ifdef CHAN_STATS
-    size_t p_blocks, p_ops, c_blocks, c_ops;      // counts total ops and ops resulting in a blocked thd
+    size_t blocks, operations;      // counts total ops and ops resulting in a blocked thd
     #endif
 };
@@ -75 +75 @@
     closed = false;
     #ifdef CHAN_STATS
-    p_blocks = 0;
-    p_ops = 0;
-    c_blocks = 0;
-    c_ops = 0;
+    blocks = 0;
+    operations = 0;
     #endif
 }
@@ -85 +83 @@
 static inline void ^?{}( channel(T) &c ) with(c) {
     #ifdef CHAN_STATS
-    printf("Channel %p Blocks: %lu,\t\tOperations: %lu,\t%.2f%% of ops blocked\n", &c, p_blocks + c_blocks, p_ops + c_ops, ((double)p_blocks + c_blocks)/(p_ops + c_ops) * 100);
-    printf("Channel %p Consumer Blocks: %lu,\tConsumer Ops: %lu,\t%.2f%% of Consumer ops blocked\n", &c, p_blocks, p_ops, ((double)p_blocks)/p_ops * 100);
-    printf("Channel %p Producer Blocks: %lu,\tProducer Ops: %lu,\t%.2f%% of Producer ops blocked\n", &c, c_blocks, c_ops, ((double)c_blocks)/c_ops * 100);
-    #endif
-    verifyf( __handle_waituntil_OR( cons ) || __handle_waituntil_OR( prods ) || cons`isEmpty && prods`isEmpty, 
-        "Attempted to delete channel with waiting threads (Deadlock).\n" );
+    printf("Channel %p Blocks: %lu, Operations: %lu, %.2f%% of ops blocked\n", &c, blocks, operations, ((double)blocks)/operations * 100);
+    #endif
+    verifyf( cons`isEmpty && prods`isEmpty, "Attempted to delete channel with waiting threads (Deadlock).\n" );
     if ( size != 0 ) delete( buffer );
 }
@@ -154 +149 @@
     lock( mutex_lock );
     #ifdef CHAN_STATS
-    p_ops++;
+    operations++;
     #endif
 
@@ -192 +187 @@
 
     #ifdef CHAN_STATS
-    if ( !closed ) p_ops++;
+    if ( !closed ) operations++;
     #endif
 
@@ -213 +208 @@
     if ( count == size ) {
         #ifdef CHAN_STATS
-        p_blocks++;
+        blocks++;
         #endif
 
@@ -242 +237 @@
     lock( mutex_lock );
     #ifdef CHAN_STATS
-    c_ops++;
+    operations++;
     #endif
 
@@ -290 +285 @@
 
     #ifdef CHAN_STATS
-    if ( !closed ) c_ops++;
+    if ( !closed ) operations++;
     #endif
 
@@ -310 +305 @@
     if ( count == 0 ) {
         #ifdef CHAN_STATS
-        c_blocks++;
+        blocks++;
         #endif
         // check for if woken due to close
@@ -328 +323 @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 static inline bool unregister_chan( channel(T) & chan, select_node & node ) with(chan) {
-    if ( !node`isListed && !node.park_counter ) return false; // handle special OR case
+    // if ( !node`isListed && !node.park_counter ) return false; // handle special OR case C_TODO: try adding this back
     lock( mutex_lock );
     if ( node`isListed ) { // op wasn't performed
+        #ifdef CHAN_STATS
+        operations--;
+        #endif
         remove( node );
         unlock( mutex_lock );
@@ -364 +362 @@
 
     #ifdef CHAN_STATS
-    if ( !closed ) c_ops++;
+    if ( !closed ) operations++;
     #endif
 
@@ -409 +407 @@
     if ( count == 0 ) {
         #ifdef CHAN_STATS
-        c_blocks++;
+        blocks++;
         #endif
         
@@ -453 +451 @@
 
     #ifdef CHAN_STATS
-    if ( !closed ) p_ops++;
+    if ( !closed ) operations++;
     #endif
 
@@ -500 +498 @@
     if ( count == size ) {
         #ifdef CHAN_STATS
-        p_blocks++;
+        blocks++;
         #endif
 

libcfa/src/concurrency/locks.hfa

@@ -176 +176 @@
 static inline void ?{}(mcs_spin_node & this) { this.next = 0p; this.locked = true; }
 
+static inline mcs_spin_node * volatile & ?`next ( mcs_spin_node * node ) {
+        return node->next;
+}
+
 struct mcs_spin_lock {
         mcs_spin_queue queue;
@@ -181 +185 @@
 
 static inline void lock(mcs_spin_lock & l, mcs_spin_node & n) {
-    n.locked = true;
         mcs_spin_node * prev = __atomic_exchange_n(&l.queue.tail, &n, __ATOMIC_SEQ_CST);
-        if( prev == 0p ) return;
+        n.locked = true;
+        if(prev == 0p) return;
         prev->next = &n;
-        while( __atomic_load_n(&n.locked, __ATOMIC_RELAXED) ) Pause();
+        while(__atomic_load_n(&n.locked, __ATOMIC_RELAXED)) Pause();
 }
 
@@ -191 +195 @@
         mcs_spin_node * n_ptr = &n;
         if (__atomic_compare_exchange_n(&l.queue.tail, &n_ptr, 0p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) return;
-        while (__atomic_load_n(&n.next, __ATOMIC_RELAXED) == 0p) Pause();
+        while (__atomic_load_n(&n.next, __ATOMIC_RELAXED) == 0p) {}
         n.next->locked = false;
 }