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.169 by root, Thu Sep 27 16:25:10 2007 UTC vs.
Revision 1.182 by root, Wed Oct 3 18:37:48 2007 UTC

… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 133static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 134static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 135static SV *coro_mortal; /* will be freed after next transfer */
136 136
137static GV *irsgv; /* $/ */
138
137/* async_pool helper stuff */ 139/* async_pool helper stuff */
138static SV *sv_pool_rss; 140static SV *sv_pool_rss;
139static SV *sv_pool_size; 141static SV *sv_pool_size;
140static AV *av_async_pool; 142static AV *av_async_pool;
141 143
… …
184 coro_cctx *cctx; 186 coro_cctx *cctx;
185 187
186 /* data associated with this coroutine (initial args) */ 188 /* data associated with this coroutine (initial args) */
187 AV *args; 189 AV *args;
188 int refcnt; 190 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 191 int flags; /* CF_ flags */
191 192
192 /* optionally saved, might be zero */ 193 /* optionally saved, might be zero */
193 AV *defav; /* @_ */ 194 AV *defav; /* @_ */
194 SV *defsv; /* $_ */ 195 SV *defsv; /* $_ */
… …
199 200
200#define VAR(name,type) type name; 201#define VAR(name,type) type name;
201# include "state.h" 202# include "state.h"
202#undef VAR 203#undef VAR
203 204
205 /* statistics */
206 int usecount; /* number of transfers to this coro */
207
204 /* coro process data */ 208 /* coro process data */
205 int prio; 209 int prio;
210 //SV *throw;
211
212 /* async_pool */
213 GV *asp_deffh;
206 214
207 /* linked list */ 215 /* linked list */
208 struct coro *next, *prev; 216 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */ 217 HV *hv; /* the perl hash associated with this coro, if any */
210}; 218};
… …
307 HV *stash; 315 HV *stash;
308 MAGIC *mg; 316 MAGIC *mg;
309 317
310 if (SvROK (coro)) 318 if (SvROK (coro))
311 coro = SvRV (coro); 319 coro = SvRV (coro);
320
321 if (SvTYPE (coro) != SVt_PVHV)
322 croak ("Coro::State object required");
312 323
313 stash = SvSTASH (coro); 324 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash) 325 if (stash != coro_stash && stash != coro_state_stash)
315 { 326 {
316 /* very slow, but rare, check */ 327 /* very slow, but rare, check */
… …
369 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
370} 381}
371 382
372/** load & save, init *******************************************************/ 383/** load & save, init *******************************************************/
373 384
374#define SB do {
375#define SE } while (0)
376
377#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
378
379static void 385static void
380load_perl (pTHX_ Coro__State c) 386load_perl (pTHX_ Coro__State c)
381{ 387{
382#define VAR(name,type) PL_ ## name = c->name; 388#define VAR(name,type) PL_ ## name = c->name;
383# include "state.h" 389# include "state.h"
384#undef VAR 390#undef VAR
385 391
386 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 392 GvSV (PL_defgv) = c->defsv;
387 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 393 GvAV (PL_defgv) = c->defav;
388 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 394 GvSV (PL_errgv) = c->errsv;
389 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 395 PL_defoutgv = c->deffh;
390 396 PL_rs = c->irssv;
391 if (c->irssv) 397 GvSV (irsgv) = c->irssv_sv;
392 {
393 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
394 {
395 SvREFCNT_dec (c->irssv);
396 c->irssv = 0;
397 }
398 else
399 {
400 REPLACE_SV (PL_rs, c->irssv);
401 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
402 sv_setsv (c->irssv_sv, PL_rs);
403 }
404 }
405 398
406 { 399 {
407 dSP; 400 dSP;
408 CV *cv; 401 CV *cv;
409 402
… …
467 } 460 }
468 461
469 PUTBACK; 462 PUTBACK;
470 } 463 }
471 464
472 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 465 c->defav = GvAV (PL_defgv);
473 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 466 c->defsv = DEFSV;
474 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 467 c->errsv = ERRSV;
475 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 468 c->deffh = PL_defoutgv;
476 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 469 c->irssv = PL_rs;
470 c->irssv_sv = GvSV (irsgv);
477 471
478#define VAR(name,type)c->name = PL_ ## name; 472#define VAR(name,type)c->name = PL_ ## name;
479# include "state.h" 473# include "state.h"
480#undef VAR 474#undef VAR
481} 475}
… …
534 * destroy the stacks, the callchain etc... 528 * destroy the stacks, the callchain etc...
535 */ 529 */
536static void 530static void
537coro_destroy_stacks (pTHX) 531coro_destroy_stacks (pTHX)
538{ 532{
539 if (!IN_DESTRUCT)
540 {
541 /* restore all saved variables and stuff */
542 LEAVE_SCOPE (0);
543 assert (PL_tmps_floor == -1);
544
545 /* free all temporaries */
546 FREETMPS;
547 assert (PL_tmps_ix == -1);
548
549 /* unwind all extra stacks */
550 POPSTACK_TO (PL_mainstack);
551
552 /* unwind main stack */
553 dounwind (-1);
554 }
555
556 while (PL_curstackinfo->si_next) 533 while (PL_curstackinfo->si_next)
557 PL_curstackinfo = PL_curstackinfo->si_next; 534 PL_curstackinfo = PL_curstackinfo->si_next;
558 535
559 while (PL_curstackinfo) 536 while (PL_curstackinfo)
560 { 537 {
… …
576 Safefree (PL_retstack); 553 Safefree (PL_retstack);
577#endif 554#endif
578} 555}
579 556
580static size_t 557static size_t
581coro_rss (struct coro *coro) 558coro_rss (pTHX_ struct coro *coro)
582{ 559{
583 size_t rss = sizeof (coro); 560 size_t rss = sizeof (coro);
584 561
585 if (coro->mainstack) 562 if (coro->mainstack)
586 { 563 {
… …
609} 586}
610 587
611/** coroutine stack handling ************************************************/ 588/** coroutine stack handling ************************************************/
612 589
613static void 590static void
614setup_coro (pTHX_ struct coro *coro) 591coro_setup (pTHX_ struct coro *coro)
615{ 592{
616 /* 593 /*
617 * emulate part of the perl startup here. 594 * emulate part of the perl startup here.
618 */ 595 */
619 coro_init_stacks (aTHX); 596 coro_init_stacks (aTHX);
… …
624 PL_comppad = 0; 601 PL_comppad = 0;
625 PL_curpm = 0; 602 PL_curpm = 0;
626 PL_localizing = 0; 603 PL_localizing = 0;
627 PL_dirty = 0; 604 PL_dirty = 0;
628 PL_restartop = 0; 605 PL_restartop = 0;
606
607 GvSV (PL_defgv) = NEWSV (0, 0);
608 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 GvSV (PL_errgv) = NEWSV (0, 0);
610 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
611 PL_rs = newSVsv (GvSV (irsgv));
612
613 {
614 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro");
616 GvIOp(PL_defoutgv) = io;
617 IoTYPE (io) = IoTYPE_WRONLY;
618 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
619 IoFLAGS (io) |= IOf_FLUSH;
620 }
629 621
630 { 622 {
631 dSP; 623 dSP;
632 LOGOP myop; 624 LOGOP myop;
633
634 SvREFCNT_dec (GvAV (PL_defgv));
635 GvAV (PL_defgv) = coro->args; coro->args = 0;
636 625
637 Zero (&myop, 1, LOGOP); 626 Zero (&myop, 1, LOGOP);
638 myop.op_next = Nullop; 627 myop.op_next = Nullop;
639 myop.op_flags = OPf_WANT_VOID; 628 myop.op_flags = OPf_WANT_VOID;
640 629
… …
648 637
649 ENTER; /* necessary e.g. for dounwind */ 638 ENTER; /* necessary e.g. for dounwind */
650} 639}
651 640
652static void 641static void
642coro_destroy (pTHX_ struct coro *coro)
643{
644 if (!IN_DESTRUCT)
645 {
646 /* restore all saved variables and stuff */
647 LEAVE_SCOPE (0);
648 assert (PL_tmps_floor == -1);
649
650 /* free all temporaries */
651 FREETMPS;
652 assert (PL_tmps_ix == -1);
653
654 /* unwind all extra stacks */
655 POPSTACK_TO (PL_mainstack);
656
657 /* unwind main stack */
658 dounwind (-1);
659 }
660
661 SvREFCNT_dec (GvSV (PL_defgv));
662 SvREFCNT_dec (GvAV (PL_defgv));
663 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv));
667
668 SvREFCNT_dec (coro->asp_deffh);
669 //SvREFCNT_dec (coro->throw);
670
671 coro_destroy_stacks (aTHX);
672}
673
674static void
653free_coro_mortal (pTHX) 675free_coro_mortal (pTHX)
654{ 676{
655 if (coro_mortal) 677 if (coro_mortal)
656 { 678 {
657 SvREFCNT_dec (coro_mortal); 679 SvREFCNT_dec (coro_mortal);
… …
669 691
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 692 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 { 693 {
672 PERL_ASYNC_CHECK (); 694 PERL_ASYNC_CHECK ();
673 695
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 696 if (cctx->flags & CC_TRACE_ALL)
675 { 697 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 698 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 { 699 {
700 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
701 SV **bot, **top;
702 AV *av = newAV (); /* return values */
720 SV **cb; 703 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 dSP; 704 dSP;
705
706 GV *gv = CvGV (cx->blk_sub.cv);
707 SV *fullname = sv_2mortal (newSV (0));
708 if (isGV (gv))
709 gv_efullname3 (fullname, gv, 0);
710
711 bot = PL_stack_base + cx->blk_oldsp + 1;
712 top = cx->blk_gimme == G_ARRAY ? SP + 1
713 : cx->blk_gimme == G_SCALAR ? bot + 1
714 : bot;
715
716 while (bot < top)
717 av_push (av, SvREFCNT_inc (*bot++));
718
719 PL_runops = RUNOPS_DEFAULT;
723 ENTER; 720 ENTER;
724 SAVETMPS; 721 SAVETMPS;
725 EXTEND (SP, 3); 722 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT; 723 PUSHMARK (SP);
724 PUSHs (&PL_sv_no);
725 PUSHs (fullname);
726 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
727 PUTBACK;
728 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
729 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
730 SPAGAIN;
731 FREETMPS;
732 LEAVE;
733 PL_runops = runops_trace;
734 }
727 735
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 736 if (oldcop != PL_curcop)
737 {
738 oldcop = PL_curcop;
739
740 if (PL_curcop != &PL_compiling)
729 { 741 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 742 SV **cb;
731 743
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 744 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
733 { 745 {
746 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
747
748 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
749 {
750 runops_proc_t old_runops = PL_runops;
751 dSP;
734 GV *gv = CvGV (cx->blk_sub.cv); 752 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0)); 753 SV *fullname = sv_2mortal (newSV (0));
754
736 if (isGV (gv)) 755 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0); 756 gv_efullname3 (fullname, gv, 0);
738 757
758 PL_runops = RUNOPS_DEFAULT;
759 ENTER;
760 SAVETMPS;
761 EXTEND (SP, 3);
762 PUSHMARK (SP);
763 PUSHs (&PL_sv_yes);
764 PUSHs (fullname);
765 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
766 PUTBACK;
767 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
768 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
769 SPAGAIN;
770 FREETMPS;
771 LEAVE;
772 PL_runops = runops_trace;
773 }
774
775 oldcxix = cxstack_ix;
776 }
777
778 if (cctx->flags & CC_TRACE_LINE)
779 {
780 dSP;
781
782 PL_runops = RUNOPS_DEFAULT;
783 ENTER;
784 SAVETMPS;
785 EXTEND (SP, 3);
786 PL_runops = RUNOPS_DEFAULT;
739 PUSHMARK (SP); 787 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes); 788 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
741 PUSHs (fullname); 789 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK; 790 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 791 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 792 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN; 793 SPAGAIN;
794 FREETMPS;
795 LEAVE;
796 PL_runops = runops_trace;
747 } 797 }
748
749 oldcxix = cxstack_ix;
750 } 798 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 } 799 }
767 } 800 }
768 } 801 }
769 802
770 TAINT_NOT; 803 TAINT_NOT;
… …
937 cctx_first = cctx; 970 cctx_first = cctx;
938} 971}
939 972
940/** coroutine switching *****************************************************/ 973/** coroutine switching *****************************************************/
941 974
942/* never call directly, always through the coro_state_transfer global variable */ 975static void NOINLINE
976transfer_check (pTHX_ struct coro *prev, struct coro *next)
977{
978 if (prev != next)
979 {
980 if (!(prev->flags & (CF_RUNNING | CF_NEW)))
981 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
982
983 if (next->flags & CF_RUNNING)
984 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
985
986 if (next->flags & CF_DESTROYED)
987 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
988
989 if (PL_lex_state != LEX_NOTPARSING)
990 croak ("Coro::State::transfer called while parsing, but this is not supported");
991 }
992}
993
994/* always use the TRANSFER macro */
943static void NOINLINE 995static void NOINLINE
944transfer (pTHX_ struct coro *prev, struct coro *next) 996transfer (pTHX_ struct coro *prev, struct coro *next)
945{ 997{
946 dSTACKLEVEL; 998 dSTACKLEVEL;
947 999
… …
961 Newz (0, prev->cctx, 1, coro_cctx); 1013 Newz (0, prev->cctx, 1, coro_cctx);
962 prev->flags &= ~CF_NEW; 1014 prev->flags &= ~CF_NEW;
963 prev->flags |= CF_RUNNING; 1015 prev->flags |= CF_RUNNING;
964 } 1016 }
965 1017
966 /*TODO: must not croak here */
967 if (!prev->flags & CF_RUNNING)
968 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
969
970 if (next->flags & CF_RUNNING)
971 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
972
973 if (next->flags & CF_DESTROYED)
974 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
975
976 prev->flags &= ~CF_RUNNING; 1018 prev->flags &= ~CF_RUNNING;
977 next->flags |= CF_RUNNING; 1019 next->flags |= CF_RUNNING;
978 1020
979 LOCK; 1021 LOCK;
980 1022
… …
983 /* need to start coroutine */ 1025 /* need to start coroutine */
984 next->flags &= ~CF_NEW; 1026 next->flags &= ~CF_NEW;
985 /* first get rid of the old state */ 1027 /* first get rid of the old state */
986 save_perl (aTHX_ prev); 1028 save_perl (aTHX_ prev);
987 /* setup coroutine call */ 1029 /* setup coroutine call */
988 setup_coro (aTHX_ next); 1030 coro_setup (aTHX_ next);
989 } 1031 }
990 else 1032 else
991 { 1033 {
992 /* coroutine already started */ 1034 /* coroutine already started */
993 save_perl (aTHX_ prev); 1035 save_perl (aTHX_ prev);
… …
1005 prev->cctx = 0; 1047 prev->cctx = 0;
1006 1048
1007 cctx_put (prev__cctx); 1049 cctx_put (prev__cctx);
1008 } 1050 }
1009 1051
1052 ++next->usecount;
1053
1010 if (!next->cctx) 1054 if (!next->cctx)
1011 next->cctx = cctx_get (aTHX); 1055 next->cctx = cctx_get (aTHX);
1012 1056
1013 if (prev__cctx != next->cctx) 1057 if (prev__cctx != next->cctx)
1014 { 1058 {
… …
1026{ 1070{
1027 struct coro *prev, *next; 1071 struct coro *prev, *next;
1028}; 1072};
1029 1073
1030#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1074#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1075#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1031 1076
1032/** high level stuff ********************************************************/ 1077/** high level stuff ********************************************************/
1033 1078
1034static int 1079static int
1035coro_state_destroy (pTHX_ struct coro *coro) 1080coro_state_destroy (pTHX_ struct coro *coro)
… …
1052 1097
1053 if (coro->mainstack && coro->mainstack != main_mainstack) 1098 if (coro->mainstack && coro->mainstack != main_mainstack)
1054 { 1099 {
1055 struct coro temp; 1100 struct coro temp;
1056 1101
1057 assert (!(coro->flags & CF_RUNNING));
1058
1059 Zero (&temp, 1, struct coro);
1060 temp.save = CORO_SAVE_ALL;
1061
1062 if (coro->flags & CF_RUNNING) 1102 if (coro->flags & CF_RUNNING)
1063 croak ("FATAL: tried to destroy currently running coroutine"); 1103 croak ("FATAL: tried to destroy currently running coroutine");
1064 1104
1065 save_perl (aTHX_ &temp); 1105 save_perl (aTHX_ &temp);
1066 load_perl (aTHX_ coro); 1106 load_perl (aTHX_ coro);
1067 1107
1068 coro_destroy_stacks (aTHX); 1108 coro_destroy (aTHX_ coro);
1069 1109
1070 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1110 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1071 1111
1072 coro->mainstack = 0; 1112 coro->mainstack = 0;
1073 } 1113 }
… …
1123static void 1163static void
1124prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1164prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1125{ 1165{
1126 ta->prev = SvSTATE (prev_sv); 1166 ta->prev = SvSTATE (prev_sv);
1127 ta->next = SvSTATE (next_sv); 1167 ta->next = SvSTATE (next_sv);
1168 TRANSFER_CHECK (*ta);
1128} 1169}
1129 1170
1130static void 1171static void
1131api_transfer (SV *prev_sv, SV *next_sv) 1172api_transfer (SV *prev_sv, SV *next_sv)
1132{ 1173{
1133 dTHX; 1174 dTHX;
1134 struct transfer_args ta; 1175 struct transfer_args ta;
1135 1176
1136 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1177 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1137 TRANSFER (ta); 1178 TRANSFER (ta);
1138}
1139
1140static int
1141api_save (SV *coro_sv, int new_save)
1142{
1143 dTHX;
1144 struct coro *coro = SvSTATE (coro_sv);
1145 int old_save = coro->save;
1146
1147 if (new_save >= 0)
1148 coro->save = new_save;
1149
1150 return old_save;
1151} 1179}
1152 1180
1153/** Coro ********************************************************************/ 1181/** Coro ********************************************************************/
1154 1182
1155static void 1183static void
… …
1249 break; 1277 break;
1250 } 1278 }
1251 1279
1252 /* free this only after the transfer */ 1280 /* free this only after the transfer */
1253 prev_sv = SvRV (coro_current); 1281 prev_sv = SvRV (coro_current);
1254 SvRV_set (coro_current, next_sv);
1255 ta->prev = SvSTATE (prev_sv); 1282 ta->prev = SvSTATE (prev_sv);
1256 1283 TRANSFER_CHECK (*ta);
1257 assert (ta->next->flags & CF_READY); 1284 assert (ta->next->flags & CF_READY);
1258 ta->next->flags &= ~CF_READY; 1285 ta->next->flags &= ~CF_READY;
1286 SvRV_set (coro_current, next_sv);
1259 1287
1260 LOCK; 1288 LOCK;
1261 free_coro_mortal (aTHX); 1289 free_coro_mortal (aTHX);
1262 coro_mortal = prev_sv; 1290 coro_mortal = prev_sv;
1263 UNLOCK; 1291 UNLOCK;
… …
1324 } 1352 }
1325 else 1353 else
1326 return 0; 1354 return 0;
1327} 1355}
1328 1356
1357static void
1358api_trace (SV *coro_sv, int flags)
1359{
1360 dTHX;
1361 struct coro *coro = SvSTATE (coro_sv);
1362
1363 if (flags & CC_TRACE)
1364 {
1365 if (!coro->cctx)
1366 coro->cctx = cctx_new ();
1367 else if (!(coro->cctx->flags & CC_TRACE))
1368 croak ("cannot enable tracing on coroutine with custom stack");
1369
1370 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1371 }
1372 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1373 {
1374 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1375
1376 if (coro->flags & CF_RUNNING)
1377 PL_runops = RUNOPS_DEFAULT;
1378 else
1379 coro->runops = RUNOPS_DEFAULT;
1380 }
1381}
1382
1329MODULE = Coro::State PACKAGE = Coro::State 1383MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1330 1384
1331PROTOTYPES: DISABLE 1385PROTOTYPES: DISABLE
1332 1386
1333BOOT: 1387BOOT:
1334{ 1388{
1335#ifdef USE_ITHREADS 1389#ifdef USE_ITHREADS
1336 MUTEX_INIT (&coro_mutex); 1390 MUTEX_INIT (&coro_mutex);
1337#endif 1391#endif
1338 BOOT_PAGESIZE; 1392 BOOT_PAGESIZE;
1393
1394 irsgv = gv_fetchpv ("/", 1, SVt_PV);
1339 1395
1340 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1341 1397
1342 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1343 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1344 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1345 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1346 1402
1347 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1348 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1349 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1350 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1351 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1352 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1353 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1354
1355 main_mainstack = PL_mainstack; 1403 main_mainstack = PL_mainstack;
1356 main_top_env = PL_top_env; 1404 main_top_env = PL_top_env;
1357 1405
1358 while (main_top_env->je_prev) 1406 while (main_top_env->je_prev)
1359 main_top_env = main_top_env->je_prev; 1407 main_top_env = main_top_env->je_prev;
… …
1371 struct coro *coro; 1419 struct coro *coro;
1372 HV *hv; 1420 HV *hv;
1373 int i; 1421 int i;
1374 1422
1375 Newz (0, coro, 1, struct coro); 1423 Newz (0, coro, 1, struct coro);
1376 coro->args = newAV (); 1424 coro->args = newAV ();
1377 coro->save = CORO_SAVE_DEF;
1378 coro->flags = CF_NEW; 1425 coro->flags = CF_NEW;
1379 1426
1380 if (coro_first) coro_first->prev = coro; 1427 if (coro_first) coro_first->prev = coro;
1381 coro->next = coro_first; 1428 coro->next = coro_first;
1382 coro_first = coro; 1429 coro_first = coro;
… …
1389 av_push (coro->args, newSVsv (ST (i))); 1436 av_push (coro->args, newSVsv (ST (i)));
1390} 1437}
1391 OUTPUT: 1438 OUTPUT:
1392 RETVAL 1439 RETVAL
1393 1440
1394int 1441# these not obviously related functions are all rolled into the same xs
1395save (SV *coro, int new_save = -1) 1442# function to increase chances that they all will call transfer with the same
1396 CODE: 1443# stack offset
1397 RETVAL = api_save (coro, new_save);
1398 OUTPUT:
1399 RETVAL
1400
1401int
1402save_also (SV *coro_sv, int save_also)
1403 CODE:
1404{
1405 struct coro *coro = SvSTATE (coro_sv);
1406 RETVAL = coro->save;
1407 coro->save |= save_also;
1408}
1409 OUTPUT:
1410 RETVAL
1411
1412void 1444void
1413_set_stacklevel (...) 1445_set_stacklevel (...)
1414 ALIAS: 1446 ALIAS:
1415 Coro::State::transfer = 1 1447 Coro::State::transfer = 1
1416 Coro::schedule = 2 1448 Coro::schedule = 2
… …
1511{ 1543{
1512 if (coro->mainstack) 1544 if (coro->mainstack)
1513 { 1545 {
1514 struct coro temp; 1546 struct coro temp;
1515 Zero (&temp, 1, struct coro); 1547 Zero (&temp, 1, struct coro);
1516 temp.save = CORO_SAVE_ALL;
1517 1548
1518 if (!(coro->flags & CF_RUNNING)) 1549 if (!(coro->flags & CF_RUNNING))
1519 { 1550 {
1520 save_perl (aTHX_ &temp); 1551 save_perl (aTHX_ &temp);
1521 load_perl (aTHX_ coro); 1552 load_perl (aTHX_ coro);
… …
1542 save_perl (aTHX_ coro); 1573 save_perl (aTHX_ coro);
1543 load_perl (aTHX_ &temp); 1574 load_perl (aTHX_ &temp);
1544 } 1575 }
1545 } 1576 }
1546} 1577}
1547 1578
1548SV * 1579SV *
1549is_ready (Coro::State coro) 1580is_ready (Coro::State coro)
1550 PROTOTYPE: $ 1581 PROTOTYPE: $
1551 ALIAS: 1582 ALIAS:
1552 is_ready = CF_READY 1583 is_ready = CF_READY
… …
1557 RETVAL = boolSV (coro->flags & ix); 1588 RETVAL = boolSV (coro->flags & ix);
1558 OUTPUT: 1589 OUTPUT:
1559 RETVAL 1590 RETVAL
1560 1591
1561void 1592void
1562trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1593api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1563 CODE:
1564 if (flags & CC_TRACE)
1565 {
1566 if (!coro->cctx)
1567 coro->cctx = cctx_new ();
1568 else if (!(coro->cctx->flags & CC_TRACE))
1569 croak ("cannot enable tracing on coroutine with custom stack");
1570
1571 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1572 }
1573 else
1574 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1575 {
1576 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1577 coro->cctx->flags |= CC_NOREUSE;
1578
1579 if (coro->flags & CF_RUNNING)
1580 PL_runops = RUNOPS_DEFAULT;
1581 else
1582 coro->runops = RUNOPS_DEFAULT;
1583 }
1584 1594
1585SV * 1595SV *
1586has_stack (Coro::State coro) 1596has_stack (Coro::State coro)
1587 PROTOTYPE: $ 1597 PROTOTYPE: $
1588 CODE: 1598 CODE:
… …
1599 RETVAL 1609 RETVAL
1600 1610
1601IV 1611IV
1602rss (Coro::State coro) 1612rss (Coro::State coro)
1603 PROTOTYPE: $ 1613 PROTOTYPE: $
1614 ALIAS:
1615 usecount = 1
1604 CODE: 1616 CODE:
1605 RETVAL = coro_rss (coro); 1617 switch (ix)
1618 {
1619 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1620 case 1: RETVAL = coro->usecount; break;
1621 }
1606 OUTPUT: 1622 OUTPUT:
1607 RETVAL 1623 RETVAL
1608 1624
1609 1625
1610MODULE = Coro::State PACKAGE = Coro 1626MODULE = Coro::State PACKAGE = Coro
… …
1615 1631
1616 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1617 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1618 av_async_pool = get_av ("Coro::async_pool", TRUE); 1634 av_async_pool = get_av ("Coro::async_pool", TRUE);
1619 1635
1620 coro_current = get_sv ("Coro::current", FALSE); 1636 coro_current = get_sv ("Coro::current", FALSE);
1621 SvREADONLY_on (coro_current); 1637 SvREADONLY_on (coro_current);
1622 1638
1623 coro_stash = gv_stashpv ("Coro", TRUE); 1639 coro_stash = gv_stashpv ("Coro", TRUE);
1624 1640
1625 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1634 1650
1635 { 1651 {
1636 SV *sv = perl_get_sv("Coro::API", 1); 1652 SV *sv = perl_get_sv("Coro::API", 1);
1637 1653
1638 coroapi.schedule = api_schedule; 1654 coroapi.schedule = api_schedule;
1639 coroapi.save = api_save;
1640 coroapi.cede = api_cede; 1655 coroapi.cede = api_cede;
1641 coroapi.cede_notself = api_cede_notself; 1656 coroapi.cede_notself = api_cede_notself;
1642 coroapi.ready = api_ready; 1657 coroapi.ready = api_ready;
1643 coroapi.is_ready = api_is_ready; 1658 coroapi.is_ready = api_is_ready;
1644 coroapi.nready = &coro_nready; 1659 coroapi.nready = &coro_nready;
… …
1698# for async_pool speedup 1713# for async_pool speedup
1699void 1714void
1700_pool_1 (SV *cb) 1715_pool_1 (SV *cb)
1701 CODE: 1716 CODE:
1702{ 1717{
1703 int i, len; 1718 struct coro *coro = SvSTATE (coro_current);
1704 HV *hv = (HV *)SvRV (coro_current); 1719 HV *hv = (HV *)SvRV (coro_current);
1705 AV *defav = GvAV (PL_defgv); 1720 AV *defav = GvAV (PL_defgv);
1706 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1707 AV *invoke_av; 1722 AV *invoke_av;
1723 int i, len;
1708 1724
1709 if (!invoke) 1725 if (!invoke)
1710 croak ("\3terminate\2\n"); 1726 croak ("\3terminate\2\n");
1727
1728 SvREFCNT_dec (coro->asp_deffh);
1729 coro->asp_deffh = SvREFCNT_inc (PL_defoutgv);
1711 1730
1712 hv_store (hv, "desc", sizeof ("desc") - 1, 1731 hv_store (hv, "desc", sizeof ("desc") - 1,
1713 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1714 1733
1715 invoke_av = (AV *)SvRV (invoke); 1734 invoke_av = (AV *)SvRV (invoke);
… …
1733{ 1752{
1734 struct coro *coro = SvSTATE (coro_current); 1753 struct coro *coro = SvSTATE (coro_current);
1735 1754
1736 sv_setsv (cb, &PL_sv_undef); 1755 sv_setsv (cb, &PL_sv_undef);
1737 1756
1757 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->asp_deffh;
1758 coro->asp_deffh = 0;
1759
1738 if (coro_rss (coro) > SvIV (sv_pool_rss) 1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1739 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1740 croak ("\3terminate\2\n"); 1762 croak ("\3terminate\2\n");
1741 1763
1742 av_clear (GvAV (PL_defgv)); 1764 av_clear (GvAV (PL_defgv));
1743 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1744 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1745 coro->save = CORO_SAVE_DEF; 1767
1746 coro->prio = 0; 1768 coro->prio = 0;
1769
1770 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1771 api_trace (coro_current, 0);
1772
1747 av_push (av_async_pool, newSVsv (coro_current)); 1773 av_push (av_async_pool, newSVsv (coro_current));
1748} 1774}
1749 1775
1750 1776
1751MODULE = Coro::State PACKAGE = Coro::AIO 1777MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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