Changeset d923fca for tests/concurrency/waituntil

Timestamp:

Feb 18, 2025, 12:54:23 PM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

8705a11

Parents:

3e5fea2

Message:

Clean-up the warnings of the concurrency tests. A lot of little test level fixes, the most interesting repeated one is some formally redundent fallthough statements. pthread_attr_test had to be rewritten because of library restrictions. Changed some types so they would always be pointer sized. There was a library change, there was a function that could not be implemented; I trust that it is included for a reason so I just put it in a comment. There is a change to the compiler, wait-until now uses goto. The labelled breaks were code generated as unlabelled breaks and although it worked out slipped through some checks. Finally, there is one warning that I cannot solve at this time so tests that produce it have been put in their own lax group.

Location:

tests/concurrency/waituntil

Files:

• all_types.cfa (modified) (3 diffs)
• channel_close.cfa (modified) (5 diffs)
• channels.cfa (modified) (3 diffs)
• futures.cfa (modified) (2 diffs)
• locks.cfa (modified) (2 diffs)
• repeat_close.cfa (modified) (3 diffs)

tests/concurrency/waituntil/all_types.cfa

@@ -33 +33 @@
 
 thread Server1 {};
-void main( Server1 & this ) {
-    long long int a, b, c, i = 0, myTotal = 0;
+void main( Server1 & ) {
+    long long int a, c, i = 0, myTotal = 0;
     for( ;;i++ ) {
         when( i % 2 == 0 ) waituntil( a << A ) { myTotal += a; }
@@ -46 +46 @@
 
 thread Drainer {}; // ensures that the changing when states of Server1 don't result in a deadlock
-void main( Drainer & this ) {
-    long long int a, b, c, myTotal = 0;
+void main( Drainer & ) {
+    long long int a, c, myTotal = 0;
     for( ;; ) {
         waituntil( F ) { myTotal += get(F); reset( F ); }
@@ -59 +59 @@
 
 thread Churner {}; // performs non-waituntil try insert/remove operations to add churn/interference
-void main( Churner & this ) {
+void main( Churner & ) {
     long long int out, myTotal = 0;
     bool success;

tests/concurrency/waituntil/channel_close.cfa

@@ -9 +9 @@
 
 thread Producer {};
-void main( Producer & this ) {
+void main( Producer & ) {
     try {
         for( size_t i; 0~@ ) {
@@ -15 +15 @@
             and waituntil( B << i ) { inserts++; }
         }
-    } catch ( channel_closed * e ) {} 
+    } catch ( channel_closed * e ) {}
 }
 
 bool useAnd = false;
 thread Consumer {}; // ensures that the changing when states of Server1 don't result in a deadlock
-void main( Consumer & this ) {
+void main( Consumer & ) {
     ssize_t in, in2, A_removes = 0, B_removes = 0;
 
@@ -34 +34 @@
         }
     } catchResume ( channel_closed * e ) {                              // continue to remove until would block
-        } catch ( channel_closed * e ) {} 
+        } catch ( channel_closed * e ) {}
 
     try {
@@ -40 +40 @@
             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 ) {} 
+        } catch ( channel_closed * e ) {}
 
     try {
@@ -46 +46 @@
             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 ) {} 
+        } catch ( channel_closed * e ) {}
 }
 

tests/concurrency/waituntil/channels.cfa

@@ -9 +9 @@
 
 thread Server1 {};
-void main( Server1 & this ) {
+void main( Server1 & ) {
     long long int a, b, c, i = 0, myTotal = 0;
     for( ;;i++ ) {
@@ -21 +21 @@
 
 thread Drainer {}; // ensures that the changing when states of Server1 don't result in a deadlock
-void main( Drainer & this ) {
+void main( Drainer & ) {
     long long int a, b, c, myTotal = 0;
     for( ;; ) {
@@ -33 +33 @@
 
 thread Churner {}; // performs non-waituntil try insert/remove operations to add churn/interference
-void main( Churner & this ) {
+void main( Churner & ) {
     long long int out, myTotal = 0;
     bool success;

tests/concurrency/waituntil/futures.cfa

@@ -8 +8 @@
 
 thread Server1 {};
-void main( Server1 & this ) {
+void main( Server1 & ) {
     fulfil(B, 3);
     P( s );
@@ -16 +16 @@
 
 thread Server2 {};
-void main( Server2 & this ) {
+void main( Server2 & ) {
     fulfil(B, 6);
     fulfil(A, 5);

tests/concurrency/waituntil/locks.cfa

@@ -12 +12 @@
 
 thread Server1 {};
-void main( Server1 & this ) {
+void main( Server1 & ) {
     while( !done ) {
         lock(A);
@@ -44 +44 @@
                 )
                 and when( i < 4 ) waituntil( C ) { c++; }
-                
+
                 when( i % 2 == 0 ) waituntil( A ) { a++; }
                 and when( i % 4 < 2 ) waituntil( B ) { b++; }

tests/concurrency/waituntil/repeat_close.cfa

@@ -10 +10 @@
 
 thread Producer {};
-void main( Producer & this ) {
-    long long int my_inserts = 0;
+void main( Producer & ) {
     long long int A_i = 0, B_i = 0, C_i = 0, D_i = 0, E_i = 0, F_i = 0;
     try {
@@ -22 +21 @@
             and waituntil( F << i ) { F_i++; }
         }
-    } catch ( channel_closed * e ) {} 
+    } catch ( channel_closed * e ) {}
     __atomic_fetch_add( &inserts, A_i + B_i + C_i + D_i + E_i + F_i, __ATOMIC_SEQ_CST );
 }
 
 thread Consumer {};
-void main( Consumer & this ) {
+void main( Consumer & ) {
     long long int in, A_removes = 0, B_removes = 0, C_removes = 0, D_removes = 0, E_removes = 0, F_removes = 0;
     try {
@@ -83 +82 @@
     printf("Start\n");
     for ( i; num_times ) {
-        printf("%lu\n", i);
+        printf("%zu\n", i);
         A{chan_size};
         B{chan_size};