Changes in libcfa/src/concurrency/locks.cfa [5a05946:f5f2768]

File:

• libcfa/src/concurrency/locks.cfa (modified) (15 diffs)

libcfa/src/concurrency/locks.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// locks.cfa -- LIBCFATHREAD
+// locks.hfa -- LIBCFATHREAD
 // Runtime locks that used with the runtime thread system.
 //
@@ -79 +79 @@
         // lock is held by some other thread
         if ( owner != 0p && owner != thrd ) {
-        select_node node;
-                insert_last( blocked_threads, node );
+                insert_last( blocked_threads, *thrd );
                 wait_count++;
                 unlock( lock );
                 park( );
-        return;
-        } else if ( owner == thrd && multi_acquisition ) { // multi acquisition lock is held by current thread
+        }
+        // multi acquisition lock is held by current thread
+        else if ( owner == thrd && multi_acquisition ) {
                 recursion_count++;
-        } else {  // lock isn't held
+                unlock( lock );
+        }
+        // lock isn't held
+        else {
                 owner = thrd;
                 recursion_count = 1;
-        }
-    unlock( lock );
+                unlock( lock );
+        }
 }
 
@@ -114 +117 @@
 }
 
-static inline void pop_node( blocking_lock & this ) with( this ) {
-    __handle_waituntil_OR( blocked_threads );
-    select_node * node = &try_pop_front( blocked_threads );
-    if ( node ) {
-        wait_count--;
-        owner = node->blocked_thread;
-        recursion_count = 1;
-        // if ( !node->clause_status || __make_select_node_available( *node ) ) unpark( node->blocked_thread );
-        wake_one( blocked_threads, *node );
-    } else {
-        owner = 0p;
-        recursion_count = 0;
-    }
+static void pop_and_set_new_owner( blocking_lock & this ) with( this ) {
+        thread$ * t = &try_pop_front( blocked_threads );
+        owner = t;
+        recursion_count = ( t ? 1 : 0 );
+        if ( t ) wait_count--;
+        unpark( t );
 }
 
@@ -138 +134 @@
         recursion_count--;
         if ( recursion_count == 0 ) {
-                pop_node( this );
+                pop_and_set_new_owner( this );
         }
         unlock( lock );
@@ -151 +147 @@
         // lock held
         if ( owner != 0p ) {
-                insert_last( blocked_threads, *(select_node *)t->link_node );
+                insert_last( blocked_threads, *t );
                 wait_count++;
+                unlock( lock );
         }
         // lock not held
@@ -159 +156 @@
                 recursion_count = 1;
                 unpark( t );
-        }
-    unlock( lock );
-}
-
-size_t on_wait( blocking_lock & this, __cfa_pre_park pp_fn, void * pp_datum ) with( this ) {
+                unlock( lock );
+        }
+}
+
+size_t on_wait( blocking_lock & this ) with( this ) {
         lock( lock __cfaabi_dbg_ctx2 );
         /* paranoid */ verifyf( owner != 0p, "Attempt to release lock %p that isn't held", &this );
@@ -170 +167 @@
         size_t ret = recursion_count;
 
-        pop_node( this );
-
-    select_node node;
-    active_thread()->link_node = (void *)&node;
+        pop_and_set_new_owner( this );
         unlock( lock );
-
-    pre_park_then_park( pp_fn, pp_datum );
-
         return ret;
 }
@@ -184 +175 @@
         recursion_count = recursion;
 }
-
-// waituntil() support
-bool register_select( blocking_lock & this, select_node & node ) with(this) {
-    lock( lock __cfaabi_dbg_ctx2 );
-        thread$ * thrd = active_thread();
-
-        // single acquisition lock is held by current thread
-        /* paranoid */ verifyf( owner != thrd || multi_acquisition, "Single acquisition lock holder (%p) attempted to reacquire the lock %p resulting in a deadlock.", owner, &this );
-
-    if ( !node.park_counter && ( (owner == thrd && multi_acquisition) || owner == 0p ) ) { // OR special case
-        if ( !__make_select_node_available( node ) ) { // we didn't win the race so give up on registering
-           unlock( lock );
-           return false;
-        }
-    }
-
-        // lock is held by some other thread
-        if ( owner != 0p && owner != thrd ) {
-                insert_last( blocked_threads, node );
-                wait_count++;
-                unlock( lock );
-        return false;
-        } else if ( owner == thrd && multi_acquisition ) { // multi acquisition lock is held by current thread
-                recursion_count++;
-        } else {  // lock isn't held
-                owner = thrd;
-                recursion_count = 1;
-        }
-
-    if ( node.park_counter ) __make_select_node_available( node );
-    unlock( lock );
-    return true;
-}
-
-bool unregister_select( blocking_lock & this, select_node & node ) with(this) {
-    lock( lock __cfaabi_dbg_ctx2 );
-    if ( node`isListed ) {
-        remove( node );
-        wait_count--;
-        unlock( lock );
-        return false;
-    }
-    
-    if ( owner == active_thread() ) {
-        /* paranoid */ verifyf( recursion_count == 1 || multi_acquisition, "Thread %p attempted to unlock owner lock %p in waituntil unregister, which is not recursive but has a recursive count of %zu", active_thread(), &this, recursion_count );
-        // if recursion count is zero release lock and set new owner if one is waiting
-        recursion_count--;
-        if ( recursion_count == 0 ) {
-            pop_node( this );
-        }
-    }
-        unlock( lock );
-    return false;
-}
-
-bool on_selected( blocking_lock & this, select_node & node ) { return true; }
 
 //-----------------------------------------------------------------------------
@@ -376 +311 @@
         int counter( condition_variable(L) & this ) with(this) { return count; }
 
-        static void enqueue_thread( condition_variable(L) & this, info_thread(L) * i ) with(this) {
+        static size_t queue_and_get_recursion( condition_variable(L) & this, info_thread(L) * i ) with(this) {
                 // add info_thread to waiting queue
                 insert_last( blocked_threads, *i );
                 count++;
-        }
-
-    static size_t block_and_get_recursion( info_thread(L) & i, __cfa_pre_park pp_fn, void * pp_datum ) {
-        size_t recursion_count = 0;
-                if ( i.lock ) // if lock was passed get recursion count to reset to after waking thread
-                        recursion_count = on_wait( *i.lock, pp_fn, pp_datum ); // this call blocks
-                else
-            pre_park_then_park( pp_fn, pp_datum );
-        return recursion_count;
-    }
-    static size_t block_and_get_recursion( info_thread(L) & i ) { return block_and_get_recursion( i, pre_park_noop, 0p ); }
+                size_t recursion_count = 0;
+                if (i->lock) {
+                        // if lock was passed get recursion count to reset to after waking thread
+                        recursion_count = on_wait( *i->lock );
+                }
+                return recursion_count;
+        }
 
         // helper for wait()'s' with no timeout
         static void queue_info_thread( condition_variable(L) & this, info_thread(L) & i ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
-        enqueue_thread( this, &i );
+                size_t recursion_count = queue_and_get_recursion(this, &i);
                 unlock( lock );
 
                 // blocks here
-        size_t recursion_count = block_and_get_recursion( i );
+                park( );
 
                 // resets recursion count here after waking
-                if ( i.lock ) on_wakeup( *i.lock, recursion_count );
+                if (i.lock) on_wakeup(*i.lock, recursion_count);
         }
 
@@ -409 +340 @@
                 queue_info_thread( this, i );
 
-    static void cond_alarm_register( void * node_ptr ) { register_self( (alarm_node_t *)node_ptr ); }
-
         // helper for wait()'s' with a timeout
         static void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
-        enqueue_thread( this, &info );
+                size_t recursion_count = queue_and_get_recursion(this, &info);
                 alarm_node_wrap(L) node_wrap = { t, 0`s, callback, &this, &info };
                 unlock( lock );
 
-                // blocks here and registers alarm node before blocking after releasing locks to avoid deadlock
-        size_t recursion_count = block_and_get_recursion( info, cond_alarm_register, (void *)(&node_wrap.alarm_node) );
-                // park();
+                // registers alarm outside cond lock to avoid deadlock
+                register_self( &node_wrap.alarm_node );
+
+                // blocks here
+                park();
 
                 // unregisters alarm so it doesn't go off if this happens first
@@ -426 +357 @@
 
                 // resets recursion count here after waking
-                if ( info.lock ) on_wakeup( *info.lock, recursion_count );
+                if (info.lock) on_wakeup(*info.lock, recursion_count);
         }
 
@@ -486 +417 @@
                 info_thread( L ) i = { active_thread(), info, &l };
                 insert_last( blocked_threads, i );
-                size_t recursion_count = on_wait( *i.lock, pre_park_noop, 0p ); // blocks here
-                // park( );
+                size_t recursion_count = on_wait( *i.lock );
+                park( );
                 on_wakeup(*i.lock, recursion_count);
         }
@@ -528 +459 @@
         bool empty ( pthread_cond_var(L) & this ) with(this) { return blocked_threads`isEmpty; }
 
+        static size_t queue_and_get_recursion( pthread_cond_var(L) & this, info_thread(L) * i ) with(this) {
+                // add info_thread to waiting queue
+                insert_last( blocked_threads, *i );
+                size_t recursion_count = 0;
+                recursion_count = on_wait( *i->lock );
+                return recursion_count;
+        }
+        
         static void queue_info_thread_timeout( pthread_cond_var(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
-        insert_last( blocked_threads, info );
+                size_t recursion_count = queue_and_get_recursion(this, &info);
                 pthread_alarm_node_wrap(L) node_wrap = { t, 0`s, callback, &this, &info };
                 unlock( lock );
 
-                // blocks here and registers alarm node before blocking after releasing locks to avoid deadlock
-        size_t recursion_count = block_and_get_recursion( info, cond_alarm_register, (void *)(&node_wrap.alarm_node) );
-
-                // unregisters alarm so it doesn't go off if signal happens first
+                // registers alarm outside cond lock to avoid deadlock
+                register_self( &node_wrap.alarm_node );
+
+                // blocks here
+                park();
+
+                // unregisters alarm so it doesn't go off if this happens first
                 unregister_self( &node_wrap.alarm_node );
 
                 // resets recursion count here after waking
-                if ( info.lock ) on_wakeup( *info.lock, recursion_count );
+                if (info.lock) on_wakeup(*info.lock, recursion_count);
         }
 
@@ -551 +493 @@
                 lock( lock __cfaabi_dbg_ctx2 );
                 info_thread( L ) i = { active_thread(), info, &l };
-        insert_last( blocked_threads, i );
-                unlock( lock );
-
-        // blocks here
-                size_t recursion_count = block_and_get_recursion( i );
-
-                on_wakeup( *i.lock, recursion_count );
+                size_t recursion_count = queue_and_get_recursion(this, &i);
+                unlock( lock );
+                park( );
+                on_wakeup(*i.lock, recursion_count);
         }
 
@@ -645 +584 @@
         return thrd != 0p;
 }
-