Changeset b110bcc for tests/concurrent/actors/matrix.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/matrix.cfa (modified) (3 diffs)

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 {
@@ -21 +18 @@
 void ?{}( derived_msg & this ) {}
 void ?{}( derived_msg & this, int * Z, int * X, int ** Y ) {
-    ((message &) this){ Finished };
+    ((message &) this){ Nodelete };
     this.Z = Z;
     this.X = X;
@@ -108 +105 @@
 
         for ( unsigned int r = 0; r < xr; r += 1 ) {
-                actors[r] | messages[r];
+                actors[r] << messages[r];
         } // for