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.167 by root, Thu Sep 27 15:52:31 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
214 /* statistics */
215 int usecount; /* number of transfers to this coro */
216
204 /* coro process data */ 217 /* coro process data */
205 int prio; 218 int prio;
219 //SV *throw;
220
221 /* async_pool */
222 SV *saved_deffh;
206 223
207 /* linked list */ 224 /* linked list */
208 struct coro *next, *prev; 225 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */ 226 HV *hv; /* the perl hash associated with this coro, if any */
210}; 227};
… …
298 SvMAGIC (cv) \ 315 SvMAGIC (cv) \
299 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 316 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
300 ? SvMAGIC (cv) \ 317 ? SvMAGIC (cv) \
301 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 318 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
302 : 0 319 : 0
320
321static struct coro *
322SvSTATE_ (pTHX_ SV *coro)
323{
324 HV *stash;
325 MAGIC *mg;
326
327 if (SvROK (coro))
328 coro = SvRV (coro);
329
330 if (SvTYPE (coro) != SVt_PVHV)
331 croak ("Coro::State object required");
332
333 stash = SvSTASH (coro);
334 if (stash != coro_stash && stash != coro_state_stash)
335 {
336 /* very slow, but rare, check */
337 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
338 croak ("Coro::State object required");
339 }
340
341 mg = CORO_MAGIC (coro);
342 return (struct coro *)mg->mg_ptr;
343}
344
345#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
303 346
304/* the next two functions merely cache the padlists */ 347/* the next two functions merely cache the padlists */
305static void 348static void
306get_padlist (pTHX_ CV *cv) 349get_padlist (pTHX_ CV *cv)
307{ 350{
… …
346 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 389 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
347} 390}
348 391
349/** load & save, init *******************************************************/ 392/** load & save, init *******************************************************/
350 393
351#define SB do {
352#define SE } while (0)
353
354#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
355
356static void 394static void
357load_perl (pTHX_ Coro__State c) 395load_perl (pTHX_ Coro__State c)
358{ 396{
359#define VAR(name,type) PL_ ## name = c->name; 397#define VAR(name,type) PL_ ## name = c->name;
360# include "state.h" 398# include "state.h"
361#undef VAR 399#undef VAR
362 400
363 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 401 GvSV (PL_defgv) = c->defsv;
364 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 402 GvAV (PL_defgv) = c->defav;
365 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 403 GvSV (PL_errgv) = c->errsv;
366 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 404 GvSV (irsgv) = c->irssv_sv;
367
368 if (c->irssv)
369 {
370 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
371 {
372 SvREFCNT_dec (c->irssv);
373 c->irssv = 0;
374 }
375 else
376 {
377 REPLACE_SV (PL_rs, c->irssv);
378 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
379 sv_setsv (c->irssv_sv, PL_rs);
380 }
381 }
382 405
383 { 406 {
384 dSP; 407 dSP;
385 CV *cv; 408 CV *cv;
386 409
… …
444 } 467 }
445 468
446 PUTBACK; 469 PUTBACK;
447 } 470 }
448 471
449 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 472 c->defav = GvAV (PL_defgv);
450 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 473 c->defsv = DEFSV;
451 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 474 c->errsv = ERRSV;
452 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 475 c->irssv_sv = GvSV (irsgv);
453 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
454 476
455#define VAR(name,type)c->name = PL_ ## name; 477#define VAR(name,type)c->name = PL_ ## name;
456# include "state.h" 478# include "state.h"
457#undef VAR 479#undef VAR
458} 480}
… …
511 * destroy the stacks, the callchain etc... 533 * destroy the stacks, the callchain etc...
512 */ 534 */
513static void 535static void
514coro_destroy_stacks (pTHX) 536coro_destroy_stacks (pTHX)
515{ 537{
516 if (!IN_DESTRUCT)
517 {
518 /* restore all saved variables and stuff */
519 LEAVE_SCOPE (0);
520 assert (PL_tmps_floor == -1);
521
522 /* free all temporaries */
523 FREETMPS;
524 assert (PL_tmps_ix == -1);
525
526 /* unwind all extra stacks */
527 POPSTACK_TO (PL_mainstack);
528
529 /* unwind main stack */
530 dounwind (-1);
531 }
532
533 while (PL_curstackinfo->si_next) 538 while (PL_curstackinfo->si_next)
534 PL_curstackinfo = PL_curstackinfo->si_next; 539 PL_curstackinfo = PL_curstackinfo->si_next;
535 540
536 while (PL_curstackinfo) 541 while (PL_curstackinfo)
537 { 542 {
… …
553 Safefree (PL_retstack); 558 Safefree (PL_retstack);
554#endif 559#endif
555} 560}
556 561
557static size_t 562static size_t
558coro_rss (struct coro *coro) 563coro_rss (pTHX_ struct coro *coro)
559{ 564{
560 size_t rss = sizeof (coro); 565 size_t rss = sizeof (*coro);
561 566
562 if (coro->mainstack) 567 if (coro->mainstack)
563 { 568 {
564 if (coro->flags & CF_RUNNING) 569 if (coro->flags & CF_RUNNING)
565 { 570 {
… …
567 # include "state.h" 572 # include "state.h"
568 #undef VAR 573 #undef VAR
569 } 574 }
570 575
571 rss += sizeof (coro->curstackinfo); 576 rss += sizeof (coro->curstackinfo);
572 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 *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 578 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 579 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 580 rss += coro->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 581 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 582 rss += coro->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 583 rss += coro->savestack_max * sizeof (ANY);
579 584
… …
586} 591}
587 592
588/** coroutine stack handling ************************************************/ 593/** coroutine stack handling ************************************************/
589 594
590static void 595static void
591setup_coro (pTHX_ struct coro *coro) 596coro_setup (pTHX_ struct coro *coro)
592{ 597{
593 /* 598 /*
594 * emulate part of the perl startup here. 599 * emulate part of the perl startup here.
595 */ 600 */
596 coro_init_stacks (aTHX); 601 coro_init_stacks (aTHX);
597 602
603 PL_runops = RUNOPS_DEFAULT;
598 PL_curcop = &PL_compiling; 604 PL_curcop = &PL_compiling;
599 PL_in_eval = EVAL_NULL; 605 PL_in_eval = EVAL_NULL;
600 PL_comppad = 0; 606 PL_comppad = 0;
601 PL_curpm = 0; 607 PL_curpm = 0;
602 PL_localizing = 0; 608 PL_localizing = 0;
603 PL_dirty = 0; 609 PL_dirty = 0;
604 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 */
605 620
606 { 621 {
607 dSP; 622 dSP;
608 LOGOP myop; 623 LOGOP myop;
609 624
610 SvREFCNT_dec (GvAV (PL_defgv));
611 GvAV (PL_defgv) = coro->args; coro->args = 0;
612
613 Zero (&myop, 1, LOGOP); 625 Zero (&myop, 1, LOGOP);
614 myop.op_next = Nullop; 626 myop.op_next = Nullop;
615 myop.op_flags = OPf_WANT_VOID; 627 myop.op_flags = OPf_WANT_VOID;
616 628
617 PUSHMARK (SP); 629 PUSHMARK (SP);
618 XPUSHs (av_shift (GvAV (PL_defgv))); 630 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
619 PUTBACK; 631 PUTBACK;
620 PL_op = (OP *)&myop; 632 PL_op = (OP *)&myop;
621 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 633 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
622 SPAGAIN; 634 SPAGAIN;
623 } 635 }
636}
624 637
625 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);
626} 669}
627 670
628static void 671static void
629free_coro_mortal (pTHX) 672free_coro_mortal (pTHX)
630{ 673{
… …
634 coro_mortal = 0; 677 coro_mortal = 0;
635 } 678 }
636} 679}
637 680
638static int 681static int
639runops_coro (pTHX) 682runops_trace (pTHX)
640{ 683{
641 COP *oldcop = 0; 684 COP *oldcop = 0;
642 int oldcxix = -2; 685 int oldcxix = -2;
686 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
687 coro_cctx *cctx = coro->cctx;
643 688
644 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 689 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
645 { 690 {
646 PERL_ASYNC_CHECK (); 691 PERL_ASYNC_CHECK ();
647 692
648 if (PL_op->op_type == OP_LEAVESUB) 693 if (cctx->flags & CC_TRACE_ALL)
649 { 694 {
650 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 695 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
651 SV **bot, **top;
652 AV *av = newAV (); /* return values */
653 runops_proc_t old_runops = PL_runops;
654 dSP;
655 ENTER;
656 SAVETMPS;
657 EXTEND (SP, 3);
658 PL_runops = RUNOPS_DEFAULT;
659
660 GV *gv = CvGV (cx->blk_sub.cv);
661 SV *fullname = sv_2mortal (newSV (0));
662 if (isGV (gv))
663 gv_efullname3 (fullname, gv, 0);
664
665 bot = PL_stack_base + cx->blk_oldsp + 1;
666 top = cx->blk_gimme == G_ARRAY ? SP + 1
667 : cx->blk_gimme == G_SCALAR ? bot + 1
668 : bot;
669
670 while (bot < top)
671 av_push (av, SvREFCNT_inc (*bot++));
672
673 PUSHMARK (SP);
674 PUSHs (&PL_sv_no);
675 PUSHs (fullname);
676 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
677 PUTBACK;
678 call_pv ("Coro::_do_trace_sub", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
679 SPAGAIN;
680
681 FREETMPS;
682 LEAVE;
683 PL_runops = old_runops;
684 }
685
686 if (oldcop != PL_curcop)
687 {
688 oldcop = PL_curcop;
689
690 if (PL_curcop != &PL_compiling)
691 { 696 {
692 runops_proc_t old_runops = PL_runops; 697 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
698 SV **bot, **top;
699 AV *av = newAV (); /* return values */
700 SV **cb;
693 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;
694 ENTER; 718 ENTER;
695 SAVETMPS; 719 SAVETMPS;
696 EXTEND (SP, 3); 720 EXTEND (SP, 3);
697 PL_runops = RUNOPS_DEFAULT;
698
699 if (oldcxix != cxstack_ix)
700 {
701 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
702
703 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
704 {
705 GV *gv = CvGV (cx->blk_sub.cv);
706 SV *fullname = sv_2mortal (newSV (0));
707 if (isGV (gv))
708 gv_efullname3 (fullname, gv, 0);
709
710 PUSHMARK (SP);
711 PUSHs (&PL_sv_yes);
712 PUSHs (fullname);
713 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
714 PUTBACK;
715 call_pv ("Coro::_do_trace_sub", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
716 SPAGAIN;
717 }
718
719 oldcxix = cxstack_ix;
720 }
721
722 if (0) {
723 PUSHMARK (SP); 721 PUSHMARK (SP);
724 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 722 PUSHs (&PL_sv_no);
725 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 723 PUSHs (fullname);
724 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
726 PUTBACK; 725 PUTBACK;
726 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
727 call_pv ("Coro::_do_trace_line", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 727 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
728 SPAGAIN; 728 SPAGAIN;
729 }
730
731 FREETMPS; 729 FREETMPS;
732 LEAVE; 730 LEAVE;
733 PL_runops = old_runops; 731 PL_runops = runops_trace;
732 }
733
734 if (oldcop != PL_curcop)
735 {
736 oldcop = PL_curcop;
737
738 if (PL_curcop != &PL_compiling)
739 {
740 SV **cb;
741
742 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
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;
750 GV *gv = CvGV (cx->blk_sub.cv);
751 SV *fullname = sv_2mortal (newSV (0));
752
753 if (isGV (gv))
754 gv_efullname3 (fullname, gv, 0);
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;
785 PUSHMARK (SP);
786 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
787 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
788 PUTBACK;
789 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
790 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
791 SPAGAIN;
792 FREETMPS;
793 LEAVE;
794 PL_runops = runops_trace;
795 }
796 }
734 } 797 }
735 } 798 }
736 } 799 }
737 800
738 TAINT_NOT; 801 TAINT_NOT;
… …
749 LOGOP myop; 812 LOGOP myop;
750 813
751 PL_top_env = &PL_start_env; 814 PL_top_env = &PL_start_env;
752 815
753 if (cctx->flags & CC_TRACE) 816 if (cctx->flags & CC_TRACE)
754 PL_runops = runops_coro; 817 PL_runops = runops_trace;
755 818
756 Zero (&myop, 1, LOGOP); 819 Zero (&myop, 1, LOGOP);
757 myop.op_next = PL_op; 820 myop.op_next = PL_op;
758 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 821 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
759 822
… …
867 Safefree (cctx->sptr); 930 Safefree (cctx->sptr);
868 931
869 Safefree (cctx); 932 Safefree (cctx);
870} 933}
871 934
935/* wether this cctx should be destructed */
936#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
937
872static coro_cctx * 938static coro_cctx *
873cctx_get (pTHX) 939cctx_get (pTHX)
874{ 940{
875 while (cctx_first) 941 while (cctx_first)
876 { 942 {
877 coro_cctx *cctx = cctx_first; 943 coro_cctx *cctx = cctx_first;
878 cctx_first = cctx->next; 944 cctx_first = cctx->next;
879 --cctx_idle; 945 --cctx_idle;
880 946
881 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 947 if (!CCTX_EXPIRED (cctx))
882 return cctx; 948 return cctx;
883 949
884 cctx_destroy (cctx); 950 cctx_destroy (cctx);
885 } 951 }
886 952
… …
905 cctx_first = cctx; 971 cctx_first = cctx;
906} 972}
907 973
908/** coroutine switching *****************************************************/ 974/** coroutine switching *****************************************************/
909 975
910/* never call directly, always through the coro_state_transfer global variable */ 976static void NOINLINE
977transfer_check (pTHX_ struct coro *prev, struct coro *next)
978{
979 if (prev != next)
980 {
981 if (!(prev->flags & (CF_RUNNING | CF_NEW)))
982 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
983
984 if (next->flags & CF_RUNNING)
985 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
986
987 if (next->flags & CF_DESTROYED)
988 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
989
990 if (PL_lex_state != LEX_NOTPARSING)
991 croak ("Coro::State::transfer called while parsing, but this is not supported");
992 }
993}
994
995/* always use the TRANSFER macro */
911static void NOINLINE 996static void NOINLINE
912transfer (pTHX_ struct coro *prev, struct coro *next) 997transfer (pTHX_ struct coro *prev, struct coro *next)
913{ 998{
914 dSTACKLEVEL; 999 dSTACKLEVEL;
915 1000
… …
929 Newz (0, prev->cctx, 1, coro_cctx); 1014 Newz (0, prev->cctx, 1, coro_cctx);
930 prev->flags &= ~CF_NEW; 1015 prev->flags &= ~CF_NEW;
931 prev->flags |= CF_RUNNING; 1016 prev->flags |= CF_RUNNING;
932 } 1017 }
933 1018
934 /*TODO: must not croak here */
935 if (!prev->flags & CF_RUNNING)
936 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
937
938 if (next->flags & CF_RUNNING)
939 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
940
941 if (next->flags & CF_DESTROYED)
942 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
943
944 prev->flags &= ~CF_RUNNING; 1019 prev->flags &= ~CF_RUNNING;
945 next->flags |= CF_RUNNING; 1020 next->flags |= CF_RUNNING;
946 1021
947 LOCK; 1022 LOCK;
948 1023
… …
951 /* need to start coroutine */ 1026 /* need to start coroutine */
952 next->flags &= ~CF_NEW; 1027 next->flags &= ~CF_NEW;
953 /* first get rid of the old state */ 1028 /* first get rid of the old state */
954 save_perl (aTHX_ prev); 1029 save_perl (aTHX_ prev);
955 /* setup coroutine call */ 1030 /* setup coroutine call */
956 setup_coro (aTHX_ next); 1031 coro_setup (aTHX_ next);
957 } 1032 }
958 else 1033 else
959 { 1034 {
960 /* coroutine already started */ 1035 /* coroutine already started */
961 save_perl (aTHX_ prev); 1036 save_perl (aTHX_ prev);
… …
963 } 1038 }
964 1039
965 prev__cctx = prev->cctx; 1040 prev__cctx = prev->cctx;
966 1041
967 /* possibly "free" the cctx */ 1042 /* possibly "free" the cctx */
968 if (prev__cctx->idle_sp == STACKLEVEL) 1043 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))
969 { 1044 {
970 /* 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 */
971 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));
972 1047
973 prev->cctx = 0; 1048 prev->cctx = 0;
974 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
975 cctx_put (prev__cctx); 1054 cctx_put (prev__cctx);
976 } 1055 }
1056
1057 ++next->usecount;
977 1058
978 if (!next->cctx) 1059 if (!next->cctx)
979 next->cctx = cctx_get (aTHX); 1060 next->cctx = cctx_get (aTHX);
980 1061
981 if (prev__cctx != next->cctx) 1062 if (prev__cctx != next->cctx)
… …
994{ 1075{
995 struct coro *prev, *next; 1076 struct coro *prev, *next;
996}; 1077};
997 1078
998#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1079#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1080#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
999 1081
1000/** high level stuff ********************************************************/ 1082/** high level stuff ********************************************************/
1001 1083
1002static int 1084static int
1003coro_state_destroy (pTHX_ struct coro *coro) 1085coro_state_destroy (pTHX_ struct coro *coro)
… …
1020 1102
1021 if (coro->mainstack && coro->mainstack != main_mainstack) 1103 if (coro->mainstack && coro->mainstack != main_mainstack)
1022 { 1104 {
1023 struct coro temp; 1105 struct coro temp;
1024 1106
1025 assert (!(coro->flags & CF_RUNNING));
1026
1027 Zero (&temp, 1, struct coro);
1028 temp.save = CORO_SAVE_ALL;
1029
1030 if (coro->flags & CF_RUNNING) 1107 if (coro->flags & CF_RUNNING)
1031 croak ("FATAL: tried to destroy currently running coroutine"); 1108 croak ("FATAL: tried to destroy currently running coroutine");
1032 1109
1033 save_perl (aTHX_ &temp); 1110 save_perl (aTHX_ &temp);
1034 load_perl (aTHX_ coro); 1111 load_perl (aTHX_ coro);
1035 1112
1036 coro_destroy_stacks (aTHX); 1113 coro_destroy (aTHX_ coro);
1037 1114
1038 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1115 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1039 1116
1040 coro->mainstack = 0; 1117 coro->mainstack = 0;
1041 } 1118 }
… …
1086#else 1163#else
1087# define MGf_DUP 0 1164# define MGf_DUP 0
1088#endif 1165#endif
1089}; 1166};
1090 1167
1091static struct coro *
1092SvSTATE_ (pTHX_ SV *coro)
1093{
1094 HV *stash;
1095 MAGIC *mg;
1096
1097 if (SvROK (coro))
1098 coro = SvRV (coro);
1099
1100 stash = SvSTASH (coro);
1101 if (stash != coro_stash && stash != coro_state_stash)
1102 {
1103 /* very slow, but rare, check */
1104 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
1105 croak ("Coro::State object required");
1106 }
1107
1108 mg = CORO_MAGIC (coro);
1109 return (struct coro *)mg->mg_ptr;
1110}
1111
1112#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1113
1114static void 1168static void
1115prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1169prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1116{ 1170{
1117 ta->prev = SvSTATE (prev_sv); 1171 ta->prev = SvSTATE (prev_sv);
1118 ta->next = SvSTATE (next_sv); 1172 ta->next = SvSTATE (next_sv);
1173 TRANSFER_CHECK (*ta);
1119} 1174}
1120 1175
1121static void 1176static void
1122api_transfer (SV *prev_sv, SV *next_sv) 1177api_transfer (SV *prev_sv, SV *next_sv)
1123{ 1178{
1124 dTHX; 1179 dTHX;
1125 struct transfer_args ta; 1180 struct transfer_args ta;
1126 1181
1127 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1182 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1128 TRANSFER (ta); 1183 TRANSFER (ta);
1129}
1130
1131static int
1132api_save (SV *coro_sv, int new_save)
1133{
1134 dTHX;
1135 struct coro *coro = SvSTATE (coro_sv);
1136 int old_save = coro->save;
1137
1138 if (new_save >= 0)
1139 coro->save = new_save;
1140
1141 return old_save;
1142} 1184}
1143 1185
1144/** Coro ********************************************************************/ 1186/** Coro ********************************************************************/
1145 1187
1146static void 1188static void
… …
1240 break; 1282 break;
1241 } 1283 }
1242 1284
1243 /* free this only after the transfer */ 1285 /* free this only after the transfer */
1244 prev_sv = SvRV (coro_current); 1286 prev_sv = SvRV (coro_current);
1245 SvRV_set (coro_current, next_sv);
1246 ta->prev = SvSTATE (prev_sv); 1287 ta->prev = SvSTATE (prev_sv);
1247 1288 TRANSFER_CHECK (*ta);
1248 assert (ta->next->flags & CF_READY); 1289 assert (ta->next->flags & CF_READY);
1249 ta->next->flags &= ~CF_READY; 1290 ta->next->flags &= ~CF_READY;
1291 SvRV_set (coro_current, next_sv);
1250 1292
1251 LOCK; 1293 LOCK;
1252 free_coro_mortal (aTHX); 1294 free_coro_mortal (aTHX);
1253 coro_mortal = prev_sv; 1295 coro_mortal = prev_sv;
1254 UNLOCK; 1296 UNLOCK;
… …
1315 } 1357 }
1316 else 1358 else
1317 return 0; 1359 return 0;
1318} 1360}
1319 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
1320MODULE = Coro::State PACKAGE = Coro::State 1388MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1321 1389
1322PROTOTYPES: DISABLE 1390PROTOTYPES: DISABLE
1323 1391
1324BOOT: 1392BOOT:
1325{ 1393{
1326#ifdef USE_ITHREADS 1394#ifdef USE_ITHREADS
1327 MUTEX_INIT (&coro_mutex); 1395 MUTEX_INIT (&coro_mutex);
1328#endif 1396#endif
1329 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);
1330 1401
1331 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1402 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1332 1403
1333 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1404 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1334 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1405 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1335 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1406 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1336 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1407 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1337 1408
1338 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1339 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1340 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1341 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1342 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1343 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1344 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1345
1346 main_mainstack = PL_mainstack; 1409 main_mainstack = PL_mainstack;
1347 main_top_env = PL_top_env; 1410 main_top_env = PL_top_env;
1348 1411
1349 while (main_top_env->je_prev) 1412 while (main_top_env->je_prev)
1350 main_top_env = main_top_env->je_prev; 1413 main_top_env = main_top_env->je_prev;
… …
1362 struct coro *coro; 1425 struct coro *coro;
1363 HV *hv; 1426 HV *hv;
1364 int i; 1427 int i;
1365 1428
1366 Newz (0, coro, 1, struct coro); 1429 Newz (0, coro, 1, struct coro);
1367 coro->args = newAV (); 1430 coro->args = newAV ();
1368 coro->save = CORO_SAVE_DEF;
1369 coro->flags = CF_NEW; 1431 coro->flags = CF_NEW;
1370 1432
1371 if (coro_first) coro_first->prev = coro; 1433 if (coro_first) coro_first->prev = coro;
1372 coro->next = coro_first; 1434 coro->next = coro_first;
1373 coro_first = coro; 1435 coro_first = coro;
1374 1436
1375 coro->hv = hv = newHV (); 1437 coro->hv = hv = newHV ();
1376 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;
1377 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1439 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1378 1440
1441 av_extend (coro->args, items - 1);
1379 for (i = 1; i < items; i++) 1442 for (i = 1; i < items; i++)
1380 av_push (coro->args, newSVsv (ST (i))); 1443 av_push (coro->args, newSVsv (ST (i)));
1381} 1444}
1382 OUTPUT: 1445 OUTPUT:
1383 RETVAL 1446 RETVAL
1384 1447
1385int 1448# these not obviously related functions are all rolled into the same xs
1386save (SV *coro, int new_save = -1) 1449# function to increase chances that they all will call transfer with the same
1387 CODE: 1450# stack offset
1388 RETVAL = api_save (coro, new_save);
1389 OUTPUT:
1390 RETVAL
1391
1392int
1393save_also (SV *coro_sv, int save_also)
1394 CODE:
1395{
1396 struct coro *coro = SvSTATE (coro_sv);
1397 RETVAL = coro->save;
1398 coro->save |= save_also;
1399}
1400 OUTPUT:
1401 RETVAL
1402
1403void 1451void
1404_set_stacklevel (...) 1452_set_stacklevel (...)
1405 ALIAS: 1453 ALIAS:
1406 Coro::State::transfer = 1 1454 Coro::State::transfer = 1
1407 Coro::schedule = 2 1455 Coro::schedule = 2
… …
1502{ 1550{
1503 if (coro->mainstack) 1551 if (coro->mainstack)
1504 { 1552 {
1505 struct coro temp; 1553 struct coro temp;
1506 Zero (&temp, 1, struct coro); 1554 Zero (&temp, 1, struct coro);
1507 temp.save = CORO_SAVE_ALL;
1508 1555
1509 if (!(coro->flags & CF_RUNNING)) 1556 if (!(coro->flags & CF_RUNNING))
1510 { 1557 {
1511 save_perl (aTHX_ &temp); 1558 save_perl (aTHX_ &temp);
1512 load_perl (aTHX_ coro); 1559 load_perl (aTHX_ coro);
… …
1533 save_perl (aTHX_ coro); 1580 save_perl (aTHX_ coro);
1534 load_perl (aTHX_ &temp); 1581 load_perl (aTHX_ &temp);
1535 } 1582 }
1536 } 1583 }
1537} 1584}
1538 1585
1539SV * 1586SV *
1540is_ready (Coro::State coro) 1587is_ready (Coro::State coro)
1541 PROTOTYPE: $ 1588 PROTOTYPE: $
1542 ALIAS: 1589 ALIAS:
1543 is_ready = CF_READY 1590 is_ready = CF_READY
… …
1548 RETVAL = boolSV (coro->flags & ix); 1595 RETVAL = boolSV (coro->flags & ix);
1549 OUTPUT: 1596 OUTPUT:
1550 RETVAL 1597 RETVAL
1551 1598
1552void 1599void
1553trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1600api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1554 CODE:
1555 if (flags & CC_TRACE)
1556 {
1557 if (!coro->cctx)
1558 coro->cctx = cctx_new ();
1559 else if (!(coro->cctx->flags & CC_TRACE))
1560 croak ("cannot enable tracing on coroutine with custom stack");
1561
1562 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1563 }
1564 else
1565 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1566 {
1567 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1568 coro->cctx->flags |= CC_NOREUSE;
1569 }
1570 1601
1571SV * 1602SV *
1572has_stack (Coro::State coro) 1603has_stack (Coro::State coro)
1573 PROTOTYPE: $ 1604 PROTOTYPE: $
1574 CODE: 1605 CODE:
… …
1585 RETVAL 1616 RETVAL
1586 1617
1587IV 1618IV
1588rss (Coro::State coro) 1619rss (Coro::State coro)
1589 PROTOTYPE: $ 1620 PROTOTYPE: $
1621 ALIAS:
1622 usecount = 1
1590 CODE: 1623 CODE:
1591 RETVAL = coro_rss (coro); 1624 switch (ix)
1625 {
1626 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1627 case 1: RETVAL = coro->usecount; break;
1628 }
1592 OUTPUT: 1629 OUTPUT:
1593 RETVAL 1630 RETVAL
1594 1631
1595 1632
1596MODULE = Coro::State PACKAGE = Coro 1633MODULE = Coro::State PACKAGE = Coro
… …
1601 1638
1602 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1639 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1603 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1640 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1604 av_async_pool = get_av ("Coro::async_pool", TRUE); 1641 av_async_pool = get_av ("Coro::async_pool", TRUE);
1605 1642
1606 coro_current = get_sv ("Coro::current", FALSE); 1643 coro_current = get_sv ("Coro::current", FALSE);
1607 SvREADONLY_on (coro_current); 1644 SvREADONLY_on (coro_current);
1608 1645
1609 coro_stash = gv_stashpv ("Coro", TRUE); 1646 coro_stash = gv_stashpv ("Coro", TRUE);
1610 1647
1611 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1648 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1620 1657
1621 { 1658 {
1622 SV *sv = perl_get_sv("Coro::API", 1); 1659 SV *sv = perl_get_sv("Coro::API", 1);
1623 1660
1624 coroapi.schedule = api_schedule; 1661 coroapi.schedule = api_schedule;
1625 coroapi.save = api_save;
1626 coroapi.cede = api_cede; 1662 coroapi.cede = api_cede;
1627 coroapi.cede_notself = api_cede_notself; 1663 coroapi.cede_notself = api_cede_notself;
1628 coroapi.ready = api_ready; 1664 coroapi.ready = api_ready;
1629 coroapi.is_ready = api_is_ready; 1665 coroapi.is_ready = api_is_ready;
1630 coroapi.nready = &coro_nready; 1666 coroapi.nready = &coro_nready;
… …
1684# for async_pool speedup 1720# for async_pool speedup
1685void 1721void
1686_pool_1 (SV *cb) 1722_pool_1 (SV *cb)
1687 CODE: 1723 CODE:
1688{ 1724{
1689 int i, len; 1725 struct coro *coro = SvSTATE (coro_current);
1690 HV *hv = (HV *)SvRV (coro_current); 1726 HV *hv = (HV *)SvRV (coro_current);
1691 AV *defav = GvAV (PL_defgv); 1727 AV *defav = GvAV (PL_defgv);
1692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1728 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1693 AV *invoke_av; 1729 AV *invoke_av;
1730 int i, len;
1694 1731
1695 if (!invoke) 1732 if (!invoke)
1696 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);
1697 1737
1698 hv_store (hv, "desc", sizeof ("desc") - 1, 1738 hv_store (hv, "desc", sizeof ("desc") - 1,
1699 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1739 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1700 1740
1701 invoke_av = (AV *)SvRV (invoke); 1741 invoke_av = (AV *)SvRV (invoke);
… …
1719{ 1759{
1720 struct coro *coro = SvSTATE (coro_current); 1760 struct coro *coro = SvSTATE (coro_current);
1721 1761
1722 sv_setsv (cb, &PL_sv_undef); 1762 sv_setsv (cb, &PL_sv_undef);
1723 1763
1764 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1765 coro->saved_deffh = 0;
1766
1724 if (coro_rss (coro) > SvIV (sv_pool_rss) 1767 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1725 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1768 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1726 croak ("\3terminate\2\n"); 1769 croak ("\3terminate\2\n");
1727 1770
1728 av_clear (GvAV (PL_defgv)); 1771 av_clear (GvAV (PL_defgv));
1729 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1772 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1730 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1773 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1731 coro->save = CORO_SAVE_DEF; 1774
1732 coro->prio = 0; 1775 coro->prio = 0;
1776
1777 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1778 api_trace (coro_current, 0);
1779
1733 av_push (av_async_pool, newSVsv (coro_current)); 1780 av_push (av_async_pool, newSVsv (coro_current));
1734} 1781}
1735 1782
1736 1783
1737MODULE = Coro::State PACKAGE = Coro::AIO 1784MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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