Changeset d60a4c2 for tests/concurrency/waitfor

Timestamp:

Jan 11, 2025, 5:48:46 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

f886608

Parents:

7d65715f (diff), 32a119e9 (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/waitfor

Files:

• .expect/parse.txt (modified) (1 diff)
• barge.cfa (modified) (4 diffs)
• parse.cfa (modified) (1 diff)
• statment.cfa (modified) (2 diffs)
• when.cfa (modified) (2 diffs)

tests/concurrency/waitfor/.expect/parse.txt

@@ -1 @@
-concurrency/waitfor/parse.cfa:255:25: warning: Compiled
+done

tests/concurrency/waitfor/barge.cfa

@@ -30 +30 @@
 }
 
-void ^?{} ( global_t & mutex this ) {}
+void ^?{} ( global_t & mutex ) {}
 
 global_t global;
@@ -40 +40 @@
 
 thread barger_t {};
-void main( barger_t & this ) {
+void main( barger_t & ) {
         yield();
         while( barge( global ) ) { yield(random( 10 )); }
@@ -56 +56 @@
 
 thread caller_t {};
-void main( caller_t & this ) {
+void main( caller_t & ) {
         while( do_call(global) ) { yield(random( 10 )); }
 }
@@ -78 +78 @@
 
 thread waiter_t{};
-void main( waiter_t & this ) {
+void main( waiter_t & ) {
         do_wait(global);
 }

tests/concurrency/waitfor/parse.cfa

@@ -252 +252 @@
 
 //Dummy main
-int main( int argc, char const * argv[] ) {
-    #pragma GCC warning "Compiled"                      // force non-empty .expect file, NO TABS!!!
+int main() {
+        printf("done\n");
 }
 

tests/concurrency/waitfor/statment.cfa

@@ -89 +89 @@
 }
 
-void main( caller & this ) {
+void main( caller & ) {
         int index = get_index( m );
         while( !start ) yield();
@@ -122 +122 @@
 thread waiter{};
 
-void main( waiter & this ) {
+void main( waiter & ) {
         do_wait( m );
 }

tests/concurrency/waitfor/when.cfa

@@ -39 +39 @@
 
 thread caller_t{};
-void main( caller_t & this ) {
+void main( caller_t & ) {
         while( true ) {
                 rand_yield();
@@ -76 +76 @@
 
 thread arbiter_t{};
-void main( arbiter_t & this ) {
+void main( arbiter_t & ) {
         arbiter( global );
 }