Changeset b7b3e41 for tests/concurrency/actors/types.cfa

Timestamp:

Jun 19, 2023, 1:57:11 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

master, stuck-waitfor-destruct

Children:

adc73a5

Parents:

fa5e1aa5 (diff), 33d4bc8 (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

File:

• tests/concurrency/actors/types.cfa (modified) (10 diffs)

tests/concurrency/actors/types.cfa

@@ -20 +20 @@
 
 // this isn't a valid receive routine since int is not a message type
-Allocation receive( derived_actor & receiver, int i ) with( receiver ) {
+allocation receive( derived_actor & receiver, int i ) with( receiver ) {
     mutex(sout) sout | i;
     counter++;
@@ -27 +27 @@
 }
 
-Allocation receive( derived_actor & receiver, d_msg & msg ) {
+allocation receive( derived_actor & receiver, d_msg & msg ) {
     return receive( receiver, msg.num );
 }
@@ -36 +36 @@
 };
 
-Allocation receive( derived_actor2 & receiver, d_msg & msg ) {
+allocation receive( derived_actor2 & receiver, d_msg & msg ) {
     mutex(sout) sout | msg.num;
     return Finished;
@@ -48 +48 @@
 };
 
-Allocation receive( derived_actor3 & receiver, d_msg & msg ) {
+allocation receive( derived_actor3 & receiver, d_msg & msg ) {
     mutex(sout) sout | msg.num;
     if ( msg.num == -1 ) return Nodelete;
@@ -54 +54 @@
 }
 
-Allocation receive( derived_actor3 & receiver, d_msg2 & msg ) {
+allocation receive( derived_actor3 & receiver, d_msg2 & msg ) {
     mutex(sout) sout | msg.num;
     return Finished;
@@ -72 +72 @@
     b.num = 1;
     c.num = 2;
-    a << b << c;
+    a | b | c;
     stop_actor_system();
 
@@ -80 +80 @@
     d_msg d_ac2_msg;
     d_ac2_msg.num = 3;
-    d_ac2_0 << d_ac2_msg;
-    d_ac2_1 << d_ac2_msg;
+    d_ac2_0 | d_ac2_msg;
+    d_ac2_1 | d_ac2_msg;
     stop_actor_system();
 
@@ -93 +93 @@
         d_msg d_ac23_msg;
         d_ac23_msg.num = 4;
-        d_ac3_0 << d_ac23_msg;
-        d_ac2_2 << d_ac23_msg;
+        d_ac3_0 | d_ac23_msg;
+        d_ac2_2 | d_ac23_msg;
         stop_actor_system();
     } // RAII to clean up executor
@@ -107 +107 @@
         b1.num = -1;
         c2.num = 5;
-        a3 << b1 << c2;
+        a3 | b1 | c2;
         stop_actor_system();
     } // RAII to clean up executor
@@ -120 +120 @@
         b1.num = -1;
         c2.num = 5;
-        a4 << b1 << c2;
+        a4 | b1 | c2;
         stop_actor_system();
     } // RAII to clean up executor