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

Timestamp:

Sep 21, 2023, 10:15:58 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

62c6cfa

Parents:

c1e66d9 (diff), 5a1ae14 (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) (3 diffs)

tests/concurrency/actors/types.cfa

@@ -9 +9 @@
 
 struct derived_actor {
-    inline actor;
-    int counter;
+        inline actor;
+        int counter;
 };
 static inline void ?{}( derived_actor & this ) { ((actor &)this){}; this.counter = 0; }
 
 struct d_msg {
-    inline message;
-    int num;
+        inline message;
+        int num;
 };
 
 // this isn't a valid receive routine since int is not a message type
 allocation receive( derived_actor & receiver, int i ) with( receiver ) {
-    mutex(sout) sout | i;
-    counter++;
-    if ( counter == 2 ) return Finished;
-    return Nodelete; 
+        mutex(sout) sout | i;
+        counter++;
+        if ( counter == 2 ) return Finished;
+        return Nodelete; 
 }
 
 allocation receive( derived_actor & receiver, d_msg & msg ) {
-    return receive( receiver, msg.num );
+        return receive( receiver, msg.num );
 }
 
 struct derived_actor2 {
-    struct nested { int i; }; // testing nested before inline
-    inline actor;
+        struct nested { int i; }; // testing nested before inline
+        inline actor;
 };
 
 allocation receive( derived_actor2 & receiver, d_msg & msg ) {
-    mutex(sout) sout | msg.num;
-    return Finished;
+        mutex(sout) sout | msg.num;
+        return Finished;
 }
 
@@ -44 +44 @@
 struct derived_actor4 { inline derived_actor3; };
 struct d_msg2 {
-    inline message;
-    int num;
+        inline message;
+        int num;
 };
 
 allocation receive( derived_actor3 & receiver, d_msg & msg ) {
-    mutex(sout) sout | msg.num;
-    if ( msg.num == -1 ) return Nodelete;
-    return Finished;
+        mutex(sout) sout | msg.num;
+        if ( msg.num == -1 ) return Nodelete;
+        return Finished;
 }
 
 allocation receive( derived_actor3 & receiver, d_msg2 & msg ) {
-    mutex(sout) sout | msg.num;
-    return Finished;
+        mutex(sout) sout | msg.num;
+        return Finished;
 }
 
@@ -62 +62 @@
 
 int main( int argc, char * argv[] ) {
-    printf("start\n");
+        sout | "start";
 
-    processor p[Processors - 1];
+        processor p[Processors - 1];
 
-    printf("basic test\n"); 
-    start_actor_system( Processors ); // test passing number of processors
-    derived_actor a;
-    d_msg b, c;
-    b.num = 1;
-    c.num = 2;
-    a | b | c;
-    stop_actor_system();
+        sout | "basic test"; 
+        start_actor_system( Processors ); // test passing number of processors
+        derived_actor a;
+        d_msg b, c;
+        b.num = 1;
+        c.num = 2;
+        a | b | c;
+        stop_actor_system();
 
-    printf("same message and different actors test\n");
-    start_actor_system(); // let system detect # of processors
-    derived_actor2 d_ac2_0, d_ac2_1;
-    d_msg d_ac2_msg;
-    d_ac2_msg.num = 3;
-    d_ac2_0 | d_ac2_msg;
-    d_ac2_1 | d_ac2_msg;
-    stop_actor_system();
+        sout | "same message and different actors test";
+        start_actor_system(); // let system detect # of processors
+        derived_actor2 d_ac2_0, d_ac2_1;
+        d_msg d_ac2_msg;
+        d_ac2_msg.num = 3;
+        d_ac2_0 | d_ac2_msg;
+        d_ac2_1 | d_ac2_msg;
+        stop_actor_system();
 
-    
-    {
-        printf("same message and different actor types test\n");
-        executor e{ 0, Processors, Processors == 1 ? 1 : Processors * 4, false };
-        start_actor_system( e ); // pass an explicit executor
-        derived_actor2 d_ac2_2;
-        derived_actor3 d_ac3_0;
-        d_msg d_ac23_msg;
-        d_ac23_msg.num = 4;
-        d_ac3_0 | d_ac23_msg;
-        d_ac2_2 | d_ac23_msg;
-        stop_actor_system();
-    } // RAII to clean up executor
+        
+        {
+                sout | "same message and different actor types test";
+                executor e{ 0, Processors, Processors == 1 ? 1 : Processors * 4, false };
+                start_actor_system( e ); // pass an explicit executor
+                derived_actor2 d_ac2_2;
+                derived_actor3 d_ac3_0;
+                d_msg d_ac23_msg;
+                d_ac23_msg.num = 4;
+                d_ac3_0 | d_ac23_msg;
+                d_ac2_2 | d_ac23_msg;
+                stop_actor_system();
+        } // RAII to clean up executor
 
-    {
-        printf("different message types, one actor test\n");
-        executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true };
-        start_actor_system( Processors );
-        derived_actor3 a3;
-        d_msg b1;
-        d_msg2 c2;
-        b1.num = -1;
-        c2.num = 5;
-        a3 | b1 | c2;
-        stop_actor_system();
-    } // RAII to clean up executor
+        {
+                sout | "different message types, one actor test";
+                executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true };
+                start_actor_system( Processors );
+                derived_actor3 a3;
+                d_msg b1;
+                d_msg2 c2;
+                b1.num = -1;
+                c2.num = 5;
+                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
+        {
+                sout | "nested inheritance actor test";
+                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;
+        sout | "end";
 }