Changeset 1755226 for src/libcfa/concurrency/coroutine.c

Timestamp:

Sep 22, 2017, 6:51:37 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:

f265042

Parents:

60c3b06c (diff), 9bae71f (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

File:

• src/libcfa/concurrency/coroutine.c (modified) (2 diffs)

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 );