Changeset 6ff08d8 for libcfa/src/concurrency/coroutine.cfa

Timestamp:

Jul 12, 2021, 1:44:35 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

605673f, 9345684

Parents:

cf444b6 (diff), a953c2e3 (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:

• libcfa/src/concurrency/coroutine.cfa (modified) (7 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -37 +37 @@
 
 extern "C" {
-        void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct $coroutine *) __attribute__ ((__noreturn__));
+        void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine$ *) __attribute__ ((__noreturn__));
         static void _CtxCoroutine_UnwindCleanup(_Unwind_Reason_Code, struct _Unwind_Exception *) __attribute__ ((__noreturn__));
         static void _CtxCoroutine_UnwindCleanup(_Unwind_Reason_Code, struct _Unwind_Exception *) {
@@ -62 +62 @@
 forall(T & | is_coroutine(T))
 void __cfaehm_cancelled_coroutine(
-                T & cor, $coroutine * desc, EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)) ) {
+                T & cor, coroutine$ * desc, EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)) ) {
         verify( desc->cancellation );
         desc->state = Cancelled;
@@ -114 +114 @@
 }
 
-void ?{}( $coroutine & this, const char name[], void * storage, size_t storageSize ) with( this ) {
+void ?{}( coroutine$ & this, const char name[], void * storage, size_t storageSize ) with( this ) {
         (this.context){0p, 0p};
         (this.stack){storage, storageSize};
@@ -124 +124 @@
 }
 
-void ^?{}($coroutine& this) {
+void ^?{}(coroutine$& this) {
         if(this.state != Halted && this.state != Start && this.state != Primed) {
-                $coroutine * src = active_coroutine();
-                $coroutine * dst = &this;
+                coroutine$ * src = active_coroutine();
+                coroutine$ * dst = &this;
 
                 struct _Unwind_Exception storage;
@@ -148 +148 @@
 forall(T & | is_coroutine(T) | { EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)); })
 void prime(T& cor) {
-        $coroutine* this = get_coroutine(cor);
+        coroutine$* this = get_coroutine(cor);
         assert(this->state == Start);
 
@@ -248 +248 @@
 // is not inline (We can't inline Cforall in C)
 extern "C" {
-        void __cfactx_cor_leave( struct $coroutine * src ) {
-                $coroutine * starter = src->cancellation != 0 ? src->last : src->starter;
+        void __cfactx_cor_leave( struct coroutine$ * src ) {
+                coroutine$ * starter = src->cancellation != 0 ? src->last : src->starter;
 
                 src->state = Halted;
@@ -265 +265 @@
         }
 
-        struct $coroutine * __cfactx_cor_finish(void) {
-                struct $coroutine * cor = active_coroutine();
+        struct coroutine$ * __cfactx_cor_finish(void) {
+                struct coroutine$ * cor = active_coroutine();
 
                 // get the active thread once
-                $thread * athrd = active_thread();
+                thread$ * athrd = active_thread();
 
                 /* paranoid */ verify( athrd->corctx_flag );