Changeset 2a301ff for libcfa/src/concurrency/select.hfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• libcfa/src/concurrency/select.hfa (modified) (3 diffs)

libcfa/src/concurrency/select.hfa

@@ -17 +17 @@
 #pragma once
 
-#include "containers/list.hfa"
+#include "collections/list.hfa"
 #include "alarm.hfa"
 #include "kernel.hfa"
@@ -94 +94 @@
 
     // This routine is run on the selecting thread prior to executing the statement corresponding to the select_node
-    //    passed as an arg to this routine
-    // If on_selected returns false, the statement is not run, if it returns true it is run.
-    void on_selected( T &, select_node & );
+    //    passed as an arg to this routine. If true is returned proceed as normal, if false is returned the statement is skipped
+    bool on_selected( T &, select_node & );
 };
+// Used inside the compiler to allow for overloading on return type for operations such as '?<<?' for channels
+// YOU MUST USE THIS MACRO OR INCLUDE AN EQUIVALENT DECL FOR YOUR TYPE TO SUPPORT WAITUNTIL
+#define __CFA_SELECT_GET_TYPE( typename ) typename __CFA_select_get_type( typename __CFA_t )
+
 
 //=============================================================================================
@@ -208 +211 @@
 bool register_select( select_timeout_node & this, select_node & node );
 bool unregister_select( select_timeout_node & this, select_node & node );
-void on_selected( select_timeout_node & this, select_node & node );
+bool on_selected( select_timeout_node & this, select_node & node );
+select_timeout_node __CFA_select_get_type( select_timeout_node this );
 
 // Gateway routines to waituntil on duration
 select_timeout_node timeout( Duration duration );
 select_timeout_node sleep( Duration duration );
+