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.166 by root, Wed Sep 26 21:11:28 2007 UTC vs.
Revision 1.182 by root, Wed Oct 3 18:37:48 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
142static struct coro_cctx *cctx_first; 144static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 145static int cctx_count, cctx_idle;
144 146
145enum { 147enum {
146 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
147 CC_TRACE = 0x02,
148 CC_NOREUSE = 0x04, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
150 CC_TRACE = 0x04,
151 CC_TRACE_SUB = 0x08, /* trace sub calls */
152 CC_TRACE_LINE = 0x10, /* trace each statement */
153 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
149}; 154};
150 155
151/* this is a structure representing a c-level coroutine */ 156/* this is a structure representing a c-level coroutine */
152typedef struct coro_cctx { 157typedef struct coro_cctx {
153 struct coro_cctx *next; 158 struct coro_cctx *next;
… …
181 coro_cctx *cctx; 186 coro_cctx *cctx;
182 187
183 /* data associated with this coroutine (initial args) */ 188 /* data associated with this coroutine (initial args) */
184 AV *args; 189 AV *args;
185 int refcnt; 190 int refcnt;
186 int save; /* CORO_SAVE flags */
187 int flags; /* CF_ flags */ 191 int flags; /* CF_ flags */
188 192
189 /* optionally saved, might be zero */ 193 /* optionally saved, might be zero */
190 AV *defav; /* @_ */ 194 AV *defav; /* @_ */
191 SV *defsv; /* $_ */ 195 SV *defsv; /* $_ */
… …
196 200
197#define VAR(name,type) type name; 201#define VAR(name,type) type name;
198# include "state.h" 202# include "state.h"
199#undef VAR 203#undef VAR
200 204
205 /* statistics */
206 int usecount; /* number of transfers to this coro */
207
201 /* coro process data */ 208 /* coro process data */
202 int prio; 209 int prio;
210 //SV *throw;
211
212 /* async_pool */
213 GV *asp_deffh;
203 214
204 /* linked list */ 215 /* linked list */
205 struct coro *next, *prev; 216 struct coro *next, *prev;
206 HV *hv; /* the perl hash associated with this coro, if any */ 217 HV *hv; /* the perl hash associated with this coro, if any */
207}; 218};
… …
295 SvMAGIC (cv) \ 306 SvMAGIC (cv) \
296 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 307 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
297 ? SvMAGIC (cv) \ 308 ? SvMAGIC (cv) \
298 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 309 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
299 : 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))
300 337
301/* the next two functions merely cache the padlists */ 338/* the next two functions merely cache the padlists */
302static void 339static void
303get_padlist (pTHX_ CV *cv) 340get_padlist (pTHX_ CV *cv)
304{ 341{
… …
343 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
344} 381}
345 382
346/** load & save, init *******************************************************/ 383/** load & save, init *******************************************************/
347 384
348#define SB do {
349#define SE } while (0)
350
351#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
352
353static void 385static void
354load_perl (pTHX_ Coro__State c) 386load_perl (pTHX_ Coro__State c)
355{ 387{
356#define VAR(name,type) PL_ ## name = c->name; 388#define VAR(name,type) PL_ ## name = c->name;
357# include "state.h" 389# include "state.h"
358#undef VAR 390#undef VAR
359 391
360 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 392 GvSV (PL_defgv) = c->defsv;
361 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 393 GvAV (PL_defgv) = c->defav;
362 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 394 GvSV (PL_errgv) = c->errsv;
363 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 395 PL_defoutgv = c->deffh;
364 396 PL_rs = c->irssv;
365 if (c->irssv) 397 GvSV (irsgv) = c->irssv_sv;
366 {
367 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
368 {
369 SvREFCNT_dec (c->irssv);
370 c->irssv = 0;
371 }
372 else
373 {
374 REPLACE_SV (PL_rs, c->irssv);
375 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
376 sv_setsv (c->irssv_sv, PL_rs);
377 }
378 }
379 398
380 { 399 {
381 dSP; 400 dSP;
382 CV *cv; 401 CV *cv;
383 402
… …
441 } 460 }
442 461
443 PUTBACK; 462 PUTBACK;
444 } 463 }
445 464
446 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 465 c->defav = GvAV (PL_defgv);
447 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 466 c->defsv = DEFSV;
448 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 467 c->errsv = ERRSV;
449 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 468 c->deffh = PL_defoutgv;
450 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 469 c->irssv = PL_rs;
470 c->irssv_sv = GvSV (irsgv);
451 471
452#define VAR(name,type)c->name = PL_ ## name; 472#define VAR(name,type)c->name = PL_ ## name;
453# include "state.h" 473# include "state.h"
454#undef VAR 474#undef VAR
455} 475}
… …
508 * destroy the stacks, the callchain etc... 528 * destroy the stacks, the callchain etc...
509 */ 529 */
510static void 530static void
511coro_destroy_stacks (pTHX) 531coro_destroy_stacks (pTHX)
512{ 532{
513 if (!IN_DESTRUCT)
514 {
515 /* restore all saved variables and stuff */
516 LEAVE_SCOPE (0);
517 assert (PL_tmps_floor == -1);
518
519 /* free all temporaries */
520 FREETMPS;
521 assert (PL_tmps_ix == -1);
522
523 /* unwind all extra stacks */
524 POPSTACK_TO (PL_mainstack);
525
526 /* unwind main stack */
527 dounwind (-1);
528 }
529
530 while (PL_curstackinfo->si_next) 533 while (PL_curstackinfo->si_next)
531 PL_curstackinfo = PL_curstackinfo->si_next; 534 PL_curstackinfo = PL_curstackinfo->si_next;
532 535
533 while (PL_curstackinfo) 536 while (PL_curstackinfo)
534 { 537 {
… …
550 Safefree (PL_retstack); 553 Safefree (PL_retstack);
551#endif 554#endif
552} 555}
553 556
554static size_t 557static size_t
555coro_rss (struct coro *coro) 558coro_rss (pTHX_ struct coro *coro)
556{ 559{
557 size_t rss = sizeof (coro); 560 size_t rss = sizeof (coro);
558 561
559 if (coro->mainstack) 562 if (coro->mainstack)
560 { 563 {
… …
583} 586}
584 587
585/** coroutine stack handling ************************************************/ 588/** coroutine stack handling ************************************************/
586 589
587static void 590static void
588setup_coro (pTHX_ struct coro *coro) 591coro_setup (pTHX_ struct coro *coro)
589{ 592{
590 /* 593 /*
591 * emulate part of the perl startup here. 594 * emulate part of the perl startup here.
592 */ 595 */
593 coro_init_stacks (aTHX); 596 coro_init_stacks (aTHX);
594 597
598 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 599 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 600 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 601 PL_comppad = 0;
598 PL_curpm = 0; 602 PL_curpm = 0;
599 PL_localizing = 0; 603 PL_localizing = 0;
600 PL_dirty = 0; 604 PL_dirty = 0;
601 PL_restartop = 0; 605 PL_restartop = 0;
606
607 GvSV (PL_defgv) = NEWSV (0, 0);
608 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 GvSV (PL_errgv) = NEWSV (0, 0);
610 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
611 PL_rs = newSVsv (GvSV (irsgv));
612
613 {
614 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro");
616 GvIOp(PL_defoutgv) = io;
617 IoTYPE (io) = IoTYPE_WRONLY;
618 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
619 IoFLAGS (io) |= IOf_FLUSH;
620 }
602 621
603 { 622 {
604 dSP; 623 dSP;
605 LOGOP myop; 624 LOGOP myop;
606
607 SvREFCNT_dec (GvAV (PL_defgv));
608 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 625
610 Zero (&myop, 1, LOGOP); 626 Zero (&myop, 1, LOGOP);
611 myop.op_next = Nullop; 627 myop.op_next = Nullop;
612 myop.op_flags = OPf_WANT_VOID; 628 myop.op_flags = OPf_WANT_VOID;
613 629
… …
621 637
622 ENTER; /* necessary e.g. for dounwind */ 638 ENTER; /* necessary e.g. for dounwind */
623} 639}
624 640
625static void 641static void
642coro_destroy (pTHX_ struct coro *coro)
643{
644 if (!IN_DESTRUCT)
645 {
646 /* restore all saved variables and stuff */
647 LEAVE_SCOPE (0);
648 assert (PL_tmps_floor == -1);
649
650 /* free all temporaries */
651 FREETMPS;
652 assert (PL_tmps_ix == -1);
653
654 /* unwind all extra stacks */
655 POPSTACK_TO (PL_mainstack);
656
657 /* unwind main stack */
658 dounwind (-1);
659 }
660
661 SvREFCNT_dec (GvSV (PL_defgv));
662 SvREFCNT_dec (GvAV (PL_defgv));
663 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv));
667
668 SvREFCNT_dec (coro->asp_deffh);
669 //SvREFCNT_dec (coro->throw);
670
671 coro_destroy_stacks (aTHX);
672}
673
674static void
626free_coro_mortal (pTHX) 675free_coro_mortal (pTHX)
627{ 676{
628 if (coro_mortal) 677 if (coro_mortal)
629 { 678 {
630 SvREFCNT_dec (coro_mortal); 679 SvREFCNT_dec (coro_mortal);
631 coro_mortal = 0; 680 coro_mortal = 0;
632 } 681 }
633} 682}
634 683
635static void
636do_trace (pTHX)
637{
638 if (PL_curcop != &PL_compiling)
639 {
640 runops_proc_t old_runops = PL_runops;
641 dSP;
642 ENTER;
643 SAVETMPS;
644 PUSHMARK (SP);
645 PUTBACK;
646 PL_runops = RUNOPS_DEFAULT;
647 call_pv ("Coro::_do_trace", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD | G_NOARGS);
648 PL_runops = old_runops;
649 SPAGAIN;
650 FREETMPS;
651 LEAVE;
652 PUTBACK;
653 }
654}
655
656static int 684static int
657runops_coro (pTHX) 685runops_trace (pTHX)
658{ 686{
659 COP *oldcop = 0; 687 COP *oldcop = 0;
688 int oldcxix = -2;
689 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
690 coro_cctx *cctx = coro->cctx;
660 691
661 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 692 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
662 { 693 {
663 PERL_ASYNC_CHECK (); 694 PERL_ASYNC_CHECK ();
664 695
665 if (oldcop != PL_curcop) 696 if (cctx->flags & CC_TRACE_ALL)
666 { 697 {
698 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
699 {
700 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
701 SV **bot, **top;
702 AV *av = newAV (); /* return values */
703 SV **cb;
704 dSP;
705
706 GV *gv = CvGV (cx->blk_sub.cv);
707 SV *fullname = sv_2mortal (newSV (0));
708 if (isGV (gv))
709 gv_efullname3 (fullname, gv, 0);
710
711 bot = PL_stack_base + cx->blk_oldsp + 1;
712 top = cx->blk_gimme == G_ARRAY ? SP + 1
713 : cx->blk_gimme == G_SCALAR ? bot + 1
714 : bot;
715
716 while (bot < top)
717 av_push (av, SvREFCNT_inc (*bot++));
718
719 PL_runops = RUNOPS_DEFAULT;
720 ENTER;
721 SAVETMPS;
722 EXTEND (SP, 3);
723 PUSHMARK (SP);
724 PUSHs (&PL_sv_no);
725 PUSHs (fullname);
726 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
727 PUTBACK;
728 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
729 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
730 SPAGAIN;
731 FREETMPS;
732 LEAVE;
733 PL_runops = runops_trace;
734 }
735
736 if (oldcop != PL_curcop)
737 {
667 oldcop = PL_curcop; 738 oldcop = PL_curcop;
668 do_trace (aTHX); 739
740 if (PL_curcop != &PL_compiling)
741 {
742 SV **cb;
743
744 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
745 {
746 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
747
748 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
749 {
750 runops_proc_t old_runops = PL_runops;
751 dSP;
752 GV *gv = CvGV (cx->blk_sub.cv);
753 SV *fullname = sv_2mortal (newSV (0));
754
755 if (isGV (gv))
756 gv_efullname3 (fullname, gv, 0);
757
758 PL_runops = RUNOPS_DEFAULT;
759 ENTER;
760 SAVETMPS;
761 EXTEND (SP, 3);
762 PUSHMARK (SP);
763 PUSHs (&PL_sv_yes);
764 PUSHs (fullname);
765 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
766 PUTBACK;
767 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
768 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
769 SPAGAIN;
770 FREETMPS;
771 LEAVE;
772 PL_runops = runops_trace;
773 }
774
775 oldcxix = cxstack_ix;
776 }
777
778 if (cctx->flags & CC_TRACE_LINE)
779 {
780 dSP;
781
782 PL_runops = RUNOPS_DEFAULT;
783 ENTER;
784 SAVETMPS;
785 EXTEND (SP, 3);
786 PL_runops = RUNOPS_DEFAULT;
787 PUSHMARK (SP);
788 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
789 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
790 PUTBACK;
791 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
792 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
793 SPAGAIN;
794 FREETMPS;
795 LEAVE;
796 PL_runops = runops_trace;
797 }
798 }
799 }
669 } 800 }
670 } 801 }
671 802
672 TAINT_NOT; 803 TAINT_NOT;
673 return 0; 804 return 0;
… …
683 LOGOP myop; 814 LOGOP myop;
684 815
685 PL_top_env = &PL_start_env; 816 PL_top_env = &PL_start_env;
686 817
687 if (cctx->flags & CC_TRACE) 818 if (cctx->flags & CC_TRACE)
688 PL_runops = runops_coro; 819 PL_runops = runops_trace;
689 820
690 Zero (&myop, 1, LOGOP); 821 Zero (&myop, 1, LOGOP);
691 myop.op_next = PL_op; 822 myop.op_next = PL_op;
692 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 823 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
693 824
… …
839 cctx_first = cctx; 970 cctx_first = cctx;
840} 971}
841 972
842/** coroutine switching *****************************************************/ 973/** coroutine switching *****************************************************/
843 974
844/* never call directly, always through the coro_state_transfer global variable */ 975static void NOINLINE
976transfer_check (pTHX_ struct coro *prev, struct coro *next)
977{
978 if (prev != next)
979 {
980 if (!(prev->flags & (CF_RUNNING | CF_NEW)))
981 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
982
983 if (next->flags & CF_RUNNING)
984 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
985
986 if (next->flags & CF_DESTROYED)
987 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
988
989 if (PL_lex_state != LEX_NOTPARSING)
990 croak ("Coro::State::transfer called while parsing, but this is not supported");
991 }
992}
993
994/* always use the TRANSFER macro */
845static void NOINLINE 995static void NOINLINE
846transfer (pTHX_ struct coro *prev, struct coro *next) 996transfer (pTHX_ struct coro *prev, struct coro *next)
847{ 997{
848 dSTACKLEVEL; 998 dSTACKLEVEL;
849 999
… …
863 Newz (0, prev->cctx, 1, coro_cctx); 1013 Newz (0, prev->cctx, 1, coro_cctx);
864 prev->flags &= ~CF_NEW; 1014 prev->flags &= ~CF_NEW;
865 prev->flags |= CF_RUNNING; 1015 prev->flags |= CF_RUNNING;
866 } 1016 }
867 1017
868 /*TODO: must not croak here */
869 if (!prev->flags & CF_RUNNING)
870 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
871
872 if (next->flags & CF_RUNNING)
873 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
874
875 if (next->flags & CF_DESTROYED)
876 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
877
878 prev->flags &= ~CF_RUNNING; 1018 prev->flags &= ~CF_RUNNING;
879 next->flags |= CF_RUNNING; 1019 next->flags |= CF_RUNNING;
880 1020
881 LOCK; 1021 LOCK;
882 1022
… …
885 /* need to start coroutine */ 1025 /* need to start coroutine */
886 next->flags &= ~CF_NEW; 1026 next->flags &= ~CF_NEW;
887 /* first get rid of the old state */ 1027 /* first get rid of the old state */
888 save_perl (aTHX_ prev); 1028 save_perl (aTHX_ prev);
889 /* setup coroutine call */ 1029 /* setup coroutine call */
890 setup_coro (aTHX_ next); 1030 coro_setup (aTHX_ next);
891 } 1031 }
892 else 1032 else
893 { 1033 {
894 /* coroutine already started */ 1034 /* coroutine already started */
895 save_perl (aTHX_ prev); 1035 save_perl (aTHX_ prev);
… …
897 } 1037 }
898 1038
899 prev__cctx = prev->cctx; 1039 prev__cctx = prev->cctx;
900 1040
901 /* possibly "free" the cctx */ 1041 /* possibly "free" the cctx */
902 if (prev__cctx->idle_sp == STACKLEVEL) 1042 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))
903 { 1043 {
904 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1044 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
905 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1045 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
906 1046
907 prev->cctx = 0; 1047 prev->cctx = 0;
908 1048
909 cctx_put (prev__cctx); 1049 cctx_put (prev__cctx);
910 } 1050 }
1051
1052 ++next->usecount;
911 1053
912 if (!next->cctx) 1054 if (!next->cctx)
913 next->cctx = cctx_get (aTHX); 1055 next->cctx = cctx_get (aTHX);
914 1056
915 if (prev__cctx != next->cctx) 1057 if (prev__cctx != next->cctx)
… …
928{ 1070{
929 struct coro *prev, *next; 1071 struct coro *prev, *next;
930}; 1072};
931 1073
932#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1074#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1075#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
933 1076
934/** high level stuff ********************************************************/ 1077/** high level stuff ********************************************************/
935 1078
936static int 1079static int
937coro_state_destroy (pTHX_ struct coro *coro) 1080coro_state_destroy (pTHX_ struct coro *coro)
… …
954 1097
955 if (coro->mainstack && coro->mainstack != main_mainstack) 1098 if (coro->mainstack && coro->mainstack != main_mainstack)
956 { 1099 {
957 struct coro temp; 1100 struct coro temp;
958 1101
959 assert (!(coro->flags & CF_RUNNING));
960
961 Zero (&temp, 1, struct coro);
962 temp.save = CORO_SAVE_ALL;
963
964 if (coro->flags & CF_RUNNING) 1102 if (coro->flags & CF_RUNNING)
965 croak ("FATAL: tried to destroy currently running coroutine"); 1103 croak ("FATAL: tried to destroy currently running coroutine");
966 1104
967 save_perl (aTHX_ &temp); 1105 save_perl (aTHX_ &temp);
968 load_perl (aTHX_ coro); 1106 load_perl (aTHX_ coro);
969 1107
970 coro_destroy_stacks (aTHX); 1108 coro_destroy (aTHX_ coro);
971 1109
972 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1110 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
973 1111
974 coro->mainstack = 0; 1112 coro->mainstack = 0;
975 } 1113 }
… …
1020#else 1158#else
1021# define MGf_DUP 0 1159# define MGf_DUP 0
1022#endif 1160#endif
1023}; 1161};
1024 1162
1025static struct coro *
1026SvSTATE_ (pTHX_ SV *coro)
1027{
1028 HV *stash;
1029 MAGIC *mg;
1030
1031 if (SvROK (coro))
1032 coro = SvRV (coro);
1033
1034 stash = SvSTASH (coro);
1035 if (stash != coro_stash && stash != coro_state_stash)
1036 {
1037 /* very slow, but rare, check */
1038 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
1039 croak ("Coro::State object required");
1040 }
1041
1042 mg = CORO_MAGIC (coro);
1043 return (struct coro *)mg->mg_ptr;
1044}
1045
1046#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1047
1048static void 1163static void
1049prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1164prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1050{ 1165{
1051 ta->prev = SvSTATE (prev_sv); 1166 ta->prev = SvSTATE (prev_sv);
1052 ta->next = SvSTATE (next_sv); 1167 ta->next = SvSTATE (next_sv);
1168 TRANSFER_CHECK (*ta);
1053} 1169}
1054 1170
1055static void 1171static void
1056api_transfer (SV *prev_sv, SV *next_sv) 1172api_transfer (SV *prev_sv, SV *next_sv)
1057{ 1173{
1058 dTHX; 1174 dTHX;
1059 struct transfer_args ta; 1175 struct transfer_args ta;
1060 1176
1061 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1177 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1062 TRANSFER (ta); 1178 TRANSFER (ta);
1063}
1064
1065static int
1066api_save (SV *coro_sv, int new_save)
1067{
1068 dTHX;
1069 struct coro *coro = SvSTATE (coro_sv);
1070 int old_save = coro->save;
1071
1072 if (new_save >= 0)
1073 coro->save = new_save;
1074
1075 return old_save;
1076} 1179}
1077 1180
1078/** Coro ********************************************************************/ 1181/** Coro ********************************************************************/
1079 1182
1080static void 1183static void
… …
1174 break; 1277 break;
1175 } 1278 }
1176 1279
1177 /* free this only after the transfer */ 1280 /* free this only after the transfer */
1178 prev_sv = SvRV (coro_current); 1281 prev_sv = SvRV (coro_current);
1179 SvRV_set (coro_current, next_sv);
1180 ta->prev = SvSTATE (prev_sv); 1282 ta->prev = SvSTATE (prev_sv);
1181 1283 TRANSFER_CHECK (*ta);
1182 assert (ta->next->flags & CF_READY); 1284 assert (ta->next->flags & CF_READY);
1183 ta->next->flags &= ~CF_READY; 1285 ta->next->flags &= ~CF_READY;
1286 SvRV_set (coro_current, next_sv);
1184 1287
1185 LOCK; 1288 LOCK;
1186 free_coro_mortal (aTHX); 1289 free_coro_mortal (aTHX);
1187 coro_mortal = prev_sv; 1290 coro_mortal = prev_sv;
1188 UNLOCK; 1291 UNLOCK;
… …
1249 } 1352 }
1250 else 1353 else
1251 return 0; 1354 return 0;
1252} 1355}
1253 1356
1357static void
1358api_trace (SV *coro_sv, int flags)
1359{
1360 dTHX;
1361 struct coro *coro = SvSTATE (coro_sv);
1362
1363 if (flags & CC_TRACE)
1364 {
1365 if (!coro->cctx)
1366 coro->cctx = cctx_new ();
1367 else if (!(coro->cctx->flags & CC_TRACE))
1368 croak ("cannot enable tracing on coroutine with custom stack");
1369
1370 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1371 }
1372 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1373 {
1374 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1375
1376 if (coro->flags & CF_RUNNING)
1377 PL_runops = RUNOPS_DEFAULT;
1378 else
1379 coro->runops = RUNOPS_DEFAULT;
1380 }
1381}
1382
1254MODULE = Coro::State PACKAGE = Coro::State 1383MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1255 1384
1256PROTOTYPES: DISABLE 1385PROTOTYPES: DISABLE
1257 1386
1258BOOT: 1387BOOT:
1259{ 1388{
1260#ifdef USE_ITHREADS 1389#ifdef USE_ITHREADS
1261 MUTEX_INIT (&coro_mutex); 1390 MUTEX_INIT (&coro_mutex);
1262#endif 1391#endif
1263 BOOT_PAGESIZE; 1392 BOOT_PAGESIZE;
1264 1393
1394 irsgv = gv_fetchpv ("/", 1, SVt_PV);
1395
1265 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1266 1397
1267 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1268 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1269 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1270 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1271 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1272 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF)); 1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1273 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1274 1402
1275 main_mainstack = PL_mainstack; 1403 main_mainstack = PL_mainstack;
1276 main_top_env = PL_top_env; 1404 main_top_env = PL_top_env;
1277 1405
1278 while (main_top_env->je_prev) 1406 while (main_top_env->je_prev)
… …
1291 struct coro *coro; 1419 struct coro *coro;
1292 HV *hv; 1420 HV *hv;
1293 int i; 1421 int i;
1294 1422
1295 Newz (0, coro, 1, struct coro); 1423 Newz (0, coro, 1, struct coro);
1296 coro->args = newAV (); 1424 coro->args = newAV ();
1297 coro->save = CORO_SAVE_DEF;
1298 coro->flags = CF_NEW; 1425 coro->flags = CF_NEW;
1299 1426
1300 if (coro_first) coro_first->prev = coro; 1427 if (coro_first) coro_first->prev = coro;
1301 coro->next = coro_first; 1428 coro->next = coro_first;
1302 coro_first = coro; 1429 coro_first = coro;
… …
1309 av_push (coro->args, newSVsv (ST (i))); 1436 av_push (coro->args, newSVsv (ST (i)));
1310} 1437}
1311 OUTPUT: 1438 OUTPUT:
1312 RETVAL 1439 RETVAL
1313 1440
1314int 1441# these not obviously related functions are all rolled into the same xs
1315save (SV *coro, int new_save = -1) 1442# function to increase chances that they all will call transfer with the same
1316 CODE: 1443# stack offset
1317 RETVAL = api_save (coro, new_save);
1318 OUTPUT:
1319 RETVAL
1320
1321int
1322save_also (SV *coro_sv, int save_also)
1323 CODE:
1324{
1325 struct coro *coro = SvSTATE (coro_sv);
1326 RETVAL = coro->save;
1327 coro->save |= save_also;
1328}
1329 OUTPUT:
1330 RETVAL
1331
1332void 1444void
1333_set_stacklevel (...) 1445_set_stacklevel (...)
1334 ALIAS: 1446 ALIAS:
1335 Coro::State::transfer = 1 1447 Coro::State::transfer = 1
1336 Coro::schedule = 2 1448 Coro::schedule = 2
… …
1431{ 1543{
1432 if (coro->mainstack) 1544 if (coro->mainstack)
1433 { 1545 {
1434 struct coro temp; 1546 struct coro temp;
1435 Zero (&temp, 1, struct coro); 1547 Zero (&temp, 1, struct coro);
1436 temp.save = CORO_SAVE_ALL;
1437 1548
1438 if (!(coro->flags & CF_RUNNING)) 1549 if (!(coro->flags & CF_RUNNING))
1439 { 1550 {
1440 save_perl (aTHX_ &temp); 1551 save_perl (aTHX_ &temp);
1441 load_perl (aTHX_ coro); 1552 load_perl (aTHX_ coro);
… …
1462 save_perl (aTHX_ coro); 1573 save_perl (aTHX_ coro);
1463 load_perl (aTHX_ &temp); 1574 load_perl (aTHX_ &temp);
1464 } 1575 }
1465 } 1576 }
1466} 1577}
1467 1578
1468SV * 1579SV *
1469is_ready (Coro::State coro) 1580is_ready (Coro::State coro)
1470 PROTOTYPE: $ 1581 PROTOTYPE: $
1471 ALIAS: 1582 ALIAS:
1472 is_ready = CF_READY 1583 is_ready = CF_READY
… …
1477 RETVAL = boolSV (coro->flags & ix); 1588 RETVAL = boolSV (coro->flags & ix);
1478 OUTPUT: 1589 OUTPUT:
1479 RETVAL 1590 RETVAL
1480 1591
1481void 1592void
1482trace (Coro::State coro, int enable = 0) 1593api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1483 CODE:
1484 if (enable)
1485 {
1486 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1487 XSRETURN_EMPTY;
1488
1489 if (coro->flags & CF_RUNNING)
1490 croak ("cannot enable tracing on running coroutine");
1491
1492 if (coro->cctx)
1493 croak ("cannot enable tracing on coroutine with custom stack");
1494
1495 coro->cctx = cctx_new ();
1496 coro->cctx->flags |= CC_TRACE;
1497 }
1498 else
1499 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1500 {
1501 coro->cctx->flags &= ~CC_TRACE;
1502 coro->cctx->flags |= CC_NOREUSE;
1503 }
1504 1594
1505SV * 1595SV *
1506has_stack (Coro::State coro) 1596has_stack (Coro::State coro)
1507 PROTOTYPE: $ 1597 PROTOTYPE: $
1508 CODE: 1598 CODE:
1509 RETVAL = boolSV (!!coro->cctx); 1599 RETVAL = boolSV (!!coro->cctx);
1510 OUTPUT: 1600 OUTPUT:
1511 RETVAL 1601 RETVAL
1512 1602
1603int
1604is_traced (Coro::State coro)
1605 PROTOTYPE: $
1606 CODE:
1607 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1608 OUTPUT:
1609 RETVAL
1610
1513IV 1611IV
1514rss (Coro::State coro) 1612rss (Coro::State coro)
1515 PROTOTYPE: $ 1613 PROTOTYPE: $
1614 ALIAS:
1615 usecount = 1
1516 CODE: 1616 CODE:
1517 RETVAL = coro_rss (coro); 1617 switch (ix)
1618 {
1619 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1620 case 1: RETVAL = coro->usecount; break;
1621 }
1518 OUTPUT: 1622 OUTPUT:
1519 RETVAL 1623 RETVAL
1520 1624
1521 1625
1522MODULE = Coro::State PACKAGE = Coro 1626MODULE = Coro::State PACKAGE = Coro
… …
1527 1631
1528 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1529 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1530 av_async_pool = get_av ("Coro::async_pool", TRUE); 1634 av_async_pool = get_av ("Coro::async_pool", TRUE);
1531 1635
1532 coro_current = get_sv ("Coro::current", FALSE); 1636 coro_current = get_sv ("Coro::current", FALSE);
1533 SvREADONLY_on (coro_current); 1637 SvREADONLY_on (coro_current);
1534 1638
1535 coro_stash = gv_stashpv ("Coro", TRUE); 1639 coro_stash = gv_stashpv ("Coro", TRUE);
1536 1640
1537 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1546 1650
1547 { 1651 {
1548 SV *sv = perl_get_sv("Coro::API", 1); 1652 SV *sv = perl_get_sv("Coro::API", 1);
1549 1653
1550 coroapi.schedule = api_schedule; 1654 coroapi.schedule = api_schedule;
1551 coroapi.save = api_save;
1552 coroapi.cede = api_cede; 1655 coroapi.cede = api_cede;
1553 coroapi.cede_notself = api_cede_notself; 1656 coroapi.cede_notself = api_cede_notself;
1554 coroapi.ready = api_ready; 1657 coroapi.ready = api_ready;
1555 coroapi.is_ready = api_is_ready; 1658 coroapi.is_ready = api_is_ready;
1556 coroapi.nready = &coro_nready; 1659 coroapi.nready = &coro_nready;
… …
1610# for async_pool speedup 1713# for async_pool speedup
1611void 1714void
1612_pool_1 (SV *cb) 1715_pool_1 (SV *cb)
1613 CODE: 1716 CODE:
1614{ 1717{
1615 int i, len; 1718 struct coro *coro = SvSTATE (coro_current);
1616 HV *hv = (HV *)SvRV (coro_current); 1719 HV *hv = (HV *)SvRV (coro_current);
1617 AV *defav = GvAV (PL_defgv); 1720 AV *defav = GvAV (PL_defgv);
1618 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1619 AV *invoke_av; 1722 AV *invoke_av;
1723 int i, len;
1620 1724
1621 if (!invoke) 1725 if (!invoke)
1622 croak ("\3terminate\2\n"); 1726 croak ("\3terminate\2\n");
1727
1728 SvREFCNT_dec (coro->asp_deffh);
1729 coro->asp_deffh = SvREFCNT_inc (PL_defoutgv);
1623 1730
1624 hv_store (hv, "desc", sizeof ("desc") - 1, 1731 hv_store (hv, "desc", sizeof ("desc") - 1,
1625 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1626 1733
1627 invoke_av = (AV *)SvRV (invoke); 1734 invoke_av = (AV *)SvRV (invoke);
… …
1645{ 1752{
1646 struct coro *coro = SvSTATE (coro_current); 1753 struct coro *coro = SvSTATE (coro_current);
1647 1754
1648 sv_setsv (cb, &PL_sv_undef); 1755 sv_setsv (cb, &PL_sv_undef);
1649 1756
1757 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->asp_deffh;
1758 coro->asp_deffh = 0;
1759
1650 if (coro_rss (coro) > SvIV (sv_pool_rss) 1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1651 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1652 croak ("\3terminate\2\n"); 1762 croak ("\3terminate\2\n");
1653 1763
1654 av_clear (GvAV (PL_defgv)); 1764 av_clear (GvAV (PL_defgv));
1655 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1656 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1657 coro->save = CORO_SAVE_DEF; 1767
1658 coro->prio = 0; 1768 coro->prio = 0;
1769
1770 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1771 api_trace (coro_current, 0);
1772
1659 av_push (av_async_pool, newSVsv (coro_current)); 1773 av_push (av_async_pool, newSVsv (coro_current));
1660} 1774}
1661 1775
1662 1776
1663MODULE = Coro::State PACKAGE = Coro::AIO 1777MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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