Changeset c34bb1f for libcfa

Timestamp:

Aug 7, 2023, 3:08:14 PM (17 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

7c2820e

Parents:

27f2bef

Message:

fixed nonlocal exception edge case for program main and added poll() routine with no args that polls the currrent active coroutine

Location:

libcfa/src/concurrency

Files:

• coroutine.cfa (modified) (2 diffs)
• coroutine.hfa (modified) (1 diff)
• kernel/startup.cfa (modified) (1 diff)

libcfa/src/concurrency/coroutine.cfa

@@ -298 +298 @@
 }
 
+bool poll( coroutine$ * cor ) libcfa_public {
+    nonlocal_exception * nl_ex = pop_ehm_head( cor );
+
+    // if no exceptions return false
+    if ( nl_ex == 0p ) return false;
+    
+    // otherwise loop and throwResume all pending exceptions
+    while ( nl_ex != 0p ){
+        exception_t * ex = nl_ex->the_exception;
+        free( nl_ex );
+        throwResume *ex;
+        nl_ex = pop_ehm_head( cor );
+    }
+    
+    return true;
+}
+
+bool poll() libcfa_public { return poll( active_coroutine() ); }
+
 // user facing ehm operations
 forall(T & | is_coroutine(T)) {
@@ -305 +324 @@
 
     // poll for non-local exceptions
-    bool poll( T & cor ) libcfa_public {
-        coroutine$ * base_cor = get_coroutine( cor );
-        nonlocal_exception * nl_ex = pop_ehm_head( base_cor );
-
-        // if no exceptions return false
-        if ( nl_ex == 0p ) return false;
-        
-        // otherwise loop and throwResume all pending exceptions
-        while ( nl_ex != 0p ){
-            exception_t * ex = nl_ex->the_exception;
-            free( nl_ex );
-            throwResume *ex;
-            nl_ex = pop_ehm_head( base_cor );
-        }
-        
-        return true;
-    }
+    bool poll( T & cor ) libcfa_public { return poll( get_coroutine( cor ) ); }
 
     // poll iff nonlocal ehm is enabled

libcfa/src/concurrency/coroutine.hfa

@@ -219 +219 @@
 
 // non local ehm and coroutine utility routines
+bool poll( coroutine$ * cor );
+bool poll();
+
 forall(T & | is_coroutine(T)) {
     void enable_ehm( T & cor );

libcfa/src/concurrency/kernel/startup.cfa

@@ -487 +487 @@
         last = 0p;
         cancellation = 0p;
+    ehm_state.ehm_buffer{};
+    ehm_state.buffer_lock{};
+    ehm_state.ehm_enabled = false;
 }