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.168 by root, Thu Sep 27 16:10:48 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};
… …
298 SvMAGIC (cv) \ 312 SvMAGIC (cv) \
299 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 313 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
300 ? SvMAGIC (cv) \ 314 ? SvMAGIC (cv) \
301 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 315 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
302 : 0 316 : 0
317
318static struct coro *
319SvSTATE_ (pTHX_ SV *coro)
320{
321 HV *stash;
322 MAGIC *mg;
323
324 if (SvROK (coro))
325 coro = SvRV (coro);
326
327 if (SvTYPE (coro) != SVt_PVHV)
328 croak ("Coro::State object required");
329
330 stash = SvSTASH (coro);
331 if (stash != coro_stash && stash != coro_state_stash)
332 {
333 /* very slow, but rare, check */
334 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
335 croak ("Coro::State object required");
336 }
337
338 mg = CORO_MAGIC (coro);
339 return (struct coro *)mg->mg_ptr;
340}
341
342#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
303 343
304/* the next two functions merely cache the padlists */ 344/* the next two functions merely cache the padlists */
305static void 345static void
306get_padlist (pTHX_ CV *cv) 346get_padlist (pTHX_ CV *cv)
307{ 347{
… …
346 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 386 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
347} 387}
348 388
349/** load & save, init *******************************************************/ 389/** load & save, init *******************************************************/
350 390
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 391static void
357load_perl (pTHX_ Coro__State c) 392load_perl (pTHX_ Coro__State c)
358{ 393{
359#define VAR(name,type) PL_ ## name = c->name; 394#define VAR(name,type) PL_ ## name = c->name;
360# include "state.h" 395# include "state.h"
361#undef VAR 396#undef VAR
362 397
363 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 398 GvSV (PL_defgv) = c->defsv;
364 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 399 GvAV (PL_defgv) = c->defav;
365 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 400 GvSV (PL_errgv) = c->errsv;
366 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 401 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 402
383 { 403 {
384 dSP; 404 dSP;
385 CV *cv; 405 CV *cv;
386 406
… …
444 } 464 }
445 465
446 PUTBACK; 466 PUTBACK;
447 } 467 }
448 468
449 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 469 c->defav = GvAV (PL_defgv);
450 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 470 c->defsv = DEFSV;
451 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 471 c->errsv = ERRSV;
452 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 472 c->irssv_sv = GvSV (irsgv);
453 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
454 473
455#define VAR(name,type)c->name = PL_ ## name; 474#define VAR(name,type)c->name = PL_ ## name;
456# include "state.h" 475# include "state.h"
457#undef VAR 476#undef VAR
458} 477}
… …
511 * destroy the stacks, the callchain etc... 530 * destroy the stacks, the callchain etc...
512 */ 531 */
513static void 532static void
514coro_destroy_stacks (pTHX) 533coro_destroy_stacks (pTHX)
515{ 534{
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) 535 while (PL_curstackinfo->si_next)
534 PL_curstackinfo = PL_curstackinfo->si_next; 536 PL_curstackinfo = PL_curstackinfo->si_next;
535 537
536 while (PL_curstackinfo) 538 while (PL_curstackinfo)
537 { 539 {
… …
553 Safefree (PL_retstack); 555 Safefree (PL_retstack);
554#endif 556#endif
555} 557}
556 558
557static size_t 559static size_t
558coro_rss (struct coro *coro) 560coro_rss (pTHX_ struct coro *coro)
559{ 561{
560 size_t rss = sizeof (coro); 562 size_t rss = sizeof (*coro);
561 563
562 if (coro->mainstack) 564 if (coro->mainstack)
563 { 565 {
564 if (coro->flags & CF_RUNNING) 566 if (coro->flags & CF_RUNNING)
565 { 567 {
… …
567 # include "state.h" 569 # include "state.h"
568 #undef VAR 570 #undef VAR
569 } 571 }
570 572
571 rss += sizeof (coro->curstackinfo); 573 rss += sizeof (coro->curstackinfo);
572 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 *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 575 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 576 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 577 rss += coro->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 578 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 579 rss += coro->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 580 rss += coro->savestack_max * sizeof (ANY);
579 581
… …
586} 588}
587 589
588/** coroutine stack handling ************************************************/ 590/** coroutine stack handling ************************************************/
589 591
590static void 592static void
591setup_coro (pTHX_ struct coro *coro) 593coro_setup (pTHX_ struct coro *coro)
592{ 594{
593 /* 595 /*
594 * emulate part of the perl startup here. 596 * emulate part of the perl startup here.
595 */ 597 */
596 coro_init_stacks (aTHX); 598 coro_init_stacks (aTHX);
597 599
600 PL_runops = RUNOPS_DEFAULT;
598 PL_curcop = &PL_compiling; 601 PL_curcop = &PL_compiling;
599 PL_in_eval = EVAL_NULL; 602 PL_in_eval = EVAL_NULL;
600 PL_comppad = 0; 603 PL_comppad = 0;
601 PL_curpm = 0; 604 PL_curpm = 0;
602 PL_localizing = 0; 605 PL_localizing = 0;
603 PL_dirty = 0; 606 PL_dirty = 0;
604 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);
605 615
606 { 616 {
607 dSP; 617 dSP;
608 LOGOP myop; 618 LOGOP myop;
609
610 SvREFCNT_dec (GvAV (PL_defgv));
611 GvAV (PL_defgv) = coro->args; coro->args = 0;
612 619
613 Zero (&myop, 1, LOGOP); 620 Zero (&myop, 1, LOGOP);
614 myop.op_next = Nullop; 621 myop.op_next = Nullop;
615 myop.op_flags = OPf_WANT_VOID; 622 myop.op_flags = OPf_WANT_VOID;
616 623
… …
624 631
625 ENTER; /* necessary e.g. for dounwind */ 632 ENTER; /* necessary e.g. for dounwind */
626} 633}
627 634
628static 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
629free_coro_mortal (pTHX) 669free_coro_mortal (pTHX)
630{ 670{
631 if (coro_mortal) 671 if (coro_mortal)
632 { 672 {
633 SvREFCNT_dec (coro_mortal); 673 SvREFCNT_dec (coro_mortal);
634 coro_mortal = 0; 674 coro_mortal = 0;
635 } 675 }
636} 676}
637 677
638static int 678static int
639runops_coro (pTHX) 679runops_trace (pTHX)
640{ 680{
641 COP *oldcop = 0; 681 COP *oldcop = 0;
642 int oldcxix = -2; 682 int oldcxix = -2;
683 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
684 coro_cctx *cctx = coro->cctx;
643 685
644 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 686 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
645 { 687 {
646 PERL_ASYNC_CHECK (); 688 PERL_ASYNC_CHECK ();
647 689
648 if (PL_op->op_type == OP_LEAVESUB) 690 if (cctx->flags & CC_TRACE_ALL)
649 { 691 {
650 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 692 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 { 693 {
692 runops_proc_t old_runops = PL_runops; 694 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
695 SV **bot, **top;
696 AV *av = newAV (); /* return values */
697 SV **cb;
693 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;
694 ENTER; 714 ENTER;
695 SAVETMPS; 715 SAVETMPS;
696 EXTEND (SP, 3); 716 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); 717 PUSHMARK (SP);
724 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 718 PUSHs (&PL_sv_no);
725 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 719 PUSHs (fullname);
720 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
726 PUTBACK; 721 PUTBACK;
722 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); 723 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
728 SPAGAIN; 724 SPAGAIN;
729 }
730
731 FREETMPS; 725 FREETMPS;
732 LEAVE; 726 LEAVE;
733 PL_runops = old_runops; 727 PL_runops = runops_trace;
728 }
729
730 if (oldcop != PL_curcop)
731 {
732 oldcop = PL_curcop;
733
734 if (PL_curcop != &PL_compiling)
735 {
736 SV **cb;
737
738 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
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;
746 GV *gv = CvGV (cx->blk_sub.cv);
747 SV *fullname = sv_2mortal (newSV (0));
748
749 if (isGV (gv))
750 gv_efullname3 (fullname, gv, 0);
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;
781 PUSHMARK (SP);
782 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
783 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
784 PUTBACK;
785 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
786 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
787 SPAGAIN;
788 FREETMPS;
789 LEAVE;
790 PL_runops = runops_trace;
791 }
792 }
734 } 793 }
735 } 794 }
736 } 795 }
737 796
738 TAINT_NOT; 797 TAINT_NOT;
… …
749 LOGOP myop; 808 LOGOP myop;
750 809
751 PL_top_env = &PL_start_env; 810 PL_top_env = &PL_start_env;
752 811
753 if (cctx->flags & CC_TRACE) 812 if (cctx->flags & CC_TRACE)
754 PL_runops = runops_coro; 813 PL_runops = runops_trace;
755 814
756 Zero (&myop, 1, LOGOP); 815 Zero (&myop, 1, LOGOP);
757 myop.op_next = PL_op; 816 myop.op_next = PL_op;
758 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 817 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
759 818
… …
905 cctx_first = cctx; 964 cctx_first = cctx;
906} 965}
907 966
908/** coroutine switching *****************************************************/ 967/** coroutine switching *****************************************************/
909 968
910/* 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 */
911static void NOINLINE 989static void NOINLINE
912transfer (pTHX_ struct coro *prev, struct coro *next) 990transfer (pTHX_ struct coro *prev, struct coro *next)
913{ 991{
914 dSTACKLEVEL; 992 dSTACKLEVEL;
915 993
… …
929 Newz (0, prev->cctx, 1, coro_cctx); 1007 Newz (0, prev->cctx, 1, coro_cctx);
930 prev->flags &= ~CF_NEW; 1008 prev->flags &= ~CF_NEW;
931 prev->flags |= CF_RUNNING; 1009 prev->flags |= CF_RUNNING;
932 } 1010 }
933 1011
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; 1012 prev->flags &= ~CF_RUNNING;
945 next->flags |= CF_RUNNING; 1013 next->flags |= CF_RUNNING;
946 1014
947 LOCK; 1015 LOCK;
948 1016
… …
951 /* need to start coroutine */ 1019 /* need to start coroutine */
952 next->flags &= ~CF_NEW; 1020 next->flags &= ~CF_NEW;
953 /* first get rid of the old state */ 1021 /* first get rid of the old state */
954 save_perl (aTHX_ prev); 1022 save_perl (aTHX_ prev);
955 /* setup coroutine call */ 1023 /* setup coroutine call */
956 setup_coro (aTHX_ next); 1024 coro_setup (aTHX_ next);
957 } 1025 }
958 else 1026 else
959 { 1027 {
960 /* coroutine already started */ 1028 /* coroutine already started */
961 save_perl (aTHX_ prev); 1029 save_perl (aTHX_ prev);
… …
973 prev->cctx = 0; 1041 prev->cctx = 0;
974 1042
975 cctx_put (prev__cctx); 1043 cctx_put (prev__cctx);
976 } 1044 }
977 1045
1046 ++next->usecount;
1047
978 if (!next->cctx) 1048 if (!next->cctx)
979 next->cctx = cctx_get (aTHX); 1049 next->cctx = cctx_get (aTHX);
980 1050
981 if (prev__cctx != next->cctx) 1051 if (prev__cctx != next->cctx)
982 { 1052 {
… …
994{ 1064{
995 struct coro *prev, *next; 1065 struct coro *prev, *next;
996}; 1066};
997 1067
998#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)
999 1070
1000/** high level stuff ********************************************************/ 1071/** high level stuff ********************************************************/
1001 1072
1002static int 1073static int
1003coro_state_destroy (pTHX_ struct coro *coro) 1074coro_state_destroy (pTHX_ struct coro *coro)
… …
1020 1091
1021 if (coro->mainstack && coro->mainstack != main_mainstack) 1092 if (coro->mainstack && coro->mainstack != main_mainstack)
1022 { 1093 {
1023 struct coro temp; 1094 struct coro temp;
1024 1095
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) 1096 if (coro->flags & CF_RUNNING)
1031 croak ("FATAL: tried to destroy currently running coroutine"); 1097 croak ("FATAL: tried to destroy currently running coroutine");
1032 1098
1033 save_perl (aTHX_ &temp); 1099 save_perl (aTHX_ &temp);
1034 load_perl (aTHX_ coro); 1100 load_perl (aTHX_ coro);
1035 1101
1036 coro_destroy_stacks (aTHX); 1102 coro_destroy (aTHX_ coro);
1037 1103
1038 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1104 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1039 1105
1040 coro->mainstack = 0; 1106 coro->mainstack = 0;
1041 } 1107 }
… …
1086#else 1152#else
1087# define MGf_DUP 0 1153# define MGf_DUP 0
1088#endif 1154#endif
1089}; 1155};
1090 1156
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 1157static void
1115prepare_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)
1116{ 1159{
1117 ta->prev = SvSTATE (prev_sv); 1160 ta->prev = SvSTATE (prev_sv);
1118 ta->next = SvSTATE (next_sv); 1161 ta->next = SvSTATE (next_sv);
1162 TRANSFER_CHECK (*ta);
1119} 1163}
1120 1164
1121static void 1165static void
1122api_transfer (SV *prev_sv, SV *next_sv) 1166api_transfer (SV *prev_sv, SV *next_sv)
1123{ 1167{
1124 dTHX; 1168 dTHX;
1125 struct transfer_args ta; 1169 struct transfer_args ta;
1126 1170
1127 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1171 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1128 TRANSFER (ta); 1172 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} 1173}
1143 1174
1144/** Coro ********************************************************************/ 1175/** Coro ********************************************************************/
1145 1176
1146static void 1177static void
… …
1240 break; 1271 break;
1241 } 1272 }
1242 1273
1243 /* free this only after the transfer */ 1274 /* free this only after the transfer */
1244 prev_sv = SvRV (coro_current); 1275 prev_sv = SvRV (coro_current);
1245 SvRV_set (coro_current, next_sv);
1246 ta->prev = SvSTATE (prev_sv); 1276 ta->prev = SvSTATE (prev_sv);
1247 1277 TRANSFER_CHECK (*ta);
1248 assert (ta->next->flags & CF_READY); 1278 assert (ta->next->flags & CF_READY);
1249 ta->next->flags &= ~CF_READY; 1279 ta->next->flags &= ~CF_READY;
1280 SvRV_set (coro_current, next_sv);
1250 1281
1251 LOCK; 1282 LOCK;
1252 free_coro_mortal (aTHX); 1283 free_coro_mortal (aTHX);
1253 coro_mortal = prev_sv; 1284 coro_mortal = prev_sv;
1254 UNLOCK; 1285 UNLOCK;
… …
1315 } 1346 }
1316 else 1347 else
1317 return 0; 1348 return 0;
1318} 1349}
1319 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
1320MODULE = Coro::State PACKAGE = Coro::State 1377MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1321 1378
1322PROTOTYPES: DISABLE 1379PROTOTYPES: DISABLE
1323 1380
1324BOOT: 1381BOOT:
1325{ 1382{
1326#ifdef USE_ITHREADS 1383#ifdef USE_ITHREADS
1327 MUTEX_INIT (&coro_mutex); 1384 MUTEX_INIT (&coro_mutex);
1328#endif 1385#endif
1329 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);
1330 1390
1331 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1391 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1332 1392
1333 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1393 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1334 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1394 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1335 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1395 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1336 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1396 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1337 1397
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; 1398 main_mainstack = PL_mainstack;
1347 main_top_env = PL_top_env; 1399 main_top_env = PL_top_env;
1348 1400
1349 while (main_top_env->je_prev) 1401 while (main_top_env->je_prev)
1350 main_top_env = main_top_env->je_prev; 1402 main_top_env = main_top_env->je_prev;
… …
1362 struct coro *coro; 1414 struct coro *coro;
1363 HV *hv; 1415 HV *hv;
1364 int i; 1416 int i;
1365 1417
1366 Newz (0, coro, 1, struct coro); 1418 Newz (0, coro, 1, struct coro);
1367 coro->args = newAV (); 1419 coro->args = newAV ();
1368 coro->save = CORO_SAVE_DEF;
1369 coro->flags = CF_NEW; 1420 coro->flags = CF_NEW;
1370 1421
1371 if (coro_first) coro_first->prev = coro; 1422 if (coro_first) coro_first->prev = coro;
1372 coro->next = coro_first; 1423 coro->next = coro_first;
1373 coro_first = coro; 1424 coro_first = coro;
… …
1380 av_push (coro->args, newSVsv (ST (i))); 1431 av_push (coro->args, newSVsv (ST (i)));
1381} 1432}
1382 OUTPUT: 1433 OUTPUT:
1383 RETVAL 1434 RETVAL
1384 1435
1385int 1436# these not obviously related functions are all rolled into the same xs
1386save (SV *coro, int new_save = -1) 1437# function to increase chances that they all will call transfer with the same
1387 CODE: 1438# 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 1439void
1404_set_stacklevel (...) 1440_set_stacklevel (...)
1405 ALIAS: 1441 ALIAS:
1406 Coro::State::transfer = 1 1442 Coro::State::transfer = 1
1407 Coro::schedule = 2 1443 Coro::schedule = 2
… …
1502{ 1538{
1503 if (coro->mainstack) 1539 if (coro->mainstack)
1504 { 1540 {
1505 struct coro temp; 1541 struct coro temp;
1506 Zero (&temp, 1, struct coro); 1542 Zero (&temp, 1, struct coro);
1507 temp.save = CORO_SAVE_ALL;
1508 1543
1509 if (!(coro->flags & CF_RUNNING)) 1544 if (!(coro->flags & CF_RUNNING))
1510 { 1545 {
1511 save_perl (aTHX_ &temp); 1546 save_perl (aTHX_ &temp);
1512 load_perl (aTHX_ coro); 1547 load_perl (aTHX_ coro);
… …
1533 save_perl (aTHX_ coro); 1568 save_perl (aTHX_ coro);
1534 load_perl (aTHX_ &temp); 1569 load_perl (aTHX_ &temp);
1535 } 1570 }
1536 } 1571 }
1537} 1572}
1538 1573
1539SV * 1574SV *
1540is_ready (Coro::State coro) 1575is_ready (Coro::State coro)
1541 PROTOTYPE: $ 1576 PROTOTYPE: $
1542 ALIAS: 1577 ALIAS:
1543 is_ready = CF_READY 1578 is_ready = CF_READY
… …
1548 RETVAL = boolSV (coro->flags & ix); 1583 RETVAL = boolSV (coro->flags & ix);
1549 OUTPUT: 1584 OUTPUT:
1550 RETVAL 1585 RETVAL
1551 1586
1552void 1587void
1553trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1588api_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 if (coro->flags & CF_RUNNING)
1571 PL_runops = RUNOPS_DEFAULT;
1572 else
1573 coro->runops = RUNOPS_DEFAULT;
1574 }
1575 1589
1576SV * 1590SV *
1577has_stack (Coro::State coro) 1591has_stack (Coro::State coro)
1578 PROTOTYPE: $ 1592 PROTOTYPE: $
1579 CODE: 1593 CODE:
… …
1590 RETVAL 1604 RETVAL
1591 1605
1592IV 1606IV
1593rss (Coro::State coro) 1607rss (Coro::State coro)
1594 PROTOTYPE: $ 1608 PROTOTYPE: $
1609 ALIAS:
1610 usecount = 1
1595 CODE: 1611 CODE:
1596 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 }
1597 OUTPUT: 1617 OUTPUT:
1598 RETVAL 1618 RETVAL
1599 1619
1600 1620
1601MODULE = Coro::State PACKAGE = Coro 1621MODULE = Coro::State PACKAGE = Coro
… …
1606 1626
1607 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1608 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1609 av_async_pool = get_av ("Coro::async_pool", TRUE); 1629 av_async_pool = get_av ("Coro::async_pool", TRUE);
1610 1630
1611 coro_current = get_sv ("Coro::current", FALSE); 1631 coro_current = get_sv ("Coro::current", FALSE);
1612 SvREADONLY_on (coro_current); 1632 SvREADONLY_on (coro_current);
1613 1633
1614 coro_stash = gv_stashpv ("Coro", TRUE); 1634 coro_stash = gv_stashpv ("Coro", TRUE);
1615 1635
1616 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1625 1645
1626 { 1646 {
1627 SV *sv = perl_get_sv("Coro::API", 1); 1647 SV *sv = perl_get_sv("Coro::API", 1);
1628 1648
1629 coroapi.schedule = api_schedule; 1649 coroapi.schedule = api_schedule;
1630 coroapi.save = api_save;
1631 coroapi.cede = api_cede; 1650 coroapi.cede = api_cede;
1632 coroapi.cede_notself = api_cede_notself; 1651 coroapi.cede_notself = api_cede_notself;
1633 coroapi.ready = api_ready; 1652 coroapi.ready = api_ready;
1634 coroapi.is_ready = api_is_ready; 1653 coroapi.is_ready = api_is_ready;
1635 coroapi.nready = &coro_nready; 1654 coroapi.nready = &coro_nready;
… …
1689# for async_pool speedup 1708# for async_pool speedup
1690void 1709void
1691_pool_1 (SV *cb) 1710_pool_1 (SV *cb)
1692 CODE: 1711 CODE:
1693{ 1712{
1694 int i, len; 1713 struct coro *coro = SvSTATE (coro_current);
1695 HV *hv = (HV *)SvRV (coro_current); 1714 HV *hv = (HV *)SvRV (coro_current);
1696 AV *defav = GvAV (PL_defgv); 1715 AV *defav = GvAV (PL_defgv);
1697 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1716 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1698 AV *invoke_av; 1717 AV *invoke_av;
1718 int i, len;
1699 1719
1700 if (!invoke) 1720 if (!invoke)
1701 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);
1702 1725
1703 hv_store (hv, "desc", sizeof ("desc") - 1, 1726 hv_store (hv, "desc", sizeof ("desc") - 1,
1704 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1727 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1705 1728
1706 invoke_av = (AV *)SvRV (invoke); 1729 invoke_av = (AV *)SvRV (invoke);
… …
1724{ 1747{
1725 struct coro *coro = SvSTATE (coro_current); 1748 struct coro *coro = SvSTATE (coro_current);
1726 1749
1727 sv_setsv (cb, &PL_sv_undef); 1750 sv_setsv (cb, &PL_sv_undef);
1728 1751
1752 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1753 coro->saved_deffh = 0;
1754
1729 if (coro_rss (coro) > SvIV (sv_pool_rss) 1755 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1730 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1756 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1731 croak ("\3terminate\2\n"); 1757 croak ("\3terminate\2\n");
1732 1758
1733 av_clear (GvAV (PL_defgv)); 1759 av_clear (GvAV (PL_defgv));
1734 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1760 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1735 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1761 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1736 coro->save = CORO_SAVE_DEF; 1762
1737 coro->prio = 0; 1763 coro->prio = 0;
1764
1765 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1766 api_trace (coro_current, 0);
1767
1738 av_push (av_async_pool, newSVsv (coro_current)); 1768 av_push (av_async_pool, newSVsv (coro_current));
1739} 1769}
1740 1770
1741 1771
1742MODULE = Coro::State PACKAGE = Coro::AIO 1772MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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