Changeset ee9ad40

Timestamp:

Oct 9, 2023, 1:02:03 PM (18 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

cf3da24

Parents:

72b518fc

Message:

Changed cofor files to support the corun statement

Location:

libcfa/src/concurrency

Files:

• cofor.cfa (modified) (4 diffs)
• cofor.hfa (modified) (1 diff)

libcfa/src/concurrency/cofor.cfa

@@ -4 +4 @@
 // cofor ( uC++ COFOR )
 
-thread co_runner {
+thread cofor_runner {
         ssize_t low, high;
         __cofor_body_t loop_body;
 };
 
-static void ?{}( co_runner & this, ssize_t low, ssize_t high, __cofor_body_t loop_body ) {
+static void ?{}( cofor_runner & this, ssize_t low, ssize_t high, __cofor_body_t loop_body ) {
         this.low = low;
         this.high = high;
@@ -15 +15 @@
 }
 
-void main( co_runner & this ) with( this ) {
+void main( cofor_runner & this ) with( this ) {
         for ( ssize_t i = low; i < high; i++ )
                 loop_body(i);
@@ -29 +29 @@
         ssize_t i = 0;
         ssize_t stride_iter = low;
-        co_runner * runners[ threads ];
+        cofor_runner * runners[ threads ];
         for ( i; threads ) {
                 runners[i] = alloc();
@@ -45 +45 @@
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// parallel (COBEGIN/COEND)
 
-thread para_runner {
-        parallel_stmt_t body;
-        void * arg;
-};
-
-static void ?{}( para_runner & this, parallel_stmt_t body, void * arg ) { 
-        this.body = body;
-        this.arg = arg;
-}
-
-void main( para_runner & this ) with( this ) { body( arg ); }
-
-void parallel( parallel_stmt_t * stmts, void ** args, size_t num ) libcfa_public {
-        para_runner * runners[ num ];
-        for ( i; num )
-                (*(runners[i] = malloc())){ stmts[i], args[i] };
-        for ( i; num )
-                delete( runners[i] );
-}
-

libcfa/src/concurrency/cofor.hfa

@@ -16 +16 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// parallel (COBEGIN/COEND)
-typedef void (*parallel_stmt_t)( void * );
+// corun
 
-void parallel( parallel_stmt_t * stmts, void ** args, size_t num );
+// 
+typedef void (*__CFA_corun_lambda_t)( void );
+
+// used to run a corun statement in parallel
+thread co_runner {
+        __CFA_corun_lambda_t body;
+};
+
+// wraps a co_runner to provide RAII deallocation
+struct runner_block {
+    co_runner * runner;
+};
+static inline void ?{}( co_runner & this, __CFA_corun_lambda_t body ) { this.body = body; }
+
+void main( co_runner & this ) with( this ) { body(); }
+
+static inline void ?{}( runner_block & this ) {}
+static inline void ?{}( runner_block & this, __CFA_corun_lambda_t body ) {
+    (*(this.runner = malloc())){ body };
+}
+
+static inline void ^?{}( runner_block & this ) {
+    delete( this.runner );
+}
+