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.172 by root, Sun Sep 30 13:15:01 2007 UTC vs.
Revision 1.193 by root, Fri Oct 5 23:38:40 2007 UTC

75/* 5.8.7 */ 75/* 5.8.7 */
76#ifndef SvRV_set 76#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 78#endif
79 79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84#ifndef newSV
85# define newSV(l) NEWSV(0,l)
86#endif
87
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 89# undef CORO_STACKGUARD
82#endif 90#endif
83 91
84#ifndef CORO_STACKGUARD 92#ifndef CORO_STACKGUARD
131static struct CoroAPI coroapi; 139static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 140static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 141static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 142static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 143static SV *coro_mortal; /* will be freed after next transfer */
144
145static GV *irsgv; /* $/ */
146static GV *stdoutgv; /* *STDOUT */
136 147
137/* async_pool helper stuff */ 148/* async_pool helper stuff */
138static SV *sv_pool_rss; 149static SV *sv_pool_rss;
139static SV *sv_pool_size; 150static SV *sv_pool_size;
140static AV *av_async_pool; 151static AV *av_async_pool;
184 coro_cctx *cctx; 195 coro_cctx *cctx;
185 196
186 /* data associated with this coroutine (initial args) */ 197 /* data associated with this coroutine (initial args) */
187 AV *args; 198 AV *args;
188 int refcnt; 199 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 200 int flags; /* CF_ flags */
191 201
192 /* optionally saved, might be zero */ 202 /* optionally saved, might be zero */
193 AV *defav; /* @_ */ 203 AV *defav; /* @_ */
194 SV *defsv; /* $_ */ 204 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */ 205 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */ 206 SV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */ 207 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */ 208 SV *irssv_sv; /* real $/ cache */
199 209
200#define VAR(name,type) type name; 210#define VAR(name,type) type name;
201# include "state.h" 211# include "state.h"
202#undef VAR 212#undef VAR
203 213
204 /* statistics */ 214 /* statistics */
205 int usecount; /* number of switches to this coro */ 215 int usecount; /* number of transfers to this coro */
206 216
207 /* coro process data */ 217 /* coro process data */
208 int prio; 218 int prio;
219 //SV *throw;
220
221 /* async_pool */
222 SV *saved_deffh;
209 223
210 /* linked list */ 224 /* linked list */
211 struct coro *next, *prev; 225 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */ 226 HV *hv; /* the perl hash associated with this coro, if any */
213}; 227};
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 389 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 390}
377 391
378/** load & save, init *******************************************************/ 392/** load & save, init *******************************************************/
379 393
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384
385static void 394static void
386load_perl (pTHX_ Coro__State c) 395load_perl (pTHX_ Coro__State c)
387{ 396{
388#define VAR(name,type) PL_ ## name = c->name; 397#define VAR(name,type) PL_ ## name = c->name;
389# include "state.h" 398# include "state.h"
390#undef VAR 399#undef VAR
391 400
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 401 GvSV (PL_defgv) = c->defsv;
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 402 GvAV (PL_defgv) = c->defav;
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 403 GvSV (PL_errgv) = c->errsv;
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 404 GvSV (irsgv) = c->irssv_sv;
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 405
412 { 406 {
413 dSP; 407 dSP;
414 CV *cv; 408 CV *cv;
415 409
473 } 467 }
474 468
475 PUTBACK; 469 PUTBACK;
476 } 470 }
477 471
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 472 c->defav = GvAV (PL_defgv);
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 473 c->defsv = DEFSV;
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 474 c->errsv = ERRSV;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 475 c->irssv_sv = GvSV (irsgv);
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
483 476
484#define VAR(name,type)c->name = PL_ ## name; 477#define VAR(name,type)c->name = PL_ ## name;
485# include "state.h" 478# include "state.h"
486#undef VAR 479#undef VAR
487} 480}
540 * destroy the stacks, the callchain etc... 533 * destroy the stacks, the callchain etc...
541 */ 534 */
542static void 535static void
543coro_destroy_stacks (pTHX) 536coro_destroy_stacks (pTHX)
544{ 537{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 538 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 539 PL_curstackinfo = PL_curstackinfo->si_next;
564 540
565 while (PL_curstackinfo) 541 while (PL_curstackinfo)
566 { 542 {
584} 560}
585 561
586static size_t 562static size_t
587coro_rss (pTHX_ struct coro *coro) 563coro_rss (pTHX_ struct coro *coro)
588{ 564{
589 size_t rss = sizeof (coro); 565 size_t rss = sizeof (*coro);
590 566
591 if (coro->mainstack) 567 if (coro->mainstack)
592 { 568 {
593 if (coro->flags & CF_RUNNING) 569 if (coro->flags & CF_RUNNING)
594 { 570 {
596 # include "state.h" 572 # include "state.h"
597 #undef VAR 573 #undef VAR
598 } 574 }
599 575
600 rss += sizeof (coro->curstackinfo); 576 rss += sizeof (coro->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *); 577 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 578 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 579 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 580 rss += coro->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 581 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 582 rss += coro->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 583 rss += coro->savestack_max * sizeof (ANY);
608 584
615} 591}
616 592
617/** coroutine stack handling ************************************************/ 593/** coroutine stack handling ************************************************/
618 594
619static void 595static void
620setup_coro (pTHX_ struct coro *coro) 596coro_setup (pTHX_ struct coro *coro)
621{ 597{
622 /* 598 /*
623 * emulate part of the perl startup here. 599 * emulate part of the perl startup here.
624 */ 600 */
625 coro_init_stacks (aTHX); 601 coro_init_stacks (aTHX);
630 PL_comppad = 0; 606 PL_comppad = 0;
631 PL_curpm = 0; 607 PL_curpm = 0;
632 PL_localizing = 0; 608 PL_localizing = 0;
633 PL_dirty = 0; 609 PL_dirty = 0;
634 PL_restartop = 0; 610 PL_restartop = 0;
611
612 GvSV (PL_defgv) = newSV (0);
613 GvAV (PL_defgv) = coro->args; coro->args = 0;
614 GvSV (PL_errgv) = newSV (0);
615 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
616 PL_rs = newSVsv (GvSV (irsgv));
617 PL_defoutgv = SvREFCNT_inc (stdoutgv);
618
619 ENTER; /* necessary e.g. for dounwind */
635 620
636 { 621 {
637 dSP; 622 dSP;
638 LOGOP myop; 623 LOGOP myop;
639 624
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 625 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 626 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 627 myop.op_flags = OPf_WANT_VOID;
646 628
647 PUSHMARK (SP); 629 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 630 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 631 PUTBACK;
650 PL_op = (OP *)&myop; 632 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 633 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 634 SPAGAIN;
653 } 635 }
636}
654 637
655 ENTER; /* necessary e.g. for dounwind */ 638static void
639coro_destroy (pTHX_ struct coro *coro)
640{
641 if (!IN_DESTRUCT)
642 {
643 /* restore all saved variables and stuff */
644 LEAVE_SCOPE (0);
645 assert (PL_tmps_floor == -1);
646
647 /* free all temporaries */
648 FREETMPS;
649 assert (PL_tmps_ix == -1);
650
651 /* unwind all extra stacks */
652 POPSTACK_TO (PL_mainstack);
653
654 /* unwind main stack */
655 dounwind (-1);
656 }
657
658 SvREFCNT_dec (GvSV (PL_defgv));
659 SvREFCNT_dec (GvAV (PL_defgv));
660 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv));
664
665 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw);
667
668 coro_destroy_stacks (aTHX);
656} 669}
657 670
658static void 671static void
659free_coro_mortal (pTHX) 672free_coro_mortal (pTHX)
660{ 673{
675 688
676 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 689 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
677 { 690 {
678 PERL_ASYNC_CHECK (); 691 PERL_ASYNC_CHECK ();
679 692
680 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 693 if (cctx->flags & CC_TRACE_ALL)
681 { 694 {
682 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 695 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
683 SV **bot, **top;
684 AV *av = newAV (); /* return values */
685 SV **cb;
686 runops_proc_t old_runops = PL_runops;
687 dSP;
688 ENTER;
689 SAVETMPS;
690 EXTEND (SP, 3);
691 PL_runops = RUNOPS_DEFAULT;
692
693 GV *gv = CvGV (cx->blk_sub.cv);
694 SV *fullname = sv_2mortal (newSV (0));
695 if (isGV (gv))
696 gv_efullname3 (fullname, gv, 0);
697
698 bot = PL_stack_base + cx->blk_oldsp + 1;
699 top = cx->blk_gimme == G_ARRAY ? SP + 1
700 : cx->blk_gimme == G_SCALAR ? bot + 1
701 : bot;
702
703 while (bot < top)
704 av_push (av, SvREFCNT_inc (*bot++));
705
706 PUSHMARK (SP);
707 PUSHs (&PL_sv_no);
708 PUSHs (fullname);
709 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
710 PUTBACK;
711 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
712 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
713 SPAGAIN;
714
715 FREETMPS;
716 LEAVE;
717 PL_runops = old_runops;
718 }
719
720 if (oldcop != PL_curcop)
721 {
722 oldcop = PL_curcop;
723
724 if (PL_curcop != &PL_compiling)
725 { 696 {
697 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
698 SV **bot, **top;
699 AV *av = newAV (); /* return values */
726 SV **cb; 700 SV **cb;
727 runops_proc_t old_runops = PL_runops;
728 dSP; 701 dSP;
702
703 GV *gv = CvGV (cx->blk_sub.cv);
704 SV *fullname = sv_2mortal (newSV (0));
705 if (isGV (gv))
706 gv_efullname3 (fullname, gv, 0);
707
708 bot = PL_stack_base + cx->blk_oldsp + 1;
709 top = cx->blk_gimme == G_ARRAY ? SP + 1
710 : cx->blk_gimme == G_SCALAR ? bot + 1
711 : bot;
712
713 av_extend (av, top - bot);
714 while (bot < top)
715 av_push (av, SvREFCNT_inc (*bot++));
716
717 PL_runops = RUNOPS_DEFAULT;
729 ENTER; 718 ENTER;
730 SAVETMPS; 719 SAVETMPS;
731 EXTEND (SP, 3); 720 EXTEND (SP, 3);
732 PL_runops = RUNOPS_DEFAULT; 721 PUSHMARK (SP);
722 PUSHs (&PL_sv_no);
723 PUSHs (fullname);
724 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
725 PUTBACK;
726 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
727 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
728 SPAGAIN;
729 FREETMPS;
730 LEAVE;
731 PL_runops = runops_trace;
732 }
733 733
734 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 734 if (oldcop != PL_curcop)
735 {
736 oldcop = PL_curcop;
737
738 if (PL_curcop != &PL_compiling)
735 { 739 {
736 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 740 SV **cb;
737 741
738 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 742 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
739 { 743 {
744 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
745
746 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
747 {
748 runops_proc_t old_runops = PL_runops;
749 dSP;
740 GV *gv = CvGV (cx->blk_sub.cv); 750 GV *gv = CvGV (cx->blk_sub.cv);
741 SV *fullname = sv_2mortal (newSV (0)); 751 SV *fullname = sv_2mortal (newSV (0));
752
742 if (isGV (gv)) 753 if (isGV (gv))
743 gv_efullname3 (fullname, gv, 0); 754 gv_efullname3 (fullname, gv, 0);
744 755
756 PL_runops = RUNOPS_DEFAULT;
757 ENTER;
758 SAVETMPS;
759 EXTEND (SP, 3);
760 PUSHMARK (SP);
761 PUSHs (&PL_sv_yes);
762 PUSHs (fullname);
763 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
764 PUTBACK;
765 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
766 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
767 SPAGAIN;
768 FREETMPS;
769 LEAVE;
770 PL_runops = runops_trace;
771 }
772
773 oldcxix = cxstack_ix;
774 }
775
776 if (cctx->flags & CC_TRACE_LINE)
777 {
778 dSP;
779
780 PL_runops = RUNOPS_DEFAULT;
781 ENTER;
782 SAVETMPS;
783 EXTEND (SP, 3);
784 PL_runops = RUNOPS_DEFAULT;
745 PUSHMARK (SP); 785 PUSHMARK (SP);
746 PUSHs (&PL_sv_yes); 786 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
747 PUSHs (fullname); 787 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
748 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
749 PUTBACK; 788 PUTBACK;
750 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 789 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
751 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 790 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
752 SPAGAIN; 791 SPAGAIN;
792 FREETMPS;
793 LEAVE;
794 PL_runops = runops_trace;
753 } 795 }
754
755 oldcxix = cxstack_ix;
756 } 796 }
757
758 if (cctx->flags & CC_TRACE_LINE)
759 {
760 PUSHMARK (SP);
761 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
762 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
763 PUTBACK;
764 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
765 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
766 SPAGAIN;
767 }
768
769 FREETMPS;
770 LEAVE;
771 PL_runops = old_runops;
772 } 797 }
773 } 798 }
774 } 799 }
775 800
776 TAINT_NOT; 801 TAINT_NOT;
905 Safefree (cctx->sptr); 930 Safefree (cctx->sptr);
906 931
907 Safefree (cctx); 932 Safefree (cctx);
908} 933}
909 934
935/* wether this cctx should be destructed */
936#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
937
910static coro_cctx * 938static coro_cctx *
911cctx_get (pTHX) 939cctx_get (pTHX)
912{ 940{
913 while (cctx_first) 941 while (cctx_first)
914 { 942 {
915 coro_cctx *cctx = cctx_first; 943 coro_cctx *cctx = cctx_first;
916 cctx_first = cctx->next; 944 cctx_first = cctx->next;
917 --cctx_idle; 945 --cctx_idle;
918 946
919 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 947 if (!CCTX_EXPIRED (cctx))
920 return cctx; 948 return cctx;
921 949
922 cctx_destroy (cctx); 950 cctx_destroy (cctx);
923 } 951 }
924 952
998 /* need to start coroutine */ 1026 /* need to start coroutine */
999 next->flags &= ~CF_NEW; 1027 next->flags &= ~CF_NEW;
1000 /* first get rid of the old state */ 1028 /* first get rid of the old state */
1001 save_perl (aTHX_ prev); 1029 save_perl (aTHX_ prev);
1002 /* setup coroutine call */ 1030 /* setup coroutine call */
1003 setup_coro (aTHX_ next); 1031 coro_setup (aTHX_ next);
1004 } 1032 }
1005 else 1033 else
1006 { 1034 {
1007 /* coroutine already started */ 1035 /* coroutine already started */
1008 save_perl (aTHX_ prev); 1036 save_perl (aTHX_ prev);
1017 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1045 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1018 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1046 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1019 1047
1020 prev->cctx = 0; 1048 prev->cctx = 0;
1021 1049
1050 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1051 if (CCTX_EXPIRED (prev__cctx))
1052 next->cctx = cctx_get (aTHX);
1053
1022 cctx_put (prev__cctx); 1054 cctx_put (prev__cctx);
1023 } 1055 }
1024 1056
1025 ++next->usecount; 1057 ++next->usecount;
1026 1058
1070 1102
1071 if (coro->mainstack && coro->mainstack != main_mainstack) 1103 if (coro->mainstack && coro->mainstack != main_mainstack)
1072 { 1104 {
1073 struct coro temp; 1105 struct coro temp;
1074 1106
1075 assert (!(coro->flags & CF_RUNNING));
1076
1077 Zero (&temp, 1, struct coro);
1078 temp.save = CORO_SAVE_ALL;
1079
1080 if (coro->flags & CF_RUNNING) 1107 if (coro->flags & CF_RUNNING)
1081 croak ("FATAL: tried to destroy currently running coroutine"); 1108 croak ("FATAL: tried to destroy currently running coroutine");
1082 1109
1083 save_perl (aTHX_ &temp); 1110 save_perl (aTHX_ &temp);
1084 load_perl (aTHX_ coro); 1111 load_perl (aTHX_ coro);
1085 1112
1086 coro_destroy_stacks (aTHX); 1113 coro_destroy (aTHX_ coro);
1087 1114
1088 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1115 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1089 1116
1090 coro->mainstack = 0; 1117 coro->mainstack = 0;
1091 } 1118 }
1154 1181
1155 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1182 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1156 TRANSFER (ta); 1183 TRANSFER (ta);
1157} 1184}
1158 1185
1159static int
1160api_save (SV *coro_sv, int new_save)
1161{
1162 dTHX;
1163 struct coro *coro = SvSTATE (coro_sv);
1164 int old_save = coro->save;
1165
1166 if (new_save >= 0)
1167 coro->save = new_save;
1168
1169 return old_save;
1170}
1171
1172/** Coro ********************************************************************/ 1186/** Coro ********************************************************************/
1173 1187
1174static void 1188static void
1175coro_enq (pTHX_ SV *coro_sv) 1189coro_enq (pTHX_ SV *coro_sv)
1176{ 1190{
1343 } 1357 }
1344 else 1358 else
1345 return 0; 1359 return 0;
1346} 1360}
1347 1361
1362static void
1363api_trace (SV *coro_sv, int flags)
1364{
1365 dTHX;
1366 struct coro *coro = SvSTATE (coro_sv);
1367
1368 if (flags & CC_TRACE)
1369 {
1370 if (!coro->cctx)
1371 coro->cctx = cctx_new ();
1372 else if (!(coro->cctx->flags & CC_TRACE))
1373 croak ("cannot enable tracing on coroutine with custom stack");
1374
1375 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1376 }
1377 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1378 {
1379 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1380
1381 if (coro->flags & CF_RUNNING)
1382 PL_runops = RUNOPS_DEFAULT;
1383 else
1384 coro->runops = RUNOPS_DEFAULT;
1385 }
1386}
1387
1348MODULE = Coro::State PACKAGE = Coro::State 1388MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1349 1389
1350PROTOTYPES: DISABLE 1390PROTOTYPES: DISABLE
1351 1391
1352BOOT: 1392BOOT:
1353{ 1393{
1354#ifdef USE_ITHREADS 1394#ifdef USE_ITHREADS
1355 MUTEX_INIT (&coro_mutex); 1395 MUTEX_INIT (&coro_mutex);
1356#endif 1396#endif
1357 BOOT_PAGESIZE; 1397 BOOT_PAGESIZE;
1398
1399 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1400 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1358 1401
1359 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1402 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1360 1403
1361 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1404 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1362 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1405 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1363 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1406 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1364 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1407 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1365 1408
1366 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1367 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1368 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1369 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1370 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1371 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1372 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1373
1374 main_mainstack = PL_mainstack; 1409 main_mainstack = PL_mainstack;
1375 main_top_env = PL_top_env; 1410 main_top_env = PL_top_env;
1376 1411
1377 while (main_top_env->je_prev) 1412 while (main_top_env->je_prev)
1378 main_top_env = main_top_env->je_prev; 1413 main_top_env = main_top_env->je_prev;
1390 struct coro *coro; 1425 struct coro *coro;
1391 HV *hv; 1426 HV *hv;
1392 int i; 1427 int i;
1393 1428
1394 Newz (0, coro, 1, struct coro); 1429 Newz (0, coro, 1, struct coro);
1395 coro->args = newAV (); 1430 coro->args = newAV ();
1396 coro->save = CORO_SAVE_DEF;
1397 coro->flags = CF_NEW; 1431 coro->flags = CF_NEW;
1398 1432
1399 if (coro_first) coro_first->prev = coro; 1433 if (coro_first) coro_first->prev = coro;
1400 coro->next = coro_first; 1434 coro->next = coro_first;
1401 coro_first = coro; 1435 coro_first = coro;
1402 1436
1403 coro->hv = hv = newHV (); 1437 coro->hv = hv = newHV ();
1404 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1438 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1405 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1439 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1406 1440
1441 av_extend (coro->args, items - 1);
1407 for (i = 1; i < items; i++) 1442 for (i = 1; i < items; i++)
1408 av_push (coro->args, newSVsv (ST (i))); 1443 av_push (coro->args, newSVsv (ST (i)));
1409} 1444}
1410 OUTPUT: 1445 OUTPUT:
1411 RETVAL 1446 RETVAL
1412 1447
1413int 1448# these not obviously related functions are all rolled into the same xs
1414save (SV *coro, int new_save = -1) 1449# function to increase chances that they all will call transfer with the same
1415 CODE: 1450# stack offset
1416 RETVAL = api_save (coro, new_save);
1417 OUTPUT:
1418 RETVAL
1419
1420int
1421save_also (SV *coro_sv, int save_also)
1422 CODE:
1423{
1424 struct coro *coro = SvSTATE (coro_sv);
1425 RETVAL = coro->save;
1426 coro->save |= save_also;
1427}
1428 OUTPUT:
1429 RETVAL
1430
1431void 1451void
1432_set_stacklevel (...) 1452_set_stacklevel (...)
1433 ALIAS: 1453 ALIAS:
1434 Coro::State::transfer = 1 1454 Coro::State::transfer = 1
1435 Coro::schedule = 2 1455 Coro::schedule = 2
1530{ 1550{
1531 if (coro->mainstack) 1551 if (coro->mainstack)
1532 { 1552 {
1533 struct coro temp; 1553 struct coro temp;
1534 Zero (&temp, 1, struct coro); 1554 Zero (&temp, 1, struct coro);
1535 temp.save = CORO_SAVE_ALL;
1536 1555
1537 if (!(coro->flags & CF_RUNNING)) 1556 if (!(coro->flags & CF_RUNNING))
1538 { 1557 {
1539 save_perl (aTHX_ &temp); 1558 save_perl (aTHX_ &temp);
1540 load_perl (aTHX_ coro); 1559 load_perl (aTHX_ coro);
1576 RETVAL = boolSV (coro->flags & ix); 1595 RETVAL = boolSV (coro->flags & ix);
1577 OUTPUT: 1596 OUTPUT:
1578 RETVAL 1597 RETVAL
1579 1598
1580void 1599void
1581trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1600api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1582 CODE:
1583 if (flags & CC_TRACE)
1584 {
1585 if (!coro->cctx)
1586 coro->cctx = cctx_new ();
1587 else if (!(coro->cctx->flags & CC_TRACE))
1588 croak ("cannot enable tracing on coroutine with custom stack");
1589
1590 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1591 }
1592 else
1593 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1594 {
1595 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1596 coro->cctx->flags |= CC_NOREUSE;
1597
1598 if (coro->flags & CF_RUNNING)
1599 PL_runops = RUNOPS_DEFAULT;
1600 else
1601 coro->runops = RUNOPS_DEFAULT;
1602 }
1603 1601
1604SV * 1602SV *
1605has_stack (Coro::State coro) 1603has_stack (Coro::State coro)
1606 PROTOTYPE: $ 1604 PROTOTYPE: $
1607 CODE: 1605 CODE:
1640 1638
1641 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1639 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1642 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1640 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1643 av_async_pool = get_av ("Coro::async_pool", TRUE); 1641 av_async_pool = get_av ("Coro::async_pool", TRUE);
1644 1642
1645 coro_current = get_sv ("Coro::current", FALSE); 1643 coro_current = get_sv ("Coro::current", FALSE);
1646 SvREADONLY_on (coro_current); 1644 SvREADONLY_on (coro_current);
1647 1645
1648 coro_stash = gv_stashpv ("Coro", TRUE); 1646 coro_stash = gv_stashpv ("Coro", TRUE);
1649 1647
1650 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1648 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1659 1657
1660 { 1658 {
1661 SV *sv = perl_get_sv("Coro::API", 1); 1659 SV *sv = perl_get_sv("Coro::API", 1);
1662 1660
1663 coroapi.schedule = api_schedule; 1661 coroapi.schedule = api_schedule;
1664 coroapi.save = api_save;
1665 coroapi.cede = api_cede; 1662 coroapi.cede = api_cede;
1666 coroapi.cede_notself = api_cede_notself; 1663 coroapi.cede_notself = api_cede_notself;
1667 coroapi.ready = api_ready; 1664 coroapi.ready = api_ready;
1668 coroapi.is_ready = api_is_ready; 1665 coroapi.is_ready = api_is_ready;
1669 coroapi.nready = &coro_nready; 1666 coroapi.nready = &coro_nready;
1723# for async_pool speedup 1720# for async_pool speedup
1724void 1721void
1725_pool_1 (SV *cb) 1722_pool_1 (SV *cb)
1726 CODE: 1723 CODE:
1727{ 1724{
1728 int i, len; 1725 struct coro *coro = SvSTATE (coro_current);
1729 HV *hv = (HV *)SvRV (coro_current); 1726 HV *hv = (HV *)SvRV (coro_current);
1730 AV *defav = GvAV (PL_defgv); 1727 AV *defav = GvAV (PL_defgv);
1731 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1728 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1732 AV *invoke_av; 1729 AV *invoke_av;
1730 int i, len;
1733 1731
1734 if (!invoke) 1732 if (!invoke)
1735 croak ("\3terminate\2\n"); 1733 croak ("\3terminate\2\n");
1734
1735 SvREFCNT_dec (coro->saved_deffh);
1736 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1736 1737
1737 hv_store (hv, "desc", sizeof ("desc") - 1, 1738 hv_store (hv, "desc", sizeof ("desc") - 1,
1738 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1739 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1739 1740
1740 invoke_av = (AV *)SvRV (invoke); 1741 invoke_av = (AV *)SvRV (invoke);
1758{ 1759{
1759 struct coro *coro = SvSTATE (coro_current); 1760 struct coro *coro = SvSTATE (coro_current);
1760 1761
1761 sv_setsv (cb, &PL_sv_undef); 1762 sv_setsv (cb, &PL_sv_undef);
1762 1763
1764 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1765 coro->saved_deffh = 0;
1766
1763 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1767 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1764 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1768 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1765 croak ("\3terminate\2\n"); 1769 croak ("\3terminate\2\n");
1766 1770
1767 av_clear (GvAV (PL_defgv)); 1771 av_clear (GvAV (PL_defgv));
1768 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1772 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1769 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1773 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1770 coro->save = CORO_SAVE_DEF; 1774
1771 coro->prio = 0; 1775 coro->prio = 0;
1776
1777 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1778 api_trace (coro_current, 0);
1779
1772 av_push (av_async_pool, newSVsv (coro_current)); 1780 av_push (av_async_pool, newSVsv (coro_current));
1773} 1781}
1774 1782
1775 1783
1776MODULE = Coro::State PACKAGE = Coro::AIO 1784MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines