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.189 by root, Fri Oct 5 20:38:43 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; /* $/ */
138static GV *stdoutgv; /* *STDOUT */
139
137/* async_pool helper stuff */ 140/* async_pool helper stuff */
138static SV *sv_pool_rss; 141static SV *sv_pool_rss;
139static SV *sv_pool_size; 142static SV *sv_pool_size;
140static AV *av_async_pool; 143static AV *av_async_pool;
141 144
142static struct coro_cctx *cctx_first; 145static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 146static int cctx_count, cctx_idle;
144 147
145enum { 148enum {
146 CC_MAPPED = 0x01, 149 CC_MAPPED = 0x01,
147 CC_TRACE = 0x02,
148 CC_NOREUSE = 0x04, /* throw this away after tracing */ 150 CC_NOREUSE = 0x02, /* throw this away after tracing */
151 CC_TRACE = 0x04,
152 CC_TRACE_SUB = 0x08, /* trace sub calls */
153 CC_TRACE_LINE = 0x10, /* trace each statement */
154 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
149}; 155};
150 156
151/* this is a structure representing a c-level coroutine */ 157/* this is a structure representing a c-level coroutine */
152typedef struct coro_cctx { 158typedef struct coro_cctx {
153 struct coro_cctx *next; 159 struct coro_cctx *next;
… …
181 coro_cctx *cctx; 187 coro_cctx *cctx;
182 188
183 /* data associated with this coroutine (initial args) */ 189 /* data associated with this coroutine (initial args) */
184 AV *args; 190 AV *args;
185 int refcnt; 191 int refcnt;
186 int save; /* CORO_SAVE flags */
187 int flags; /* CF_ flags */ 192 int flags; /* CF_ flags */
188 193
189 /* optionally saved, might be zero */ 194 /* optionally saved, might be zero */
190 AV *defav; /* @_ */ 195 AV *defav; /* @_ */
191 SV *defsv; /* $_ */ 196 SV *defsv; /* $_ */
192 SV *errsv; /* $@ */ 197 SV *errsv; /* $@ */
193 GV *deffh; /* default filehandle */ 198 SV *deffh; /* default filehandle */
194 SV *irssv; /* $/ */ 199 SV *irssv; /* $/ */
195 SV *irssv_sv; /* real $/ cache */ 200 SV *irssv_sv; /* real $/ cache */
196 201
197#define VAR(name,type) type name; 202#define VAR(name,type) type name;
198# include "state.h" 203# include "state.h"
199#undef VAR 204#undef VAR
200 205
206 /* statistics */
207 int usecount; /* number of transfers to this coro */
208
201 /* coro process data */ 209 /* coro process data */
202 int prio; 210 int prio;
211 //SV *throw;
212
213 /* async_pool */
214 SV *saved_deffh;
203 215
204 /* linked list */ 216 /* linked list */
205 struct coro *next, *prev; 217 struct coro *next, *prev;
206 HV *hv; /* the perl hash associated with this coro, if any */ 218 HV *hv; /* the perl hash associated with this coro, if any */
207}; 219};
… …
295 SvMAGIC (cv) \ 307 SvMAGIC (cv) \
296 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 308 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
297 ? SvMAGIC (cv) \ 309 ? SvMAGIC (cv) \
298 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 310 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
299 : 0 311 : 0
312
313static struct coro *
314SvSTATE_ (pTHX_ SV *coro)
315{
316 HV *stash;
317 MAGIC *mg;
318
319 if (SvROK (coro))
320 coro = SvRV (coro);
321
322 if (SvTYPE (coro) != SVt_PVHV)
323 croak ("Coro::State object required");
324
325 stash = SvSTASH (coro);
326 if (stash != coro_stash && stash != coro_state_stash)
327 {
328 /* very slow, but rare, check */
329 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
330 croak ("Coro::State object required");
331 }
332
333 mg = CORO_MAGIC (coro);
334 return (struct coro *)mg->mg_ptr;
335}
336
337#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
300 338
301/* the next two functions merely cache the padlists */ 339/* the next two functions merely cache the padlists */
302static void 340static void
303get_padlist (pTHX_ CV *cv) 341get_padlist (pTHX_ CV *cv)
304{ 342{
… …
343 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 381 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
344} 382}
345 383
346/** load & save, init *******************************************************/ 384/** load & save, init *******************************************************/
347 385
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 386static void
354load_perl (pTHX_ Coro__State c) 387load_perl (pTHX_ Coro__State c)
355{ 388{
356#define VAR(name,type) PL_ ## name = c->name; 389#define VAR(name,type) PL_ ## name = c->name;
357# include "state.h" 390# include "state.h"
358#undef VAR 391#undef VAR
359 392
360 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 393 GvSV (PL_defgv) = c->defsv;
361 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 394 GvAV (PL_defgv) = c->defav;
362 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 395 GvSV (PL_errgv) = c->errsv;
363 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 396 GvSV (irsgv) = c->irssv_sv;
364
365 if (c->irssv)
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 397
380 { 398 {
381 dSP; 399 dSP;
382 CV *cv; 400 CV *cv;
383 401
… …
441 } 459 }
442 460
443 PUTBACK; 461 PUTBACK;
444 } 462 }
445 463
446 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 464 c->defav = GvAV (PL_defgv);
447 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 465 c->defsv = DEFSV;
448 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 466 c->errsv = ERRSV;
449 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 467 c->irssv_sv = GvSV (irsgv);
450 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
451 468
452#define VAR(name,type)c->name = PL_ ## name; 469#define VAR(name,type)c->name = PL_ ## name;
453# include "state.h" 470# include "state.h"
454#undef VAR 471#undef VAR
455} 472}
… …
508 * destroy the stacks, the callchain etc... 525 * destroy the stacks, the callchain etc...
509 */ 526 */
510static void 527static void
511coro_destroy_stacks (pTHX) 528coro_destroy_stacks (pTHX)
512{ 529{
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) 530 while (PL_curstackinfo->si_next)
531 PL_curstackinfo = PL_curstackinfo->si_next; 531 PL_curstackinfo = PL_curstackinfo->si_next;
532 532
533 while (PL_curstackinfo) 533 while (PL_curstackinfo)
534 { 534 {
… …
550 Safefree (PL_retstack); 550 Safefree (PL_retstack);
551#endif 551#endif
552} 552}
553 553
554static size_t 554static size_t
555coro_rss (struct coro *coro) 555coro_rss (pTHX_ struct coro *coro)
556{ 556{
557 size_t rss = sizeof (coro); 557 size_t rss = sizeof (*coro);
558 558
559 if (coro->mainstack) 559 if (coro->mainstack)
560 { 560 {
561 if (coro->flags & CF_RUNNING) 561 if (coro->flags & CF_RUNNING)
562 { 562 {
… …
564 # include "state.h" 564 # include "state.h"
565 #undef VAR 565 #undef VAR
566 } 566 }
567 567
568 rss += sizeof (coro->curstackinfo); 568 rss += sizeof (coro->curstackinfo);
569 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *); 569 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
570 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 570 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
571 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 571 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
572 rss += coro->tmps_max * sizeof (SV *); 572 rss += coro->tmps_max * sizeof (SV *);
573 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 573 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
574 rss += coro->scopestack_max * sizeof (I32); 574 rss += coro->scopestack_max * sizeof (I32);
575 rss += coro->savestack_max * sizeof (ANY); 575 rss += coro->savestack_max * sizeof (ANY);
576 576
… …
583} 583}
584 584
585/** coroutine stack handling ************************************************/ 585/** coroutine stack handling ************************************************/
586 586
587static void 587static void
588setup_coro (pTHX_ struct coro *coro) 588coro_setup (pTHX_ struct coro *coro)
589{ 589{
590 /* 590 /*
591 * emulate part of the perl startup here. 591 * emulate part of the perl startup here.
592 */ 592 */
593 coro_init_stacks (aTHX); 593 coro_init_stacks (aTHX);
594 594
595 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 596 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 597 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 598 PL_comppad = 0;
598 PL_curpm = 0; 599 PL_curpm = 0;
599 PL_localizing = 0; 600 PL_localizing = 0;
600 PL_dirty = 0; 601 PL_dirty = 0;
601 PL_restartop = 0; 602 PL_restartop = 0;
603
604 GvSV (PL_defgv) = NEWSV (0, 0);
605 GvAV (PL_defgv) = coro->args; coro->args = 0;
606 GvSV (PL_errgv) = NEWSV (0, 0);
607 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
608 PL_rs = newSVsv (GvSV (irsgv));
609 PL_defoutgv = SvREFCNT_inc (stdoutgv);
602 610
603 { 611 {
604 dSP; 612 dSP;
605 LOGOP myop; 613 LOGOP myop;
606
607 SvREFCNT_dec (GvAV (PL_defgv));
608 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 614
610 Zero (&myop, 1, LOGOP); 615 Zero (&myop, 1, LOGOP);
611 myop.op_next = Nullop; 616 myop.op_next = Nullop;
612 myop.op_flags = OPf_WANT_VOID; 617 myop.op_flags = OPf_WANT_VOID;
613 618
… …
621 626
622 ENTER; /* necessary e.g. for dounwind */ 627 ENTER; /* necessary e.g. for dounwind */
623} 628}
624 629
625static 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
626free_coro_mortal (pTHX) 664free_coro_mortal (pTHX)
627{ 665{
628 if (coro_mortal) 666 if (coro_mortal)
629 { 667 {
630 SvREFCNT_dec (coro_mortal); 668 SvREFCNT_dec (coro_mortal);
631 coro_mortal = 0; 669 coro_mortal = 0;
632 } 670 }
633} 671}
634 672
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 673static int
657runops_coro (pTHX) 674runops_trace (pTHX)
658{ 675{
659 COP *oldcop = 0; 676 COP *oldcop = 0;
677 int oldcxix = -2;
678 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
679 coro_cctx *cctx = coro->cctx;
660 680
661 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 681 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
662 { 682 {
663 PERL_ASYNC_CHECK (); 683 PERL_ASYNC_CHECK ();
664 684
665 if (oldcop != PL_curcop) 685 if (cctx->flags & CC_TRACE_ALL)
666 { 686 {
687 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
688 {
689 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
690 SV **bot, **top;
691 AV *av = newAV (); /* return values */
692 SV **cb;
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;
709 ENTER;
710 SAVETMPS;
711 EXTEND (SP, 3);
712 PUSHMARK (SP);
713 PUSHs (&PL_sv_no);
714 PUSHs (fullname);
715 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
716 PUTBACK;
717 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
718 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
719 SPAGAIN;
720 FREETMPS;
721 LEAVE;
722 PL_runops = runops_trace;
723 }
724
725 if (oldcop != PL_curcop)
726 {
667 oldcop = PL_curcop; 727 oldcop = PL_curcop;
668 do_trace (aTHX); 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 }
788 }
669 } 789 }
670 } 790 }
671 791
672 TAINT_NOT; 792 TAINT_NOT;
673 return 0; 793 return 0;
… …
683 LOGOP myop; 803 LOGOP myop;
684 804
685 PL_top_env = &PL_start_env; 805 PL_top_env = &PL_start_env;
686 806
687 if (cctx->flags & CC_TRACE) 807 if (cctx->flags & CC_TRACE)
688 PL_runops = runops_coro; 808 PL_runops = runops_trace;
689 809
690 Zero (&myop, 1, LOGOP); 810 Zero (&myop, 1, LOGOP);
691 myop.op_next = PL_op; 811 myop.op_next = PL_op;
692 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 812 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
693 813
… …
839 cctx_first = cctx; 959 cctx_first = cctx;
840} 960}
841 961
842/** coroutine switching *****************************************************/ 962/** coroutine switching *****************************************************/
843 963
844/* 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 */
845static void NOINLINE 984static void NOINLINE
846transfer (pTHX_ struct coro *prev, struct coro *next) 985transfer (pTHX_ struct coro *prev, struct coro *next)
847{ 986{
848 dSTACKLEVEL; 987 dSTACKLEVEL;
849 988
… …
863 Newz (0, prev->cctx, 1, coro_cctx); 1002 Newz (0, prev->cctx, 1, coro_cctx);
864 prev->flags &= ~CF_NEW; 1003 prev->flags &= ~CF_NEW;
865 prev->flags |= CF_RUNNING; 1004 prev->flags |= CF_RUNNING;
866 } 1005 }
867 1006
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; 1007 prev->flags &= ~CF_RUNNING;
879 next->flags |= CF_RUNNING; 1008 next->flags |= CF_RUNNING;
880 1009
881 LOCK; 1010 LOCK;
882 1011
… …
885 /* need to start coroutine */ 1014 /* need to start coroutine */
886 next->flags &= ~CF_NEW; 1015 next->flags &= ~CF_NEW;
887 /* first get rid of the old state */ 1016 /* first get rid of the old state */
888 save_perl (aTHX_ prev); 1017 save_perl (aTHX_ prev);
889 /* setup coroutine call */ 1018 /* setup coroutine call */
890 setup_coro (aTHX_ next); 1019 coro_setup (aTHX_ next);
891 } 1020 }
892 else 1021 else
893 { 1022 {
894 /* coroutine already started */ 1023 /* coroutine already started */
895 save_perl (aTHX_ prev); 1024 save_perl (aTHX_ prev);
… …
897 } 1026 }
898 1027
899 prev__cctx = prev->cctx; 1028 prev__cctx = prev->cctx;
900 1029
901 /* possibly "free" the cctx */ 1030 /* possibly "free" the cctx */
902 if (prev__cctx->idle_sp == STACKLEVEL) 1031 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))
903 { 1032 {
904 /* 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 */
905 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));
906 1035
907 prev->cctx = 0; 1036 prev->cctx = 0;
908 1037
909 cctx_put (prev__cctx); 1038 cctx_put (prev__cctx);
910 } 1039 }
1040
1041 ++next->usecount;
911 1042
912 if (!next->cctx) 1043 if (!next->cctx)
913 next->cctx = cctx_get (aTHX); 1044 next->cctx = cctx_get (aTHX);
914 1045
915 if (prev__cctx != next->cctx) 1046 if (prev__cctx != next->cctx)
… …
928{ 1059{
929 struct coro *prev, *next; 1060 struct coro *prev, *next;
930}; 1061};
931 1062
932#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)
933 1065
934/** high level stuff ********************************************************/ 1066/** high level stuff ********************************************************/
935 1067
936static int 1068static int
937coro_state_destroy (pTHX_ struct coro *coro) 1069coro_state_destroy (pTHX_ struct coro *coro)
… …
954 1086
955 if (coro->mainstack && coro->mainstack != main_mainstack) 1087 if (coro->mainstack && coro->mainstack != main_mainstack)
956 { 1088 {
957 struct coro temp; 1089 struct coro temp;
958 1090
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) 1091 if (coro->flags & CF_RUNNING)
965 croak ("FATAL: tried to destroy currently running coroutine"); 1092 croak ("FATAL: tried to destroy currently running coroutine");
966 1093
967 save_perl (aTHX_ &temp); 1094 save_perl (aTHX_ &temp);
968 load_perl (aTHX_ coro); 1095 load_perl (aTHX_ coro);
969 1096
970 coro_destroy_stacks (aTHX); 1097 coro_destroy (aTHX_ coro);
971 1098
972 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
973 1100
974 coro->mainstack = 0; 1101 coro->mainstack = 0;
975 } 1102 }
… …
1020#else 1147#else
1021# define MGf_DUP 0 1148# define MGf_DUP 0
1022#endif 1149#endif
1023}; 1150};
1024 1151
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 1152static void
1049prepare_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)
1050{ 1154{
1051 ta->prev = SvSTATE (prev_sv); 1155 ta->prev = SvSTATE (prev_sv);
1052 ta->next = SvSTATE (next_sv); 1156 ta->next = SvSTATE (next_sv);
1157 TRANSFER_CHECK (*ta);
1053} 1158}
1054 1159
1055static void 1160static void
1056api_transfer (SV *prev_sv, SV *next_sv) 1161api_transfer (SV *prev_sv, SV *next_sv)
1057{ 1162{
1058 dTHX; 1163 dTHX;
1059 struct transfer_args ta; 1164 struct transfer_args ta;
1060 1165
1061 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1062 TRANSFER (ta); 1167 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} 1168}
1077 1169
1078/** Coro ********************************************************************/ 1170/** Coro ********************************************************************/
1079 1171
1080static void 1172static void
… …
1174 break; 1266 break;
1175 } 1267 }
1176 1268
1177 /* free this only after the transfer */ 1269 /* free this only after the transfer */
1178 prev_sv = SvRV (coro_current); 1270 prev_sv = SvRV (coro_current);
1179 SvRV_set (coro_current, next_sv);
1180 ta->prev = SvSTATE (prev_sv); 1271 ta->prev = SvSTATE (prev_sv);
1181 1272 TRANSFER_CHECK (*ta);
1182 assert (ta->next->flags & CF_READY); 1273 assert (ta->next->flags & CF_READY);
1183 ta->next->flags &= ~CF_READY; 1274 ta->next->flags &= ~CF_READY;
1275 SvRV_set (coro_current, next_sv);
1184 1276
1185 LOCK; 1277 LOCK;
1186 free_coro_mortal (aTHX); 1278 free_coro_mortal (aTHX);
1187 coro_mortal = prev_sv; 1279 coro_mortal = prev_sv;
1188 UNLOCK; 1280 UNLOCK;
… …
1249 } 1341 }
1250 else 1342 else
1251 return 0; 1343 return 0;
1252} 1344}
1253 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
1254MODULE = Coro::State PACKAGE = Coro::State 1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1255 1373
1256PROTOTYPES: DISABLE 1374PROTOTYPES: DISABLE
1257 1375
1258BOOT: 1376BOOT:
1259{ 1377{
1260#ifdef USE_ITHREADS 1378#ifdef USE_ITHREADS
1261 MUTEX_INIT (&coro_mutex); 1379 MUTEX_INIT (&coro_mutex);
1262#endif 1380#endif
1263 BOOT_PAGESIZE; 1381 BOOT_PAGESIZE;
1264 1382
1383 irsgv = gv_fetchpv ("/" , GV_ADD, SVt_PV);
1384 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD, SVt_PVIO);
1385
1265 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1386 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1266 1387
1267 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1388 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1268 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1389 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)); 1390 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1273 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1391 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1274 1392
1275 main_mainstack = PL_mainstack; 1393 main_mainstack = PL_mainstack;
1276 main_top_env = PL_top_env; 1394 main_top_env = PL_top_env;
1277 1395
1278 while (main_top_env->je_prev) 1396 while (main_top_env->je_prev)
… …
1291 struct coro *coro; 1409 struct coro *coro;
1292 HV *hv; 1410 HV *hv;
1293 int i; 1411 int i;
1294 1412
1295 Newz (0, coro, 1, struct coro); 1413 Newz (0, coro, 1, struct coro);
1296 coro->args = newAV (); 1414 coro->args = newAV ();
1297 coro->save = CORO_SAVE_DEF;
1298 coro->flags = CF_NEW; 1415 coro->flags = CF_NEW;
1299 1416
1300 if (coro_first) coro_first->prev = coro; 1417 if (coro_first) coro_first->prev = coro;
1301 coro->next = coro_first; 1418 coro->next = coro_first;
1302 coro_first = coro; 1419 coro_first = coro;
… …
1309 av_push (coro->args, newSVsv (ST (i))); 1426 av_push (coro->args, newSVsv (ST (i)));
1310} 1427}
1311 OUTPUT: 1428 OUTPUT:
1312 RETVAL 1429 RETVAL
1313 1430
1314int 1431# these not obviously related functions are all rolled into the same xs
1315save (SV *coro, int new_save = -1) 1432# function to increase chances that they all will call transfer with the same
1316 CODE: 1433# 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 1434void
1333_set_stacklevel (...) 1435_set_stacklevel (...)
1334 ALIAS: 1436 ALIAS:
1335 Coro::State::transfer = 1 1437 Coro::State::transfer = 1
1336 Coro::schedule = 2 1438 Coro::schedule = 2
… …
1431{ 1533{
1432 if (coro->mainstack) 1534 if (coro->mainstack)
1433 { 1535 {
1434 struct coro temp; 1536 struct coro temp;
1435 Zero (&temp, 1, struct coro); 1537 Zero (&temp, 1, struct coro);
1436 temp.save = CORO_SAVE_ALL;
1437 1538
1438 if (!(coro->flags & CF_RUNNING)) 1539 if (!(coro->flags & CF_RUNNING))
1439 { 1540 {
1440 save_perl (aTHX_ &temp); 1541 save_perl (aTHX_ &temp);
1441 load_perl (aTHX_ coro); 1542 load_perl (aTHX_ coro);
… …
1462 save_perl (aTHX_ coro); 1563 save_perl (aTHX_ coro);
1463 load_perl (aTHX_ &temp); 1564 load_perl (aTHX_ &temp);
1464 } 1565 }
1465 } 1566 }
1466} 1567}
1467 1568
1468SV * 1569SV *
1469is_ready (Coro::State coro) 1570is_ready (Coro::State coro)
1470 PROTOTYPE: $ 1571 PROTOTYPE: $
1471 ALIAS: 1572 ALIAS:
1472 is_ready = CF_READY 1573 is_ready = CF_READY
… …
1477 RETVAL = boolSV (coro->flags & ix); 1578 RETVAL = boolSV (coro->flags & ix);
1478 OUTPUT: 1579 OUTPUT:
1479 RETVAL 1580 RETVAL
1480 1581
1481void 1582void
1482trace (Coro::State coro, int enable = 0) 1583api_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 1584
1505SV * 1585SV *
1506has_stack (Coro::State coro) 1586has_stack (Coro::State coro)
1507 PROTOTYPE: $ 1587 PROTOTYPE: $
1508 CODE: 1588 CODE:
1509 RETVAL = boolSV (!!coro->cctx); 1589 RETVAL = boolSV (!!coro->cctx);
1510 OUTPUT: 1590 OUTPUT:
1511 RETVAL 1591 RETVAL
1512 1592
1593int
1594is_traced (Coro::State coro)
1595 PROTOTYPE: $
1596 CODE:
1597 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1598 OUTPUT:
1599 RETVAL
1600
1513IV 1601IV
1514rss (Coro::State coro) 1602rss (Coro::State coro)
1515 PROTOTYPE: $ 1603 PROTOTYPE: $
1604 ALIAS:
1605 usecount = 1
1516 CODE: 1606 CODE:
1517 RETVAL = coro_rss (coro); 1607 switch (ix)
1608 {
1609 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1610 case 1: RETVAL = coro->usecount; break;
1611 }
1518 OUTPUT: 1612 OUTPUT:
1519 RETVAL 1613 RETVAL
1520 1614
1521 1615
1522MODULE = Coro::State PACKAGE = Coro 1616MODULE = Coro::State PACKAGE = Coro
… …
1527 1621
1528 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1622 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1529 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1623 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1530 av_async_pool = get_av ("Coro::async_pool", TRUE); 1624 av_async_pool = get_av ("Coro::async_pool", TRUE);
1531 1625
1532 coro_current = get_sv ("Coro::current", FALSE); 1626 coro_current = get_sv ("Coro::current", FALSE);
1533 SvREADONLY_on (coro_current); 1627 SvREADONLY_on (coro_current);
1534 1628
1535 coro_stash = gv_stashpv ("Coro", TRUE); 1629 coro_stash = gv_stashpv ("Coro", TRUE);
1536 1630
1537 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1631 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1546 1640
1547 { 1641 {
1548 SV *sv = perl_get_sv("Coro::API", 1); 1642 SV *sv = perl_get_sv("Coro::API", 1);
1549 1643
1550 coroapi.schedule = api_schedule; 1644 coroapi.schedule = api_schedule;
1551 coroapi.save = api_save;
1552 coroapi.cede = api_cede; 1645 coroapi.cede = api_cede;
1553 coroapi.cede_notself = api_cede_notself; 1646 coroapi.cede_notself = api_cede_notself;
1554 coroapi.ready = api_ready; 1647 coroapi.ready = api_ready;
1555 coroapi.is_ready = api_is_ready; 1648 coroapi.is_ready = api_is_ready;
1556 coroapi.nready = &coro_nready; 1649 coroapi.nready = &coro_nready;
… …
1610# for async_pool speedup 1703# for async_pool speedup
1611void 1704void
1612_pool_1 (SV *cb) 1705_pool_1 (SV *cb)
1613 CODE: 1706 CODE:
1614{ 1707{
1615 int i, len; 1708 struct coro *coro = SvSTATE (coro_current);
1616 HV *hv = (HV *)SvRV (coro_current); 1709 HV *hv = (HV *)SvRV (coro_current);
1617 AV *defav = GvAV (PL_defgv); 1710 AV *defav = GvAV (PL_defgv);
1618 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1711 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1619 AV *invoke_av; 1712 AV *invoke_av;
1713 int i, len;
1620 1714
1621 if (!invoke) 1715 if (!invoke)
1622 croak ("\3terminate\2\n"); 1716 croak ("\3terminate\2\n");
1717
1718 SvREFCNT_dec (coro->saved_deffh);
1719 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1623 1720
1624 hv_store (hv, "desc", sizeof ("desc") - 1, 1721 hv_store (hv, "desc", sizeof ("desc") - 1,
1625 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1722 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1626 1723
1627 invoke_av = (AV *)SvRV (invoke); 1724 invoke_av = (AV *)SvRV (invoke);
… …
1645{ 1742{
1646 struct coro *coro = SvSTATE (coro_current); 1743 struct coro *coro = SvSTATE (coro_current);
1647 1744
1648 sv_setsv (cb, &PL_sv_undef); 1745 sv_setsv (cb, &PL_sv_undef);
1649 1746
1747 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1748 coro->saved_deffh = 0;
1749
1650 if (coro_rss (coro) > SvIV (sv_pool_rss) 1750 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1651 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1751 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1652 croak ("\3terminate\2\n"); 1752 croak ("\3terminate\2\n");
1653 1753
1654 av_clear (GvAV (PL_defgv)); 1754 av_clear (GvAV (PL_defgv));
1655 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1755 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1656 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1657 coro->save = CORO_SAVE_DEF; 1757
1658 coro->prio = 0; 1758 coro->prio = 0;
1759
1760 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1761 api_trace (coro_current, 0);
1762
1659 av_push (av_async_pool, newSVsv (coro_current)); 1763 av_push (av_async_pool, newSVsv (coro_current));
1660} 1764}
1661 1765
1662 1766
1663MODULE = Coro::State PACKAGE = Coro::AIO 1767MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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