Changes in libcfa/src/bits/weakso_locks.hfa [fece3d9:b2f3880]

File:

• libcfa/src/bits/weakso_locks.hfa (modified) (4 diffs)

libcfa/src/bits/weakso_locks.hfa

@@ -23 +23 @@
 #include "containers/list.hfa"
 
-struct select_node;
+struct thread$;
 
 //-----------------------------------------------------------------------------
@@ -32 +32 @@
 
         // List of blocked threads
-        dlist( select_node ) blocked_threads;
+        dlist( thread$ ) blocked_threads;
 
         // Count of current blocked threads
@@ -57 +57 @@
 void unlock( blocking_lock & this ) OPTIONAL_THREAD;
 void on_notify( blocking_lock & this, struct thread$ * t ) OPTIONAL_THREAD;
-size_t on_wait( blocking_lock & this, void (*pp_fn)( void * ), void * pp_datum ) OPTIONAL_THREAD;
+size_t on_wait( blocking_lock & this ) OPTIONAL_THREAD;
 void on_wakeup( blocking_lock & this, size_t ) OPTIONAL_THREAD;
 size_t wait_count( blocking_lock & this ) OPTIONAL_THREAD;
-bool register_select( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
-bool unregister_select( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
-bool on_selected( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
 
 //----------
@@ -75 +72 @@
 static inline bool   try_lock ( multiple_acquisition_lock & this ) { return try_lock( (blocking_lock &)this ); }
 static inline void   unlock   ( multiple_acquisition_lock & this ) { unlock  ( (blocking_lock &)this ); }
-static inline size_t on_wait  ( multiple_acquisition_lock & this, void (*pp_fn)( void * ), void * pp_datum ) { return on_wait ( (blocking_lock &)this, pp_fn, pp_datum ); }
+static inline size_t on_wait  ( multiple_acquisition_lock & this ) { return on_wait ( (blocking_lock &)this ); }
 static inline void   on_wakeup( multiple_acquisition_lock & this, size_t v ) { on_wakeup ( (blocking_lock &)this, v ); }
 static inline void   on_notify( multiple_acquisition_lock & this, struct thread$ * t ){ on_notify( (blocking_lock &)this, t ); }
-static inline bool   register_select( multiple_acquisition_lock & this, select_node & node ) { return register_select( (blocking_lock &)this, node ); }
-static inline bool   unregister_select( multiple_acquisition_lock & this, select_node & node ) { return unregister_select( (blocking_lock &)this, node ); }
-static inline bool   on_selected( multiple_acquisition_lock & this, select_node & node ) { return on_selected( (blocking_lock &)this, node ); }