Changes in libcfa/src/concurrency/future.hfa [beeff61e:5e4a830]

File:

• libcfa/src/concurrency/future.hfa (modified) (7 diffs)

libcfa/src/concurrency/future.hfa

@@ -19 +19 @@
 #include "monitor.hfa"
 #include "select.hfa"
-#include "locks.hfa"
 
 //----------------------------------------------------------------------------
@@ -27 +26 @@
 //  future_t is lockfree and uses atomics which aren't needed given we use locks here
 forall( T ) {
-    // enum { FUTURE_EMPTY = 0, FUTURE_FULFILLED = 1 }; // Enums seem to be broken so feel free to add this back afterwards
+    // enum(int) { FUTURE_EMPTY = 0, FUTURE_FULFILLED = 1 }; // Enums seem to be broken so feel free to add this back afterwards
 
     // temporary enum replacement
@@ -45 +44 @@
     };
 
+    // C_TODO: perhaps allow exceptions to be inserted like uC++?
+
         static inline {
 
@@ -81 +82 @@
         void _internal_flush( future(T) & this ) with(this) {
             while( ! waiters`isEmpty ) {
-                if ( !__handle_waituntil_OR( waiters ) ) // handle special waituntil OR case
-                    break; // if handle_OR returns false then waiters is empty so break
                 select_node &s = try_pop_front( waiters );
 
-                if ( s.clause_status == 0p )
+                if ( s.race_flag == 0p )
                     // poke in result so that woken threads do not need to reacquire any locks
+                    // *(((future_node(T) &)s).my_result) = result;
                     copy_T( result, *(((future_node(T) &)s).my_result) );
-                else if ( !__make_select_node_available( s ) ) continue;
+                else if ( !install_select_winner( s, &this ) ) continue;
                 
                 // only unpark if future is not selected
@@ -97 +97 @@
 
                 // Fulfil the future, returns whether or not someone was unblocked
-                bool fulfil( future(T) & this, T val ) with(this) {
+                bool fulfil( future(T) & this, T & val ) with(this) {
             lock( lock );
             if( state != FUTURE_EMPTY )
@@ -153 +153 @@
         }
 
-        bool register_select( future(T) & this, select_node & s ) with(this) {
-            lock( lock );
-
-            // check if we can complete operation. If so race to establish winner in special OR case
-            if ( !s.park_counter && state != FUTURE_EMPTY ) { 
-                if ( !__make_select_node_available( s ) ) { // we didn't win the race so give up on registering
-                    unlock( lock );
-                    return false;
-                }
-            }
-
-            // future not ready -> insert select node and return
+        void * register_select( future(T) & this, select_node & s ) with(this) {
+            lock( lock );
+
+            // future not ready -> insert select node and return 0p
             if( state == FUTURE_EMPTY ) {
                 insert_last( waiters, s );
                 unlock( lock );
-                return false;
-            }
-
-            __make_select_node_available( s );
-            unlock( lock );
-            return true;
-        }
-
-        bool unregister_select( future(T) & this, select_node & s ) with(this) {
-            if ( ! s`isListed ) return false;
+                return 0p;
+            }
+
+            // future ready and we won race to install it as the select winner return 1p
+            if ( install_select_winner( s, &this ) ) {
+                unlock( lock );
+                return 1p;
+            }
+
+            unlock( lock );
+            // future ready and we lost race to install it as the select winner
+            return 2p;
+        }
+
+        void unregister_select( future(T) & this, select_node & s ) with(this) {
             lock( lock );
             if ( s`isListed ) remove( s );
             unlock( lock );
-            return false;
         }
                 
-        bool on_selected( future(T) & this, select_node & node ) { return true; }
         }
 }
@@ -191 +186 @@
 // These futures below do not support select statements so they may not be as useful as 'future'
 //  however the 'single_future' is cheap and cheerful and is most likely more performant than 'future'
-//  since it uses raw atomics and no locks
+//  since it uses raw atomics and no locks afaik
 //
 // As far as 'multi_future' goes I can't see many use cases as it will be less performant than 'future'