ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.35 by root, Mon Sep 24 01:36:20 2001 UTC vs.
Revision 1.50 by pcg, Sun Nov 30 16:59:15 2003 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "patchlevel.h"
6
7#if PATCHLEVEL < 6
8# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr
10# endif
11# ifndef call_sv
12# define call_sv perl_call_sv
13# endif
14# ifndef get_sv
15# define get_sv perl_get_sv
16# endif
17# ifndef get_cv
18# define get_cv perl_get_cv
19# endif
20# ifndef IS_PADGV
21# define IS_PADGV(v) 0
22# endif
23# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0
25# endif
26#endif
27
5#include "libcoro/coro.c" 28#include "libcoro/coro.c"
6 29
7#include <signal.h> 30#include <signal.h>
8 31
9#ifdef HAVE_MMAP 32#ifdef HAVE_MMAP
10# include <unistd.h> 33# include <unistd.h>
11# include <sys/mman.h> 34# include <sys/mman.h>
12# ifndef MAP_ANON
13# ifdef MAP_ANONYMOUS 35# ifndef MAP_ANONYMOUS
14# define MAP_ANON MAP_ANONYMOUS 36# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON
15# else 38# else
16# undef HAVE_MMAP 39# undef HAVE_MMAP
17# endif 40# endif
18# endif 41# endif
19#endif 42#endif
20 43
21#define MAY_FLUSH /* increases codesize and is rarely used */
22
23#define SUB_INIT "Coro::State::initialize" 44#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 45#define UCORO_STATE "_coro_state"
25 46
26/* The next macro should declare a variable stacklevel that contains and approximation 47/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 48 * to the current C stack pointer. Its property is that it changes with each call
47 void *sptr; 68 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 69 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 70} coro_stack;
50 71
51struct coro { 72struct coro {
73 /* the top-level JMPENV for each coroutine, needed to catch dies. */
74 JMPENV start_env;
75
52 /* the optional C context */ 76 /* the optional C context */
53 coro_stack *stack; 77 coro_stack *stack;
54 void *cursp; 78 void *cursp;
55 int gencnt; 79 int gencnt;
56 80
68 AV *curstack; 92 AV *curstack;
69 AV *mainstack; 93 AV *mainstack;
70 SV **stack_sp; 94 SV **stack_sp;
71 OP *op; 95 OP *op;
72 SV **curpad; 96 SV **curpad;
97 AV *comppad;
73 SV **stack_base; 98 SV **stack_base;
74 SV **stack_max; 99 SV **stack_max;
75 SV **tmps_stack; 100 SV **tmps_stack;
76 I32 tmps_floor; 101 I32 tmps_floor;
77 I32 tmps_ix; 102 I32 tmps_ix;
101static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
102static HV *coro_state_stash; 127static HV *coro_state_stash;
103static SV *ucoro_state_sv; 128static SV *ucoro_state_sv;
104static U32 ucoro_state_hash; 129static U32 ucoro_state_hash;
105static HV *padlist_cache; 130static HV *padlist_cache;
131static SV *coro_mortal; /* will be freed after next transfer */
106 132
107/* mostly copied from op.c:cv_clone2 */ 133/* mostly copied from op.c:cv_clone2 */
108STATIC AV * 134STATIC AV *
109clone_padlist (AV *protopadlist) 135clone_padlist (AV *protopadlist)
110{ 136{
156 sv = (SV *) newAV (); 182 sv = (SV *) newAV ();
157 else if (*name == '%') 183 else if (*name == '%')
158 sv = (SV *) newHV (); 184 sv = (SV *) newHV ();
159 else 185 else
160 sv = NEWSV (0, 0); 186 sv = NEWSV (0, 0);
187#ifdef SvPADBUSY
161 if (!SvPADBUSY (sv)) 188 if (!SvPADBUSY (sv))
189#endif
162 SvPADMY_on (sv); 190 SvPADMY_on (sv);
163 npad[ix] = sv; 191 npad[ix] = sv;
164 } 192 }
165 } 193 }
166 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
196#endif 224#endif
197 225
198 return newpadlist; 226 return newpadlist;
199} 227}
200 228
201#ifdef MAY_FLUSH
202STATIC void 229STATIC void
203free_padlist (AV *padlist) 230free_padlist (AV *padlist)
204{ 231{
205 /* may be during global destruction */ 232 /* may be during global destruction */
206 if (SvREFCNT(padlist)) 233 if (SvREFCNT (padlist))
207 { 234 {
208 I32 i = AvFILLp(padlist); 235 I32 i = AvFILLp (padlist);
209 while (i >= 0) 236 while (i >= 0)
210 { 237 {
211 SV **svp = av_fetch(padlist, i--, FALSE); 238 SV **svp = av_fetch (padlist, i--, FALSE);
212 SV *sv = svp ? *svp : Nullsv;
213 if (sv) 239 if (svp)
240 {
241 SV *sv;
242 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
214 SvREFCNT_dec(sv); 243 SvREFCNT_dec (sv);
244
245 SvREFCNT_dec (*svp);
246 }
215 } 247 }
216 248
217 SvREFCNT_dec((SV*)padlist); 249 SvREFCNT_dec ((SV*)padlist);
218 } 250 }
219} 251}
220#endif 252
253STATIC int
254coro_cv_free (SV *sv, MAGIC *mg)
255{
256 AV *padlist;
257 AV *av = (AV *)mg->mg_obj;
258
259 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist);
262}
263
264#define PERL_MAGIC_coro PERL_MAGIC_ext
265
266static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
221 267
222/* the next two functions merely cache the padlists */ 268/* the next two functions merely cache the padlists */
223STATIC void 269STATIC void
224get_padlist (CV *cv) 270get_padlist (CV *cv)
225{ 271{
226 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
227 273
228 if (he && AvFILLp ((AV *)*he) >= 0) 274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
229 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
230 else 276 else
231 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
232} 278}
233 279
234STATIC void 280STATIC void
235put_padlist (CV *cv) 281put_padlist (CV *cv)
236{ 282{
237 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
238 284
239 if (SvTYPE (*he) != SVt_PVAV) 285 if (!mg)
240 { 286 {
241 SvREFCNT_dec (*he); 287 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
288 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
289 mg->mg_virtual = &vtbl_coro;
242 *he = (SV *)newAV (); 290 mg->mg_obj = (SV *)newAV ();
243 } 291 }
244 292
245 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 293 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
246} 294}
247
248#ifdef MAY_FLUSH
249STATIC void
250flush_padlist_cache ()
251{
252 HV *hv = padlist_cache;
253 padlist_cache = newHV ();
254
255 if (hv_iterinit (hv))
256 {
257 HE *he;
258 AV *padlist;
259
260 while (!!(he = hv_iternext (hv)))
261 {
262 AV *av = (AV *)HeVAL(he);
263
264 /* casting is fun. */
265 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
266 free_padlist (padlist);
267 }
268 }
269
270 SvREFCNT_dec (hv);
271}
272#endif
273 295
274#define SB do { 296#define SB do {
275#define SE } while (0) 297#define SE } while (0)
276 298
277#define LOAD(state) load_state(aTHX_ (state)); 299#define LOAD(state) load_state(aTHX_ (state));
278#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 300#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
279 301
280#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 302#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
281 303
282static void 304static void
283load_state(pTHX_ Coro__State c) 305load_state(pTHX_ Coro__State c)
284{ 306{
285 PL_dowarn = c->dowarn; 307 PL_dowarn = c->dowarn;
289 PL_curstack = c->curstack; 311 PL_curstack = c->curstack;
290 PL_mainstack = c->mainstack; 312 PL_mainstack = c->mainstack;
291 PL_stack_sp = c->stack_sp; 313 PL_stack_sp = c->stack_sp;
292 PL_op = c->op; 314 PL_op = c->op;
293 PL_curpad = c->curpad; 315 PL_curpad = c->curpad;
316 PL_comppad = c->comppad;
294 PL_stack_base = c->stack_base; 317 PL_stack_base = c->stack_base;
295 PL_stack_max = c->stack_max; 318 PL_stack_max = c->stack_max;
296 PL_tmps_stack = c->tmps_stack; 319 PL_tmps_stack = c->tmps_stack;
297 PL_tmps_floor = c->tmps_floor; 320 PL_tmps_floor = c->tmps_floor;
298 PL_tmps_ix = c->tmps_ix; 321 PL_tmps_ix = c->tmps_ix;
386 PUSHs ((SV *)cv); 409 PUSHs ((SV *)cv);
387 410
388 get_padlist (cv); /* this is a monster */ 411 get_padlist (cv); /* this is a monster */
389 } 412 }
390 } 413 }
414#ifdef CXt_FORMAT
391 else if (CxTYPE(cx) == CXt_FORMAT) 415 else if (CxTYPE(cx) == CXt_FORMAT)
392 { 416 {
393 /* I never used formats, so how should I know how these are implemented? */ 417 /* I never used formats, so how should I know how these are implemented? */
394 /* my bold guess is as a simple, plain sub... */ 418 /* my bold guess is as a simple, plain sub... */
395 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 419 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
396 } 420 }
421#endif
397 } 422 }
398 423
399 if (top_si->si_type == PERLSI_MAIN) 424 if (top_si->si_type == PERLSI_MAIN)
400 break; 425 break;
401 426
418 c->curstack = PL_curstack; 443 c->curstack = PL_curstack;
419 c->mainstack = PL_mainstack; 444 c->mainstack = PL_mainstack;
420 c->stack_sp = PL_stack_sp; 445 c->stack_sp = PL_stack_sp;
421 c->op = PL_op; 446 c->op = PL_op;
422 c->curpad = PL_curpad; 447 c->curpad = PL_curpad;
448 c->comppad = PL_comppad;
423 c->stack_base = PL_stack_base; 449 c->stack_base = PL_stack_base;
424 c->stack_max = PL_stack_max; 450 c->stack_max = PL_stack_max;
425 c->tmps_stack = PL_tmps_stack; 451 c->tmps_stack = PL_tmps_stack;
426 c->tmps_floor = PL_tmps_floor; 452 c->tmps_floor = PL_tmps_floor;
427 c->tmps_ix = PL_tmps_ix; 453 c->tmps_ix = PL_tmps_ix;
467 493
468 New(54,PL_markstack,16,I32); 494 New(54,PL_markstack,16,I32);
469 PL_markstack_ptr = PL_markstack; 495 PL_markstack_ptr = PL_markstack;
470 PL_markstack_max = PL_markstack + 16; 496 PL_markstack_max = PL_markstack + 16;
471 497
498#ifdef SET_MARK_OFFSET
472 SET_MARK_OFFSET; 499 SET_MARK_OFFSET;
500#endif
473 501
474 New(54,PL_scopestack,16,I32); 502 New(54,PL_scopestack,16,I32);
475 PL_scopestack_ix = 0; 503 PL_scopestack_ix = 0;
476 PL_scopestack_max = 16; 504 PL_scopestack_max = 16;
477 505
484 PL_retstack_max = 8; 512 PL_retstack_max = 8;
485} 513}
486 514
487/* 515/*
488 * destroy the stacks, the callchain etc... 516 * destroy the stacks, the callchain etc...
489 * still there is a memleak of 128 bytes...
490 */ 517 */
491STATIC void 518STATIC void
492destroy_stacks(pTHX) 519destroy_stacks(pTHX)
493{ 520{
494 if (!IN_DESTRUCT) 521 if (!IN_DESTRUCT)
543 stack->refcnt = 1; 570 stack->refcnt = 1;
544 stack->usecnt = 1; 571 stack->usecnt = 1;
545 stack->gencnt = ctx->gencnt = 0; 572 stack->gencnt = ctx->gencnt = 0;
546 if (alloc) 573 if (alloc)
547 { 574 {
548#ifdef HAVE_MMAP 575#if HAVE_MMAP
549 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 576 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */
550 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 577 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
551 if (stack->sptr == (void *)-1) 578 if (stack->sptr == (void *)-1)
552#endif 579#endif
553 { 580 {
554 /*FIXME*//*D*//* reasonable stack size! */ 581 /*FIXME*//*D*//* reasonable stack size! */
555 stack->ssize = -4096 * sizeof (long); 582 stack->ssize = -4096 * sizeof (long);
575 { 602 {
576#ifdef HAVE_MMAP 603#ifdef HAVE_MMAP
577 if (stack->ssize > 0 && stack->sptr) 604 if (stack->ssize > 0 && stack->sptr)
578 munmap (stack->sptr, stack->ssize); 605 munmap (stack->sptr, stack->ssize);
579 else 606 else
580#else 607#endif
581 Safefree (stack->sptr); 608 Safefree (stack->sptr);
582#endif 609
583 Safefree (stack); 610 Safefree (stack);
584 } 611 }
585 else if (ctx->gencnt == stack->gencnt) 612 else if (ctx->gencnt == stack->gencnt)
586 --stack->usecnt; 613 --stack->usecnt;
587 } 614 }
599 626
600 coro_init_stacks (aTHX); 627 coro_init_stacks (aTHX);
601 /*PL_curcop = 0;*/ 628 /*PL_curcop = 0;*/
602 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 629 /*PL_in_eval = PL_in_eval;*/ /* inherit */
603 SvREFCNT_dec (GvAV (PL_defgv)); 630 SvREFCNT_dec (GvAV (PL_defgv));
604 GvAV (PL_defgv) = ctx->args; 631 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
605 632
606 SPAGAIN; 633 SPAGAIN;
607 634
608 if (ctx->stack) 635 if (ctx->stack)
609 { 636 {
636 * that doesn't matter, though, since it is only 663 * that doesn't matter, though, since it is only
637 * pp_nextstate and we never return... 664 * pp_nextstate and we never return...
638 * ah yes, and I don't care anyways ;) 665 * ah yes, and I don't care anyways ;)
639 */ 666 */
640 PUTBACK; 667 PUTBACK;
641 PL_op = pp_entersub(); 668 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
642 SPAGAIN; 669 SPAGAIN;
643 670
644 ENTER; /* necessary e.g. for dounwind */ 671 ENTER; /* necessary e.g. for dounwind */
645 } 672 }
646} 673}
652 * this is a _very_ stripped down perl interpreter ;) 679 * this is a _very_ stripped down perl interpreter ;)
653 */ 680 */
654 Coro__State ctx = (Coro__State)arg; 681 Coro__State ctx = (Coro__State)arg;
655 JMPENV coro_start_env; 682 JMPENV coro_start_env;
656 683
657 /* same as JMPENV_BOOTSTRAP */
658 Zero(&coro_start_env, 1, JMPENV);
659 coro_start_env.je_ret = -1;
660 coro_start_env.je_mustcatch = TRUE;
661 PL_top_env = &coro_start_env; 684 PL_top_env = &ctx->start_env;
662 685
663 ctx->cursp = 0; 686 ctx->cursp = 0;
664 PL_op = PL_op->op_next; 687 PL_op = PL_op->op_next;
665 CALLRUNOPS(aTHX); 688 CALLRUNOPS(aTHX);
666 689
724 if (!prev->stack) 747 if (!prev->stack)
725 allocate_stack (prev, 0); 748 allocate_stack (prev, 0);
726 749
727 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 750 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
728 { 751 {
752 PL_top_env = &next->start_env;
753
729 setup_coro (next); 754 setup_coro (next);
730 755
731 prev->stack->refcnt++; 756 prev->stack->refcnt++;
732 prev->stack->usecnt++; 757 prev->stack->usecnt++;
733 next->stack = prev->stack; 758 next->stack = prev->stack;
734 next->gencnt = prev->gencnt; 759 next->gencnt = prev->gencnt;
735 } 760 }
736 else 761 else
737 { 762 {
763 assert (!next->stack);
738 allocate_stack (next, 1); 764 allocate_stack (next, 1);
739 coro_create (&(next->stack->cctx), 765 coro_create (&(next->stack->cctx),
740 setup_coro, (void *)next, 766 setup_coro, (void *)next,
741 next->stack->sptr, labs (next->stack->ssize)); 767 next->stack->sptr, labs (next->stack->ssize));
742 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 768 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
747 setup_coro (next); 773 setup_coro (next);
748 } 774 }
749 775
750 /* 776 /*
751 * xnext is now either prev or next, depending on wether 777 * xnext is now either prev or next, depending on wether
752 * we switched the c stack or not. that's why i use a global 778 * we switched the c stack or not. that's why I use a global
753 * variable, that should become thread-specific at one point. 779 * variable, that should become thread-specific at one point.
754 */ 780 */
755 xnext->cursp = stacklevel; 781 xnext->cursp = stacklevel;
756 } 782 }
757}
758 783
759static struct coro * 784 if (coro_mortal)
760sv_to_coro (SV *arg, const char *funcname, const char *varname)
761{
762 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
763 { 785 {
764 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 786 SvREFCNT_dec (coro_mortal);
765 787 coro_mortal = 0;
766 if (!he)
767 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
768
769 arg = HeVAL(he);
770 } 788 }
771 789}
790
791#define SV_CORO(sv,func) \
792 do { \
793 if (SvROK (sv)) \
794 sv = SvRV (sv); \
795 \
796 if (SvTYPE(sv) == SVt_PVHV) \
797 { \
798 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
799 \
800 if (!he) \
801 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
802 \
803 (sv) = SvRV (HeVAL(he)); \
804 } \
805 \
772 /* must also be changed inside Coro::Cont::yield */ 806 /* must also be changed inside Coro::Cont::yield */ \
773 if (SvROK(arg) && SvOBJECT(SvRV(arg)) 807 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \
774 && SvSTASH(SvRV(arg)) == coro_state_stash)
775 return (struct coro *) SvIV((SV*)SvRV(arg));
776
777 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 808 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
778 /*NORETURN*/ 809 \
779} 810 } while(0)
811
812#define SvSTATE(sv) (struct coro *)SvIV (sv)
780 813
781static void 814static void
782api_transfer(pTHX_ SV *prev, SV *next, int flags) 815api_transfer(pTHX_ SV *prev, SV *next, int flags)
783{ 816{
784 transfer(aTHX_ 817 SV_CORO (prev, "Coro::transfer");
785 sv_to_coro (prev, "Coro::transfer", "prev"), 818 SV_CORO (next, "Coro::transfer");
786 sv_to_coro (next, "Coro::transfer", "next"), 819
787 flags); 820 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
788} 821}
789 822
790/** Coro ********************************************************************/ 823/** Coro ********************************************************************/
791 824
792#define PRIO_MAX 3 825#define PRIO_MAX 3
802static int coro_nready; 835static int coro_nready;
803 836
804static void 837static void
805coro_enq (SV *sv) 838coro_enq (SV *sv)
806{ 839{
807 if (SvROK (sv)) 840 if (SvTYPE (sv) == SVt_PVHV)
808 { 841 {
809 SV *hv = SvRV (sv);
810 if (SvTYPE (hv) == SVt_PVHV)
811 {
812 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 842 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
813 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 843 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
814 844
815 prio = prio > PRIO_MAX ? PRIO_MAX 845 prio = prio > PRIO_MAX ? PRIO_MAX
816 : prio < PRIO_MIN ? PRIO_MIN 846 : prio < PRIO_MIN ? PRIO_MIN
817 : prio; 847 : prio;
818 848
819 av_push (coro_ready [prio - PRIO_MIN], sv); 849 av_push (coro_ready [prio - PRIO_MIN], sv);
820 coro_nready++; 850 coro_nready++;
821 851
822 return; 852 return;
823 }
824 } 853 }
825 854
826 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 855 croak ("Coro::ready tried to enqueue something that is not a coroutine");
827} 856}
828 857
846} 875}
847 876
848static void 877static void
849api_ready (SV *coro) 878api_ready (SV *coro)
850{ 879{
880 if (SvROK (coro))
881 coro = SvRV (coro);
882
851 coro_enq (SvREFCNT_inc (coro)); 883 coro_enq (SvREFCNT_inc (coro));
852} 884}
853 885
854static void 886static void
855api_schedule (int cede) 887api_schedule (void)
856{ 888{
857 SV *prev, *next; 889 SV *prev, *next;
858 890
859 prev = GvSV (coro_current); 891 prev = SvRV (GvSV (coro_current));
860
861 if (cede)
862 coro_enq (SvREFCNT_inc (prev));
863
864 next = coro_deq (PRIO_MIN); 892 next = coro_deq (PRIO_MIN);
865 893
866 if (!next) 894 if (!next)
867 next = SvREFCNT_inc (GvSV (coro_idle)); 895 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
868 896
869 GvSV (coro_current) = SvREFCNT_inc (next); 897 /* free this only after the transfer */
870 transfer (aTHX_ 898 coro_mortal = prev;
871 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 899 SV_CORO (prev, "Coro::schedule");
872 sv_to_coro (next, "Coro::schedule", "next coroutine"), 900
901 SvRV (GvSV (coro_current)) = next;
902
903 SV_CORO (next, "Coro::schedule");
904
905 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
873 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 906 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
874 SvREFCNT_dec (next); 907}
875 SvREFCNT_dec (prev); 908
909static void
910api_cede (void)
911{
912 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
913
914 api_schedule ();
876} 915}
877 916
878MODULE = Coro::State PACKAGE = Coro::State 917MODULE = Coro::State PACKAGE = Coro::State
879 918
880PROTOTYPES: ENABLE 919PROTOTYPES: ENABLE
907 Coro__State coro; 946 Coro__State coro;
908 947
909 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 948 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
910 croak ("Coro::State::_newprocess expects an arrayref"); 949 croak ("Coro::State::_newprocess expects an arrayref");
911 950
912 New (0, coro, 1, struct coro); 951 Newz (0, coro, 1, struct coro);
913 952
914 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 953 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
915 coro->mainstack = 0; /* actual work is done inside transfer */ 954 coro->mainstack = 0; /* actual work is done inside transfer */
916 coro->stack = 0; 955 coro->stack = 0;
917 956
957 /* same as JMPENV_BOOTSTRAP */
958 /* we might be able to recycle start_env, but safe is safe */
959 //Zero(&coro->start_env, 1, JMPENV);
960 coro->start_env.je_ret = -1;
961 coro->start_env.je_mustcatch = TRUE;
962
918 RETVAL = coro; 963 RETVAL = coro;
919 OUTPUT: 964 OUTPUT:
920 RETVAL 965 RETVAL
921 966
922void 967void
923transfer(prev, next, flags) 968transfer(prev, next, flags)
924 Coro::State_or_hashref prev 969 SV *prev
925 Coro::State_or_hashref next 970 SV *next
926 int flags 971 int flags
927 PROTOTYPE: @ 972 PROTOTYPE: @
928 CODE: 973 CODE:
929 PUTBACK; 974 PUTBACK;
975 SV_CORO (next, "Coro::transfer");
976 SV_CORO (prev, "Coro::transfer");
930 transfer (aTHX_ prev, next, flags); 977 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
931 SPAGAIN; 978 SPAGAIN;
932 979
933void 980void
934DESTROY(coro) 981DESTROY(coro)
935 Coro::State coro 982 Coro::State coro
951 998
952 coro->mainstack = 0; 999 coro->mainstack = 0;
953 } 1000 }
954 1001
955 deallocate_stack (coro); 1002 deallocate_stack (coro);
956 1003 SvREFCNT_dec (coro->args);
957 Safefree (coro); 1004 Safefree (coro);
958
959void
960flush()
961 CODE:
962#ifdef MAY_FLUSH
963 flush_padlist_cache ();
964#endif
965 1005
966void 1006void
967_exit(code) 1007_exit(code)
968 int code 1008 int code
969 PROTOTYPE: $ 1009 PROTOTYPE: $
988 SV *sv; 1028 SV *sv;
989 AV *defav = GvAV (PL_defgv); 1029 AV *defav = GvAV (PL_defgv);
990 struct coro *prev, *next; 1030 struct coro *prev, *next;
991 1031
992 if (!returnstk) 1032 if (!returnstk)
993 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1033 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
994 1034
995 /* set up @_ -- ugly */ 1035 /* set up @_ -- ugly */
996 av_clear (defav); 1036 av_clear (defav);
997 av_fill (defav, items - 1); 1037 av_fill (defav, items - 1);
998 while (items--) 1038 while (items--)
1030 1070
1031 { 1071 {
1032 SV *sv = perl_get_sv("Coro::API", 1); 1072 SV *sv = perl_get_sv("Coro::API", 1);
1033 1073
1034 coroapi.schedule = api_schedule; 1074 coroapi.schedule = api_schedule;
1075 coroapi.cede = api_cede;
1035 coroapi.ready = api_ready; 1076 coroapi.ready = api_ready;
1036 coroapi.nready = &coro_nready; 1077 coroapi.nready = &coro_nready;
1037 coroapi.current = coro_current; 1078 coroapi.current = coro_current;
1038 1079
1039 GCoroAPI = &coroapi; 1080 GCoroAPI = &coroapi;
1040 sv_setiv(sv, (IV)&coroapi); 1081 sv_setiv(sv, (IV)&coroapi);
1041 SvREADONLY_on(sv); 1082 SvREADONLY_on(sv);
1042 } 1083 }
1043} 1084}
1085
1086#if !PERL_MICRO
1044 1087
1045void 1088void
1046ready(self) 1089ready(self)
1047 SV * self 1090 SV * self
1048 PROTOTYPE: $ 1091 PROTOTYPE: $
1049 CODE: 1092 CODE:
1050 api_ready (self); 1093 api_ready (self);
1094
1095#endif
1051 1096
1052int 1097int
1053nready(...) 1098nready(...)
1054 PROTOTYPE: 1099 PROTOTYPE:
1055 CODE: 1100 CODE:
1058 RETVAL 1103 RETVAL
1059 1104
1060void 1105void
1061schedule(...) 1106schedule(...)
1062 PROTOTYPE: 1107 PROTOTYPE:
1063 ALIAS:
1064 cede = 1
1065 CODE: 1108 CODE:
1066 api_schedule (ix); 1109 api_schedule ();
1067 1110
1111void
1112cede(...)
1113 PROTOTYPE:
1114 CODE:
1115 api_cede ();
1116

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines