Changeset c3e510b

Timestamp:

Aug 7, 2023, 12:35:53 PM (16 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

27f2bef

Parents:

ff7f6d07

Message:

added support for resuming at resumer, added test for support and cleaned up uneeded include in pingpong exception test

Files:

• libcfa/src/concurrency/coroutine.cfa (modified) (2 diffs)
• libcfa/src/concurrency/coroutine.hfa (modified) (3 diffs)
• tests/exceptions/.expect/cor_resumer.txt (added)
• tests/exceptions/cor_resumer.cfa (added)
• tests/exceptions/pingpong_nonlocal.cfa (modified) (1 diff)

libcfa/src/concurrency/coroutine.cfa

@@ -325 +325 @@
     // poll iff nonlocal ehm is enabled
     bool checked_poll( T & cor ) libcfa_public { return get_coroutine( cor )->ehm_state.ehm_enabled ? poll( cor ) : false; }
+
+    coroutine$ * resumer( T & cor ) libcfa_public { return get_coroutine( cor )->last; }
 }
 
@@ -338 +340 @@
 }
 
+forall(exceptT & | { void $throwResume(exceptT &); })
+void resumeAt( coroutine$ * receiver, exceptT & ex ) libcfa_public {
+    nonlocal_exception * nl_ex = alloc();
+    (*nl_ex){ (exception_t *)&ex };
+    lock( receiver->ehm_state.buffer_lock __cfaabi_dbg_ctx2 );
+    append( receiver->ehm_state.ehm_buffer, nl_ex ); 
+    unlock( receiver->ehm_state.buffer_lock );
+}
+
 // Local Variables: //
 // mode: c //

libcfa/src/concurrency/coroutine.hfa

@@ -218 +218 @@
 }
 
-// non local ehm routines
+// non local ehm and coroutine utility routines
 forall(T & | is_coroutine(T)) {
     void enable_ehm( T & cor );
@@ -224 +224 @@
     bool poll( T & cor );
     bool checked_poll( T & cor );
+    coroutine$ * resumer( T & cor );
 }
 
@@ -230 +231 @@
 trait ehm_resume_at { void $throwResume(exceptT &); };
 
+// general resumeAt
 forall(exceptT &, T & | ehm_resume_at( exceptT, T ))
 void resumeAt( T & receiver, exceptT & ex );
+
+// resumeAt for underlying coroutine$ type
+forall(exceptT & | { void $throwResume(exceptT &); })
+void resumeAt( coroutine$ * receiver, exceptT & ex );
 
 // Local Variables: //

tests/exceptions/pingpong_nonlocal.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
 #include <thread.hfa>
-#include <fstream.hfa>
 #include <mutex_stmt.hfa>