Changeset 4b30318b for libcfa

Timestamp:

Sep 2, 2023, 3:07:49 PM (16 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

6e93819

Parents:

389fbf5 (diff), 8a9a3ab (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

Location:

libcfa/src/concurrency

Files:

• coroutine.cfa (modified) (2 diffs)
• coroutine.hfa (modified) (5 diffs)
• exception.cfa (modified) (1 diff)

libcfa/src/concurrency/coroutine.cfa

@@ -344 +344 @@
 bool poll() libcfa_public { return poll( active_coroutine() ); }
 coroutine$ * resumer() libcfa_public { return active_coroutine()->last; }
+coroutine$ * first_resumer() libcfa_public { return active_coroutine()->starter; }
 
 // user facing ehm operations
@@ -358 +359 @@
 
     coroutine$ * resumer( T & cor ) libcfa_public { return get_coroutine( cor )->last; }
+    coroutine$ * first_resumer( T & cor ) libcfa_public { return get_coroutine( cor )->starter; }
 }
 

libcfa/src/concurrency/coroutine.hfa

@@ -124 +124 @@
         src->state = Active;
 
-        if( unlikely(src->cancellation != 0p) ) {
+        if( unlikely(src->cancellation != 0p && src->cancellation != 1p) ) {
                 __cfactx_coroutine_unwind(src->cancellation, src);
         }
@@ -169 +169 @@
         coroutine$ * dst = get_coroutine(cor);
 
+    // printf("FROM RES src: %p, dest: %p\n", src, dst);
+
         if( unlikely(dst->context.SP == 0p) ) {
                 __stack_prepare(&dst->stack, DEFAULT_STACK_SIZE);
@@ -188 +190 @@
         // always done for performance testing
         $ctx_switch( src, dst );
-        if ( unlikely(dst->cancellation) ) {
+
+        if ( unlikely(src->cancellation == 1p) ) {
+        src->cancellation = 0p;
+        // we know dst hasn't been deallocated
                 __cfaehm_cancelled_coroutine( cor, dst, _default_vtable );
         }
@@ -222 +227 @@
 bool poll();
 coroutine$ * resumer();
+coroutine$ * first_resumer();
 
 forall(T & | is_coroutine(T)) {
@@ -229 +235 @@
     bool checked_poll( T & cor );
     coroutine$ * resumer( T & cor );
+    coroutine$ * first_resumer( T & cor );
 }
 

libcfa/src/concurrency/exception.cfa

@@ -57 +57 @@
         struct coroutine$ * src = (coroutine$ *)stop_param;
         struct coroutine$ * dst = src->last;
-
+    dst->cancellation = 1p;
         $ctx_switch( src, dst );
         abort();