Changeset 2a301ff for tests/concurrency/channels/daisy_chain.cfa

Timestamp:

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

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

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:

• tests/concurrency/channels/daisy_chain.cfa (modified) (2 diffs)

tests/concurrency/channels/daisy_chain.cfa

@@ -19 +19 @@
 void main(Task & this) {
     size_t runs = 0;
+    int token = 0;
     try{
         for ( ;; ) {
-            remove( *chain );
-            insert( *chain, 0 );
+            token << *chain;
+            *chain << token;
             runs++;
         }
@@ -59 +60 @@
     Channel chainChan{ 1 };
 
-    insert( chainChan, 0 );
+    chainChan << ((int)0);
 
     chain = &chainChan;