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.28 by root, Sat Aug 25 21:32:05 2001 UTC vs.
Revision 1.49 by pcg, Sun Nov 23 03:34:13 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
… …
25 48
26/* The next macro should declare a variable stacklevel that contains and approximation 49/* 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 50 * to the current C stack pointer. Its property is that it changes with each call
28 * and should be unique. */ 51 * and should be unique. */
29#define dSTACKLEVEL void *stacklevel = &stacklevel 52#define dSTACKLEVEL void *stacklevel = &stacklevel
53
54#define IN_DESTRUCT (PL_main_cv == Nullcv)
30 55
31#define labs(l) ((l) >= 0 ? (l) : -(l)) 56#define labs(l) ((l) >= 0 ? (l) : -(l))
32 57
33#include "CoroAPI.h" 58#include "CoroAPI.h"
34 59
… …
45 void *sptr; 70 void *sptr;
46 long ssize; /* positive == mmap, otherwise malloc */ 71 long ssize; /* positive == mmap, otherwise malloc */
47} coro_stack; 72} coro_stack;
48 73
49struct coro { 74struct coro {
75 /* the top-level JMPENV for each coroutine, needed to catch dies. */
76 JMPENV start_env;
77
50 /* the optional C context */ 78 /* the optional C context */
51 coro_stack *stack; 79 coro_stack *stack;
52 void *cursp; 80 void *cursp;
53 int gencnt; 81 int gencnt;
54 82
… …
66 AV *curstack; 94 AV *curstack;
67 AV *mainstack; 95 AV *mainstack;
68 SV **stack_sp; 96 SV **stack_sp;
69 OP *op; 97 OP *op;
70 SV **curpad; 98 SV **curpad;
99 AV *comppad;
71 SV **stack_base; 100 SV **stack_base;
72 SV **stack_max; 101 SV **stack_max;
73 SV **tmps_stack; 102 SV **tmps_stack;
74 I32 tmps_floor; 103 I32 tmps_floor;
75 I32 tmps_ix; 104 I32 tmps_ix;
… …
99static AV *main_mainstack; /* used to differentiate between $main and others */ 128static AV *main_mainstack; /* used to differentiate between $main and others */
100static HV *coro_state_stash; 129static HV *coro_state_stash;
101static SV *ucoro_state_sv; 130static SV *ucoro_state_sv;
102static U32 ucoro_state_hash; 131static U32 ucoro_state_hash;
103static HV *padlist_cache; 132static HV *padlist_cache;
133static SV *coro_mortal; /* will be freed after next transfer */
104 134
105/* mostly copied from op.c:cv_clone2 */ 135/* mostly copied from op.c:cv_clone2 */
106STATIC AV * 136STATIC AV *
107clone_padlist (AV *protopadlist) 137clone_padlist (AV *protopadlist)
108{ 138{
… …
154 sv = (SV *) newAV (); 184 sv = (SV *) newAV ();
155 else if (*name == '%') 185 else if (*name == '%')
156 sv = (SV *) newHV (); 186 sv = (SV *) newHV ();
157 else 187 else
158 sv = NEWSV (0, 0); 188 sv = NEWSV (0, 0);
189#ifdef SvPADBUSY
159 if (!SvPADBUSY (sv)) 190 if (!SvPADBUSY (sv))
191#endif
160 SvPADMY_on (sv); 192 SvPADMY_on (sv);
161 npad[ix] = sv; 193 npad[ix] = sv;
162 } 194 }
163 } 195 }
164 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 196 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
… …
273#define SE } while (0) 305#define SE } while (0)
274 306
275#define LOAD(state) load_state(aTHX_ (state)); 307#define LOAD(state) load_state(aTHX_ (state));
276#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 308#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
277 309
278#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 310#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
279 311
280static void 312static void
281load_state(pTHX_ Coro__State c) 313load_state(pTHX_ Coro__State c)
282{ 314{
283 PL_dowarn = c->dowarn; 315 PL_dowarn = c->dowarn;
… …
287 PL_curstack = c->curstack; 319 PL_curstack = c->curstack;
288 PL_mainstack = c->mainstack; 320 PL_mainstack = c->mainstack;
289 PL_stack_sp = c->stack_sp; 321 PL_stack_sp = c->stack_sp;
290 PL_op = c->op; 322 PL_op = c->op;
291 PL_curpad = c->curpad; 323 PL_curpad = c->curpad;
324 PL_comppad = c->comppad;
292 PL_stack_base = c->stack_base; 325 PL_stack_base = c->stack_base;
293 PL_stack_max = c->stack_max; 326 PL_stack_max = c->stack_max;
294 PL_tmps_stack = c->tmps_stack; 327 PL_tmps_stack = c->tmps_stack;
295 PL_tmps_floor = c->tmps_floor; 328 PL_tmps_floor = c->tmps_floor;
296 PL_tmps_ix = c->tmps_ix; 329 PL_tmps_ix = c->tmps_ix;
… …
355 388
356 PUSHs (Nullsv); 389 PUSHs (Nullsv);
357 /* this loop was inspired by pp_caller */ 390 /* this loop was inspired by pp_caller */
358 for (;;) 391 for (;;)
359 { 392 {
360 do 393 while (cxix >= 0)
361 { 394 {
362 PERL_CONTEXT *cx = &ccstk[cxix--]; 395 PERL_CONTEXT *cx = &ccstk[cxix--];
363 396
364 if (CxTYPE(cx) == CXt_SUB) 397 if (CxTYPE(cx) == CXt_SUB)
365 { 398 {
… …
384 PUSHs ((SV *)cv); 417 PUSHs ((SV *)cv);
385 418
386 get_padlist (cv); /* this is a monster */ 419 get_padlist (cv); /* this is a monster */
387 } 420 }
388 } 421 }
422#ifdef CXt_FORMAT
389 else if (CxTYPE(cx) == CXt_FORMAT) 423 else if (CxTYPE(cx) == CXt_FORMAT)
390 { 424 {
391 /* I never used formats, so how should I know how these are implemented? */ 425 /* I never used formats, so how should I know how these are implemented? */
392 /* my bold guess is as a simple, plain sub... */ 426 /* my bold guess is as a simple, plain sub... */
393 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 427 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
394 } 428 }
429#endif
395 } 430 }
396 while (cxix >= 0);
397 431
398 if (top_si->si_type == PERLSI_MAIN) 432 if (top_si->si_type == PERLSI_MAIN)
399 break; 433 break;
400 434
401 top_si = top_si->si_prev; 435 top_si = top_si->si_prev;
… …
417 c->curstack = PL_curstack; 451 c->curstack = PL_curstack;
418 c->mainstack = PL_mainstack; 452 c->mainstack = PL_mainstack;
419 c->stack_sp = PL_stack_sp; 453 c->stack_sp = PL_stack_sp;
420 c->op = PL_op; 454 c->op = PL_op;
421 c->curpad = PL_curpad; 455 c->curpad = PL_curpad;
456 c->comppad = PL_comppad;
422 c->stack_base = PL_stack_base; 457 c->stack_base = PL_stack_base;
423 c->stack_max = PL_stack_max; 458 c->stack_max = PL_stack_max;
424 c->tmps_stack = PL_tmps_stack; 459 c->tmps_stack = PL_tmps_stack;
425 c->tmps_floor = PL_tmps_floor; 460 c->tmps_floor = PL_tmps_floor;
426 c->tmps_ix = PL_tmps_ix; 461 c->tmps_ix = PL_tmps_ix;
… …
466 501
467 New(54,PL_markstack,16,I32); 502 New(54,PL_markstack,16,I32);
468 PL_markstack_ptr = PL_markstack; 503 PL_markstack_ptr = PL_markstack;
469 PL_markstack_max = PL_markstack + 16; 504 PL_markstack_max = PL_markstack + 16;
470 505
506#ifdef SET_MARK_OFFSET
471 SET_MARK_OFFSET; 507 SET_MARK_OFFSET;
508#endif
472 509
473 New(54,PL_scopestack,16,I32); 510 New(54,PL_scopestack,16,I32);
474 PL_scopestack_ix = 0; 511 PL_scopestack_ix = 0;
475 PL_scopestack_max = 16; 512 PL_scopestack_max = 16;
476 513
… …
483 PL_retstack_max = 8; 520 PL_retstack_max = 8;
484} 521}
485 522
486/* 523/*
487 * destroy the stacks, the callchain etc... 524 * destroy the stacks, the callchain etc...
488 * still there is a memleak of 128 bytes...
489 */ 525 */
490STATIC void 526STATIC void
491destroy_stacks(pTHX) 527destroy_stacks(pTHX)
492{ 528{
529 if (!IN_DESTRUCT)
530 {
493 /* is this ugly, I ask? */ 531 /* is this ugly, I ask? */
494 while (PL_scopestack_ix) 532 while (PL_scopestack_ix)
495 LEAVE; 533 LEAVE;
496 534
497 /* sure it is, but more important: is it correct?? :/ */ 535 /* sure it is, but more important: is it correct?? :/ */
498 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */ 536 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
499 FREETMPS; 537 FREETMPS;
538 }
500 539
501 while (PL_curstackinfo->si_next) 540 while (PL_curstackinfo->si_next)
502 PL_curstackinfo = PL_curstackinfo->si_next; 541 PL_curstackinfo = PL_curstackinfo->si_next;
503 542
504 while (PL_curstackinfo) 543 while (PL_curstackinfo)
… …
509 dSP; 548 dSP;
510 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 549 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
511 PUTBACK; /* possibly superfluous */ 550 PUTBACK; /* possibly superfluous */
512 } 551 }
513 552
514 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 553 if (!IN_DESTRUCT)
554 {
515 dounwind(-1); 555 dounwind(-1);
516
517 SvREFCNT_dec(PL_curstackinfo->si_stack); 556 SvREFCNT_dec(PL_curstackinfo->si_stack);
557 }
558
518 Safefree(PL_curstackinfo->si_cxstack); 559 Safefree(PL_curstackinfo->si_cxstack);
519 Safefree(PL_curstackinfo); 560 Safefree(PL_curstackinfo);
520 PL_curstackinfo = p; 561 PL_curstackinfo = p;
521 } 562 }
522 563
… …
537 stack->refcnt = 1; 578 stack->refcnt = 1;
538 stack->usecnt = 1; 579 stack->usecnt = 1;
539 stack->gencnt = ctx->gencnt = 0; 580 stack->gencnt = ctx->gencnt = 0;
540 if (alloc) 581 if (alloc)
541 { 582 {
542#ifdef HAVE_MMAP 583#if HAVE_MMAP
543 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 584 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */
544 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 585 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
545 if (stack->sptr == (void *)-1) 586 if (stack->sptr == (void *)-1)
546#endif 587#endif
547 { 588 {
548 /*FIXME*//*D*//* reasonable stack size! */ 589 /*FIXME*//*D*//* reasonable stack size! */
549 stack->ssize = -4096 * sizeof (long); 590 stack->ssize = -4096 * sizeof (long);
… …
563 604
564 ctx->stack = 0; 605 ctx->stack = 0;
565 606
566 if (stack) 607 if (stack)
567 { 608 {
568 printf ("deallocating stack %p %d\n", stack, stack->refcnt);/*D*/
569 if (!--stack->refcnt) 609 if (!--stack->refcnt)
570 { 610 {
571#ifdef HAVE_MMAP 611#ifdef HAVE_MMAP
572 if (stack->ssize > 0 && stack->sptr) 612 if (stack->ssize > 0 && stack->sptr)
573 munmap (stack->sptr, stack->ssize); 613 munmap (stack->sptr, stack->ssize);
574 else 614 else
575#else 615#endif
576 Safefree (stack->sptr); 616 Safefree (stack->sptr);
577#endif 617
578 Safefree (stack); 618 Safefree (stack);
579 } 619 }
580 else if (ctx->gencnt == stack->gencnt) 620 else if (ctx->gencnt == stack->gencnt)
581 --stack->usecnt; 621 --stack->usecnt;
582 } 622 }
… …
594 634
595 coro_init_stacks (aTHX); 635 coro_init_stacks (aTHX);
596 /*PL_curcop = 0;*/ 636 /*PL_curcop = 0;*/
597 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 637 /*PL_in_eval = PL_in_eval;*/ /* inherit */
598 SvREFCNT_dec (GvAV (PL_defgv)); 638 SvREFCNT_dec (GvAV (PL_defgv));
599 GvAV (PL_defgv) = ctx->args; 639 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
600 640
601 SPAGAIN; 641 SPAGAIN;
602 642
603 if (ctx->stack) 643 if (ctx->stack)
604 { 644 {
… …
631 * that doesn't matter, though, since it is only 671 * that doesn't matter, though, since it is only
632 * pp_nextstate and we never return... 672 * pp_nextstate and we never return...
633 * ah yes, and I don't care anyways ;) 673 * ah yes, and I don't care anyways ;)
634 */ 674 */
635 PUTBACK; 675 PUTBACK;
636 PL_op = pp_entersub(); 676 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
637 SPAGAIN; 677 SPAGAIN;
638 678
639 ENTER; /* necessary e.g. for dounwind */ 679 ENTER; /* necessary e.g. for dounwind */
640 } 680 }
641} 681}
… …
645{ 685{
646 /* 686 /*
647 * this is a _very_ stripped down perl interpreter ;) 687 * this is a _very_ stripped down perl interpreter ;)
648 */ 688 */
649 Coro__State ctx = (Coro__State)arg; 689 Coro__State ctx = (Coro__State)arg;
690 JMPENV coro_start_env;
650 691
651 /*FIXME*//* must set up top_env here */ 692 PL_top_env = &ctx->start_env;
693
652 ctx->cursp = 0; 694 ctx->cursp = 0;
653 PL_op = PL_op->op_next; 695 PL_op = PL_op->op_next;
654 CALLRUNOPS(aTHX); 696 CALLRUNOPS(aTHX);
655 697
656 abort (); 698 abort ();
… …
660transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 702transfer(pTHX_ struct coro *prev, struct coro *next, int flags)
661{ 703{
662 dSTACKLEVEL; 704 dSTACKLEVEL;
663 static struct coro *xnext; 705 static struct coro *xnext;
664 706
665 printf ("%p => %p\n", prev, next);/*D*/
666 if (prev != next) 707 if (prev != next)
667 { 708 {
668 xnext = next; 709 xnext = next;
669 710
670 if (next->mainstack) 711 if (next->mainstack)
… …
714 if (!prev->stack) 755 if (!prev->stack)
715 allocate_stack (prev, 0); 756 allocate_stack (prev, 0);
716 757
717 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 758 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
718 { 759 {
760 PL_top_env = &next->start_env;
761
719 setup_coro (next); 762 setup_coro (next);
720 763
721 prev->stack->refcnt++; 764 prev->stack->refcnt++;
722 prev->stack->usecnt++; 765 prev->stack->usecnt++;
723 next->stack = prev->stack; 766 next->stack = prev->stack;
724 next->gencnt = prev->gencnt; 767 next->gencnt = prev->gencnt;
725 } 768 }
726 else 769 else
727 { 770 {
771 assert (!next->stack);
728 allocate_stack (next, 1); 772 allocate_stack (next, 1);
729 coro_create (&(next->stack->cctx), 773 coro_create (&(next->stack->cctx),
730 setup_coro, (void *)next, 774 setup_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 775 next->stack->sptr, labs (next->stack->ssize));
732 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 776 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
… …
734 } 778 }
735 } 779 }
736 else 780 else
737 setup_coro (next); 781 setup_coro (next);
738 } 782 }
783
784 /*
785 * xnext is now either prev or next, depending on wether
786 * we switched the c stack or not. that's why I use a global
787 * variable, that should become thread-specific at one point.
788 */
789 xnext->cursp = stacklevel;
739 } 790 }
740 791
741 xnext->cursp = stacklevel; 792 if (coro_mortal)
742}
743
744static struct coro *
745sv_to_coro (SV *arg, const char *funcname, const char *varname)
746{
747 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
748 { 793 {
749 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 794 SvREFCNT_dec (coro_mortal);
750 795 coro_mortal = 0;
751 if (!he)
752 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
753
754 arg = HeVAL(he);
755 } 796 }
756 797}
798
799#define SV_CORO(sv,func) \
800 do { \
801 if (SvROK (sv)) \
802 sv = SvRV (sv); \
803 \
804 if (SvTYPE(sv) == SVt_PVHV) \
805 { \
806 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
807 \
808 if (!he) \
809 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
810 \
811 (sv) = SvRV (HeVAL(he)); \
812 } \
813 \
757 /* must also be changed inside Coro::Cont::yield */ 814 /* must also be changed inside Coro::Cont::yield */ \
758 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 815 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \
759 return (struct coro *) SvIV((SV*)SvRV(arg));
760
761 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 816 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
762 /*NORETURN*/ 817 \
763} 818 } while(0)
819
820#define SvSTATE(sv) (struct coro *)SvIV (sv)
764 821
765static void 822static void
766api_transfer(pTHX_ SV *prev, SV *next, int flags) 823api_transfer(pTHX_ SV *prev, SV *next, int flags)
767{ 824{
768 transfer(aTHX_ 825 SV_CORO (prev, "Coro::transfer");
769 sv_to_coro (prev, "Coro::transfer", "prev"), 826 SV_CORO (next, "Coro::transfer");
770 sv_to_coro (next, "Coro::transfer", "next"), 827
771 flags); 828 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
772} 829}
773 830
774/** Coro ********************************************************************/ 831/** Coro ********************************************************************/
775 832
776#define PRIO_MAX 3 833#define PRIO_MAX 3
… …
786static int coro_nready; 843static int coro_nready;
787 844
788static void 845static void
789coro_enq (SV *sv) 846coro_enq (SV *sv)
790{ 847{
791 if (SvROK (sv))
792 {
793 SV *hv = SvRV (sv);
794 if (SvTYPE (hv) == SVt_PVHV) 848 if (SvTYPE (sv) == SVt_PVHV)
795 { 849 {
796 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 850 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
797 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 851 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
798 852
799 prio = prio > PRIO_MAX ? PRIO_MAX 853 prio = prio > PRIO_MAX ? PRIO_MAX
800 : prio < PRIO_MIN ? PRIO_MIN 854 : prio < PRIO_MIN ? PRIO_MIN
801 : prio; 855 : prio;
802 856
803 av_push (coro_ready [prio - PRIO_MIN], sv); 857 av_push (coro_ready [prio - PRIO_MIN], sv);
804 coro_nready++; 858 coro_nready++;
805 859
806 return; 860 return;
807 }
808 } 861 }
809 862
810 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 863 croak ("Coro::ready tried to enqueue something that is not a coroutine");
811} 864}
812 865
… …
830} 883}
831 884
832static void 885static void
833api_ready (SV *coro) 886api_ready (SV *coro)
834{ 887{
888 if (SvROK (coro))
889 coro = SvRV (coro);
890
835 coro_enq (SvREFCNT_inc (coro)); 891 coro_enq (SvREFCNT_inc (coro));
836} 892}
837 893
838static void 894static void
839api_schedule (int cede) 895api_schedule (void)
840{ 896{
841 SV *prev, *next; 897 SV *prev, *next;
842 898
843 prev = GvSV (coro_current); 899 prev = SvRV (GvSV (coro_current));
844
845 if (cede)
846 coro_enq (SvREFCNT_inc (prev));
847
848 next = coro_deq (PRIO_MIN); 900 next = coro_deq (PRIO_MIN);
849 901
850 if (!next) 902 if (!next)
851 next = SvREFCNT_inc (GvSV (coro_idle)); 903 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
852 904
853 GvSV (coro_current) = SvREFCNT_inc (next); 905 /* free this only after the transfer */
854 transfer (aTHX_ 906 coro_mortal = prev;
855 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 907 SV_CORO (prev, "Coro::schedule");
856 sv_to_coro (next, "Coro::schedule", "next coroutine"), 908
909 SvRV (GvSV (coro_current)) = next;
910
911 SV_CORO (next, "Coro::schedule");
912
913 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
857 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 914 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
858 SvREFCNT_dec (next); 915}
859 SvREFCNT_dec (prev); 916
917static void
918api_cede (void)
919{
920 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
921
922 api_schedule ();
860} 923}
861 924
862MODULE = Coro::State PACKAGE = Coro::State 925MODULE = Coro::State PACKAGE = Coro::State
863 926
864PROTOTYPES: ENABLE 927PROTOTYPES: ENABLE
… …
891 Coro__State coro; 954 Coro__State coro;
892 955
893 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 956 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
894 croak ("Coro::State::_newprocess expects an arrayref"); 957 croak ("Coro::State::_newprocess expects an arrayref");
895 958
896 New (0, coro, 1, struct coro); 959 Newz (0, coro, 1, struct coro);
897 960
898 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 961 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
899 coro->mainstack = 0; /* actual work is done inside transfer */ 962 coro->mainstack = 0; /* actual work is done inside transfer */
900 coro->stack = 0; 963 coro->stack = 0;
901 964
965 /* same as JMPENV_BOOTSTRAP */
966 /* we might be able to recycle start_env, but safe is safe */
967 //Zero(&coro->start_env, 1, JMPENV);
968 coro->start_env.je_ret = -1;
969 coro->start_env.je_mustcatch = TRUE;
970
902 RETVAL = coro; 971 RETVAL = coro;
903 OUTPUT: 972 OUTPUT:
904 RETVAL 973 RETVAL
905 974
906void 975void
907transfer(prev, next, flags) 976transfer(prev, next, flags)
908 Coro::State_or_hashref prev 977 SV *prev
909 Coro::State_or_hashref next 978 SV *next
910 int flags 979 int flags
911 PROTOTYPE: @ 980 PROTOTYPE: @
912 CODE: 981 CODE:
913 PUTBACK; 982 PUTBACK;
983 SV_CORO (next, "Coro::transfer");
984 SV_CORO (prev, "Coro::transfer");
914 transfer (aTHX_ prev, next, flags); 985 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
915 SPAGAIN; 986 SPAGAIN;
916 987
917void 988void
918DESTROY(coro) 989DESTROY(coro)
919 Coro::State coro 990 Coro::State coro
… …
935 1006
936 coro->mainstack = 0; 1007 coro->mainstack = 0;
937 } 1008 }
938 1009
939 deallocate_stack (coro); 1010 deallocate_stack (coro);
940 1011 SvREFCNT_dec (coro->args);
941 Safefree (coro); 1012 Safefree (coro);
942 1013
943void 1014void
944flush() 1015flush()
945 CODE: 1016 CODE:
… …
972 SV *sv; 1043 SV *sv;
973 AV *defav = GvAV (PL_defgv); 1044 AV *defav = GvAV (PL_defgv);
974 struct coro *prev, *next; 1045 struct coro *prev, *next;
975 1046
976 if (!returnstk) 1047 if (!returnstk)
977 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1048 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
978 1049
979 /* set up @_ -- ugly */ 1050 /* set up @_ -- ugly */
980 av_clear (defav); 1051 av_clear (defav);
981 av_fill (defav, items - 1); 1052 av_fill (defav, items - 1);
982 while (items--) 1053 while (items--)
… …
1014 1085
1015 { 1086 {
1016 SV *sv = perl_get_sv("Coro::API", 1); 1087 SV *sv = perl_get_sv("Coro::API", 1);
1017 1088
1018 coroapi.schedule = api_schedule; 1089 coroapi.schedule = api_schedule;
1090 coroapi.cede = api_cede;
1019 coroapi.ready = api_ready; 1091 coroapi.ready = api_ready;
1020 coroapi.nready = &coro_nready; 1092 coroapi.nready = &coro_nready;
1021 coroapi.current = coro_current; 1093 coroapi.current = coro_current;
1022 1094
1023 GCoroAPI = &coroapi; 1095 GCoroAPI = &coroapi;
… …
1027} 1099}
1028 1100
1029void 1101void
1030ready(self) 1102ready(self)
1031 SV * self 1103 SV * self
1104 PROTOTYPE: $
1032 CODE: 1105 CODE:
1033 api_ready (self); 1106 api_ready (self);
1034 1107
1035int 1108int
1036nready(...) 1109nready(...)
… …
1041 RETVAL 1114 RETVAL
1042 1115
1043void 1116void
1044schedule(...) 1117schedule(...)
1045 PROTOTYPE: 1118 PROTOTYPE:
1046 ALIAS:
1047 cede = 1
1048 CODE: 1119 CODE:
1049 api_schedule (ix); 1120 api_schedule ();
1050 1121
1122void
1123cede(...)
1124 PROTOTYPE:
1125 CODE:
1126 api_cede ();
1127

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines