Changeset 47b5b63

Timestamp:

Sep 20, 2017, 12:03:55 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

b462670, e4d6335, f980549

Parents:

d22e90f (diff), 39fea2f (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:/u/cforall/software/cfa/cfa-cc

Location:

src/libcfa/concurrency

Files:

• coroutine.c (modified) (2 diffs)
• invoke.c (modified) (2 diffs)
• invoke.h (modified) (1 diff)
• kernel.c (modified) (2 diffs)

src/libcfa/concurrency/coroutine.c

@@ -65 +65 @@
         this.errno_ = 0;
         this.state = Start;
-        this.starter = NULL;
+        this.starter = this_coroutine;
         this.last = NULL;
 }
@@ -171 +171 @@
                 suspend();
         }
+
+        void __leave_coroutine(void) {
+                coroutine_desc * src = this_coroutine;          // optimization
+
+                assertf( src->starter != 0,
+                        "Attempt to suspend coroutine \"%.256s\" (%p) that does not have a starter.\n"
+                        "Possible cause is a resume of a coroutine already destroyed or not yet constructed",
+                        src->name, src );
+                assertf( src->starter->state != Halted,
+                        "Attempt by coroutine \"%.256s\" (%p) to suspend back to terminated coroutine \"%.256s\" (%p).\n"
+                        "Possible cause is terminated coroutine's main routine has already returned.",
+                        src->name, src, src->starter->name, src->starter );
+
+                CoroutineCtxSwitch( src, src->starter );
+        }
 }
 

src/libcfa/concurrency/invoke.c

@@ -28 +28 @@
 
 extern void __suspend_internal(void);
+extern void __leave_coroutine(void);
 extern void __leave_thread_monitor( struct thread_desc * this );
 extern void disable_interrupts();
@@ -52 +53 @@
 
       //Final suspend, should never return
-      __suspend_internal();
+      __leave_coroutine();
       abortf("Resumed dead coroutine");
 }

src/libcfa/concurrency/invoke.h

@@ -80 +80 @@
             int errno_;                               // copy of global UNIX variable errno
             enum coroutine_state state;               // current execution status for coroutine
-            struct coroutine_desc *starter;           // first coroutine to resume this one
-            struct coroutine_desc *last;                    // last coroutine to resume this one
+            struct coroutine_desc * starter;          // first coroutine to resume this one
+            struct coroutine_desc * last;             // last coroutine to resume this one
       };
 

src/libcfa/concurrency/kernel.c

@@ -102 +102 @@
         this.errno_ = 0;
         this.state = Start;
+        this.starter = NULL;
 }
 
@@ -110 +111 @@
 //-----------------------------------------------------------------------------
 // Processor coroutine
+
+// Construct the processor context of the main processor
 void ?{}(processorCtx_t & this, processor * proc) {
         (this.__cor){ "Processor" };
+        this.__cor.starter = &mainThread->cor;
         this.proc = proc;
         proc->runner = &this;
 }
 
+// Construct the processor context of non-main processors
 void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info) {
         (this.__cor){ info };