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.47 by pcg, Sat Nov 15 03:53:10 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 */ 44#define MAY_FLUSH /* increases codesize and is rarely used */
22 45
23#define SUB_INIT "Coro::State::initialize" 46#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 47#define UCORO_STATE "_coro_state"
25 48
26/* The next macro should delcare 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{
195 225
196 return newpadlist; 226 return newpadlist;
197} 227}
198 228
199#ifdef MAY_FLUSH 229#ifdef MAY_FLUSH
200STATIC AV * 230STATIC void
201free_padlist (AV *padlist) 231free_padlist (AV *padlist)
202{ 232{
203 /* may be during global destruction */ 233 /* may be during global destruction */
204 if (SvREFCNT(padlist)) 234 if (SvREFCNT(padlist))
205 { 235 {
270#endif 300#endif
271 301
272#define SB do { 302#define SB do {
273#define SE } while (0) 303#define SE } while (0)
274 304
275#define LOAD(state) SB load_state(aTHX_ (state)); SPAGAIN; SE 305#define LOAD(state) load_state(aTHX_ (state));
276#define SAVE(state,flags) SB PUTBACK; save_state(aTHX_ (state),(flags)); SE 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;
355 386
356 PUSHs (Nullsv); 387 PUSHs (Nullsv);
357 /* this loop was inspired by pp_caller */ 388 /* this loop was inspired by pp_caller */
358 for (;;) 389 for (;;)
359 { 390 {
360 do 391 while (cxix >= 0)
361 { 392 {
362 PERL_CONTEXT *cx = &ccstk[cxix--]; 393 PERL_CONTEXT *cx = &ccstk[cxix--];
363 394
364 if (CxTYPE(cx) == CXt_SUB) 395 if (CxTYPE(cx) == CXt_SUB)
365 { 396 {
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 while (cxix >= 0);
397 429
398 if (top_si->si_type == PERLSI_MAIN) 430 if (top_si->si_type == PERLSI_MAIN)
399 break; 431 break;
400 432
401 top_si = top_si->si_prev; 433 top_si = top_si->si_prev;
407 } 439 }
408 440
409 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 441 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
410 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 442 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
411 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 443 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 444
418 c->dowarn = PL_dowarn; 445 c->dowarn = PL_dowarn;
419 c->in_eval = PL_in_eval; 446 c->in_eval = PL_in_eval;
420 447
421 c->curstackinfo = PL_curstackinfo; 448 c->curstackinfo = PL_curstackinfo;
422 c->curstack = PL_curstack; 449 c->curstack = PL_curstack;
423 c->mainstack = PL_mainstack; 450 c->mainstack = PL_mainstack;
424 c->stack_sp = PL_stack_sp; 451 c->stack_sp = PL_stack_sp;
425 c->op = PL_op; 452 c->op = PL_op;
426 c->curpad = PL_curpad; 453 c->curpad = PL_curpad;
454 c->comppad = PL_comppad;
427 c->stack_base = PL_stack_base; 455 c->stack_base = PL_stack_base;
428 c->stack_max = PL_stack_max; 456 c->stack_max = PL_stack_max;
429 c->tmps_stack = PL_tmps_stack; 457 c->tmps_stack = PL_tmps_stack;
430 c->tmps_floor = PL_tmps_floor; 458 c->tmps_floor = PL_tmps_floor;
431 c->tmps_ix = PL_tmps_ix; 459 c->tmps_ix = PL_tmps_ix;
471 499
472 New(54,PL_markstack,16,I32); 500 New(54,PL_markstack,16,I32);
473 PL_markstack_ptr = PL_markstack; 501 PL_markstack_ptr = PL_markstack;
474 PL_markstack_max = PL_markstack + 16; 502 PL_markstack_max = PL_markstack + 16;
475 503
504#ifdef SET_MARK_OFFSET
476 SET_MARK_OFFSET; 505 SET_MARK_OFFSET;
506#endif
477 507
478 New(54,PL_scopestack,16,I32); 508 New(54,PL_scopestack,16,I32);
479 PL_scopestack_ix = 0; 509 PL_scopestack_ix = 0;
480 PL_scopestack_max = 16; 510 PL_scopestack_max = 16;
481 511
493 * still there is a memleak of 128 bytes... 523 * still there is a memleak of 128 bytes...
494 */ 524 */
495STATIC void 525STATIC void
496destroy_stacks(pTHX) 526destroy_stacks(pTHX)
497{ 527{
528 if (!IN_DESTRUCT)
529 {
498 /* is this ugly, I ask? */ 530 /* is this ugly, I ask? */
499 while (PL_scopestack_ix) 531 while (PL_scopestack_ix)
500 LEAVE; 532 LEAVE;
501 533
502 /* sure it is, but more important: is it correct?? :/ */ 534 /* sure it is, but more important: is it correct?? :/ */
503 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */ 535 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
504 FREETMPS; 536 FREETMPS;
537 }
505 538
506 while (PL_curstackinfo->si_next) 539 while (PL_curstackinfo->si_next)
507 PL_curstackinfo = PL_curstackinfo->si_next; 540 PL_curstackinfo = PL_curstackinfo->si_next;
508 541
509 while (PL_curstackinfo) 542 while (PL_curstackinfo)
514 dSP; 547 dSP;
515 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 548 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
516 PUTBACK; /* possibly superfluous */ 549 PUTBACK; /* possibly superfluous */
517 } 550 }
518 551
519 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 552 if (!IN_DESTRUCT)
553 {
520 dounwind(-1); 554 dounwind(-1);
521
522 SvREFCNT_dec(PL_curstackinfo->si_stack); 555 SvREFCNT_dec(PL_curstackinfo->si_stack);
556 }
557
523 Safefree(PL_curstackinfo->si_cxstack); 558 Safefree(PL_curstackinfo->si_cxstack);
524 Safefree(PL_curstackinfo); 559 Safefree(PL_curstackinfo);
525 PL_curstackinfo = p; 560 PL_curstackinfo = p;
526 } 561 }
527 562
542 stack->refcnt = 1; 577 stack->refcnt = 1;
543 stack->usecnt = 1; 578 stack->usecnt = 1;
544 stack->gencnt = ctx->gencnt = 0; 579 stack->gencnt = ctx->gencnt = 0;
545 if (alloc) 580 if (alloc)
546 { 581 {
547#ifdef HAVE_MMAP 582#if HAVE_MMAP
548 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 583 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); 584 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
550 if (stack->sptr == (void *)-1) 585 if (stack->sptr == (void *)-1)
551#endif 586#endif
552 { 587 {
553 /*FIXME*//*D*//* reasonable stack size! */ 588 /*FIXME*//*D*//* reasonable stack size! */
554 stack->ssize = -4096 * sizeof (long); 589 stack->ssize = -4096 * sizeof (long);
574 { 609 {
575#ifdef HAVE_MMAP 610#ifdef HAVE_MMAP
576 if (stack->ssize > 0 && stack->sptr) 611 if (stack->ssize > 0 && stack->sptr)
577 munmap (stack->sptr, stack->ssize); 612 munmap (stack->sptr, stack->ssize);
578 else 613 else
579#else 614#endif
580 Safefree (stack->sptr); 615 Safefree (stack->sptr);
581#endif 616
582 Safefree (stack); 617 Safefree (stack);
583 } 618 }
584 else if (ctx->gencnt == stack->gencnt) 619 else if (ctx->gencnt == stack->gencnt)
585 --stack->usecnt; 620 --stack->usecnt;
586 } 621 }
598 633
599 coro_init_stacks (aTHX); 634 coro_init_stacks (aTHX);
600 /*PL_curcop = 0;*/ 635 /*PL_curcop = 0;*/
601 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 636 /*PL_in_eval = PL_in_eval;*/ /* inherit */
602 SvREFCNT_dec (GvAV (PL_defgv)); 637 SvREFCNT_dec (GvAV (PL_defgv));
603 GvAV (PL_defgv) = ctx->args; 638 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
604 639
605 SPAGAIN; 640 SPAGAIN;
606 641
607 if (ctx->stack) 642 if (ctx->stack)
608 { 643 {
635 * that doesn't matter, though, since it is only 670 * that doesn't matter, though, since it is only
636 * pp_nextstate and we never return... 671 * pp_nextstate and we never return...
637 * ah yes, and I don't care anyways ;) 672 * ah yes, and I don't care anyways ;)
638 */ 673 */
639 PUTBACK; 674 PUTBACK;
640 PL_op = pp_entersub(); 675 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
641 SPAGAIN; 676 SPAGAIN;
642 677
643 ENTER; /* necessary e.g. for dounwind */ 678 ENTER; /* necessary e.g. for dounwind */
644 } 679 }
645} 680}
649{ 684{
650 /* 685 /*
651 * this is a _very_ stripped down perl interpreter ;) 686 * this is a _very_ stripped down perl interpreter ;)
652 */ 687 */
653 Coro__State ctx = (Coro__State)arg; 688 Coro__State ctx = (Coro__State)arg;
689 JMPENV coro_start_env;
654 690
655 /*FIXME*//* must set up top_env here */ 691 PL_top_env = &ctx->start_env;
692
656 ctx->cursp = 0; 693 ctx->cursp = 0;
657 PL_op = PL_op->op_next; 694 PL_op = PL_op->op_next;
658 CALLRUNOPS(aTHX); 695 CALLRUNOPS(aTHX);
659 696
660 abort (); 697 abort ();
661} 698}
662 699
663STATIC void 700STATIC void
664transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 701transfer(pTHX_ struct coro *prev, struct coro *next, int flags)
665{ 702{
666 dSP;
667 dSTACKLEVEL; 703 dSTACKLEVEL;
704 static struct coro *xnext;
668 705
669 if (prev != next) 706 if (prev != next)
670 { 707 {
708 xnext = next;
709
671 if (next->mainstack) 710 if (next->mainstack)
672 { 711 {
673 SAVE (prev, flags); 712 SAVE (prev, flags);
674 LOAD (next); 713 LOAD (next);
675 714
698 continue_coro, (void *)next, 737 continue_coro, (void *)next,
699 next->stack->sptr, labs (next->stack->ssize)); 738 next->stack->sptr, labs (next->stack->ssize));
700 } 739 }
701 740
702 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 741 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
742 /* don't add any code here */
703 } 743 }
704 744
705 } 745 }
706 else if (next->tmps_ix == -2) 746 else if (next->tmps_ix == -2)
707 croak ("tried to transfer to running coroutine"); 747 croak ("tried to transfer to running coroutine");
714 if (!prev->stack) 754 if (!prev->stack)
715 allocate_stack (prev, 0); 755 allocate_stack (prev, 0);
716 756
717 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 757 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
718 { 758 {
759 PL_top_env = &next->start_env;
760
719 setup_coro (next); 761 setup_coro (next);
720 762
721 prev->stack->refcnt++; 763 prev->stack->refcnt++;
722 prev->stack->usecnt++; 764 prev->stack->usecnt++;
723 next->stack = prev->stack; 765 next->stack = prev->stack;
724 next->gencnt = prev->gencnt; 766 next->gencnt = prev->gencnt;
725 } 767 }
726 else 768 else
727 { 769 {
770 assert (!next->stack);
728 allocate_stack (next, 1); 771 allocate_stack (next, 1);
729 coro_create (&(next->stack->cctx), 772 coro_create (&(next->stack->cctx),
730 setup_coro, (void *)next, 773 setup_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 774 next->stack->sptr, labs (next->stack->ssize));
732 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 775 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
776 /* don't add any code here */
733 } 777 }
734 } 778 }
735 else 779 else
736 setup_coro (next); 780 setup_coro (next);
737 } 781 }
782
783 /*
784 * xnext is now either prev or next, depending on wether
785 * we switched the c stack or not. that's why I use a global
786 * variable, that should become thread-specific at one point.
787 */
788 xnext->cursp = stacklevel;
738 } 789 }
739 790
740 next->cursp = stacklevel; 791 if (coro_mortal)
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 { 792 {
748 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 793 SvREFCNT_dec (coro_mortal);
749 794 coro_mortal = 0;
750 if (!he)
751 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
752
753 arg = HeVAL(he);
754 } 795 }
755 796}
797
798#define SV_CORO(sv,func) \
799 do { \
800 if (SvROK (sv)) \
801 sv = SvRV (sv); \
802 \
803 if (SvTYPE(sv) == SVt_PVHV) \
804 { \
805 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
806 \
807 if (!he) \
808 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
809 \
810 (sv) = SvRV (HeVAL(he)); \
811 } \
812 \
756 /* must also be changed inside Coro::Cont::yield */ 813 /* must also be changed inside Coro::Cont::yield */ \
757 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 814 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); 815 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
761} 816 \
817 } while(0)
818
819#define SvSTATE(sv) (struct coro *)SvIV (sv)
762 820
763static void 821static void
764api_transfer(pTHX_ SV *prev, SV *next, int flags) 822api_transfer(pTHX_ SV *prev, SV *next, int flags)
765{ 823{
766 transfer(aTHX_ sv_to_coro (prev, "Coro::transfer", "prev"), 824 SV_CORO (prev, "Coro::transfer");
767 sv_to_coro (next, "Coro::transfer", "next"), 825 SV_CORO (next, "Coro::transfer");
768 flags); 826
827 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
769} 828}
770 829
771/** Coro ********************************************************************/ 830/** Coro ********************************************************************/
772 831
773#define PRIO_MAX 3 832#define PRIO_MAX 3
778#define PRIO_MIN -4 837#define PRIO_MIN -4
779 838
780/* for Coro.pm */ 839/* for Coro.pm */
781static GV *coro_current, *coro_idle; 840static GV *coro_current, *coro_idle;
782static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 841static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
842static int coro_nready;
783 843
784static void 844static void
785coro_enq (SV *sv) 845coro_enq (SV *sv)
786{ 846{
787 if (SvROK (sv))
788 {
789 SV *hv = SvRV (sv);
790 if (SvTYPE (hv) == SVt_PVHV) 847 if (SvTYPE (sv) == SVt_PVHV)
791 { 848 {
792 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 849 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
793 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 850 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
794 851
795 prio = prio > PRIO_MAX ? PRIO_MAX 852 prio = prio > PRIO_MAX ? PRIO_MAX
796 : prio < PRIO_MIN ? PRIO_MIN 853 : prio < PRIO_MIN ? PRIO_MIN
797 : prio; 854 : prio;
798 855
799 av_push (coro_ready [prio - PRIO_MIN], sv); 856 av_push (coro_ready [prio - PRIO_MIN], sv);
857 coro_nready++;
800 858
801 return; 859 return;
802 }
803 } 860 }
804 861
805 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 862 croak ("Coro::ready tried to enqueue something that is not a coroutine");
806} 863}
807 864
814 if (min_prio < 0) 871 if (min_prio < 0)
815 min_prio = 0; 872 min_prio = 0;
816 873
817 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 874 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
818 if (av_len (coro_ready[prio]) >= 0) 875 if (av_len (coro_ready[prio]) >= 0)
876 {
877 coro_nready--;
819 return av_shift (coro_ready[prio]); 878 return av_shift (coro_ready[prio]);
879 }
820 880
821 return 0; 881 return 0;
822} 882}
823 883
824static void 884static void
825api_ready (SV *coro) 885api_ready (SV *coro)
826{ 886{
887 if (SvROK (coro))
888 coro = SvRV (coro);
889
827 coro_enq (SvREFCNT_inc (coro)); 890 coro_enq (SvREFCNT_inc (coro));
828} 891}
829 892
830static void 893static void
831api_schedule (int cede) 894api_schedule (void)
832{ 895{
833 SV *prev, *next; 896 SV *prev, *next;
834 897
835 prev = GvSV (coro_current); 898 prev = SvRV (GvSV (coro_current));
836
837 if (cede)
838 coro_enq (SvREFCNT_inc (prev));
839
840 next = coro_deq (PRIO_MIN); 899 next = coro_deq (PRIO_MIN);
841 900
842 if (!next) 901 if (!next)
843 next = SvREFCNT_inc (GvSV (coro_idle)); 902 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
844 903
845 GvSV (coro_current) = SvREFCNT_inc (next); 904 /* free this only after the transfer */
846 transfer (sv_to_coro (prev, "Coro::schedule", "current coroutine"), 905 coro_mortal = prev;
847 sv_to_coro (next, "Coro::schedule", "next coroutine"), 906 SV_CORO (prev, "Coro::schedule");
907
908 SvRV (GvSV (coro_current)) = next;
909
910 SV_CORO (next, "Coro::schedule");
911
912 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
848 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 913 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
849 SvREFCNT_dec (next); 914}
850 SvREFCNT_dec (prev); 915
916static void
917api_cede (void)
918{
919 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
920
921 api_schedule ();
851} 922}
852 923
853MODULE = Coro::State PACKAGE = Coro::State 924MODULE = Coro::State PACKAGE = Coro::State
854 925
855PROTOTYPES: ENABLE 926PROTOTYPES: ENABLE
868 if (!padlist_cache) 939 if (!padlist_cache)
869 padlist_cache = newHV (); 940 padlist_cache = newHV ();
870 941
871 main_mainstack = PL_mainstack; 942 main_mainstack = PL_mainstack;
872 943
873 {
874 SV *sv = perl_get_sv("Coro::API", 1);
875
876 coroapi.ver = CORO_API_VERSION - 1; 944 coroapi.ver = CORO_API_VERSION;
877 coroapi.transfer = api_transfer; 945 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} 946}
886 947
887Coro::State 948Coro::State
888_newprocess(args) 949_newprocess(args)
889 SV * args 950 SV * args
892 Coro__State coro; 953 Coro__State coro;
893 954
894 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 955 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
895 croak ("Coro::State::_newprocess expects an arrayref"); 956 croak ("Coro::State::_newprocess expects an arrayref");
896 957
897 New (0, coro, 1, struct coro); 958 Newz (0, coro, 1, struct coro);
898 959
899 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 960 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
900 coro->mainstack = 0; /* actual work is done inside transfer */ 961 coro->mainstack = 0; /* actual work is done inside transfer */
901 coro->stack = 0; 962 coro->stack = 0;
902 963
964 /* same as JMPENV_BOOTSTRAP */
965 /* we might be able to recycle start_env, but safe is safe */
966 //Zero(&coro->start_env, 1, JMPENV);
967 coro->start_env.je_ret = -1;
968 coro->start_env.je_mustcatch = TRUE;
969
903 RETVAL = coro; 970 RETVAL = coro;
904 OUTPUT: 971 OUTPUT:
905 RETVAL 972 RETVAL
906 973
907void 974void
908transfer(prev, next, flags) 975transfer(prev, next, flags)
909 Coro::State_or_hashref prev 976 SV *prev
910 Coro::State_or_hashref next 977 SV *next
911 int flags 978 int flags
912 PROTOTYPE: @ 979 PROTOTYPE: @
913 CODE: 980 CODE:
914 PUTBACK; 981 PUTBACK;
982 SV_CORO (next, "Coro::transfer");
983 SV_CORO (prev, "Coro::transfer");
915 transfer (aTHX_ prev, next, flags); 984 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
916 SPAGAIN; 985 SPAGAIN;
917 986
918void 987void
919DESTROY(coro) 988DESTROY(coro)
920 Coro::State coro 989 Coro::State coro
922 991
923 if (coro->mainstack && coro->mainstack != main_mainstack) 992 if (coro->mainstack && coro->mainstack != main_mainstack)
924 { 993 {
925 struct coro temp; 994 struct coro temp;
926 995
996 PUTBACK;
927 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 997 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL);
928 LOAD(aTHX_ coro); 998 LOAD(aTHX_ coro);
999 SPAGAIN;
929 1000
930 destroy_stacks (aTHX); 1001 destroy_stacks (aTHX);
931 1002
932 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1003 LOAD((&temp)); /* this will get rid of defsv etc.. */
1004 SPAGAIN;
933 1005
934 coro->mainstack = 0; 1006 coro->mainstack = 0;
935 } 1007 }
936 1008
937 deallocate_stack (coro); 1009 deallocate_stack (coro);
938 1010 SvREFCNT_dec (coro->args);
939 Safefree (coro); 1011 Safefree (coro);
940 1012
941void 1013void
942flush() 1014flush()
943 CODE: 1015 CODE:
970 SV *sv; 1042 SV *sv;
971 AV *defav = GvAV (PL_defgv); 1043 AV *defav = GvAV (PL_defgv);
972 struct coro *prev, *next; 1044 struct coro *prev, *next;
973 1045
974 if (!returnstk) 1046 if (!returnstk)
975 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1047 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
976 1048
977 /* set up @_ -- ugly */ 1049 /* set up @_ -- ugly */
978 av_clear (defav); 1050 av_clear (defav);
979 av_fill (defav, items - 1); 1051 av_fill (defav, items - 1);
980 while (items--) 1052 while (items--)
1007 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1079 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV);
1008 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1080 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV);
1009 1081
1010 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1082 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1011 coro_ready[i] = newAV (); 1083 coro_ready[i] = newAV ();
1084
1085 {
1086 SV *sv = perl_get_sv("Coro::API", 1);
1087
1088 coroapi.schedule = api_schedule;
1089 coroapi.cede = api_cede;
1090 coroapi.ready = api_ready;
1091 coroapi.nready = &coro_nready;
1092 coroapi.current = coro_current;
1093
1094 GCoroAPI = &coroapi;
1095 sv_setiv(sv, (IV)&coroapi);
1096 SvREADONLY_on(sv);
1097 }
1012} 1098}
1013 1099
1014void 1100void
1015ready(self) 1101ready(self)
1016 SV * self 1102 SV * self
1103 PROTOTYPE: $
1017 CODE: 1104 CODE:
1018 api_ready (self); 1105 api_ready (self);
1019 1106
1107int
1108nready(...)
1109 PROTOTYPE:
1110 CODE:
1111 RETVAL = coro_nready;
1112 OUTPUT:
1113 RETVAL
1114
1020void 1115void
1021schedule(...) 1116schedule(...)
1022 ALIAS: 1117 PROTOTYPE:
1023 cede = 1
1024 CODE: 1118 CODE:
1025 api_schedule (ix); 1119 api_schedule ();
1026 1120
1121void
1122cede(...)
1123 PROTOTYPE:
1124 CODE:
1125 api_cede ();
1126

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines