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.24 by root, Tue Aug 14 14:56:22 2001 UTC vs.
Revision 1.44 by root, Sat Mar 22 18:50:32 2003 UTC

… …
7#include <signal.h> 7#include <signal.h>
8 8
9#ifdef HAVE_MMAP 9#ifdef HAVE_MMAP
10# include <unistd.h> 10# include <unistd.h>
11# include <sys/mman.h> 11# include <sys/mman.h>
12# ifndef MAP_ANON
13# ifdef MAP_ANONYMOUS 12# ifndef MAP_ANONYMOUS
14# define MAP_ANON MAP_ANONYMOUS 13# ifdef MAP_ANON
14# define MAP_ANONYMOUS MAP_ANON
15# else 15# else
16# undef HAVE_MMAP 16# undef HAVE_MMAP
17# endif 17# endif
18# endif 18# endif
19#endif 19#endif
20 20
21#define MAY_FLUSH /* increases codesize */ 21#define MAY_FLUSH /* increases codesize and is rarely used */
22 22
23#define SUB_INIT "Coro::State::initialize" 23#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 24#define UCORO_STATE "_coro_state"
25 25
26/* The next macro should delcare a variable stacklevel that contains and approximation 26/* 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 27 * to the current C stack pointer. Its property is that it changes with each call
28 * and should be unique. */ 28 * and should be unique. */
29#define dSTACKLEVEL void *stacklevel = &stacklevel 29#define dSTACKLEVEL void *stacklevel = &stacklevel
30
31#define IN_DESTRUCT (PL_main_cv == Nullcv)
30 32
31#define labs(l) ((l) >= 0 ? (l) : -(l)) 33#define labs(l) ((l) >= 0 ? (l) : -(l))
32 34
33#include "CoroAPI.h" 35#include "CoroAPI.h"
34 36
… …
66 AV *curstack; 68 AV *curstack;
67 AV *mainstack; 69 AV *mainstack;
68 SV **stack_sp; 70 SV **stack_sp;
69 OP *op; 71 OP *op;
70 SV **curpad; 72 SV **curpad;
73 AV *comppad;
71 SV **stack_base; 74 SV **stack_base;
72 SV **stack_max; 75 SV **stack_max;
73 SV **tmps_stack; 76 SV **tmps_stack;
74 I32 tmps_floor; 77 I32 tmps_floor;
75 I32 tmps_ix; 78 I32 tmps_ix;
… …
99static AV *main_mainstack; /* used to differentiate between $main and others */ 102static AV *main_mainstack; /* used to differentiate between $main and others */
100static HV *coro_state_stash; 103static HV *coro_state_stash;
101static SV *ucoro_state_sv; 104static SV *ucoro_state_sv;
102static U32 ucoro_state_hash; 105static U32 ucoro_state_hash;
103static HV *padlist_cache; 106static HV *padlist_cache;
107static SV *coro_mortal; /* will be freed after next transfer */
104 108
105/* mostly copied from op.c:cv_clone2 */ 109/* mostly copied from op.c:cv_clone2 */
106STATIC AV * 110STATIC AV *
107clone_padlist (AV *protopadlist) 111clone_padlist (AV *protopadlist)
108{ 112{
… …
195 199
196 return newpadlist; 200 return newpadlist;
197} 201}
198 202
199#ifdef MAY_FLUSH 203#ifdef MAY_FLUSH
200STATIC AV * 204STATIC void
201free_padlist (AV *padlist) 205free_padlist (AV *padlist)
202{ 206{
203 /* may be during global destruction */ 207 /* may be during global destruction */
204 if (SvREFCNT(padlist)) 208 if (SvREFCNT(padlist))
205 { 209 {
… …
270#endif 274#endif
271 275
272#define SB do { 276#define SB do {
273#define SE } while (0) 277#define SE } while (0)
274 278
275#define LOAD(state) SB load_state(aTHX_ (state)); SPAGAIN; SE 279#define LOAD(state) load_state(aTHX_ (state));
276#define SAVE(state,flags) SB PUTBACK; save_state(aTHX_ (state),(flags)); SE 280#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
277 281
278#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 282#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE
279 283
280static void 284static void
281load_state(pTHX_ Coro__State c) 285load_state(pTHX_ Coro__State c)
… …
287 PL_curstack = c->curstack; 291 PL_curstack = c->curstack;
288 PL_mainstack = c->mainstack; 292 PL_mainstack = c->mainstack;
289 PL_stack_sp = c->stack_sp; 293 PL_stack_sp = c->stack_sp;
290 PL_op = c->op; 294 PL_op = c->op;
291 PL_curpad = c->curpad; 295 PL_curpad = c->curpad;
296 PL_comppad = c->comppad;
292 PL_stack_base = c->stack_base; 297 PL_stack_base = c->stack_base;
293 PL_stack_max = c->stack_max; 298 PL_stack_max = c->stack_max;
294 PL_tmps_stack = c->tmps_stack; 299 PL_tmps_stack = c->tmps_stack;
295 PL_tmps_floor = c->tmps_floor; 300 PL_tmps_floor = c->tmps_floor;
296 PL_tmps_ix = c->tmps_ix; 301 PL_tmps_ix = c->tmps_ix;
… …
355 360
356 PUSHs (Nullsv); 361 PUSHs (Nullsv);
357 /* this loop was inspired by pp_caller */ 362 /* this loop was inspired by pp_caller */
358 for (;;) 363 for (;;)
359 { 364 {
360 do 365 while (cxix >= 0)
361 { 366 {
362 PERL_CONTEXT *cx = &ccstk[cxix--]; 367 PERL_CONTEXT *cx = &ccstk[cxix--];
363 368
364 if (CxTYPE(cx) == CXt_SUB) 369 if (CxTYPE(cx) == CXt_SUB)
365 { 370 {
… …
391 /* I never used formats, so how should I know how these are implemented? */ 396 /* I never used formats, so how should I know how these are implemented? */
392 /* my bold guess is as a simple, plain sub... */ 397 /* my bold guess is as a simple, plain sub... */
393 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 398 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
394 } 399 }
395 } 400 }
396 while (cxix >= 0);
397 401
398 if (top_si->si_type == PERLSI_MAIN) 402 if (top_si->si_type == PERLSI_MAIN)
399 break; 403 break;
400 404
401 top_si = top_si->si_prev; 405 top_si = top_si->si_prev;
… …
407 } 411 }
408 412
409 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 413 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
410 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 414 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
411 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 415 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
412
413 /* I have not the slightest idea of why av_reify is necessary */
414 /* but if it's missing the defav contents magically get replaced sometimes */
415 if (c->defav)
416 av_reify (c->defav);
417 416
418 c->dowarn = PL_dowarn; 417 c->dowarn = PL_dowarn;
419 c->in_eval = PL_in_eval; 418 c->in_eval = PL_in_eval;
420 419
421 c->curstackinfo = PL_curstackinfo; 420 c->curstackinfo = PL_curstackinfo;
422 c->curstack = PL_curstack; 421 c->curstack = PL_curstack;
423 c->mainstack = PL_mainstack; 422 c->mainstack = PL_mainstack;
424 c->stack_sp = PL_stack_sp; 423 c->stack_sp = PL_stack_sp;
425 c->op = PL_op; 424 c->op = PL_op;
426 c->curpad = PL_curpad; 425 c->curpad = PL_curpad;
426 c->comppad = PL_comppad;
427 c->stack_base = PL_stack_base; 427 c->stack_base = PL_stack_base;
428 c->stack_max = PL_stack_max; 428 c->stack_max = PL_stack_max;
429 c->tmps_stack = PL_tmps_stack; 429 c->tmps_stack = PL_tmps_stack;
430 c->tmps_floor = PL_tmps_floor; 430 c->tmps_floor = PL_tmps_floor;
431 c->tmps_ix = PL_tmps_ix; 431 c->tmps_ix = PL_tmps_ix;
… …
493 * still there is a memleak of 128 bytes... 493 * still there is a memleak of 128 bytes...
494 */ 494 */
495STATIC void 495STATIC void
496destroy_stacks(pTHX) 496destroy_stacks(pTHX)
497{ 497{
498 if (!IN_DESTRUCT)
499 {
498 /* is this ugly, I ask? */ 500 /* is this ugly, I ask? */
499 while (PL_scopestack_ix) 501 while (PL_scopestack_ix)
500 LEAVE; 502 LEAVE;
501 503
502 /* sure it is, but more important: is it correct?? :/ */ 504 /* sure it is, but more important: is it correct?? :/ */
503 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */ 505 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
504 FREETMPS; 506 FREETMPS;
507 }
505 508
506 while (PL_curstackinfo->si_next) 509 while (PL_curstackinfo->si_next)
507 PL_curstackinfo = PL_curstackinfo->si_next; 510 PL_curstackinfo = PL_curstackinfo->si_next;
508 511
509 while (PL_curstackinfo) 512 while (PL_curstackinfo)
… …
514 dSP; 517 dSP;
515 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 518 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
516 PUTBACK; /* possibly superfluous */ 519 PUTBACK; /* possibly superfluous */
517 } 520 }
518 521
519 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 522 if (!IN_DESTRUCT)
523 {
520 dounwind(-1); 524 dounwind(-1);
521
522 SvREFCNT_dec(PL_curstackinfo->si_stack); 525 SvREFCNT_dec(PL_curstackinfo->si_stack);
526 }
527
523 Safefree(PL_curstackinfo->si_cxstack); 528 Safefree(PL_curstackinfo->si_cxstack);
524 Safefree(PL_curstackinfo); 529 Safefree(PL_curstackinfo);
525 PL_curstackinfo = p; 530 PL_curstackinfo = p;
526 } 531 }
527 532
… …
542 stack->refcnt = 1; 547 stack->refcnt = 1;
543 stack->usecnt = 1; 548 stack->usecnt = 1;
544 stack->gencnt = ctx->gencnt = 0; 549 stack->gencnt = ctx->gencnt = 0;
545 if (alloc) 550 if (alloc)
546 { 551 {
547#ifdef HAVE_MMAP 552#if HAVE_MMAP
548 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 553 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */
549 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 554 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
550 if (stack->sptr == (void *)-1) 555 if (stack->sptr == (void *)-1)
551#endif 556#endif
552 { 557 {
553 /*FIXME*//*D*//* reasonable stack size! */ 558 /*FIXME*//*D*//* reasonable stack size! */
554 stack->ssize = -4096 * sizeof (long); 559 stack->ssize = -4096 * sizeof (long);
… …
635 * that doesn't matter, though, since it is only 640 * that doesn't matter, though, since it is only
636 * pp_nextstate and we never return... 641 * pp_nextstate and we never return...
637 * ah yes, and I don't care anyways ;) 642 * ah yes, and I don't care anyways ;)
638 */ 643 */
639 PUTBACK; 644 PUTBACK;
640 PL_op = pp_entersub(); 645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
641 SPAGAIN; 646 SPAGAIN;
642 647
643 ENTER; /* necessary e.g. for dounwind */ 648 ENTER; /* necessary e.g. for dounwind */
644 } 649 }
645} 650}
… …
649{ 654{
650 /* 655 /*
651 * this is a _very_ stripped down perl interpreter ;) 656 * this is a _very_ stripped down perl interpreter ;)
652 */ 657 */
653 Coro__State ctx = (Coro__State)arg; 658 Coro__State ctx = (Coro__State)arg;
659 JMPENV coro_start_env;
654 660
655 /*FIXME*//* must set up top_env here */ 661 /* same as JMPENV_BOOTSTRAP */
662 Zero(&coro_start_env, 1, JMPENV);
663 coro_start_env.je_ret = -1;
664 coro_start_env.je_mustcatch = TRUE;
665 PL_top_env = &coro_start_env;
666
656 ctx->cursp = 0; 667 ctx->cursp = 0;
657 PL_op = PL_op->op_next; 668 PL_op = PL_op->op_next;
658 CALLRUNOPS(aTHX); 669 CALLRUNOPS(aTHX);
659 670
660 abort (); 671 abort ();
661} 672}
662 673
663STATIC void 674STATIC void
664transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 675transfer(pTHX_ struct coro *prev, struct coro *next, int flags)
665{ 676{
666 dSP;
667 dSTACKLEVEL; 677 dSTACKLEVEL;
678 static struct coro *xnext;
668 679
669 if (prev != next) 680 if (prev != next)
670 { 681 {
682 xnext = next;
683
671 if (next->mainstack) 684 if (next->mainstack)
672 { 685 {
673 SAVE (prev, flags); 686 SAVE (prev, flags);
674 LOAD (next); 687 LOAD (next);
675 688
… …
698 continue_coro, (void *)next, 711 continue_coro, (void *)next,
699 next->stack->sptr, labs (next->stack->ssize)); 712 next->stack->sptr, labs (next->stack->ssize));
700 } 713 }
701 714
702 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 715 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
716 /* don't add any code here */
703 } 717 }
704 718
705 } 719 }
706 else if (next->tmps_ix == -2) 720 else if (next->tmps_ix == -2)
707 croak ("tried to transfer to running coroutine"); 721 croak ("tried to transfer to running coroutine");
… …
728 allocate_stack (next, 1); 742 allocate_stack (next, 1);
729 coro_create (&(next->stack->cctx), 743 coro_create (&(next->stack->cctx),
730 setup_coro, (void *)next, 744 setup_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 745 next->stack->sptr, labs (next->stack->ssize));
732 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 746 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
747 /* don't add any code here */
733 } 748 }
734 } 749 }
735 else 750 else
736 setup_coro (next); 751 setup_coro (next);
737 } 752 }
738 }
739 753
754 /*
755 * xnext is now either prev or next, depending on wether
756 * we switched the c stack or not. that's why I use a global
757 * variable, that should become thread-specific at one point.
758 */
740 next->cursp = stacklevel; 759 xnext->cursp = stacklevel;
741}
742
743static struct coro *
744sv_to_coro (SV *arg, const char *funcname, const char *varname)
745{
746 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
747 { 760 }
761
762 if (coro_mortal)
763 {
764 SvREFCNT_dec (coro_mortal);
765 coro_mortal = 0;
766 }
767}
768
769#define SV_CORO(sv,func) \
770 do { \
771 if (SvROK (sv)) \
772 sv = SvRV (sv); \
773 \
774 if (SvTYPE(sv) == SVt_PVHV) \
775 { \
748 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 776 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
749 777 \
750 if (!he) 778 if (!he) \
751 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname); 779 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
752 780 \
753 arg = HeVAL(he); 781 (sv) = SvRV (HeVAL(he)); \
754 } 782 } \
755 783 \
756 /* must also be changed inside Coro::Cont::yield */ 784 /* must also be changed inside Coro::Cont::yield */ \
757 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 785 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \
758 return (struct coro *) SvIV((SV*)SvRV(arg));
759 else
760 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 786 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
761} 787 \
788 } while(0)
789
790#define SvSTATE(sv) (struct coro *)SvIV (sv)
762 791
763static void 792static void
764api_transfer(pTHX_ SV *prev, SV *next, int flags) 793api_transfer(pTHX_ SV *prev, SV *next, int flags)
765{ 794{
766 transfer(aTHX_ sv_to_coro (prev, "Coro::transfer", "prev"), 795 SV_CORO (prev, "Coro::transfer");
767 sv_to_coro (next, "Coro::transfer", "next"), 796 SV_CORO (next, "Coro::transfer");
768 flags); 797
798 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
769} 799}
770 800
771/** Coro ********************************************************************/ 801/** Coro ********************************************************************/
772 802
773#define PRIO_MAX 3 803#define PRIO_MAX 3
… …
778#define PRIO_MIN -4 808#define PRIO_MIN -4
779 809
780/* for Coro.pm */ 810/* for Coro.pm */
781static GV *coro_current, *coro_idle; 811static GV *coro_current, *coro_idle;
782static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 812static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
813static int coro_nready;
783 814
784static void 815static void
785coro_enq (SV *sv) 816coro_enq (SV *sv)
786{ 817{
787 if (SvROK (sv))
788 {
789 SV *hv = SvRV (sv);
790 if (SvTYPE (hv) == SVt_PVHV) 818 if (SvTYPE (sv) == SVt_PVHV)
791 { 819 {
792 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 820 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
793 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 821 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
794 822
795 prio = prio > PRIO_MAX ? PRIO_MAX 823 prio = prio > PRIO_MAX ? PRIO_MAX
796 : prio < PRIO_MIN ? PRIO_MIN 824 : prio < PRIO_MIN ? PRIO_MIN
797 : prio; 825 : prio;
798 826
799 av_push (coro_ready [prio - PRIO_MIN], sv); 827 av_push (coro_ready [prio - PRIO_MIN], sv);
828 coro_nready++;
800 829
801 return; 830 return;
802 }
803 } 831 }
804 832
805 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 833 croak ("Coro::ready tried to enqueue something that is not a coroutine");
806} 834}
807 835
… …
814 if (min_prio < 0) 842 if (min_prio < 0)
815 min_prio = 0; 843 min_prio = 0;
816 844
817 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 845 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
818 if (av_len (coro_ready[prio]) >= 0) 846 if (av_len (coro_ready[prio]) >= 0)
847 {
848 coro_nready--;
819 return av_shift (coro_ready[prio]); 849 return av_shift (coro_ready[prio]);
850 }
820 851
821 return 0; 852 return 0;
822} 853}
823 854
824static void 855static void
825api_ready (SV *coro) 856api_ready (SV *coro)
826{ 857{
858 if (SvROK (coro))
859 coro = SvRV (coro);
860
827 coro_enq (SvREFCNT_inc (coro)); 861 coro_enq (SvREFCNT_inc (coro));
828} 862}
829 863
830static void 864static void
831api_schedule (int cede) 865api_schedule (void)
832{ 866{
833 SV *prev, *next; 867 SV *prev, *next;
834 868
835 prev = GvSV (coro_current); 869 prev = SvRV (GvSV (coro_current));
836
837 if (cede)
838 coro_enq (SvREFCNT_inc (prev));
839
840 next = coro_deq (PRIO_MIN); 870 next = coro_deq (PRIO_MIN);
841 871
842 if (!next) 872 if (!next)
843 next = SvREFCNT_inc (GvSV (coro_idle)); 873 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
844 874
845 GvSV (coro_current) = SvREFCNT_inc (next); 875 /* free this only after the transfer */
846 transfer (sv_to_coro (prev, "Coro::schedule", "current coroutine"), 876 coro_mortal = prev;
847 sv_to_coro (next, "Coro::schedule", "next coroutine"), 877 SV_CORO (prev, "Coro::schedule");
878
879 SvRV (GvSV (coro_current)) = next;
880
881 SV_CORO (next, "Coro::schedule");
882
883 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
848 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 884 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
849 SvREFCNT_dec (next); 885}
850 SvREFCNT_dec (prev); 886
887static void
888api_cede (void)
889{
890 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
891
892 api_schedule ();
851} 893}
852 894
853MODULE = Coro::State PACKAGE = Coro::State 895MODULE = Coro::State PACKAGE = Coro::State
854 896
855PROTOTYPES: ENABLE 897PROTOTYPES: ENABLE
… …
868 if (!padlist_cache) 910 if (!padlist_cache)
869 padlist_cache = newHV (); 911 padlist_cache = newHV ();
870 912
871 main_mainstack = PL_mainstack; 913 main_mainstack = PL_mainstack;
872 914
873 {
874 SV *sv = perl_get_sv("Coro::API", 1);
875
876 coroapi.ver = CORO_API_VERSION - 1; 915 coroapi.ver = CORO_API_VERSION;
877 coroapi.transfer = api_transfer; 916 coroapi.transfer = api_transfer;
878 coroapi.schedule = api_schedule;
879 coroapi.ready = api_ready;
880
881 GCoroAPI = &coroapi;
882 sv_setiv(sv, (IV)&coroapi);
883 SvREADONLY_on(sv);
884 }
885} 917}
886 918
887Coro::State 919Coro::State
888_newprocess(args) 920_newprocess(args)
889 SV * args 921 SV * args
… …
904 OUTPUT: 936 OUTPUT:
905 RETVAL 937 RETVAL
906 938
907void 939void
908transfer(prev, next, flags) 940transfer(prev, next, flags)
909 Coro::State_or_hashref prev 941 SV *prev
910 Coro::State_or_hashref next 942 SV *next
911 int flags 943 int flags
912 PROTOTYPE: @ 944 PROTOTYPE: @
913 CODE: 945 CODE:
914 PUTBACK; 946 PUTBACK;
947 SV_CORO (next, "Coro::transfer");
948 SV_CORO (prev, "Coro::transfer");
915 transfer (aTHX_ prev, next, flags); 949 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
916 SPAGAIN; 950 SPAGAIN;
917 951
918void 952void
919DESTROY(coro) 953DESTROY(coro)
920 Coro::State coro 954 Coro::State coro
… …
922 956
923 if (coro->mainstack && coro->mainstack != main_mainstack) 957 if (coro->mainstack && coro->mainstack != main_mainstack)
924 { 958 {
925 struct coro temp; 959 struct coro temp;
926 960
961 PUTBACK;
927 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 962 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL);
928 LOAD(aTHX_ coro); 963 LOAD(aTHX_ coro);
964 SPAGAIN;
929 965
930 destroy_stacks (aTHX); 966 destroy_stacks (aTHX);
931 967
932 LOAD((&temp)); /* this will get rid of defsv etc.. */ 968 LOAD((&temp)); /* this will get rid of defsv etc.. */
969 SPAGAIN;
933 970
934 coro->mainstack = 0; 971 coro->mainstack = 0;
935 } 972 }
936 973
937 deallocate_stack (coro); 974 deallocate_stack (coro);
… …
1007 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1044 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV);
1008 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1045 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV);
1009 1046
1010 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1047 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1011 coro_ready[i] = newAV (); 1048 coro_ready[i] = newAV ();
1049
1050 {
1051 SV *sv = perl_get_sv("Coro::API", 1);
1052
1053 coroapi.schedule = api_schedule;
1054 coroapi.cede = api_cede;
1055 coroapi.ready = api_ready;
1056 coroapi.nready = &coro_nready;
1057 coroapi.current = coro_current;
1058
1059 GCoroAPI = &coroapi;
1060 sv_setiv(sv, (IV)&coroapi);
1061 SvREADONLY_on(sv);
1062 }
1012} 1063}
1013 1064
1014void 1065void
1015ready(self) 1066ready(self)
1016 SV * self 1067 SV * self
1068 PROTOTYPE: $
1017 CODE: 1069 CODE:
1018 api_ready (self); 1070 api_ready (self);
1019 1071
1072int
1073nready(...)
1074 PROTOTYPE:
1075 CODE:
1076 RETVAL = coro_nready;
1077 OUTPUT:
1078 RETVAL
1079
1020void 1080void
1021schedule(...) 1081schedule(...)
1022 ALIAS: 1082 PROTOTYPE:
1023 cede = 1
1024 CODE: 1083 CODE:
1025 api_schedule (ix); 1084 api_schedule ();
1026 1085
1086void
1087cede(...)
1088 PROTOTYPE:
1089 CODE:
1090 api_cede ();
1091

Diff Legend

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