Changes in libcfa/src/concurrency/locks.cfa [fece3d9:beeff61e]

File:

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

libcfa/src/concurrency/locks.cfa

@@ -171 +171 @@
 }
 
-size_t on_wait( blocking_lock & this, __cfa_pre_park pp_fn, void * pp_datum ) with( this ) {
+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 );
@@ -184 +184 @@
         unlock( lock );
 
-    pre_park_then_park( pp_fn, pp_datum );
+    park();
 
         return ret;
@@ -396 +396 @@
         }
 
-    static size_t block_and_get_recursion( info_thread(L) & i, __cfa_pre_park pp_fn, void * pp_datum ) {
+    static size_t block_and_get_recursion( info_thread(L) & i ) {
         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 );
+                        recursion_count = on_wait( *i.lock ); // this call blocks
+                } else park( );
         return recursion_count;
     }
-    static size_t block_and_get_recursion( info_thread(L) & i ) { return block_and_get_recursion( i, pre_park_noop, 0p ); }
 
         // helper for wait()'s' with no timeout
@@ -425 +424 @@
                 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) {
@@ -436 +433 @@
 
                 // registers alarm outside cond lock to avoid deadlock
-                // register_self( &node_wrap.alarm_node );
+                register_self( &node_wrap.alarm_node );
 
                 // blocks here
-        size_t recursion_count = block_and_get_recursion( info, cond_alarm_register, (void *)(&node_wrap.alarm_node) );
+        size_t recursion_count = block_and_get_recursion( info );
                 // park();
 
@@ -506 +503 @@
                 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
+                size_t recursion_count = on_wait( *i.lock ); // blocks here
                 // park( );
                 on_wakeup(*i.lock, recursion_count);
@@ -555 +552 @@
         //      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) {
@@ -564 +562 @@
 
                 // registers alarm outside cond lock to avoid deadlock
-                // register_self( &node_wrap.alarm_node ); // C_TODO: fix race: registers itself and then alarm handler calls on_notify before block_and_get_recursion is run
+                register_self( &node_wrap.alarm_node );
 
                 // blocks here
-        size_t recursion_count = block_and_get_recursion( info, cond_alarm_register, (void *)(&node_wrap.alarm_node) );
+        size_t recursion_count = block_and_get_recursion( info );
                 // park();