Ignore:
Timestamp:
Feb 14, 2017, 1:19:28 PM (9 years ago)
Author:
Aaron Moss <a3moss@…>
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:
97d246d
Parents:
f923b5f (diff), eafb094 (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:
1 edited

Legend:

Unmodified
Added
Removed

  • src/libcfa/concurrency/coroutines

    rf923b5f rd3a804f5  
    3636void ?{}(coStack_t * this);
    3737void ?{}(coroutine * this);
     38void ?{}(coroutine * this, const char * name);
    3839void ^?{}(coStack_t * this);
    3940void ^?{}(coroutine * this);
    … …  
    7677                "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
    7778                src->name, src );
    78         assertf( src->last->notHalted,
     79        assertf( src->last->state != Halted,
    7980                "Attempt by coroutine \"%.256s\" (%p) to suspend back to terminated coroutine \"%.256s\" (%p).\n"
    8081                "Possible cause is terminated coroutine's main routine has already returned.",
    … …  
    9798      // not resuming self ?
    9899        if ( src != dst ) {
    99                 assertf( dst->notHalted ,
     100                assertf( dst->state != Halted ,
    100101                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
    101102                        "Possible cause is terminated coroutine's main routine has already returned.",
    … …  
    115116      // not resuming self ?
    116117        if ( src != dst ) {
    117                 assertf( dst->notHalted ,
     118                assertf( dst->state != Halted ,
    118119                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
    119120                        "Possible cause is terminated coroutine's main routine has already returned.",
Note: See TracChangeset for help on using the changeset viewer.