Changeset 8cbe732 for tests/concurrency

Timestamp:

Oct 13, 2023, 7:13:21 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

a97b9ed, bab2917

Parents:

85034ed (diff), 0bf0b978 (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/cofor.cfa (modified) (1 diff)

tests/concurrency/cofor.cfa

@@ -1 +1 @@
 #include <cofor.hfa>
 
-long total = 0;
-void add_num( void * arg ) { __atomic_fetch_add( &total, (long)arg, __ATOMIC_SEQ_CST ); }
+
+void add_num( long * total, long val ) { __atomic_fetch_add( total, (long)val, __ATOMIC_SEQ_CST ); }
 
 int main() {
     printf("start\n");
     processor p[4];
+    long total = 0;
     COFOR( i, 0, 10, __atomic_fetch_add( &total, i, __ATOMIC_SEQ_CST ); );
-    parallel_stmt_t stmts[5] = { add_num, add_num, add_num, add_num, add_num };
-    void * nums[5] = { (void *)11, (void *)12, (void *)13, (void *)14, (void *)15 };
-    parallel( stmts, nums, 5 );
+    {
+        corun;      // does nothing
+        corun{};    // does nothing
+        corun add_num( &total, 11 );
+        corun { add_num( &total, 12 ); }
+        corun __atomic_fetch_add( &total, 13, __ATOMIC_SEQ_CST );
+        corun { __atomic_fetch_add( &total, 14, __ATOMIC_SEQ_CST ); }
+        __atomic_fetch_add( &total, 15, __ATOMIC_SEQ_CST ); // run by main thd
+    }
     printf("total: %ld\n", total);
     printf("done\n");