--- Coro/Coro/State.xs 2006/11/27 01:28:03 1.102 +++ Coro/Coro/State.xs 2007/01/04 23:49:27 1.134 @@ -6,6 +6,40 @@ #include "patchlevel.h" +#include +#include +#include + +#ifdef HAVE_MMAP +# include +# include +# ifndef MAP_ANONYMOUS +# ifdef MAP_ANON +# define MAP_ANONYMOUS MAP_ANON +# else +# undef HAVE_MMAP +# endif +# endif +# include +# ifndef PAGESIZE +# define PAGESIZE pagesize +# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE) +static long pagesize; +# else +# define BOOT_PAGESIZE (void)0 +# endif +#else +# define PAGESIZE 0 +# define BOOT_PAGESIZE (void)0 +#endif + +#if USE_VALGRIND +# include +#endif + +/* the maximum number of idle cctx that will be pooled */ +#define MAX_IDLE_CCTX 8 + #define PERL_VERSION_ATLEAST(a,b,c) \ (PERL_REVISION > (a) \ || (PERL_REVISION == (a) \ @@ -33,8 +67,10 @@ # endif #endif -#include -#include +/* 5.8.7 */ +#ifndef SvRV_set +# define SvRV_set(s,v) SvRV(s) = (v) +#endif #if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 # undef STACKGUARD @@ -44,24 +80,9 @@ # define STACKGUARD 0 #endif -#ifdef HAVE_MMAP -# include -# include -# ifndef MAP_ANONYMOUS -# ifdef MAP_ANON -# define MAP_ANONYMOUS MAP_ANON -# else -# undef HAVE_MMAP -# endif -# endif -# include -# ifndef PAGESIZE -# define PAGESIZE pagesize -# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE) -static long pagesize; -# else -# define BOOT_PAGESIZE -# endif +/* prefer perl internal functions over our own? */ +#ifndef PREFER_PERL_FUNCTIONS +# define PREFER_PERL_FUNCTIONS 0 #endif /* The next macro should declare a variable stacklevel that contains and approximation @@ -74,16 +95,16 @@ #if __GNUC__ >= 3 # define attribute(x) __attribute__(x) +# define BARRIER __asm__ __volatile__ ("" : : : "memory") #else # define attribute(x) +# define BARRIER #endif #define NOINLINE attribute ((noinline)) #include "CoroAPI.h" -#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */ - #ifdef USE_ITHREADS static perl_mutex coro_mutex; # define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) @@ -93,72 +114,71 @@ # define UNLOCK (void)0 #endif +struct io_state +{ + int errorno; + I32 laststype; + int laststatval; + Stat_t statcache; +}; + static struct CoroAPI coroapi; static AV *main_mainstack; /* used to differentiate between $main and others */ static HV *coro_state_stash, *coro_stash; static SV *coro_mortal; /* will be freed after next transfer */ +static struct coro_cctx *cctx_first; +static int cctx_count, cctx_idle; + /* this is a structure representing a c-level coroutine */ -typedef struct coro_stack { - struct coro_stack *next; +typedef struct coro_cctx { + struct coro_cctx *next; /* the stack */ void *sptr; long ssize; /* positive == mmap, otherwise malloc */ /* cpu state */ - void *idle_sp; /* sp of top-level transfer/schedule/cede call */ + void *idle_sp; /* sp of top-level transfer/schedule/cede call */ + JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ JMPENV *top_env; coro_context cctx; -} coro_stack; + + int inuse; + +#if USE_VALGRIND + int valgrind_id; +#endif +} coro_cctx; + +enum { + CF_RUNNING = 0x0001, /* coroutine is running */ + CF_READY = 0x0002, /* coroutine is ready */ + CF_NEW = 0x0004, /* has never been switched to */ + CF_DESTROYED = 0x0008, /* coroutine data has been freed */ +}; /* this is a structure representing a perl-level coroutine */ struct coro { /* the c coroutine allocated to this perl coroutine, if any */ - coro_stack *stack; + coro_cctx *cctx; /* data associated with this coroutine (initial args) */ AV *args; int refcnt; + int save; /* CORO_SAVE flags */ + int flags; /* CF_ flags */ /* optionally saved, might be zero */ - AV *defav; - SV *defsv; - SV *errsv; + AV *defav; /* @_ */ + SV *defsv; /* $_ */ + SV *errsv; /* $@ */ + SV *irssv; /* $/ */ + SV *irssv_sv; /* real $/ cache */ - /* saved global state not related to stacks */ - U8 dowarn; - I32 in_eval; - - /* the stacks and related info (callchain etc..) */ - PERL_SI *curstackinfo; - AV *curstack; - AV *mainstack; - SV **stack_sp; - OP *op; - SV **curpad; - AV *comppad; - CV *compcv; - SV **stack_base; - SV **stack_max; - SV **tmps_stack; - I32 tmps_floor; - I32 tmps_ix; - I32 tmps_max; - I32 *markstack; - I32 *markstack_ptr; - I32 *markstack_max; - I32 *scopestack; - I32 scopestack_ix; - I32 scopestack_max; - ANY *savestack; - I32 savestack_ix; - I32 savestack_max; - OP **retstack; - I32 retstack_ix; - I32 retstack_max; - PMOP *curpm; - COP *curcop; +#define VAR(name,type) type name; +# include "state.h" +#undef VAR /* coro process data */ int prio; @@ -232,17 +252,25 @@ static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; +#define CORO_MAGIC(cv) \ + SvMAGIC (cv) \ + ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ + ? SvMAGIC (cv) \ + : mg_find ((SV *)cv, PERL_MAGIC_coro) \ + : 0 + /* the next two functions merely cache the padlists */ static void get_padlist (CV *cv) { - MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); + MAGIC *mg = CORO_MAGIC (cv); + AV *av; - if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) - CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); + if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) + CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; else { -#if 0 +#if PREFER_PERL_FUNCTIONS /* this is probably cleaner, but also slower? */ CV *cp = Perl_cv_clone (cv); CvPADLIST (cv) = CvPADLIST (cp); @@ -257,7 +285,8 @@ static void put_padlist (CV *cv) { - MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); + MAGIC *mg = CORO_MAGIC (cv); + AV *av; if (!mg) { @@ -267,57 +296,40 @@ mg->mg_obj = (SV *)newAV (); } - av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv)); + av = (AV *)mg->mg_obj; + + if (AvFILLp (av) >= AvMAX (av)) + av_extend (av, AvMAX (av) + 1); + + AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); } #define SB do { #define SE } while (0) -#define LOAD(state) load_state((state)); -#define SAVE(state,flags) save_state((state),(flags)); - -#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE +#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE static void -load_state(Coro__State c) +load_perl (Coro__State c) { - PL_dowarn = c->dowarn; - PL_in_eval = c->in_eval; - - PL_curstackinfo = c->curstackinfo; - PL_curstack = c->curstack; - PL_mainstack = c->mainstack; - PL_stack_sp = c->stack_sp; - PL_op = c->op; - PL_curpad = c->curpad; - PL_comppad = c->comppad; - PL_compcv = c->compcv; - PL_stack_base = c->stack_base; - PL_stack_max = c->stack_max; - PL_tmps_stack = c->tmps_stack; - PL_tmps_floor = c->tmps_floor; - PL_tmps_ix = c->tmps_ix; - PL_tmps_max = c->tmps_max; - PL_markstack = c->markstack; - PL_markstack_ptr = c->markstack_ptr; - PL_markstack_max = c->markstack_max; - PL_scopestack = c->scopestack; - PL_scopestack_ix = c->scopestack_ix; - PL_scopestack_max = c->scopestack_max; - PL_savestack = c->savestack; - PL_savestack_ix = c->savestack_ix; - PL_savestack_max = c->savestack_max; -#if !PERL_VERSION_ATLEAST (5,9,0) - PL_retstack = c->retstack; - PL_retstack_ix = c->retstack_ix; - PL_retstack_max = c->retstack_max; -#endif - PL_curpm = c->curpm; - PL_curcop = c->curcop; +#define VAR(name,type) PL_ ## name = c->name; +# include "state.h" +#undef VAR if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); if (c->defsv) REPLACE_SV (DEFSV , c->defsv); if (c->errsv) REPLACE_SV (ERRSV , c->errsv); + if (c->irssv) + { + if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv)) + SvREFCNT_dec (c->irssv); + else + { + REPLACE_SV (PL_rs, c->irssv); + if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0); + sv_setsv (c->irssv_sv, PL_rs); + } + } { dSP; @@ -326,15 +338,9 @@ /* now do the ugly restore mess */ while ((cv = (CV *)POPs)) { - AV *padlist = (AV *)POPs; - - if (padlist) - { - put_padlist (cv); /* mark this padlist as available */ - CvPADLIST(cv) = padlist; - } - - ++CvDEPTH(cv); + put_padlist (cv); /* mark this padlist as available */ + CvDEPTH (cv) = PTR2IV (POPs); + CvPADLIST (cv) = (AV *)POPs; } PUTBACK; @@ -342,7 +348,7 @@ } static void -save_state(Coro__State c, int flags) +save_perl (Coro__State c) { { dSP; @@ -355,6 +361,7 @@ * (and reinitialize) all cv's in the whole callchain :( */ + EXTEND (SP, 3 + 1); PUSHs (Nullsv); /* this loop was inspired by pp_caller */ for (;;) @@ -363,34 +370,21 @@ { PERL_CONTEXT *cx = &ccstk[cxix--]; - if (CxTYPE(cx) == CXt_SUB) + if (CxTYPE (cx) == CXt_SUB) { CV *cv = cx->blk_sub.cv; - if (CvDEPTH(cv)) - { - EXTEND (SP, CvDEPTH(cv)*2); - while (--CvDEPTH(cv)) - { - /* this tells the restore code to increment CvDEPTH */ - PUSHs (Nullsv); - PUSHs ((SV *)cv); - } - - PUSHs ((SV *)CvPADLIST(cv)); + if (CvDEPTH (cv)) + { + EXTEND (SP, 3); + PUSHs ((SV *)CvPADLIST (cv)); + PUSHs (INT2PTR (SV *, CvDEPTH (cv))); PUSHs ((SV *)cv); + CvDEPTH (cv) = 0; get_padlist (cv); } } -#ifdef CXt_FORMAT - else if (CxTYPE(cx) == CXt_FORMAT) - { - /* I never used formats, so how should I know how these are implemented? */ - /* my bold guess is as a simple, plain sub... */ - croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); - } -#endif } if (top_si->si_type == PERLSI_MAIN) @@ -404,43 +398,14 @@ PUTBACK; } - c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; - c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; - c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; - - c->dowarn = PL_dowarn; - c->in_eval = PL_in_eval; - - c->curstackinfo = PL_curstackinfo; - c->curstack = PL_curstack; - c->mainstack = PL_mainstack; - c->stack_sp = PL_stack_sp; - c->op = PL_op; - c->curpad = PL_curpad; - c->comppad = PL_comppad; - c->compcv = PL_compcv; - c->stack_base = PL_stack_base; - c->stack_max = PL_stack_max; - c->tmps_stack = PL_tmps_stack; - c->tmps_floor = PL_tmps_floor; - c->tmps_ix = PL_tmps_ix; - c->tmps_max = PL_tmps_max; - c->markstack = PL_markstack; - c->markstack_ptr = PL_markstack_ptr; - c->markstack_max = PL_markstack_max; - c->scopestack = PL_scopestack; - c->scopestack_ix = PL_scopestack_ix; - c->scopestack_max = PL_scopestack_max; - c->savestack = PL_savestack; - c->savestack_ix = PL_savestack_ix; - c->savestack_max = PL_savestack_max; -#if !PERL_VERSION_ATLEAST (5,9,0) - c->retstack = PL_retstack; - c->retstack_ix = PL_retstack_ix; - c->retstack_max = PL_retstack_max; -#endif - c->curpm = PL_curpm; - c->curcop = PL_curcop; + c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; + c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; + c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; + c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; + +#define VAR(name,type)c->name = PL_ ## name; +# include "state.h" +#undef VAR } /* @@ -449,10 +414,13 @@ * on the (sometimes correct) assumption that coroutines do * not usually need a lot of stackspace. */ +#if PREFER_PERL_FUNCTIONS +# define coro_init_stacks init_stacks +#else static void coro_init_stacks () { - PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); + PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); PL_curstackinfo->si_type = PERLSI_MAIN; PL_curstack = PL_curstackinfo->si_stack; PL_mainstack = PL_curstack; /* remember in case we switch stacks */ @@ -461,49 +429,56 @@ PL_stack_sp = PL_stack_base; PL_stack_max = PL_stack_base + AvMAX(PL_curstack); - New(50,PL_tmps_stack,96,SV*); + New(50,PL_tmps_stack,128,SV*); PL_tmps_floor = -1; PL_tmps_ix = -1; - PL_tmps_max = 96; + PL_tmps_max = 128; - New(54,PL_markstack,16,I32); + New(54,PL_markstack,32,I32); PL_markstack_ptr = PL_markstack; - PL_markstack_max = PL_markstack + 16; + PL_markstack_max = PL_markstack + 32; #ifdef SET_MARK_OFFSET SET_MARK_OFFSET; #endif - New(54,PL_scopestack,16,I32); + New(54,PL_scopestack,32,I32); PL_scopestack_ix = 0; - PL_scopestack_max = 16; + PL_scopestack_max = 32; - New(54,PL_savestack,96,ANY); + New(54,PL_savestack,64,ANY); PL_savestack_ix = 0; - PL_savestack_max = 96; + PL_savestack_max = 64; #if !PERL_VERSION_ATLEAST (5,9,0) - New(54,PL_retstack,8,OP*); + New(54,PL_retstack,16,OP*); PL_retstack_ix = 0; - PL_retstack_max = 8; + PL_retstack_max = 16; #endif } +#endif /* * destroy the stacks, the callchain etc... */ static void -coro_destroy_stacks() +coro_destroy_stacks () { if (!IN_DESTRUCT) { - /* is this ugly, I ask? */ + /* restore all saved variables and stuff */ LEAVE_SCOPE (0); + assert (PL_tmps_floor == -1); - /* sure it is, but more important: is it correct?? :/ */ + /* free all temporaries */ FREETMPS; + assert (PL_tmps_ix == -1); + + /* unwind all extra stacks */ + POPSTACK_TO (PL_mainstack); - /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ + /* unwind main stack */ + dounwind (-1); } while (PL_curstackinfo->si_next) @@ -513,17 +488,8 @@ { PERL_SI *p = PL_curstackinfo->si_prev; - { /*D*//*remove*/ - dSP; - SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); - PUTBACK; /* possibly superfluous */ - } - if (!IN_DESTRUCT) - { - dounwind (-1);/*D*//*remove*/ - SvREFCNT_dec (PL_curstackinfo->si_stack); - } + SvREFCNT_dec (PL_curstackinfo->si_stack); Safefree (PL_curstackinfo->si_cxstack); Safefree (PL_curstackinfo); @@ -548,32 +514,33 @@ coro_init_stacks (); + PL_curcop = &PL_compiling; + PL_in_eval = EVAL_NULL; + PL_curpm = 0; + PL_localizing = 0; + PL_dirty = 0; + PL_restartop = 0; + { dSP; LOGOP myop; - /*PL_curcop = 0;*/ - PL_in_eval = 0; SvREFCNT_dec (GvAV (PL_defgv)); GvAV (PL_defgv) = coro->args; coro->args = 0; - SPAGAIN; - Zero (&myop, 1, LOGOP); myop.op_next = Nullop; myop.op_flags = OPf_WANT_VOID; - PL_op = (OP *)&myop; - PUSHMARK (SP); - PUSHMARK (SP); - XPUSHs ((SV *)get_cv ("Coro::State::coro_init", FALSE)); + XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); PUTBACK; + PL_op = (OP *)&myop; PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); SPAGAIN; - - ENTER; /* necessary e.g. for dounwind */ } + + ENTER; /* necessary e.g. for dounwind */ } static void @@ -586,190 +553,246 @@ } } +/* inject a fake call to Coro::State::_cctx_init into the execution */ static void NOINLINE -prepare_cctx (coro_stack *cctx) +prepare_cctx (coro_cctx *cctx) { dSP; LOGOP myop; Zero (&myop, 1, LOGOP); myop.op_next = PL_op; - myop.op_flags = OPf_WANT_VOID; - - sv_setiv (get_sv ("Coro::State::cctx_stack", FALSE), PTR2IV (cctx)); + myop.op_flags = OPf_WANT_VOID | OPf_STACKED; PUSHMARK (SP); - XPUSHs ((SV *)get_cv ("Coro::State::cctx_init", FALSE)); + EXTEND (SP, 2); + PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); + PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); PUTBACK; - PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); + PL_op = (OP *)&myop; + PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); SPAGAIN; } static void coro_run (void *arg) { - /* coro_run is the alternative epilogue of transfer() */ + /* coro_run is the alternative tail of transfer(), so unlock here. */ UNLOCK; /* * this is a _very_ stripped down perl interpreter ;) */ PL_top_env = &PL_start_env; + /* inject call to cctx_init */ - prepare_cctx ((coro_stack *)arg); + prepare_cctx ((coro_cctx *)arg); /* somebody will hit me for both perl_run and PL_restartop */ + PL_restartop = PL_op; perl_run (PL_curinterp); - fputs ("FATAL: C coroutine fell over the edge of the world, aborting.\n", stderr); + fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); abort (); } -static coro_stack * -stack_new () +static coro_cctx * +cctx_new () { - coro_stack *stack; + coro_cctx *cctx; - New (0, stack, 1, coro_stack); + ++cctx_count; + + Newz (0, cctx, 1, coro_cctx); #if HAVE_MMAP - stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; - /* mmap suppsedly does allocate-on-write for us */ - stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); + cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; + /* mmap supposedly does allocate-on-write for us */ + cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); - if (stack->sptr == (void *)-1) + if (cctx->sptr == (void *)-1) { perror ("FATAL: unable to mmap stack for coroutine"); _exit (EXIT_FAILURE); } # if STACKGUARD - mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE); + mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); # endif #else - stack->ssize = STACKSIZE * (long)sizeof (long); - New (0, stack->sptr, STACKSIZE, long); + cctx->ssize = STACKSIZE * (long)sizeof (long); + New (0, cctx->sptr, STACKSIZE, long); - if (!stack->sptr) + if (!cctx->sptr) { - perror (stderr, "FATAL: unable to malloc stack for coroutine"); + perror ("FATAL: unable to malloc stack for coroutine"); _exit (EXIT_FAILURE); } #endif - coro_create (&stack->cctx, coro_run, (void *)stack, stack->sptr, stack->ssize); +#if USE_VALGRIND + cctx->valgrind_id = VALGRIND_STACK_REGISTER ( + STACKGUARD * PAGESIZE + (char *)cctx->sptr, + cctx->ssize + (char *)cctx->sptr + ); +#endif + + coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize); - return stack; + return cctx; } static void -stack_free (coro_stack *stack) +cctx_destroy (coro_cctx *cctx) { - if (!stack) + if (!cctx) return; + --cctx_count; + +#if USE_VALGRIND + VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); +#endif + #if HAVE_MMAP - munmap (stack->sptr, stack->ssize); + munmap (cctx->sptr, cctx->ssize); #else - Safefree (stack->sptr); + Safefree (cctx->sptr); #endif - Safefree (stack); + Safefree (cctx); } -static coro_stack *stack_first; -static int cctx_count, cctx_idle; - -static coro_stack * -stack_get () +static coro_cctx * +cctx_get () { - coro_stack *stack; + coro_cctx *cctx; - if (stack_first) + if (cctx_first) { + cctx = cctx_first; + cctx_first = cctx->next; --cctx_idle; - stack = stack_first; - stack_first = stack->next; } else { - ++cctx_count; - stack = stack_new (); + cctx = cctx_new (); PL_op = PL_op->op_next; } - return stack; + return cctx; } static void -stack_put (coro_stack *stack) +cctx_put (coro_cctx *cctx) { + /* free another cctx if overlimit */ + if (cctx_idle >= MAX_IDLE_CCTX) + { + coro_cctx *first = cctx_first; + cctx_first = first->next; + --cctx_idle; + + assert (!first->inuse); + cctx_destroy (first); + } + ++cctx_idle; - stack->next = stack_first; - stack_first = stack; + cctx->next = cctx_first; + cctx_first = cctx; } /* never call directly, always through the coro_state_transfer global variable */ static void NOINLINE -transfer (struct coro *prev, struct coro *next, int flags) +transfer (struct coro *prev, struct coro *next) { dSTACKLEVEL; /* sometimes transfer is only called to set idle_sp */ - if (flags == TRANSFER_SET_STACKLEVEL) - ((coro_stack *)prev)->idle_sp = STACKLEVEL; + if (!next) + { + ((coro_cctx *)prev)->idle_sp = STACKLEVEL; + assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ + } else if (prev != next) { - coro_stack *prev__stack; - - LOCK; + coro_cctx *prev__cctx; - if (next->mainstack) + if (prev->flags & CF_NEW) { - /* coroutine already started */ - SAVE (prev, flags); - LOAD (next); + /* create a new empty context */ + Newz (0, prev->cctx, 1, coro_cctx); + prev->cctx->inuse = 1; + prev->flags &= ~CF_NEW; + prev->flags |= CF_RUNNING; } - else + + /*TODO: must not croak here */ + if (!prev->flags & CF_RUNNING) + croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states"); + + if (next->flags & CF_RUNNING) + croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); + + if (next->flags & CF_DESTROYED) + croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); + + prev->flags &= ~CF_RUNNING; + next->flags |= CF_RUNNING; + + LOCK; + + if (next->flags & CF_NEW) { /* need to start coroutine */ + next->flags &= ~CF_NEW; /* first get rid of the old state */ - SAVE (prev, -1); + save_perl (prev); /* setup coroutine call */ setup_coro (next); - /* need a stack */ - next->stack = 0; + /* need a new stack */ + assert (!next->cctx); + } + else + { + /* coroutine already started */ + save_perl (prev); + load_perl (next); } - if (!prev->stack) - /* create a new empty context */ - Newz (0, prev->stack, 1, coro_stack); - - prev__stack = prev->stack; + prev__cctx = prev->cctx; - /* possibly "free" the stack */ - if (prev__stack->idle_sp == STACKLEVEL) + /* possibly "free" the cctx */ + if (prev__cctx->idle_sp == STACKLEVEL) { - stack_put (prev__stack); - prev->stack = 0; + /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ + assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); + + prev->cctx = 0; + + cctx_put (prev__cctx); + prev__cctx->inuse = 0; } - if (!next->stack) - next->stack = stack_get (); + if (!next->cctx) + { + next->cctx = cctx_get (); + assert (!next->cctx->inuse); + next->cctx->inuse = 1; + } - if (prev__stack != next->stack) + if (prev__cctx != next->cctx) { - prev__stack->top_env = PL_top_env; - PL_top_env = next->stack->top_env; - coro_transfer (&prev__stack->cctx, &next->stack->cctx); + prev__cctx->top_env = PL_top_env; + PL_top_env = next->cctx->top_env; + coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); } free_coro_mortal (); - UNLOCK; } } @@ -777,43 +800,56 @@ struct transfer_args { struct coro *prev, *next; - int flags; }; -#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) +#define TRANSFER(ta) transfer ((ta).prev, (ta).next) -static void +static int coro_state_destroy (struct coro *coro) { - if (coro->refcnt--) - return; + if (coro->flags & CF_DESTROYED) + return 0; + + coro->flags |= CF_DESTROYED; if (coro->mainstack && coro->mainstack != main_mainstack) { + assert (!(coro->flags & CF_RUNNING)); + struct coro temp; + Zero (&temp, 1, struct coro); + temp.save = CORO_SAVE_ALL; - SAVE ((&temp), TRANSFER_SAVE_ALL); - LOAD (coro); + if (coro->flags & CF_RUNNING) + croak ("FATAL: tried to destroy currently running coroutine"); + + save_perl (&temp); + load_perl (coro); coro_destroy_stacks (); - LOAD ((&temp)); /* this will get rid of defsv etc.. */ + load_perl (&temp); /* this will get rid of defsv etc.. */ coro->mainstack = 0; } - stack_free (coro->stack); + cctx_destroy (coro->cctx); SvREFCNT_dec (coro->args); - Safefree (coro); + + return 1; } static int -coro_state_clear (pTHX_ SV *sv, MAGIC *mg) +coro_state_free (pTHX_ SV *sv, MAGIC *mg) { struct coro *coro = (struct coro *)mg->mg_ptr; mg->mg_ptr = 0; - coro_state_destroy (coro); + if (--coro->refcnt < 0) + { + coro_state_destroy (coro); + Safefree (coro); + } return 0; } @@ -830,7 +866,7 @@ static MGVTBL coro_state_vtbl = { 0, 0, 0, 0, - coro_state_clear, + coro_state_free, 0, #ifdef MGf_DUP coro_state_dup, @@ -862,23 +898,33 @@ } static void -prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) +prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) { - ta->prev = SvSTATE (prev); - ta->next = SvSTATE (next); - ta->flags = flags; + ta->prev = SvSTATE (prev_sv); + ta->next = SvSTATE (next_sv); } static void -api_transfer (SV *prev, SV *next, int flags) +api_transfer (SV *prev_sv, SV *next_sv) { - dTHX; struct transfer_args ta; - prepare_transfer (&ta, prev, next, flags); + prepare_transfer (&ta, prev_sv, next_sv); TRANSFER (ta); } +static int +api_save (SV *coro_sv, int new_save) +{ + struct coro *coro = SvSTATE (coro_sv); + int old_save = coro->save; + + if (new_save >= 0) + coro->save = new_save; + + return old_save; +} + /** Coro ********************************************************************/ #define PRIO_MAX 3 @@ -889,21 +935,14 @@ #define PRIO_MIN -4 /* for Coro.pm */ -static GV *coro_current, *coro_idle; +static SV *coro_current; static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; static int coro_nready; static void -coro_enq (SV *sv) +coro_enq (SV *coro_sv) { - int prio; - - if (SvTYPE (sv) != SVt_PVHV) - croak ("Coro::ready tried to enqueue something that is not a coroutine"); - - prio = SvSTATE (sv)->prio; - - av_push (coro_ready [prio - PRIO_MIN], sv); + av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); coro_nready++; } @@ -926,92 +965,146 @@ return 0; } -static void -api_ready (SV *coro) +static int +api_ready (SV *coro_sv) { - dTHX; + struct coro *coro; - if (SvROK (coro)) - coro = SvRV (coro); + if (SvROK (coro_sv)) + coro_sv = SvRV (coro_sv); + + coro = SvSTATE (coro_sv); + + if (coro->flags & CF_READY) + return 0; + + coro->flags |= CF_READY; LOCK; - coro_enq (SvREFCNT_inc (coro)); + coro_enq (SvREFCNT_inc (coro_sv)); UNLOCK; + + return 1; +} + +static int +api_is_ready (SV *coro_sv) +{ + return !!(SvSTATE (coro_sv)->flags & CF_READY); } static void prepare_schedule (struct transfer_args *ta) { - SV *current, *prev, *next; - - current = GvSV (coro_current); + SV *prev_sv, *next_sv; for (;;) { LOCK; - next = coro_deq (PRIO_MIN); + next_sv = coro_deq (PRIO_MIN); UNLOCK; - if (next) - break; + /* nothing to schedule: call the idle handler */ + if (!next_sv) + { + dSP; - { - dSP; + ENTER; + SAVETMPS; - ENTER; - SAVETMPS; + PUSHMARK (SP); + PUTBACK; + call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); + + FREETMPS; + LEAVE; + continue; + } - PUSHMARK (SP); - PUTBACK; - call_sv (GvSV (coro_idle), G_DISCARD); + ta->next = SvSTATE (next_sv); - FREETMPS; - LEAVE; - } - } + /* cannot transfer to destroyed coros, skip and look for next */ + if (ta->next->flags & CF_DESTROYED) + { + SvREFCNT_dec (next_sv); + continue; + } - prev = SvRV (current); - SvRV (current) = next; + break; + } /* free this only after the transfer */ + prev_sv = SvRV (coro_current); + SvRV_set (coro_current, next_sv); + ta->prev = SvSTATE (prev_sv); + + assert (ta->next->flags & CF_READY); + ta->next->flags &= ~CF_READY; + LOCK; free_coro_mortal (); + coro_mortal = prev_sv; UNLOCK; - coro_mortal = prev; - - ta->prev = SvSTATE (prev); - ta->next = SvSTATE (next); - ta->flags = TRANSFER_SAVE_ALL; } static void prepare_cede (struct transfer_args *ta) { - LOCK; - coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); - UNLOCK; - + api_ready (coro_current); prepare_schedule (ta); } +static int +prepare_cede_notself (struct transfer_args *ta) +{ + if (coro_nready) + { + SV *prev = SvRV (coro_current); + prepare_schedule (ta); + api_ready (prev); + return 1; + } + else + return 0; +} + static void api_schedule (void) { - dTHX; struct transfer_args ta; prepare_schedule (&ta); TRANSFER (ta); } -static void +static int api_cede (void) { - dTHX; struct transfer_args ta; prepare_cede (&ta); - TRANSFER (ta); + + if (ta.prev != ta.next) + { + TRANSFER (ta); + return 1; + } + else + return 0; +} + +static int +api_cede_notself (void) +{ + struct transfer_args ta; + + if (prepare_cede_notself (&ta)) + { + TRANSFER (ta); + return 1; + } + else + return 0; } MODULE = Coro::State PACKAGE = Coro::State @@ -1027,9 +1120,11 @@ coro_state_stash = gv_stashpv ("Coro::State", TRUE); - newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); - newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); - newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); + newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); + newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); + newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); + newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); + newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); main_mainstack = PL_mainstack; @@ -1049,6 +1144,8 @@ Newz (0, coro, 1, struct coro); coro->args = newAV (); + coro->save = CORO_SAVE_ALL; + coro->flags = CF_NEW; hv = newHV (); sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; @@ -1056,20 +1153,24 @@ for (i = 1; i < items; i++) av_push (coro->args, newSVsv (ST (i))); - - /*coro->mainstack = 0; *//*actual work is done inside transfer */ - /*coro->stack = 0;*/ } OUTPUT: RETVAL +int +save (SV *coro, int new_save = -1) + CODE: + RETVAL = api_save (coro, new_save); + OUTPUT: + RETVAL + void _set_stacklevel (...) ALIAS: Coro::State::transfer = 1 Coro::schedule = 2 Coro::cede = 3 - Coro::Cont::yield = 4 + Coro::cede_notself = 4 CODE: { struct transfer_args ta; @@ -1077,16 +1178,15 @@ switch (ix) { case 0: - ta.prev = (struct coro *)INT2PTR (coro_stack *, SvIV (ST (0))); + ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); ta.next = 0; - ta.flags = TRANSFER_SET_STACKLEVEL; break; case 1: - if (items != 3) - croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); + if (items != 2) + croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); - prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); + prepare_transfer (&ta, ST (0), ST (1)); break; case 2: @@ -1098,47 +1198,22 @@ break; case 4: - { - SV *yieldstack; - SV *sv; - AV *defav = GvAV (PL_defgv); - - yieldstack = *hv_fetch ( - (HV *)SvRV (GvSV (coro_current)), - "yieldstack", sizeof ("yieldstack") - 1, - 0 - ); - - /* set up @_ -- ugly */ - av_clear (defav); - av_fill (defav, items - 1); - while (items--) - av_store (defav, items, SvREFCNT_inc (ST(items))); - - sv = av_pop ((AV *)SvRV (yieldstack)); - ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0)); - ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0)); - ta.flags = 0; - SvREFCNT_dec (sv); - } - break; + if (!prepare_cede_notself (&ta)) + XSRETURN_EMPTY; + break; } + BARRIER; TRANSFER (ta); } -void -_clone_state_from (SV *dst, SV *src) +bool +_destroy (SV *coro_sv) CODE: -{ - struct coro *coro_src = SvSTATE (src); - - sv_unmagic (SvRV (dst), PERL_MAGIC_ext); - - ++coro_src->refcnt; - sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP; -} + RETVAL = coro_state_destroy (SvSTATE (coro_sv)); + OUTPUT: + RETVAL void _exit (code) @@ -1147,6 +1222,20 @@ CODE: _exit (code); +int +cctx_count () + CODE: + RETVAL = cctx_count; + OUTPUT: + RETVAL + +int +cctx_idle () + CODE: + RETVAL = cctx_idle; + OUTPUT: + RETVAL + MODULE = Coro::State PACKAGE = Coro BOOT: @@ -1162,8 +1251,8 @@ newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); - coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); - coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); + coro_current = get_sv ("Coro::current", FALSE); + SvREADONLY_on (coro_current); for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) coro_ready[i] = newAV (); @@ -1171,11 +1260,14 @@ { SV *sv = perl_get_sv("Coro::API", 1); - coroapi.schedule = api_schedule; - coroapi.cede = api_cede; - coroapi.ready = api_ready; - coroapi.nready = &coro_nready; - coroapi.current = coro_current; + coroapi.schedule = api_schedule; + coroapi.save = api_save; + coroapi.cede = api_cede; + coroapi.cede_notself = api_cede_notself; + coroapi.ready = api_ready; + coroapi.is_ready = api_is_ready; + coroapi.nready = &coro_nready; + coroapi.current = coro_current; GCoroAPI = &coroapi; sv_setiv (sv, (IV)&coroapi); @@ -1183,6 +1275,13 @@ } } +void +_set_current (SV *current) + PROTOTYPE: $ + CODE: + SvREFCNT_dec (SvRV (coro_current)); + SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); + int prio (Coro::State coro, int newprio = 0) ALIAS: @@ -1194,7 +1293,7 @@ if (items > 1) { if (ix) - newprio += coro->prio; + newprio = coro->prio - newprio; if (newprio < PRIO_MIN) newprio = PRIO_MIN; if (newprio > PRIO_MAX) newprio = PRIO_MAX; @@ -1202,12 +1301,24 @@ coro->prio = newprio; } } + OUTPUT: + RETVAL -void +SV * ready (SV *self) PROTOTYPE: $ CODE: - api_ready (self); + RETVAL = boolSV (api_ready (self)); + OUTPUT: + RETVAL + +SV * +is_ready (SV *self) + PROTOTYPE: $ + CODE: + RETVAL = boolSV (api_is_ready (self)); + OUTPUT: + RETVAL int nready (...) @@ -1223,19 +1334,17 @@ _get_state () CODE: { - struct { - int errorno; - int laststype; - int laststatval; - Stat_t statcache; - } data; - - data.errorno = errno; - data.laststype = PL_laststype; - data.laststatval = PL_laststatval; - data.statcache = PL_statcache; + struct io_state *data; - RETVAL = newSVpvn ((char *)&data, sizeof data); + RETVAL = newSV (sizeof (struct io_state)); + data = (struct io_state *)SvPVX (RETVAL); + SvCUR_set (RETVAL, sizeof (struct io_state)); + SvPOK_only (RETVAL); + + data->errorno = errno; + data->laststype = PL_laststype; + data->laststatval = PL_laststatval; + data->statcache = PL_statcache; } OUTPUT: RETVAL @@ -1245,15 +1354,11 @@ PROTOTYPE: $ CODE: { - struct { - int errorno; - int laststype; - int laststatval; - Stat_t statcache; - } *data = (void *)data_; + struct io_state *data = (void *)data_; - errno = data->errorno; - PL_laststype = data->laststype; + errno = data->errorno; + PL_laststype = data->laststype; PL_laststatval = data->laststatval; - PL_statcache = data->statcache; + PL_statcache = data->statcache; } +