Changeset b110bcc for tests/concurrent/actors/types.cfa

Timestamp:

Apr 21, 2023, 5:36:12 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

28f8f15, 6e4c44d

Parents:

2ed94a9 (diff), 699a97d (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/concurrent/actors/types.cfa (modified) (7 diffs)

tests/concurrent/actors/types.cfa

@@ -18 +18 @@
     int num;
 };
-static inline void ?{}( d_msg & this ) { ((message &)this){}; }
 
 // this isn't a valid receive routine since int is not a message type
@@ -36 +35 @@
     inline actor;
 };
-static inline void ?{}( derived_actor2 & this ) { ((actor &)this){}; }
 
 Allocation receive( derived_actor2 & receiver, d_msg & msg ) {
@@ -43 +41 @@
 }
 
-struct derived_actor3 {
-    inline actor;
-};
-static inline void ?{}( derived_actor3 & this ) { ((actor &)this){}; }
-
+struct derived_actor3 { inline actor; };
+struct derived_actor4 { inline derived_actor3; };
 struct d_msg2 {
     inline message;
     int num;
 };
-static inline void ?{}( d_msg2 & this ) { ((message &)this){}; }
 
 Allocation receive( derived_actor3 & receiver, d_msg & msg ) {
@@ -78 +72 @@
     b.num = 1;
     c.num = 2;
-    a | b | c;
+    a << b << c;
     stop_actor_system();
 
@@ -86 +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();
 
@@ -99 +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
@@ -113 +107 @@
         b1.num = -1;
         c2.num = 5;
-        a3 | b1 | c2;
+        a3 << b1 << c2;
+        stop_actor_system();
+    } // RAII to clean up executor
+
+    {
+        printf("nested inheritance actor test\n");
+        executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true };
+        start_actor_system( Processors );
+        derived_actor4 a4;
+        d_msg b1;
+        d_msg2 c2;
+        b1.num = -1;
+        c2.num = 5;
+        a4 << b1 << c2;
         stop_actor_system();
     } // RAII to clean up executor