Changeset fd3be42 for tests/concurrency/waituntil

Timestamp:

Mar 19, 2025, 4:54:09 PM (6 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

5329cba

Parents:

42cd67b8 (diff), e1358c0 (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

Location:

tests/concurrency/waituntil

Files:

• all_types.cfa (modified) (3 diffs)
• timeout.cfa (modified) (1 diff)

tests/concurrency/waituntil/all_types.cfa

@@ -39 +39 @@
         or when( i % 4 < 2 ) waituntil( B ) { consume_b_val( myTotal ); }
         or waituntil( c << C ) { if ( c == -1 ) break; myTotal += c; }
-        or when( i % 3 ) waituntil( timeout( 1`ms ) ) {}
+        or when( i % 3 ) waituntil( _timeout( 1`ms ) ) {}
         or when( i % 8 < 4 ) else {}
     }
@@ -53 +53 @@
         or waituntil( c << C ) { if ( c == -1 ) break; myTotal += c; }
         or waituntil( B ) { consume_b_val( myTotal ); }
-        or waituntil( timeout( 100`ns ) ) { }
+        or waituntil( _timeout( 100`ns ) ) { }
     }
     __atomic_fetch_add( &globalTotal, myTotal, __ATOMIC_SEQ_CST );
@@ -99 +99 @@
                 or when( j % 4 < 2 ) waituntil( B ) { produce_b_val( total ); }
                 and when( j % 8 < 4 ) waituntil( C << j ) { total += j; }
-                and waituntil( timeout( 1`ns ) ) {}
+                and waituntil( _timeout( 1`ns ) ) {}
                 if ( j == numtimes / 2 )
                     fulfil( F, val_to_deliver );

tests/concurrency/waituntil/timeout.cfa

@@ -6 +6 @@
 
 int main() {
-    waituntil( sleep( 1`ms ) ) { printf("timeout\n"); }
-    waituntil( timeout( 1`s ) ) { printf("timeout\n"); } or waituntil( timeout( 2`s ) ) { printf("timeout\n"); }
-    waituntil( timeout( 100`s ) ) { printf("timeout 1\n"); } or else { printf("else\n"); }
-    waituntil( timeout( 1`ns ) ) { printf("timeout\n"); } and waituntil( timeout( 2`s ) ) { printf("timeout\n"); }
+    waituntil( _timeout( 1`ms ) ) { printf("timeout\n"); }
+    waituntil( _timeout( 1`s ) ) { printf("timeout\n"); } or waituntil( _timeout( 2`s ) ) { printf("timeout\n"); }
+    waituntil( _timeout( 100`s ) ) { printf("timeout 1\n"); } or else { printf("else\n"); }
+    waituntil( _timeout( 1`ns ) ) { printf("timeout\n"); } and waituntil( _timeout( 2`s ) ) { printf("timeout\n"); }
     int count = 0;
     for ( i; 1000 )
-        waituntil( timeout( 1`ns ) ) { count++; } or else { count++; }
+        waituntil( _timeout( 1`ns ) ) { count++; } or else { count++; }
 
     assert( count == 1000 );
-    sleep( 1`ms );
+    _timeout( 1`ms );
     printf("done\n");
 }