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.186 by root, Fri Oct 5 20:10:42 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};
… …
298 SvMAGIC (cv) \ 306 SvMAGIC (cv) \
299 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 307 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
300 ? SvMAGIC (cv) \ 308 ? SvMAGIC (cv) \
301 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 309 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
302 : 0 310 : 0
311
312static struct coro *
313SvSTATE_ (pTHX_ SV *coro)
314{
315 HV *stash;
316 MAGIC *mg;
317
318 if (SvROK (coro))
319 coro = SvRV (coro);
320
321 if (SvTYPE (coro) != SVt_PVHV)
322 croak ("Coro::State object required");
323
324 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash)
326 {
327 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required");
330 }
331
332 mg = CORO_MAGIC (coro);
333 return (struct coro *)mg->mg_ptr;
334}
335
336#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
303 337
304/* the next two functions merely cache the padlists */ 338/* the next two functions merely cache the padlists */
305static void 339static void
306get_padlist (pTHX_ CV *cv) 340get_padlist (pTHX_ CV *cv)
307{ 341{
… …
346 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
347} 381}
348 382
349/** load & save, init *******************************************************/ 383/** load & save, init *******************************************************/
350 384
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 385static void
357load_perl (pTHX_ Coro__State c) 386load_perl (pTHX_ Coro__State c)
358{ 387{
359#define VAR(name,type) PL_ ## name = c->name; 388#define VAR(name,type) PL_ ## name = c->name;
360# include "state.h" 389# include "state.h"
361#undef VAR 390#undef VAR
362 391
363 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 392 GvSV (PL_defgv) = c->defsv;
364 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 393 GvAV (PL_defgv) = c->defav;
365 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 394 GvSV (PL_errgv) = c->errsv;
366 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 395 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 396
383 { 397 {
384 dSP; 398 dSP;
385 CV *cv; 399 CV *cv;
386 400
… …
444 } 458 }
445 459
446 PUTBACK; 460 PUTBACK;
447 } 461 }
448 462
449 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 463 c->defav = GvAV (PL_defgv);
450 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 464 c->defsv = DEFSV;
451 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 465 c->errsv = ERRSV;
452 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 466 c->irssv_sv = GvSV (irsgv);
453 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
454 467
455#define VAR(name,type)c->name = PL_ ## name; 468#define VAR(name,type)c->name = PL_ ## name;
456# include "state.h" 469# include "state.h"
457#undef VAR 470#undef VAR
458} 471}
… …
511 * destroy the stacks, the callchain etc... 524 * destroy the stacks, the callchain etc...
512 */ 525 */
513static void 526static void
514coro_destroy_stacks (pTHX) 527coro_destroy_stacks (pTHX)
515{ 528{
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) 529 while (PL_curstackinfo->si_next)
534 PL_curstackinfo = PL_curstackinfo->si_next; 530 PL_curstackinfo = PL_curstackinfo->si_next;
535 531
536 while (PL_curstackinfo) 532 while (PL_curstackinfo)
537 { 533 {
… …
553 Safefree (PL_retstack); 549 Safefree (PL_retstack);
554#endif 550#endif
555} 551}
556 552
557static size_t 553static size_t
558coro_rss (struct coro *coro) 554coro_rss (pTHX_ struct coro *coro)
559{ 555{
560 size_t rss = sizeof (coro); 556 size_t rss = sizeof (*coro);
561 557
562 if (coro->mainstack) 558 if (coro->mainstack)
563 { 559 {
564 if (coro->flags & CF_RUNNING) 560 if (coro->flags & CF_RUNNING)
565 { 561 {
… …
567 # include "state.h" 563 # include "state.h"
568 #undef VAR 564 #undef VAR
569 } 565 }
570 566
571 rss += sizeof (coro->curstackinfo); 567 rss += sizeof (coro->curstackinfo);
572 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 *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 570 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 571 rss += coro->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 573 rss += coro->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 574 rss += coro->savestack_max * sizeof (ANY);
579 575
… …
586} 582}
587 583
588/** coroutine stack handling ************************************************/ 584/** coroutine stack handling ************************************************/
589 585
590static void 586static void
591setup_coro (pTHX_ struct coro *coro) 587coro_setup (pTHX_ struct coro *coro)
592{ 588{
593 /* 589 /*
594 * emulate part of the perl startup here. 590 * emulate part of the perl startup here.
595 */ 591 */
596 coro_init_stacks (aTHX); 592 coro_init_stacks (aTHX);
597 593
594 PL_runops = RUNOPS_DEFAULT;
598 PL_curcop = &PL_compiling; 595 PL_curcop = &PL_compiling;
599 PL_in_eval = EVAL_NULL; 596 PL_in_eval = EVAL_NULL;
600 PL_comppad = 0; 597 PL_comppad = 0;
601 PL_curpm = 0; 598 PL_curpm = 0;
602 PL_localizing = 0; 599 PL_localizing = 0;
603 PL_dirty = 0; 600 PL_dirty = 0;
604 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 = (GV *)NEWSV (0, 0);
612 gv_init (PL_defoutgv, coro_state_stash, "stdout", sizeof ("stdout") - 1, 0);
613 IoTYPE (io) = IoTYPE_WRONLY;
614 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
615 IoFLAGS (io) |= IOf_FLUSH;
616 GvIOp (PL_defoutgv) = io;
617 }
605 618
606 { 619 {
607 dSP; 620 dSP;
608 LOGOP myop; 621 LOGOP myop;
609
610 SvREFCNT_dec (GvAV (PL_defgv));
611 GvAV (PL_defgv) = coro->args; coro->args = 0;
612 622
613 Zero (&myop, 1, LOGOP); 623 Zero (&myop, 1, LOGOP);
614 myop.op_next = Nullop; 624 myop.op_next = Nullop;
615 myop.op_flags = OPf_WANT_VOID; 625 myop.op_flags = OPf_WANT_VOID;
616 626
… …
624 634
625 ENTER; /* necessary e.g. for dounwind */ 635 ENTER; /* necessary e.g. for dounwind */
626} 636}
627 637
628static void 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);
669}
670
671static void
629free_coro_mortal (pTHX) 672free_coro_mortal (pTHX)
630{ 673{
631 if (coro_mortal) 674 if (coro_mortal)
632 { 675 {
633 SvREFCNT_dec (coro_mortal); 676 SvREFCNT_dec (coro_mortal);
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 while (bot < top)
714 av_push (av, SvREFCNT_inc (*bot++));
715
716 PL_runops = RUNOPS_DEFAULT;
694 ENTER; 717 ENTER;
695 SAVETMPS; 718 SAVETMPS;
696 EXTEND (SP, 3); 719 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); 720 PUSHMARK (SP);
724 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 721 PUSHs (&PL_sv_no);
725 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 722 PUSHs (fullname);
723 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
726 PUTBACK; 724 PUTBACK;
725 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); 726 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
728 SPAGAIN; 727 SPAGAIN;
729 }
730
731 FREETMPS; 728 FREETMPS;
732 LEAVE; 729 LEAVE;
733 PL_runops = old_runops; 730 PL_runops = runops_trace;
731 }
732
733 if (oldcop != PL_curcop)
734 {
735 oldcop = PL_curcop;
736
737 if (PL_curcop != &PL_compiling)
738 {
739 SV **cb;
740
741 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
742 {
743 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
744
745 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
746 {
747 runops_proc_t old_runops = PL_runops;
748 dSP;
749 GV *gv = CvGV (cx->blk_sub.cv);
750 SV *fullname = sv_2mortal (newSV (0));
751
752 if (isGV (gv))
753 gv_efullname3 (fullname, gv, 0);
754
755 PL_runops = RUNOPS_DEFAULT;
756 ENTER;
757 SAVETMPS;
758 EXTEND (SP, 3);
759 PUSHMARK (SP);
760 PUSHs (&PL_sv_yes);
761 PUSHs (fullname);
762 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
763 PUTBACK;
764 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
765 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
766 SPAGAIN;
767 FREETMPS;
768 LEAVE;
769 PL_runops = runops_trace;
770 }
771
772 oldcxix = cxstack_ix;
773 }
774
775 if (cctx->flags & CC_TRACE_LINE)
776 {
777 dSP;
778
779 PL_runops = RUNOPS_DEFAULT;
780 ENTER;
781 SAVETMPS;
782 EXTEND (SP, 3);
783 PL_runops = RUNOPS_DEFAULT;
784 PUSHMARK (SP);
785 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
786 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
787 PUTBACK;
788 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
789 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
790 SPAGAIN;
791 FREETMPS;
792 LEAVE;
793 PL_runops = runops_trace;
794 }
795 }
734 } 796 }
735 } 797 }
736 } 798 }
737 799
738 TAINT_NOT; 800 TAINT_NOT;
… …
749 LOGOP myop; 811 LOGOP myop;
750 812
751 PL_top_env = &PL_start_env; 813 PL_top_env = &PL_start_env;
752 814
753 if (cctx->flags & CC_TRACE) 815 if (cctx->flags & CC_TRACE)
754 PL_runops = runops_coro; 816 PL_runops = runops_trace;
755 817
756 Zero (&myop, 1, LOGOP); 818 Zero (&myop, 1, LOGOP);
757 myop.op_next = PL_op; 819 myop.op_next = PL_op;
758 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 820 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
759 821
… …
905 cctx_first = cctx; 967 cctx_first = cctx;
906} 968}
907 969
908/** coroutine switching *****************************************************/ 970/** coroutine switching *****************************************************/
909 971
910/* never call directly, always through the coro_state_transfer global variable */ 972static void NOINLINE
973transfer_check (pTHX_ struct coro *prev, struct coro *next)
974{
975 if (prev != next)
976 {
977 if (!(prev->flags & (CF_RUNNING | CF_NEW)))
978 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
979
980 if (next->flags & CF_RUNNING)
981 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
982
983 if (next->flags & CF_DESTROYED)
984 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
985
986 if (PL_lex_state != LEX_NOTPARSING)
987 croak ("Coro::State::transfer called while parsing, but this is not supported");
988 }
989}
990
991/* always use the TRANSFER macro */
911static void NOINLINE 992static void NOINLINE
912transfer (pTHX_ struct coro *prev, struct coro *next) 993transfer (pTHX_ struct coro *prev, struct coro *next)
913{ 994{
914 dSTACKLEVEL; 995 dSTACKLEVEL;
915 996
… …
929 Newz (0, prev->cctx, 1, coro_cctx); 1010 Newz (0, prev->cctx, 1, coro_cctx);
930 prev->flags &= ~CF_NEW; 1011 prev->flags &= ~CF_NEW;
931 prev->flags |= CF_RUNNING; 1012 prev->flags |= CF_RUNNING;
932 } 1013 }
933 1014
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; 1015 prev->flags &= ~CF_RUNNING;
945 next->flags |= CF_RUNNING; 1016 next->flags |= CF_RUNNING;
946 1017
947 LOCK; 1018 LOCK;
948 1019
… …
951 /* need to start coroutine */ 1022 /* need to start coroutine */
952 next->flags &= ~CF_NEW; 1023 next->flags &= ~CF_NEW;
953 /* first get rid of the old state */ 1024 /* first get rid of the old state */
954 save_perl (aTHX_ prev); 1025 save_perl (aTHX_ prev);
955 /* setup coroutine call */ 1026 /* setup coroutine call */
956 setup_coro (aTHX_ next); 1027 coro_setup (aTHX_ next);
957 } 1028 }
958 else 1029 else
959 { 1030 {
960 /* coroutine already started */ 1031 /* coroutine already started */
961 save_perl (aTHX_ prev); 1032 save_perl (aTHX_ prev);
… …
973 prev->cctx = 0; 1044 prev->cctx = 0;
974 1045
975 cctx_put (prev__cctx); 1046 cctx_put (prev__cctx);
976 } 1047 }
977 1048
1049 ++next->usecount;
1050
978 if (!next->cctx) 1051 if (!next->cctx)
979 next->cctx = cctx_get (aTHX); 1052 next->cctx = cctx_get (aTHX);
980 1053
981 if (prev__cctx != next->cctx) 1054 if (prev__cctx != next->cctx)
982 { 1055 {
… …
994{ 1067{
995 struct coro *prev, *next; 1068 struct coro *prev, *next;
996}; 1069};
997 1070
998#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1071#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1072#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
999 1073
1000/** high level stuff ********************************************************/ 1074/** high level stuff ********************************************************/
1001 1075
1002static int 1076static int
1003coro_state_destroy (pTHX_ struct coro *coro) 1077coro_state_destroy (pTHX_ struct coro *coro)
… …
1020 1094
1021 if (coro->mainstack && coro->mainstack != main_mainstack) 1095 if (coro->mainstack && coro->mainstack != main_mainstack)
1022 { 1096 {
1023 struct coro temp; 1097 struct coro temp;
1024 1098
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) 1099 if (coro->flags & CF_RUNNING)
1031 croak ("FATAL: tried to destroy currently running coroutine"); 1100 croak ("FATAL: tried to destroy currently running coroutine");
1032 1101
1033 save_perl (aTHX_ &temp); 1102 save_perl (aTHX_ &temp);
1034 load_perl (aTHX_ coro); 1103 load_perl (aTHX_ coro);
1035 1104
1036 coro_destroy_stacks (aTHX); 1105 coro_destroy (aTHX_ coro);
1037 1106
1038 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1107 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1039 1108
1040 coro->mainstack = 0; 1109 coro->mainstack = 0;
1041 } 1110 }
… …
1086#else 1155#else
1087# define MGf_DUP 0 1156# define MGf_DUP 0
1088#endif 1157#endif
1089}; 1158};
1090 1159
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 1160static void
1115prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1161prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1116{ 1162{
1117 ta->prev = SvSTATE (prev_sv); 1163 ta->prev = SvSTATE (prev_sv);
1118 ta->next = SvSTATE (next_sv); 1164 ta->next = SvSTATE (next_sv);
1165 TRANSFER_CHECK (*ta);
1119} 1166}
1120 1167
1121static void 1168static void
1122api_transfer (SV *prev_sv, SV *next_sv) 1169api_transfer (SV *prev_sv, SV *next_sv)
1123{ 1170{
1124 dTHX; 1171 dTHX;
1125 struct transfer_args ta; 1172 struct transfer_args ta;
1126 1173
1127 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1174 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1128 TRANSFER (ta); 1175 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} 1176}
1143 1177
1144/** Coro ********************************************************************/ 1178/** Coro ********************************************************************/
1145 1179
1146static void 1180static void
… …
1240 break; 1274 break;
1241 } 1275 }
1242 1276
1243 /* free this only after the transfer */ 1277 /* free this only after the transfer */
1244 prev_sv = SvRV (coro_current); 1278 prev_sv = SvRV (coro_current);
1245 SvRV_set (coro_current, next_sv);
1246 ta->prev = SvSTATE (prev_sv); 1279 ta->prev = SvSTATE (prev_sv);
1247 1280 TRANSFER_CHECK (*ta);
1248 assert (ta->next->flags & CF_READY); 1281 assert (ta->next->flags & CF_READY);
1249 ta->next->flags &= ~CF_READY; 1282 ta->next->flags &= ~CF_READY;
1283 SvRV_set (coro_current, next_sv);
1250 1284
1251 LOCK; 1285 LOCK;
1252 free_coro_mortal (aTHX); 1286 free_coro_mortal (aTHX);
1253 coro_mortal = prev_sv; 1287 coro_mortal = prev_sv;
1254 UNLOCK; 1288 UNLOCK;
… …
1315 } 1349 }
1316 else 1350 else
1317 return 0; 1351 return 0;
1318} 1352}
1319 1353
1354static void
1355api_trace (SV *coro_sv, int flags)
1356{
1357 dTHX;
1358 struct coro *coro = SvSTATE (coro_sv);
1359
1360 if (flags & CC_TRACE)
1361 {
1362 if (!coro->cctx)
1363 coro->cctx = cctx_new ();
1364 else if (!(coro->cctx->flags & CC_TRACE))
1365 croak ("cannot enable tracing on coroutine with custom stack");
1366
1367 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1368 }
1369 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1370 {
1371 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1372
1373 if (coro->flags & CF_RUNNING)
1374 PL_runops = RUNOPS_DEFAULT;
1375 else
1376 coro->runops = RUNOPS_DEFAULT;
1377 }
1378}
1379
1320MODULE = Coro::State PACKAGE = Coro::State 1380MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1321 1381
1322PROTOTYPES: DISABLE 1382PROTOTYPES: DISABLE
1323 1383
1324BOOT: 1384BOOT:
1325{ 1385{
1326#ifdef USE_ITHREADS 1386#ifdef USE_ITHREADS
1327 MUTEX_INIT (&coro_mutex); 1387 MUTEX_INIT (&coro_mutex);
1328#endif 1388#endif
1329 BOOT_PAGESIZE; 1389 BOOT_PAGESIZE;
1390
1391 irsgv = gv_fetchpv ("/", 1, SVt_PV);
1330 1392
1331 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1393 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1332 1394
1333 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1395 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1334 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1396 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1335 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1397 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1336 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1398 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1337 1399
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; 1400 main_mainstack = PL_mainstack;
1347 main_top_env = PL_top_env; 1401 main_top_env = PL_top_env;
1348 1402
1349 while (main_top_env->je_prev) 1403 while (main_top_env->je_prev)
1350 main_top_env = main_top_env->je_prev; 1404 main_top_env = main_top_env->je_prev;
… …
1362 struct coro *coro; 1416 struct coro *coro;
1363 HV *hv; 1417 HV *hv;
1364 int i; 1418 int i;
1365 1419
1366 Newz (0, coro, 1, struct coro); 1420 Newz (0, coro, 1, struct coro);
1367 coro->args = newAV (); 1421 coro->args = newAV ();
1368 coro->save = CORO_SAVE_DEF;
1369 coro->flags = CF_NEW; 1422 coro->flags = CF_NEW;
1370 1423
1371 if (coro_first) coro_first->prev = coro; 1424 if (coro_first) coro_first->prev = coro;
1372 coro->next = coro_first; 1425 coro->next = coro_first;
1373 coro_first = coro; 1426 coro_first = coro;
… …
1380 av_push (coro->args, newSVsv (ST (i))); 1433 av_push (coro->args, newSVsv (ST (i)));
1381} 1434}
1382 OUTPUT: 1435 OUTPUT:
1383 RETVAL 1436 RETVAL
1384 1437
1385int 1438# these not obviously related functions are all rolled into the same xs
1386save (SV *coro, int new_save = -1) 1439# function to increase chances that they all will call transfer with the same
1387 CODE: 1440# 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 1441void
1404_set_stacklevel (...) 1442_set_stacklevel (...)
1405 ALIAS: 1443 ALIAS:
1406 Coro::State::transfer = 1 1444 Coro::State::transfer = 1
1407 Coro::schedule = 2 1445 Coro::schedule = 2
… …
1502{ 1540{
1503 if (coro->mainstack) 1541 if (coro->mainstack)
1504 { 1542 {
1505 struct coro temp; 1543 struct coro temp;
1506 Zero (&temp, 1, struct coro); 1544 Zero (&temp, 1, struct coro);
1507 temp.save = CORO_SAVE_ALL;
1508 1545
1509 if (!(coro->flags & CF_RUNNING)) 1546 if (!(coro->flags & CF_RUNNING))
1510 { 1547 {
1511 save_perl (aTHX_ &temp); 1548 save_perl (aTHX_ &temp);
1512 load_perl (aTHX_ coro); 1549 load_perl (aTHX_ coro);
… …
1533 save_perl (aTHX_ coro); 1570 save_perl (aTHX_ coro);
1534 load_perl (aTHX_ &temp); 1571 load_perl (aTHX_ &temp);
1535 } 1572 }
1536 } 1573 }
1537} 1574}
1538 1575
1539SV * 1576SV *
1540is_ready (Coro::State coro) 1577is_ready (Coro::State coro)
1541 PROTOTYPE: $ 1578 PROTOTYPE: $
1542 ALIAS: 1579 ALIAS:
1543 is_ready = CF_READY 1580 is_ready = CF_READY
… …
1548 RETVAL = boolSV (coro->flags & ix); 1585 RETVAL = boolSV (coro->flags & ix);
1549 OUTPUT: 1586 OUTPUT:
1550 RETVAL 1587 RETVAL
1551 1588
1552void 1589void
1553trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1590api_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 1591
1576SV * 1592SV *
1577has_stack (Coro::State coro) 1593has_stack (Coro::State coro)
1578 PROTOTYPE: $ 1594 PROTOTYPE: $
1579 CODE: 1595 CODE:
… …
1590 RETVAL 1606 RETVAL
1591 1607
1592IV 1608IV
1593rss (Coro::State coro) 1609rss (Coro::State coro)
1594 PROTOTYPE: $ 1610 PROTOTYPE: $
1611 ALIAS:
1612 usecount = 1
1595 CODE: 1613 CODE:
1596 RETVAL = coro_rss (coro); 1614 switch (ix)
1615 {
1616 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1617 case 1: RETVAL = coro->usecount; break;
1618 }
1597 OUTPUT: 1619 OUTPUT:
1598 RETVAL 1620 RETVAL
1599 1621
1600 1622
1601MODULE = Coro::State PACKAGE = Coro 1623MODULE = Coro::State PACKAGE = Coro
… …
1606 1628
1607 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1629 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1608 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1630 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1609 av_async_pool = get_av ("Coro::async_pool", TRUE); 1631 av_async_pool = get_av ("Coro::async_pool", TRUE);
1610 1632
1611 coro_current = get_sv ("Coro::current", FALSE); 1633 coro_current = get_sv ("Coro::current", FALSE);
1612 SvREADONLY_on (coro_current); 1634 SvREADONLY_on (coro_current);
1613 1635
1614 coro_stash = gv_stashpv ("Coro", TRUE); 1636 coro_stash = gv_stashpv ("Coro", TRUE);
1615 1637
1616 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1638 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1625 1647
1626 { 1648 {
1627 SV *sv = perl_get_sv("Coro::API", 1); 1649 SV *sv = perl_get_sv("Coro::API", 1);
1628 1650
1629 coroapi.schedule = api_schedule; 1651 coroapi.schedule = api_schedule;
1630 coroapi.save = api_save;
1631 coroapi.cede = api_cede; 1652 coroapi.cede = api_cede;
1632 coroapi.cede_notself = api_cede_notself; 1653 coroapi.cede_notself = api_cede_notself;
1633 coroapi.ready = api_ready; 1654 coroapi.ready = api_ready;
1634 coroapi.is_ready = api_is_ready; 1655 coroapi.is_ready = api_is_ready;
1635 coroapi.nready = &coro_nready; 1656 coroapi.nready = &coro_nready;
… …
1689# for async_pool speedup 1710# for async_pool speedup
1690void 1711void
1691_pool_1 (SV *cb) 1712_pool_1 (SV *cb)
1692 CODE: 1713 CODE:
1693{ 1714{
1694 int i, len; 1715 struct coro *coro = SvSTATE (coro_current);
1695 HV *hv = (HV *)SvRV (coro_current); 1716 HV *hv = (HV *)SvRV (coro_current);
1696 AV *defav = GvAV (PL_defgv); 1717 AV *defav = GvAV (PL_defgv);
1697 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1718 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1698 AV *invoke_av; 1719 AV *invoke_av;
1720 int i, len;
1699 1721
1700 if (!invoke) 1722 if (!invoke)
1701 croak ("\3terminate\2\n"); 1723 croak ("\3terminate\2\n");
1724
1725 SvREFCNT_dec (coro->saved_deffh);
1726 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1702 1727
1703 hv_store (hv, "desc", sizeof ("desc") - 1, 1728 hv_store (hv, "desc", sizeof ("desc") - 1,
1704 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1729 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1705 1730
1706 invoke_av = (AV *)SvRV (invoke); 1731 invoke_av = (AV *)SvRV (invoke);
… …
1724{ 1749{
1725 struct coro *coro = SvSTATE (coro_current); 1750 struct coro *coro = SvSTATE (coro_current);
1726 1751
1727 sv_setsv (cb, &PL_sv_undef); 1752 sv_setsv (cb, &PL_sv_undef);
1728 1753
1754 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1755 coro->saved_deffh = 0;
1756
1729 if (coro_rss (coro) > SvIV (sv_pool_rss) 1757 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1730 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1758 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1731 croak ("\3terminate\2\n"); 1759 croak ("\3terminate\2\n");
1732 1760
1733 av_clear (GvAV (PL_defgv)); 1761 av_clear (GvAV (PL_defgv));
1734 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1762 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1735 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1763 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1736 coro->save = CORO_SAVE_DEF; 1764
1737 coro->prio = 0; 1765 coro->prio = 0;
1766
1767 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1768 api_trace (coro_current, 0);
1769
1738 av_push (av_async_pool, newSVsv (coro_current)); 1770 av_push (av_async_pool, newSVsv (coro_current));
1739} 1771}
1740 1772
1741 1773
1742MODULE = Coro::State PACKAGE = Coro::AIO 1774MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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