Changeset 49caf644

Timestamp:

Jul 18, 2023, 4:41:37 PM (21 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

8a1d62b6

Parents:

c635047 (diff), da6db1a2 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• libcfa/src/concurrency/channel.hfa (modified) (2 diffs)
• tests/concurrency/waituntil/repeat_close.cfa (modified) (1 diff)

libcfa/src/concurrency/channel.hfa ¶

@@ -326 +326 @@
     return retval;
 }
+static inline void remove( channel(T) & chan ) { T elem = (T)remove( chan ); }
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -461 +463 @@
 }
 
+// type used by select statement to capture a chan read as the selected operation that doesn't have a param to read to
+struct chan_read_no_ret {
+    T ret;
+    chan_read( T ) cr;
+};
+__CFA_SELECT_GET_TYPE( chan_read_no_ret(T) );
+
+static inline void ?{}( chan_read_no_ret(T) & this, channel(T) & chan ) {
+    this.cr{ chan, this.ret };
+}
+static inline chan_read_no_ret(T) remove( channel(T) & chan ) { chan_read_no_ret(T) cr{ chan }; return cr; }
+static inline bool register_select( chan_read_no_ret(T) & this, select_node & node ) { return register_select( this.cr, node ); }
+static inline bool unregister_select( chan_read_no_ret(T) & this, select_node & node ) { return unregister_select( this.cr, node ); }
+static inline bool on_selected( chan_read_no_ret(T) & this, select_node & node ) { return on_selected( this.cr, node ); }
+
 // type used by select statement to capture a chan write as the selected operation
 struct chan_write {

tests/concurrency/waituntil/repeat_close.cfa ¶

@@ -31 +31 @@
     try {
         for( ;; ) {
-            waituntil( in << F ) { F_removes++; }
-            or waituntil( in << E ) { E_removes++; }
-            or waituntil( in << D ) { D_removes++; }
-            or waituntil( in << C ) { C_removes++; }
-            or waituntil( in << B ) { B_removes++; }
-            or waituntil( in << A ) { A_removes++; }
+            waituntil( remove(F) ) { F_removes++; }
+            or waituntil( remove(E) ) { E_removes++; }
+            or waituntil( remove(D) ) { D_removes++; }
+            or waituntil( remove(C) ) { C_removes++; }
+            or waituntil( remove(B) ) { B_removes++; }
+            or waituntil( remove(A) ) { A_removes++; }
         }
     } catchResume ( channel_closed * e ) { } // continue to remove until would block