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.187 by root, Fri Oct 5 20:31:18 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 SvREFCNT_inc (PL_defoutgv);
605 610
606 { 611 {
607 dSP; 612 dSP;
608 LOGOP myop; 613 LOGOP myop;
609
610 SvREFCNT_dec (GvAV (PL_defgv));
611 GvAV (PL_defgv) = coro->args; coro->args = 0;
612 614
613 Zero (&myop, 1, LOGOP); 615 Zero (&myop, 1, LOGOP);
614 myop.op_next = Nullop; 616 myop.op_next = Nullop;
615 myop.op_flags = OPf_WANT_VOID; 617 myop.op_flags = OPf_WANT_VOID;
616 618
… …
624 626
625 ENTER; /* necessary e.g. for dounwind */ 627 ENTER; /* necessary e.g. for dounwind */
626} 628}
627 629
628static void 630static void
631coro_destroy (pTHX_ struct coro *coro)
632{
633 if (!IN_DESTRUCT)
634 {
635 /* restore all saved variables and stuff */
636 LEAVE_SCOPE (0);
637 assert (PL_tmps_floor == -1);
638
639 /* free all temporaries */
640 FREETMPS;
641 assert (PL_tmps_ix == -1);
642
643 /* unwind all extra stacks */
644 POPSTACK_TO (PL_mainstack);
645
646 /* unwind main stack */
647 dounwind (-1);
648 }
649
650 SvREFCNT_dec (GvSV (PL_defgv));
651 SvREFCNT_dec (GvAV (PL_defgv));
652 SvREFCNT_dec (GvSV (PL_errgv));
653 SvREFCNT_dec (PL_defoutgv);
654 SvREFCNT_dec (PL_rs);
655 SvREFCNT_dec (GvSV (irsgv));
656
657 SvREFCNT_dec (coro->saved_deffh);
658 //SvREFCNT_dec (coro->throw);
659
660 coro_destroy_stacks (aTHX);
661}
662
663static void
629free_coro_mortal (pTHX) 664free_coro_mortal (pTHX)
630{ 665{
631 if (coro_mortal) 666 if (coro_mortal)
632 { 667 {
633 SvREFCNT_dec (coro_mortal); 668 SvREFCNT_dec (coro_mortal);
634 coro_mortal = 0; 669 coro_mortal = 0;
635 } 670 }
636} 671}
637 672
638static int 673static int
639runops_coro (pTHX) 674runops_trace (pTHX)
640{ 675{
641 COP *oldcop = 0; 676 COP *oldcop = 0;
642 int oldcxix = -2; 677 int oldcxix = -2;
678 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
679 coro_cctx *cctx = coro->cctx;
643 680
644 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 681 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
645 { 682 {
646 PERL_ASYNC_CHECK (); 683 PERL_ASYNC_CHECK ();
647 684
648 if (PL_op->op_type == OP_LEAVESUB) 685 if (cctx->flags & CC_TRACE_ALL)
649 { 686 {
650 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 687 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 { 688 {
692 runops_proc_t old_runops = PL_runops; 689 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
690 SV **bot, **top;
691 AV *av = newAV (); /* return values */
692 SV **cb;
693 dSP; 693 dSP;
694
695 GV *gv = CvGV (cx->blk_sub.cv);
696 SV *fullname = sv_2mortal (newSV (0));
697 if (isGV (gv))
698 gv_efullname3 (fullname, gv, 0);
699
700 bot = PL_stack_base + cx->blk_oldsp + 1;
701 top = cx->blk_gimme == G_ARRAY ? SP + 1
702 : cx->blk_gimme == G_SCALAR ? bot + 1
703 : bot;
704
705 while (bot < top)
706 av_push (av, SvREFCNT_inc (*bot++));
707
708 PL_runops = RUNOPS_DEFAULT;
694 ENTER; 709 ENTER;
695 SAVETMPS; 710 SAVETMPS;
696 EXTEND (SP, 3); 711 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); 712 PUSHMARK (SP);
724 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 713 PUSHs (&PL_sv_no);
725 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 714 PUSHs (fullname);
715 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
726 PUTBACK; 716 PUTBACK;
717 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); 718 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
728 SPAGAIN; 719 SPAGAIN;
729 }
730
731 FREETMPS; 720 FREETMPS;
732 LEAVE; 721 LEAVE;
733 PL_runops = old_runops; 722 PL_runops = runops_trace;
723 }
724
725 if (oldcop != PL_curcop)
726 {
727 oldcop = PL_curcop;
728
729 if (PL_curcop != &PL_compiling)
730 {
731 SV **cb;
732
733 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
734 {
735 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
736
737 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
738 {
739 runops_proc_t old_runops = PL_runops;
740 dSP;
741 GV *gv = CvGV (cx->blk_sub.cv);
742 SV *fullname = sv_2mortal (newSV (0));
743
744 if (isGV (gv))
745 gv_efullname3 (fullname, gv, 0);
746
747 PL_runops = RUNOPS_DEFAULT;
748 ENTER;
749 SAVETMPS;
750 EXTEND (SP, 3);
751 PUSHMARK (SP);
752 PUSHs (&PL_sv_yes);
753 PUSHs (fullname);
754 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
755 PUTBACK;
756 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
757 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
758 SPAGAIN;
759 FREETMPS;
760 LEAVE;
761 PL_runops = runops_trace;
762 }
763
764 oldcxix = cxstack_ix;
765 }
766
767 if (cctx->flags & CC_TRACE_LINE)
768 {
769 dSP;
770
771 PL_runops = RUNOPS_DEFAULT;
772 ENTER;
773 SAVETMPS;
774 EXTEND (SP, 3);
775 PL_runops = RUNOPS_DEFAULT;
776 PUSHMARK (SP);
777 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
778 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
779 PUTBACK;
780 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
781 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
782 SPAGAIN;
783 FREETMPS;
784 LEAVE;
785 PL_runops = runops_trace;
786 }
787 }
734 } 788 }
735 } 789 }
736 } 790 }
737 791
738 TAINT_NOT; 792 TAINT_NOT;
… …
749 LOGOP myop; 803 LOGOP myop;
750 804
751 PL_top_env = &PL_start_env; 805 PL_top_env = &PL_start_env;
752 806
753 if (cctx->flags & CC_TRACE) 807 if (cctx->flags & CC_TRACE)
754 PL_runops = runops_coro; 808 PL_runops = runops_trace;
755 809
756 Zero (&myop, 1, LOGOP); 810 Zero (&myop, 1, LOGOP);
757 myop.op_next = PL_op; 811 myop.op_next = PL_op;
758 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 812 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
759 813
… …
905 cctx_first = cctx; 959 cctx_first = cctx;
906} 960}
907 961
908/** coroutine switching *****************************************************/ 962/** coroutine switching *****************************************************/
909 963
910/* never call directly, always through the coro_state_transfer global variable */ 964static void NOINLINE
965transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{
967 if (prev != next)
968 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW)))
970 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
971
972 if (next->flags & CF_RUNNING)
973 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
974
975 if (next->flags & CF_DESTROYED)
976 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
977
978 if (PL_lex_state != LEX_NOTPARSING)
979 croak ("Coro::State::transfer called while parsing, but this is not supported");
980 }
981}
982
983/* always use the TRANSFER macro */
911static void NOINLINE 984static void NOINLINE
912transfer (pTHX_ struct coro *prev, struct coro *next) 985transfer (pTHX_ struct coro *prev, struct coro *next)
913{ 986{
914 dSTACKLEVEL; 987 dSTACKLEVEL;
915 988
… …
929 Newz (0, prev->cctx, 1, coro_cctx); 1002 Newz (0, prev->cctx, 1, coro_cctx);
930 prev->flags &= ~CF_NEW; 1003 prev->flags &= ~CF_NEW;
931 prev->flags |= CF_RUNNING; 1004 prev->flags |= CF_RUNNING;
932 } 1005 }
933 1006
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; 1007 prev->flags &= ~CF_RUNNING;
945 next->flags |= CF_RUNNING; 1008 next->flags |= CF_RUNNING;
946 1009
947 LOCK; 1010 LOCK;
948 1011
… …
951 /* need to start coroutine */ 1014 /* need to start coroutine */
952 next->flags &= ~CF_NEW; 1015 next->flags &= ~CF_NEW;
953 /* first get rid of the old state */ 1016 /* first get rid of the old state */
954 save_perl (aTHX_ prev); 1017 save_perl (aTHX_ prev);
955 /* setup coroutine call */ 1018 /* setup coroutine call */
956 setup_coro (aTHX_ next); 1019 coro_setup (aTHX_ next);
957 } 1020 }
958 else 1021 else
959 { 1022 {
960 /* coroutine already started */ 1023 /* coroutine already started */
961 save_perl (aTHX_ prev); 1024 save_perl (aTHX_ prev);
… …
963 } 1026 }
964 1027
965 prev__cctx = prev->cctx; 1028 prev__cctx = prev->cctx;
966 1029
967 /* possibly "free" the cctx */ 1030 /* possibly "free" the cctx */
968 if (prev__cctx->idle_sp == STACKLEVEL) 1031 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))
969 { 1032 {
970 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1033 /* 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)); 1034 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
972 1035
973 prev->cctx = 0; 1036 prev->cctx = 0;
974 1037
975 cctx_put (prev__cctx); 1038 cctx_put (prev__cctx);
976 } 1039 }
1040
1041 ++next->usecount;
977 1042
978 if (!next->cctx) 1043 if (!next->cctx)
979 next->cctx = cctx_get (aTHX); 1044 next->cctx = cctx_get (aTHX);
980 1045
981 if (prev__cctx != next->cctx) 1046 if (prev__cctx != next->cctx)
… …
994{ 1059{
995 struct coro *prev, *next; 1060 struct coro *prev, *next;
996}; 1061};
997 1062
998#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1063#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1064#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
999 1065
1000/** high level stuff ********************************************************/ 1066/** high level stuff ********************************************************/
1001 1067
1002static int 1068static int
1003coro_state_destroy (pTHX_ struct coro *coro) 1069coro_state_destroy (pTHX_ struct coro *coro)
… …
1020 1086
1021 if (coro->mainstack && coro->mainstack != main_mainstack) 1087 if (coro->mainstack && coro->mainstack != main_mainstack)
1022 { 1088 {
1023 struct coro temp; 1089 struct coro temp;
1024 1090
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) 1091 if (coro->flags & CF_RUNNING)
1031 croak ("FATAL: tried to destroy currently running coroutine"); 1092 croak ("FATAL: tried to destroy currently running coroutine");
1032 1093
1033 save_perl (aTHX_ &temp); 1094 save_perl (aTHX_ &temp);
1034 load_perl (aTHX_ coro); 1095 load_perl (aTHX_ coro);
1035 1096
1036 coro_destroy_stacks (aTHX); 1097 coro_destroy (aTHX_ coro);
1037 1098
1038 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
1039 1100
1040 coro->mainstack = 0; 1101 coro->mainstack = 0;
1041 } 1102 }
… …
1086#else 1147#else
1087# define MGf_DUP 0 1148# define MGf_DUP 0
1088#endif 1149#endif
1089}; 1150};
1090 1151
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 1152static void
1115prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1153prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1116{ 1154{
1117 ta->prev = SvSTATE (prev_sv); 1155 ta->prev = SvSTATE (prev_sv);
1118 ta->next = SvSTATE (next_sv); 1156 ta->next = SvSTATE (next_sv);
1157 TRANSFER_CHECK (*ta);
1119} 1158}
1120 1159
1121static void 1160static void
1122api_transfer (SV *prev_sv, SV *next_sv) 1161api_transfer (SV *prev_sv, SV *next_sv)
1123{ 1162{
1124 dTHX; 1163 dTHX;
1125 struct transfer_args ta; 1164 struct transfer_args ta;
1126 1165
1127 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1128 TRANSFER (ta); 1167 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} 1168}
1143 1169
1144/** Coro ********************************************************************/ 1170/** Coro ********************************************************************/
1145 1171
1146static void 1172static void
… …
1240 break; 1266 break;
1241 } 1267 }
1242 1268
1243 /* free this only after the transfer */ 1269 /* free this only after the transfer */
1244 prev_sv = SvRV (coro_current); 1270 prev_sv = SvRV (coro_current);
1245 SvRV_set (coro_current, next_sv);
1246 ta->prev = SvSTATE (prev_sv); 1271 ta->prev = SvSTATE (prev_sv);
1247 1272 TRANSFER_CHECK (*ta);
1248 assert (ta->next->flags & CF_READY); 1273 assert (ta->next->flags & CF_READY);
1249 ta->next->flags &= ~CF_READY; 1274 ta->next->flags &= ~CF_READY;
1275 SvRV_set (coro_current, next_sv);
1250 1276
1251 LOCK; 1277 LOCK;
1252 free_coro_mortal (aTHX); 1278 free_coro_mortal (aTHX);
1253 coro_mortal = prev_sv; 1279 coro_mortal = prev_sv;
1254 UNLOCK; 1280 UNLOCK;
… …
1315 } 1341 }
1316 else 1342 else
1317 return 0; 1343 return 0;
1318} 1344}
1319 1345
1346static void
1347api_trace (SV *coro_sv, int flags)
1348{
1349 dTHX;
1350 struct coro *coro = SvSTATE (coro_sv);
1351
1352 if (flags & CC_TRACE)
1353 {
1354 if (!coro->cctx)
1355 coro->cctx = cctx_new ();
1356 else if (!(coro->cctx->flags & CC_TRACE))
1357 croak ("cannot enable tracing on coroutine with custom stack");
1358
1359 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1360 }
1361 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1362 {
1363 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1364
1365 if (coro->flags & CF_RUNNING)
1366 PL_runops = RUNOPS_DEFAULT;
1367 else
1368 coro->runops = RUNOPS_DEFAULT;
1369 }
1370}
1371
1320MODULE = Coro::State PACKAGE = Coro::State 1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1321 1373
1322PROTOTYPES: DISABLE 1374PROTOTYPES: DISABLE
1323 1375
1324BOOT: 1376BOOT:
1325{ 1377{
1326#ifdef USE_ITHREADS 1378#ifdef USE_ITHREADS
1327 MUTEX_INIT (&coro_mutex); 1379 MUTEX_INIT (&coro_mutex);
1328#endif 1380#endif
1329 BOOT_PAGESIZE; 1381 BOOT_PAGESIZE;
1382
1383 irsgv = gv_fetchpv ("/", 1, SVt_PV);
1330 1384
1331 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1385 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1332 1386
1333 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1387 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1334 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1388 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1335 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1389 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1336 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1390 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1337 1391
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; 1392 main_mainstack = PL_mainstack;
1347 main_top_env = PL_top_env; 1393 main_top_env = PL_top_env;
1348 1394
1349 while (main_top_env->je_prev) 1395 while (main_top_env->je_prev)
1350 main_top_env = main_top_env->je_prev; 1396 main_top_env = main_top_env->je_prev;
… …
1362 struct coro *coro; 1408 struct coro *coro;
1363 HV *hv; 1409 HV *hv;
1364 int i; 1410 int i;
1365 1411
1366 Newz (0, coro, 1, struct coro); 1412 Newz (0, coro, 1, struct coro);
1367 coro->args = newAV (); 1413 coro->args = newAV ();
1368 coro->save = CORO_SAVE_DEF;
1369 coro->flags = CF_NEW; 1414 coro->flags = CF_NEW;
1370 1415
1371 if (coro_first) coro_first->prev = coro; 1416 if (coro_first) coro_first->prev = coro;
1372 coro->next = coro_first; 1417 coro->next = coro_first;
1373 coro_first = coro; 1418 coro_first = coro;
… …
1380 av_push (coro->args, newSVsv (ST (i))); 1425 av_push (coro->args, newSVsv (ST (i)));
1381} 1426}
1382 OUTPUT: 1427 OUTPUT:
1383 RETVAL 1428 RETVAL
1384 1429
1385int 1430# these not obviously related functions are all rolled into the same xs
1386save (SV *coro, int new_save = -1) 1431# function to increase chances that they all will call transfer with the same
1387 CODE: 1432# 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 1433void
1404_set_stacklevel (...) 1434_set_stacklevel (...)
1405 ALIAS: 1435 ALIAS:
1406 Coro::State::transfer = 1 1436 Coro::State::transfer = 1
1407 Coro::schedule = 2 1437 Coro::schedule = 2
… …
1502{ 1532{
1503 if (coro->mainstack) 1533 if (coro->mainstack)
1504 { 1534 {
1505 struct coro temp; 1535 struct coro temp;
1506 Zero (&temp, 1, struct coro); 1536 Zero (&temp, 1, struct coro);
1507 temp.save = CORO_SAVE_ALL;
1508 1537
1509 if (!(coro->flags & CF_RUNNING)) 1538 if (!(coro->flags & CF_RUNNING))
1510 { 1539 {
1511 save_perl (aTHX_ &temp); 1540 save_perl (aTHX_ &temp);
1512 load_perl (aTHX_ coro); 1541 load_perl (aTHX_ coro);
… …
1533 save_perl (aTHX_ coro); 1562 save_perl (aTHX_ coro);
1534 load_perl (aTHX_ &temp); 1563 load_perl (aTHX_ &temp);
1535 } 1564 }
1536 } 1565 }
1537} 1566}
1538 1567
1539SV * 1568SV *
1540is_ready (Coro::State coro) 1569is_ready (Coro::State coro)
1541 PROTOTYPE: $ 1570 PROTOTYPE: $
1542 ALIAS: 1571 ALIAS:
1543 is_ready = CF_READY 1572 is_ready = CF_READY
… …
1548 RETVAL = boolSV (coro->flags & ix); 1577 RETVAL = boolSV (coro->flags & ix);
1549 OUTPUT: 1578 OUTPUT:
1550 RETVAL 1579 RETVAL
1551 1580
1552void 1581void
1553trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1582api_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 1583
1571SV * 1584SV *
1572has_stack (Coro::State coro) 1585has_stack (Coro::State coro)
1573 PROTOTYPE: $ 1586 PROTOTYPE: $
1574 CODE: 1587 CODE:
… …
1585 RETVAL 1598 RETVAL
1586 1599
1587IV 1600IV
1588rss (Coro::State coro) 1601rss (Coro::State coro)
1589 PROTOTYPE: $ 1602 PROTOTYPE: $
1603 ALIAS:
1604 usecount = 1
1590 CODE: 1605 CODE:
1591 RETVAL = coro_rss (coro); 1606 switch (ix)
1607 {
1608 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1609 case 1: RETVAL = coro->usecount; break;
1610 }
1592 OUTPUT: 1611 OUTPUT:
1593 RETVAL 1612 RETVAL
1594 1613
1595 1614
1596MODULE = Coro::State PACKAGE = Coro 1615MODULE = Coro::State PACKAGE = Coro
… …
1601 1620
1602 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1621 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1603 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1622 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1604 av_async_pool = get_av ("Coro::async_pool", TRUE); 1623 av_async_pool = get_av ("Coro::async_pool", TRUE);
1605 1624
1606 coro_current = get_sv ("Coro::current", FALSE); 1625 coro_current = get_sv ("Coro::current", FALSE);
1607 SvREADONLY_on (coro_current); 1626 SvREADONLY_on (coro_current);
1608 1627
1609 coro_stash = gv_stashpv ("Coro", TRUE); 1628 coro_stash = gv_stashpv ("Coro", TRUE);
1610 1629
1611 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1630 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1620 1639
1621 { 1640 {
1622 SV *sv = perl_get_sv("Coro::API", 1); 1641 SV *sv = perl_get_sv("Coro::API", 1);
1623 1642
1624 coroapi.schedule = api_schedule; 1643 coroapi.schedule = api_schedule;
1625 coroapi.save = api_save;
1626 coroapi.cede = api_cede; 1644 coroapi.cede = api_cede;
1627 coroapi.cede_notself = api_cede_notself; 1645 coroapi.cede_notself = api_cede_notself;
1628 coroapi.ready = api_ready; 1646 coroapi.ready = api_ready;
1629 coroapi.is_ready = api_is_ready; 1647 coroapi.is_ready = api_is_ready;
1630 coroapi.nready = &coro_nready; 1648 coroapi.nready = &coro_nready;
… …
1684# for async_pool speedup 1702# for async_pool speedup
1685void 1703void
1686_pool_1 (SV *cb) 1704_pool_1 (SV *cb)
1687 CODE: 1705 CODE:
1688{ 1706{
1689 int i, len; 1707 struct coro *coro = SvSTATE (coro_current);
1690 HV *hv = (HV *)SvRV (coro_current); 1708 HV *hv = (HV *)SvRV (coro_current);
1691 AV *defav = GvAV (PL_defgv); 1709 AV *defav = GvAV (PL_defgv);
1692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1710 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1693 AV *invoke_av; 1711 AV *invoke_av;
1712 int i, len;
1694 1713
1695 if (!invoke) 1714 if (!invoke)
1696 croak ("\3terminate\2\n"); 1715 croak ("\3terminate\2\n");
1716
1717 SvREFCNT_dec (coro->saved_deffh);
1718 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1697 1719
1698 hv_store (hv, "desc", sizeof ("desc") - 1, 1720 hv_store (hv, "desc", sizeof ("desc") - 1,
1699 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1721 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1700 1722
1701 invoke_av = (AV *)SvRV (invoke); 1723 invoke_av = (AV *)SvRV (invoke);
… …
1719{ 1741{
1720 struct coro *coro = SvSTATE (coro_current); 1742 struct coro *coro = SvSTATE (coro_current);
1721 1743
1722 sv_setsv (cb, &PL_sv_undef); 1744 sv_setsv (cb, &PL_sv_undef);
1723 1745
1746 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1747 coro->saved_deffh = 0;
1748
1724 if (coro_rss (coro) > SvIV (sv_pool_rss) 1749 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1725 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1726 croak ("\3terminate\2\n"); 1751 croak ("\3terminate\2\n");
1727 1752
1728 av_clear (GvAV (PL_defgv)); 1753 av_clear (GvAV (PL_defgv));
1729 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1730 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1731 coro->save = CORO_SAVE_DEF; 1756
1732 coro->prio = 0; 1757 coro->prio = 0;
1758
1759 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1760 api_trace (coro_current, 0);
1761
1733 av_push (av_async_pool, newSVsv (coro_current)); 1762 av_push (av_async_pool, newSVsv (coro_current));
1734} 1763}
1735 1764
1736 1765
1737MODULE = Coro::State PACKAGE = Coro::AIO 1766MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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