Changeset 4933f18 for tests/concurrent/actors

Timestamp:

Mar 4, 2023, 3:05:28 PM (16 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

e54b4e9

Parents:

858350a

Message:

added test case to types test and refactored to remove redundant ctor calls

Location:

tests/concurrent/actors

Files:

• dynamic.cfa (modified) (2 diffs)
• executor.cfa (modified) (2 diffs)
• matrix.cfa (modified) (1 diff)
• pingpong.cfa (modified) (1 diff)
• static.cfa (modified) (2 diffs)
• types.cfa (modified) (4 diffs)

tests/concurrent/actors/dynamic.cfa

@@ -7 +7 @@
 int Times = 1000000;                                                            // default values
 
-struct derived_actor {
-    inline actor;
-};
-void ?{}( derived_actor & this ) { ((actor &)this){}; }
-
+struct derived_actor { inline actor; };
 struct derived_msg {
     inline message;
@@ -22 +18 @@
 }
 void ?{}( derived_msg & this ) { ((derived_msg &)this){ 0 }; }
-
 
 Allocation receive( derived_actor & receiver, derived_msg & msg ) {

tests/concurrent/actors/executor.cfa

@@ -24 +24 @@
 
 struct d_msg { inline message; } shared_msg;
-void ?{}( d_msg & this ) { ((message &) this){ Nodelete }; }
 
 Allocation receive( d_actor & this, d_msg & msg ) with( this ) {
@@ -85 +84 @@
         } // switch
 
-    
     executor e{ Processors, Processors, Processors == 1 ? 1 : Processors * 512, true };
 

tests/concurrent/actors/matrix.cfa

@@ -7 +7 @@
 unsigned int xr = 500, xc = 500, yc = 500, Processors = 1; // default values
 
-struct derived_actor {
-    inline actor;
-};
-void ?{}( derived_actor & this ) { ((actor &)this){}; }
+struct derived_actor { inline actor; };
 
 struct derived_msg {

tests/concurrent/actors/pingpong.cfa

@@ -6 +6 @@
 #include <actor.hfa>
 
-struct ping {
-    inline actor;
-};
-static inline void ?{}( ping & this ) { ((actor &)this){}; }
-
-struct pong {
-    inline actor;
-};
-static inline void ?{}( pong & this ) { ((actor &)this){}; }
+struct ping { inline actor; };
+struct pong { inline actor; };
 
 struct p_msg {

tests/concurrent/actors/static.cfa

@@ -7 +7 @@
 int Times = 1000000;                                                            // default values
 
-struct derived_actor {
-    inline actor;
-};
-void ?{}( derived_actor & this ) { ((actor &)this){}; }
-
+struct derived_actor { inline actor; };
 struct derived_msg {
     inline message;
@@ -22 +18 @@
 }
 void ?{}( derived_msg & this ) { ((derived_msg &)this){ 0 }; }
-
 
 Allocation receive( derived_actor & receiver, derived_msg & msg ) {

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 ) {
@@ -117 +111 @@
     } // 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
+
     printf("end\n");
     return 0;