Changeset b462670

Timestamp:

Sep 20, 2017, 1:59:47 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

8d722cc, 9bae71f

Parents:

47b5b63

Message:

Coroutines should now properly use the first resumner as their starter

Location:

src/libcfa/concurrency

Files:

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

src/libcfa/concurrency/coroutine

@@ -103 +103 @@
                 // set last resumer
                 dst->last = src;
+                dst->starter = dst->starter ? dst->starter : src;
         } // if
 

src/libcfa/concurrency/coroutine.c

@@ -65 +65 @@
         this.errno_ = 0;
         this.state = Start;
-        this.starter = this_coroutine;
+        this.starter = NULL;
         this.last = NULL;
 }
@@ -176 +176 @@
 
                 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",
+                        "Attempt to suspend/leave coroutine \"%.256s\" (%p) that has never been resumed.\n"
+                        "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
                         src->name, src );
                 assertf( src->starter->state != Halted,
-                        "Attempt by coroutine \"%.256s\" (%p) to suspend back to terminated coroutine \"%.256s\" (%p).\n"
+                        "Attempt by coroutine \"%.256s\" (%p) to suspend/leave 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 );

src/libcfa/concurrency/kernel.c

@@ -115 +115 @@
 void ?{}(processorCtx_t & this, processor * proc) {
         (this.__cor){ "Processor" };
-        this.__cor.starter = &mainThread->cor;
+        this.__cor.starter = NULL;
         this.proc = proc;
         proc->runner = &this;