Changeset 2a301ff for tests/concurrency/waituntil/channel_close.cfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 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/waituntil/channel_close.cfa (modified) (3 diffs)

tests/concurrency/waituntil/channel_close.cfa

@@ -13 +13 @@
     try {
         for( long long int i = 0;;i++ ) {
-            waituntil( (i >> A) ) { inserts++; }
-            and waituntil( (i >> B) ) { inserts++; }
+            waituntil( A << i ) { inserts++; }
+            and waituntil( B << i ) { inserts++; }
         }
     } catch ( channel_closed * e ) {} 
@@ -31 +31 @@
             }
             waituntil( (in << A) ) { assert( A_removes == in ); A_removes++; removes++; }
-            or waituntil( (in2 << B) ) { assert( B_removes == in2 ); B_removes++; removes++; }
+            or waituntil( (in << B) ) { assert( B_removes == in ); B_removes++; removes++; }
         }
     } catchResume ( channel_closed * e ) {} // continue to remove until would block
@@ -74 +74 @@
     ^B{};
 
+    useAnd = true;
+
     inserts = 0;
     removes = 0;