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

Diff Legend

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