Changeset 1755226


Ignore:
Timestamp:
Sep 22, 2017, 6:51:37 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
f265042
Parents:
60c3b06 (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

Location:
src
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/coroutine

    r60c3b06 r1755226  
    103103                // set last resumer
    104104                dst->last = src;
     105                dst->starter = dst->starter ? dst->starter : src;
    105106        } // if
    106107
  • src/libcfa/concurrency/coroutine.c

    r60c3b06 r1755226  
    6565        this.errno_ = 0;
    6666        this.state = Start;
    67         this.starter = this_coroutine;
     67        this.starter = NULL;
    6868        this.last = NULL;
    6969}
     
    176176
    177177                assertf( src->starter != 0,
    178                         "Attempt to suspend coroutine \"%.256s\" (%p) that does not have a starter.\n"
    179                         "Possible cause is a resume of a coroutine already destroyed or not yet constructed",
     178                        "Attempt to suspend/leave coroutine \"%.256s\" (%p) that has never been resumed.\n"
     179                        "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
    180180                        src->name, src );
    181181                assertf( src->starter->state != Halted,
    182                         "Attempt by coroutine \"%.256s\" (%p) to suspend back to terminated coroutine \"%.256s\" (%p).\n"
     182                        "Attempt by coroutine \"%.256s\" (%p) to suspend/leave back to terminated coroutine \"%.256s\" (%p).\n"
    183183                        "Possible cause is terminated coroutine's main routine has already returned.",
    184184                        src->name, src, src->starter->name, src->starter );
  • src/libcfa/concurrency/kernel.c

    r60c3b06 r1755226  
    115115void ?{}(processorCtx_t & this, processor * proc) {
    116116        (this.__cor){ "Processor" };
    117         this.__cor.starter = &mainThread->cor;
     117        this.__cor.starter = NULL;
    118118        this.proc = proc;
    119119        proc->runner = &this;
Note: See TracChangeset for help on using the changeset viewer.