Changeset 7b84d3e for tests

Timestamp:

Oct 23, 2023, 11:58:10 AM (2 years ago)

Author:

caparson <caparson@…>

Branches:

master, stuck-waitfor-destruct

Children:

edc4813

Parents:

2ad5e1d5 (diff), abb04a4 (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

Files:

• concurrency/waituntil/channel_close.cfa (modified) (2 diffs)
• genericUnion.cfa (modified) (2 diffs)

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 ) {} 

tests/genericUnion.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 25 14:42:46 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 25 14:46:33 2018
-// Update Count     : 2
+// Last Modified On : Fri Oct 20 09:13:26 2023
+// Update Count     : 15
 // 
 
+#include <fstream.hfa>
 #include <limits.hfa>
 
-forall(T)
+forall( T )
 union ByteView {
         T val;
@@ -23 +24 @@
 
 forall(T)
-void print(ByteView(T) x) {
-        for (int i = 0; i < sizeof(int); i++) {                         // want to change to sizeof(T)
-                printf("%02x", x.bytes[i] & 0xff);
+void print( ByteView(T) x ) {
+        for ( i; sizeof(int) ) {                                                        // want to change to sizeof(T)
+                sout | nobase( pad0( wd( 2, hex( x.bytes[i] & 0xff ) ) ) ) | nosep;
         }
 }
 
 forall(T)
-void f(ByteView(T) x, T val) {
-        print(x);
-        printf(" ");
+void f( ByteView(T) x, T val ) {
+        print( x );
+        sout | " ";
         x.val = val;
-        print(x);
-        printf("\n");
+        print( x );
+        sout | nl;
 }
 
 int main() {
+        sout | nlOff;
         ByteView(unsigned) u = { 0 };
         ByteView(int) i = { 0 };
-        f(u, MAX);
-        f(i, -1);
+        f( u, MAX );
+        f( i, -1 );
 }