Changeset fc12f05 for tests/concurrency

Timestamp:

Nov 13, 2023, 3:43:43 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

25f2798

Parents:

0030b508 (diff), 2174191 (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

Files:

• actors/.expect/dynamic.txt (modified) (1 diff)
• actors/.expect/static.txt (modified) (1 diff)
• actors/dynamic.cfa (modified) (1 diff)
• actors/static.cfa (modified) (1 diff)
• cofor.cfa (modified) (2 diffs)
• waitfor/parse.cfa (modified) (2 diffs)
• waituntil/channel_close.cfa (modified) (2 diffs)

tests/concurrency/actors/.expect/dynamic.txt

@@ -1 +1 @@
 starting
 started
-stopping
 Done
 stopped

tests/concurrency/actors/.expect/static.txt

@@ -1 +1 @@
 starting
 started
-stopping
 Done
 stopped

tests/concurrency/actors/dynamic.cfa

@@ -58 +58 @@
         *d_actor | *d_msg;
 
-        sout | "stopping";
-
         stop_actor_system();
 

tests/concurrency/actors/static.cfa

@@ -55 +55 @@
         actor | msg;
 
-        sout | "stopping";
-
         stop_actor_system();
 

tests/concurrency/cofor.cfa

@@ -1 +1 @@
 #include <cofor.hfa>
-
 
 void add_num( long * total, long val ) { __atomic_fetch_add( total, (long)val, __ATOMIC_SEQ_CST ); }
@@ -8 +7 @@
     processor p[4];
     long total = 0;
-    COFOR( i, 0, 10, __atomic_fetch_add( &total, i, __ATOMIC_SEQ_CST ); );
+    cofor( i; 10 ) {
+        __atomic_fetch_add( &total, i, __ATOMIC_SEQ_CST );
+    }
     {
         corun;      // does nothing

tests/concurrency/waitfor/parse.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug 30 17:53:29 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr 10 22:52:18 2023
-// Update Count     : 64
+// Last Modified On : Wed Nov  1 07:28:19 2023
+// Update Count     : 65
 // 
 
@@ -258 +258 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa waitfor.cfa" //
+// compile-command: "cfa parse.cfa" //
 // End: //

tests/concurrency/waituntil/channel_close.cfa

@@ -26 +26 @@
         for( ;; ) {
             if ( useAnd ) {
-                waituntil( (in << A) ) { assert( A_removes == in ); A_removes++; removes++; }
-                and waituntil( (in2 << B) ) { assert( B_removes == in2 ); B_removes++; removes++; }
+                waituntil( (in << A) ) { __atomic_thread_fence( __ATOMIC_SEQ_CST ); assert( A_removes == in ); A_removes++; removes++; }
+                and waituntil( (in2 << B) ) { __atomic_thread_fence( __ATOMIC_SEQ_CST ); assert( B_removes == in2 ); B_removes++; removes++; }
                 continue;
             }
-            waituntil( (in << A) ) { assert( A_removes == in ); A_removes++; removes++; }
-            or waituntil( (in << B) ) { assert( B_removes == in ); B_removes++; removes++; }
+            waituntil( (in << A) ) { __atomic_thread_fence( __ATOMIC_SEQ_CST ); assert( A_removes == in ); A_removes++; removes++; }
+            or waituntil( (in << B) ) { __atomic_thread_fence( __ATOMIC_SEQ_CST ); ( B_removes == in ); B_removes++; removes++; }
         }
     } catchResume ( channel_closed * e ) {} // continue to remove until would block
@@ -37 +37 @@
     try {
         for( ;; )
-            waituntil( (in << A) ) { assert( A_removes == in ); A_removes++; removes++; }
+            waituntil( (in << A) ) { __atomic_thread_fence( __ATOMIC_SEQ_CST ); assert( A_removes == in ); A_removes++; removes++; }
     } catchResume ( channel_closed * e ) {} // continue to remove until would block
     catch ( channel_closed * e ) {} 
     try {
         for( ;; )
-            waituntil( (in << B) ) { assert( B_removes == in ); B_removes++; removes++; }
+            waituntil( (in << B) ) { __atomic_thread_fence( __ATOMIC_SEQ_CST ); assert( B_removes == in ); B_removes++; removes++; }
     } catchResume ( channel_closed * e ) {} // continue to remove until would block
     catch ( channel_closed * e ) {}