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.30 by root, Sat Aug 25 22:19:05 2001 UTC vs.
Revision 1.48 by pcg, Sat Nov 15 03:53:37 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{
… …
273#define SE } while (0) 303#define SE } while (0)
274 304
275#define LOAD(state) load_state(aTHX_ (state)); 305#define LOAD(state) load_state(aTHX_ (state));
276#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 306#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
277 307
278#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 308#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
279 309
280static void 310static void
281load_state(pTHX_ Coro__State c) 311load_state(pTHX_ Coro__State c)
282{ 312{
283 PL_dowarn = c->dowarn; 313 PL_dowarn = c->dowarn;
… …
287 PL_curstack = c->curstack; 317 PL_curstack = c->curstack;
288 PL_mainstack = c->mainstack; 318 PL_mainstack = c->mainstack;
289 PL_stack_sp = c->stack_sp; 319 PL_stack_sp = c->stack_sp;
290 PL_op = c->op; 320 PL_op = c->op;
291 PL_curpad = c->curpad; 321 PL_curpad = c->curpad;
322 PL_comppad = c->comppad;
292 PL_stack_base = c->stack_base; 323 PL_stack_base = c->stack_base;
293 PL_stack_max = c->stack_max; 324 PL_stack_max = c->stack_max;
294 PL_tmps_stack = c->tmps_stack; 325 PL_tmps_stack = c->tmps_stack;
295 PL_tmps_floor = c->tmps_floor; 326 PL_tmps_floor = c->tmps_floor;
296 PL_tmps_ix = c->tmps_ix; 327 PL_tmps_ix = c->tmps_ix;
… …
384 PUSHs ((SV *)cv); 415 PUSHs ((SV *)cv);
385 416
386 get_padlist (cv); /* this is a monster */ 417 get_padlist (cv); /* this is a monster */
387 } 418 }
388 } 419 }
420#ifdef CXt_FORMAT
389 else if (CxTYPE(cx) == CXt_FORMAT) 421 else if (CxTYPE(cx) == CXt_FORMAT)
390 { 422 {
391 /* I never used formats, so how should I know how these are implemented? */ 423 /* I never used formats, so how should I know how these are implemented? */
392 /* my bold guess is as a simple, plain sub... */ 424 /* my bold guess is as a simple, plain sub... */
393 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 425 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
394 } 426 }
427#endif
395 } 428 }
396 429
397 if (top_si->si_type == PERLSI_MAIN) 430 if (top_si->si_type == PERLSI_MAIN)
398 break; 431 break;
399 432
… …
416 c->curstack = PL_curstack; 449 c->curstack = PL_curstack;
417 c->mainstack = PL_mainstack; 450 c->mainstack = PL_mainstack;
418 c->stack_sp = PL_stack_sp; 451 c->stack_sp = PL_stack_sp;
419 c->op = PL_op; 452 c->op = PL_op;
420 c->curpad = PL_curpad; 453 c->curpad = PL_curpad;
454 c->comppad = PL_comppad;
421 c->stack_base = PL_stack_base; 455 c->stack_base = PL_stack_base;
422 c->stack_max = PL_stack_max; 456 c->stack_max = PL_stack_max;
423 c->tmps_stack = PL_tmps_stack; 457 c->tmps_stack = PL_tmps_stack;
424 c->tmps_floor = PL_tmps_floor; 458 c->tmps_floor = PL_tmps_floor;
425 c->tmps_ix = PL_tmps_ix; 459 c->tmps_ix = PL_tmps_ix;
… …
465 499
466 New(54,PL_markstack,16,I32); 500 New(54,PL_markstack,16,I32);
467 PL_markstack_ptr = PL_markstack; 501 PL_markstack_ptr = PL_markstack;
468 PL_markstack_max = PL_markstack + 16; 502 PL_markstack_max = PL_markstack + 16;
469 503
504#ifdef SET_MARK_OFFSET
470 SET_MARK_OFFSET; 505 SET_MARK_OFFSET;
506#endif
471 507
472 New(54,PL_scopestack,16,I32); 508 New(54,PL_scopestack,16,I32);
473 PL_scopestack_ix = 0; 509 PL_scopestack_ix = 0;
474 PL_scopestack_max = 16; 510 PL_scopestack_max = 16;
475 511
… …
482 PL_retstack_max = 8; 518 PL_retstack_max = 8;
483} 519}
484 520
485/* 521/*
486 * destroy the stacks, the callchain etc... 522 * destroy the stacks, the callchain etc...
487 * still there is a memleak of 128 bytes...
488 */ 523 */
489STATIC void 524STATIC void
490destroy_stacks(pTHX) 525destroy_stacks(pTHX)
491{ 526{
527 if (!IN_DESTRUCT)
528 {
492 /* is this ugly, I ask? */ 529 /* is this ugly, I ask? */
493 while (PL_scopestack_ix) 530 while (PL_scopestack_ix)
494 LEAVE; 531 LEAVE;
495 532
496 /* sure it is, but more important: is it correct?? :/ */ 533 /* sure it is, but more important: is it correct?? :/ */
497 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */ 534 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
498 FREETMPS; 535 FREETMPS;
536 }
499 537
500 while (PL_curstackinfo->si_next) 538 while (PL_curstackinfo->si_next)
501 PL_curstackinfo = PL_curstackinfo->si_next; 539 PL_curstackinfo = PL_curstackinfo->si_next;
502 540
503 while (PL_curstackinfo) 541 while (PL_curstackinfo)
… …
508 dSP; 546 dSP;
509 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 547 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
510 PUTBACK; /* possibly superfluous */ 548 PUTBACK; /* possibly superfluous */
511 } 549 }
512 550
513 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 551 if (!IN_DESTRUCT)
552 {
514 dounwind(-1); 553 dounwind(-1);
515
516 SvREFCNT_dec(PL_curstackinfo->si_stack); 554 SvREFCNT_dec(PL_curstackinfo->si_stack);
555 }
556
517 Safefree(PL_curstackinfo->si_cxstack); 557 Safefree(PL_curstackinfo->si_cxstack);
518 Safefree(PL_curstackinfo); 558 Safefree(PL_curstackinfo);
519 PL_curstackinfo = p; 559 PL_curstackinfo = p;
520 } 560 }
521 561
… …
536 stack->refcnt = 1; 576 stack->refcnt = 1;
537 stack->usecnt = 1; 577 stack->usecnt = 1;
538 stack->gencnt = ctx->gencnt = 0; 578 stack->gencnt = ctx->gencnt = 0;
539 if (alloc) 579 if (alloc)
540 { 580 {
541#ifdef HAVE_MMAP 581#if HAVE_MMAP
542 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 582 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */
543 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 583 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
544 if (stack->sptr == (void *)-1) 584 if (stack->sptr == (void *)-1)
545#endif 585#endif
546 { 586 {
547 /*FIXME*//*D*//* reasonable stack size! */ 587 /*FIXME*//*D*//* reasonable stack size! */
548 stack->ssize = -4096 * sizeof (long); 588 stack->ssize = -4096 * sizeof (long);
… …
568 { 608 {
569#ifdef HAVE_MMAP 609#ifdef HAVE_MMAP
570 if (stack->ssize > 0 && stack->sptr) 610 if (stack->ssize > 0 && stack->sptr)
571 munmap (stack->sptr, stack->ssize); 611 munmap (stack->sptr, stack->ssize);
572 else 612 else
573#else 613#endif
574 Safefree (stack->sptr); 614 Safefree (stack->sptr);
575#endif 615
576 Safefree (stack); 616 Safefree (stack);
577 } 617 }
578 else if (ctx->gencnt == stack->gencnt) 618 else if (ctx->gencnt == stack->gencnt)
579 --stack->usecnt; 619 --stack->usecnt;
580 } 620 }
… …
592 632
593 coro_init_stacks (aTHX); 633 coro_init_stacks (aTHX);
594 /*PL_curcop = 0;*/ 634 /*PL_curcop = 0;*/
595 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 635 /*PL_in_eval = PL_in_eval;*/ /* inherit */
596 SvREFCNT_dec (GvAV (PL_defgv)); 636 SvREFCNT_dec (GvAV (PL_defgv));
597 GvAV (PL_defgv) = ctx->args; 637 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
598 638
599 SPAGAIN; 639 SPAGAIN;
600 640
601 if (ctx->stack) 641 if (ctx->stack)
602 { 642 {
… …
629 * that doesn't matter, though, since it is only 669 * that doesn't matter, though, since it is only
630 * pp_nextstate and we never return... 670 * pp_nextstate and we never return...
631 * ah yes, and I don't care anyways ;) 671 * ah yes, and I don't care anyways ;)
632 */ 672 */
633 PUTBACK; 673 PUTBACK;
634 PL_op = pp_entersub(); 674 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
635 SPAGAIN; 675 SPAGAIN;
636 676
637 ENTER; /* necessary e.g. for dounwind */ 677 ENTER; /* necessary e.g. for dounwind */
638 } 678 }
639} 679}
… …
643{ 683{
644 /* 684 /*
645 * this is a _very_ stripped down perl interpreter ;) 685 * this is a _very_ stripped down perl interpreter ;)
646 */ 686 */
647 Coro__State ctx = (Coro__State)arg; 687 Coro__State ctx = (Coro__State)arg;
688 JMPENV coro_start_env;
648 689
649 /*FIXME*//* must set up top_env here */ 690 PL_top_env = &ctx->start_env;
691
650 ctx->cursp = 0; 692 ctx->cursp = 0;
651 PL_op = PL_op->op_next; 693 PL_op = PL_op->op_next;
652 CALLRUNOPS(aTHX); 694 CALLRUNOPS(aTHX);
653 695
654 abort (); 696 abort ();
… …
711 if (!prev->stack) 753 if (!prev->stack)
712 allocate_stack (prev, 0); 754 allocate_stack (prev, 0);
713 755
714 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 756 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
715 { 757 {
758 PL_top_env = &next->start_env;
759
716 setup_coro (next); 760 setup_coro (next);
717 761
718 prev->stack->refcnt++; 762 prev->stack->refcnt++;
719 prev->stack->usecnt++; 763 prev->stack->usecnt++;
720 next->stack = prev->stack; 764 next->stack = prev->stack;
721 next->gencnt = prev->gencnt; 765 next->gencnt = prev->gencnt;
722 } 766 }
723 else 767 else
724 { 768 {
769 assert (!next->stack);
725 allocate_stack (next, 1); 770 allocate_stack (next, 1);
726 coro_create (&(next->stack->cctx), 771 coro_create (&(next->stack->cctx),
727 setup_coro, (void *)next, 772 setup_coro, (void *)next,
728 next->stack->sptr, labs (next->stack->ssize)); 773 next->stack->sptr, labs (next->stack->ssize));
729 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 774 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
… …
731 } 776 }
732 } 777 }
733 else 778 else
734 setup_coro (next); 779 setup_coro (next);
735 } 780 }
781
782 /*
783 * xnext is now either prev or next, depending on wether
784 * we switched the c stack or not. that's why I use a global
785 * variable, that should become thread-specific at one point.
786 */
787 xnext->cursp = stacklevel;
736 } 788 }
737 789
738 /* 790 if (coro_mortal)
739 * xnext is now either prev or next, depending on wether
740 * we switched the c stack or not. that's why i use a global
741 * variable, that should become thread-specific at one point.
742 */
743 xnext->cursp = stacklevel;
744}
745
746static struct coro *
747sv_to_coro (SV *arg, const char *funcname, const char *varname)
748{
749 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
750 { 791 {
751 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 792 SvREFCNT_dec (coro_mortal);
752 793 coro_mortal = 0;
753 if (!he)
754 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
755
756 arg = HeVAL(he);
757 } 794 }
758 795}
796
797#define SV_CORO(sv,func) \
798 do { \
799 if (SvROK (sv)) \
800 sv = SvRV (sv); \
801 \
802 if (SvTYPE(sv) == SVt_PVHV) \
803 { \
804 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
805 \
806 if (!he) \
807 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
808 \
809 (sv) = SvRV (HeVAL(he)); \
810 } \
811 \
759 /* must also be changed inside Coro::Cont::yield */ 812 /* must also be changed inside Coro::Cont::yield */ \
760 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 813 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \
761 return (struct coro *) SvIV((SV*)SvRV(arg));
762
763 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 814 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
764 /*NORETURN*/ 815 \
765} 816 } while(0)
817
818#define SvSTATE(sv) (struct coro *)SvIV (sv)
766 819
767static void 820static void
768api_transfer(pTHX_ SV *prev, SV *next, int flags) 821api_transfer(pTHX_ SV *prev, SV *next, int flags)
769{ 822{
770 transfer(aTHX_ 823 SV_CORO (prev, "Coro::transfer");
771 sv_to_coro (prev, "Coro::transfer", "prev"), 824 SV_CORO (next, "Coro::transfer");
772 sv_to_coro (next, "Coro::transfer", "next"), 825
773 flags); 826 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
774} 827}
775 828
776/** Coro ********************************************************************/ 829/** Coro ********************************************************************/
777 830
778#define PRIO_MAX 3 831#define PRIO_MAX 3
… …
788static int coro_nready; 841static int coro_nready;
789 842
790static void 843static void
791coro_enq (SV *sv) 844coro_enq (SV *sv)
792{ 845{
793 if (SvROK (sv))
794 {
795 SV *hv = SvRV (sv);
796 if (SvTYPE (hv) == SVt_PVHV) 846 if (SvTYPE (sv) == SVt_PVHV)
797 { 847 {
798 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 848 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
799 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 849 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
800 850
801 prio = prio > PRIO_MAX ? PRIO_MAX 851 prio = prio > PRIO_MAX ? PRIO_MAX
802 : prio < PRIO_MIN ? PRIO_MIN 852 : prio < PRIO_MIN ? PRIO_MIN
803 : prio; 853 : prio;
804 854
805 av_push (coro_ready [prio - PRIO_MIN], sv); 855 av_push (coro_ready [prio - PRIO_MIN], sv);
806 coro_nready++; 856 coro_nready++;
807 857
808 return; 858 return;
809 }
810 } 859 }
811 860
812 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 861 croak ("Coro::ready tried to enqueue something that is not a coroutine");
813} 862}
814 863
… …
832} 881}
833 882
834static void 883static void
835api_ready (SV *coro) 884api_ready (SV *coro)
836{ 885{
886 if (SvROK (coro))
887 coro = SvRV (coro);
888
837 coro_enq (SvREFCNT_inc (coro)); 889 coro_enq (SvREFCNT_inc (coro));
838} 890}
839 891
840static void 892static void
841api_schedule (int cede) 893api_schedule (void)
842{ 894{
843 SV *prev, *next; 895 SV *prev, *next;
844 896
845 prev = GvSV (coro_current); 897 prev = SvRV (GvSV (coro_current));
846
847 if (cede)
848 coro_enq (SvREFCNT_inc (prev));
849
850 next = coro_deq (PRIO_MIN); 898 next = coro_deq (PRIO_MIN);
851 899
852 if (!next) 900 if (!next)
853 next = SvREFCNT_inc (GvSV (coro_idle)); 901 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
854 902
855 GvSV (coro_current) = SvREFCNT_inc (next); 903 /* free this only after the transfer */
856 transfer (aTHX_ 904 coro_mortal = prev;
857 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 905 SV_CORO (prev, "Coro::schedule");
858 sv_to_coro (next, "Coro::schedule", "next coroutine"), 906
907 SvRV (GvSV (coro_current)) = next;
908
909 SV_CORO (next, "Coro::schedule");
910
911 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
859 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 912 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
860 SvREFCNT_dec (next); 913}
861 SvREFCNT_dec (prev); 914
915static void
916api_cede (void)
917{
918 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
919
920 api_schedule ();
862} 921}
863 922
864MODULE = Coro::State PACKAGE = Coro::State 923MODULE = Coro::State PACKAGE = Coro::State
865 924
866PROTOTYPES: ENABLE 925PROTOTYPES: ENABLE
… …
893 Coro__State coro; 952 Coro__State coro;
894 953
895 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 954 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
896 croak ("Coro::State::_newprocess expects an arrayref"); 955 croak ("Coro::State::_newprocess expects an arrayref");
897 956
898 New (0, coro, 1, struct coro); 957 Newz (0, coro, 1, struct coro);
899 958
900 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 959 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
901 coro->mainstack = 0; /* actual work is done inside transfer */ 960 coro->mainstack = 0; /* actual work is done inside transfer */
902 coro->stack = 0; 961 coro->stack = 0;
903 962
963 /* same as JMPENV_BOOTSTRAP */
964 /* we might be able to recycle start_env, but safe is safe */
965 //Zero(&coro->start_env, 1, JMPENV);
966 coro->start_env.je_ret = -1;
967 coro->start_env.je_mustcatch = TRUE;
968
904 RETVAL = coro; 969 RETVAL = coro;
905 OUTPUT: 970 OUTPUT:
906 RETVAL 971 RETVAL
907 972
908void 973void
909transfer(prev, next, flags) 974transfer(prev, next, flags)
910 Coro::State_or_hashref prev 975 SV *prev
911 Coro::State_or_hashref next 976 SV *next
912 int flags 977 int flags
913 PROTOTYPE: @ 978 PROTOTYPE: @
914 CODE: 979 CODE:
915 PUTBACK; 980 PUTBACK;
981 SV_CORO (next, "Coro::transfer");
982 SV_CORO (prev, "Coro::transfer");
916 transfer (aTHX_ prev, next, flags); 983 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
917 SPAGAIN; 984 SPAGAIN;
918 985
919void 986void
920DESTROY(coro) 987DESTROY(coro)
921 Coro::State coro 988 Coro::State coro
… …
937 1004
938 coro->mainstack = 0; 1005 coro->mainstack = 0;
939 } 1006 }
940 1007
941 deallocate_stack (coro); 1008 deallocate_stack (coro);
942 1009 SvREFCNT_dec (coro->args);
943 Safefree (coro); 1010 Safefree (coro);
944 1011
945void 1012void
946flush() 1013flush()
947 CODE: 1014 CODE:
… …
974 SV *sv; 1041 SV *sv;
975 AV *defav = GvAV (PL_defgv); 1042 AV *defav = GvAV (PL_defgv);
976 struct coro *prev, *next; 1043 struct coro *prev, *next;
977 1044
978 if (!returnstk) 1045 if (!returnstk)
979 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1046 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
980 1047
981 /* set up @_ -- ugly */ 1048 /* set up @_ -- ugly */
982 av_clear (defav); 1049 av_clear (defav);
983 av_fill (defav, items - 1); 1050 av_fill (defav, items - 1);
984 while (items--) 1051 while (items--)
… …
1016 1083
1017 { 1084 {
1018 SV *sv = perl_get_sv("Coro::API", 1); 1085 SV *sv = perl_get_sv("Coro::API", 1);
1019 1086
1020 coroapi.schedule = api_schedule; 1087 coroapi.schedule = api_schedule;
1088 coroapi.cede = api_cede;
1021 coroapi.ready = api_ready; 1089 coroapi.ready = api_ready;
1022 coroapi.nready = &coro_nready; 1090 coroapi.nready = &coro_nready;
1023 coroapi.current = coro_current; 1091 coroapi.current = coro_current;
1024 1092
1025 GCoroAPI = &coroapi; 1093 GCoroAPI = &coroapi;
… …
1029} 1097}
1030 1098
1031void 1099void
1032ready(self) 1100ready(self)
1033 SV * self 1101 SV * self
1102 PROTOTYPE: $
1034 CODE: 1103 CODE:
1035 api_ready (self); 1104 api_ready (self);
1036 1105
1037int 1106int
1038nready(...) 1107nready(...)
… …
1043 RETVAL 1112 RETVAL
1044 1113
1045void 1114void
1046schedule(...) 1115schedule(...)
1047 PROTOTYPE: 1116 PROTOTYPE:
1048 ALIAS:
1049 cede = 1
1050 CODE: 1117 CODE:
1051 api_schedule (ix); 1118 api_schedule ();
1052 1119
1120void
1121cede(...)
1122 PROTOTYPE:
1123 CODE:
1124 api_cede ();
1125

Diff Legend

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