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

Diff Legend

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