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.159 by root, Sat Sep 22 14:42:56 2007 UTC vs.
Revision 1.180 by root, Wed Oct 3 17:12:20 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;
146
147enum {
148 CC_MAPPED = 0x01,
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,
154};
144 155
145/* this is a structure representing a c-level coroutine */ 156/* this is a structure representing a c-level coroutine */
146typedef struct coro_cctx { 157typedef struct coro_cctx {
147 struct coro_cctx *next; 158 struct coro_cctx *next;
148 159
… …
157 coro_context cctx; 168 coro_context cctx;
158 169
159#if CORO_USE_VALGRIND 170#if CORO_USE_VALGRIND
160 int valgrind_id; 171 int valgrind_id;
161#endif 172#endif
162 char inuse, mapped; 173 unsigned char flags;
163} coro_cctx; 174} coro_cctx;
164 175
165enum { 176enum {
166 CF_RUNNING = 0x0001, /* coroutine is running */ 177 CF_RUNNING = 0x0001, /* coroutine is running */
167 CF_READY = 0x0002, /* coroutine is ready */ 178 CF_READY = 0x0002, /* coroutine is ready */
… …
175 coro_cctx *cctx; 186 coro_cctx *cctx;
176 187
177 /* data associated with this coroutine (initial args) */ 188 /* data associated with this coroutine (initial args) */
178 AV *args; 189 AV *args;
179 int refcnt; 190 int refcnt;
180 int save; /* CORO_SAVE flags */
181 int flags; /* CF_ flags */ 191 int flags; /* CF_ flags */
182 192
183 /* optionally saved, might be zero */ 193 /* optionally saved, might be zero */
184 AV *defav; /* @_ */ 194 AV *defav; /* @_ */
185 SV *defsv; /* $_ */ 195 SV *defsv; /* $_ */
186 SV *errsv; /* $@ */ 196 SV *errsv; /* $@ */
187 GV *deffh; /* default filehandle */ 197 IO *deffh; /* default filehandle */
188 SV *irssv; /* $/ */ 198 SV *irssv; /* $/ */
189 SV *irssv_sv; /* real $/ cache */ 199 SV *irssv_sv; /* real $/ cache */
190 200
191#define VAR(name,type) type name; 201#define VAR(name,type) type name;
192# include "state.h" 202# include "state.h"
193#undef VAR 203#undef VAR
204
205 /* statistics */
206 int usecount; /* number of switches to this coro */
194 207
195 /* coro process data */ 208 /* coro process data */
196 int prio; 209 int prio;
197 210
198 /* linked list */ 211 /* linked list */
… …
289 SvMAGIC (cv) \ 302 SvMAGIC (cv) \
290 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 303 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
291 ? SvMAGIC (cv) \ 304 ? SvMAGIC (cv) \
292 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 305 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
293 : 0 306 : 0
307
308static struct coro *
309SvSTATE_ (pTHX_ SV *coro)
310{
311 HV *stash;
312 MAGIC *mg;
313
314 if (SvROK (coro))
315 coro = SvRV (coro);
316
317 if (SvTYPE (coro) != SVt_PVHV)
318 croak ("Coro::State object required");
319
320 stash = SvSTASH (coro);
321 if (stash != coro_stash && stash != coro_state_stash)
322 {
323 /* very slow, but rare, check */
324 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
325 croak ("Coro::State object required");
326 }
327
328 mg = CORO_MAGIC (coro);
329 return (struct coro *)mg->mg_ptr;
330}
331
332#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
294 333
295/* the next two functions merely cache the padlists */ 334/* the next two functions merely cache the padlists */
296static void 335static void
297get_padlist (pTHX_ CV *cv) 336get_padlist (pTHX_ CV *cv)
298{ 337{
… …
337 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 376 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
338} 377}
339 378
340/** load & save, init *******************************************************/ 379/** load & save, init *******************************************************/
341 380
342#define SB do {
343#define SE } while (0)
344
345#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
346
347static void 381static void
348load_perl (pTHX_ Coro__State c) 382load_perl (pTHX_ Coro__State c)
349{ 383{
350#define VAR(name,type) PL_ ## name = c->name; 384#define VAR(name,type) PL_ ## name = c->name;
351# include "state.h" 385# include "state.h"
352#undef VAR 386#undef VAR
353 387
354 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 388 GvSV (PL_defgv) = c->defsv;
355 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 389 GvAV (PL_defgv) = c->defav;
356 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 390 GvSV (PL_errgv) = c->errsv;
357 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh); 391 PL_defoutgv = c->deffh;
358 392 PL_rs = c->irssv;
359 if (c->irssv) 393 GvSV (irsgv) = c->irssv_sv;
360 {
361 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
362 {
363 SvREFCNT_dec (c->irssv);
364 c->irssv = 0;
365 }
366 else
367 {
368 REPLACE_SV (PL_rs, c->irssv);
369 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
370 sv_setsv (c->irssv_sv, PL_rs);
371 }
372 }
373 394
374 { 395 {
375 dSP; 396 dSP;
376 CV *cv; 397 CV *cv;
377 398
… …
435 } 456 }
436 457
437 PUTBACK; 458 PUTBACK;
438 } 459 }
439 460
440 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 461 c->defav = GvAV (PL_defgv);
441 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 462 c->defsv = DEFSV;
442 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 463 c->errsv = ERRSV;
443 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 464 c->deffh = PL_defoutgv;
444 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 465 c->irssv = PL_rs;
466 c->irssv_sv = GvSV (irsgv);
445 467
446#define VAR(name,type)c->name = PL_ ## name; 468#define VAR(name,type)c->name = PL_ ## name;
447# include "state.h" 469# include "state.h"
448#undef VAR 470#undef VAR
449} 471}
… …
502 * destroy the stacks, the callchain etc... 524 * destroy the stacks, the callchain etc...
503 */ 525 */
504static void 526static void
505coro_destroy_stacks (pTHX) 527coro_destroy_stacks (pTHX)
506{ 528{
507 if (!IN_DESTRUCT)
508 {
509 /* restore all saved variables and stuff */
510 LEAVE_SCOPE (0);
511 assert (PL_tmps_floor == -1);
512
513 /* free all temporaries */
514 FREETMPS;
515 assert (PL_tmps_ix == -1);
516
517 /* unwind all extra stacks */
518 POPSTACK_TO (PL_mainstack);
519
520 /* unwind main stack */
521 dounwind (-1);
522 }
523
524 while (PL_curstackinfo->si_next) 529 while (PL_curstackinfo->si_next)
525 PL_curstackinfo = PL_curstackinfo->si_next; 530 PL_curstackinfo = PL_curstackinfo->si_next;
526 531
527 while (PL_curstackinfo) 532 while (PL_curstackinfo)
528 { 533 {
… …
544 Safefree (PL_retstack); 549 Safefree (PL_retstack);
545#endif 550#endif
546} 551}
547 552
548static size_t 553static size_t
549coro_rss (struct coro *coro) 554coro_rss (pTHX_ struct coro *coro)
550{ 555{
551 size_t rss = sizeof (coro); 556 size_t rss = sizeof (coro);
552 557
553 if (coro->mainstack) 558 if (coro->mainstack)
554 { 559 {
… …
577} 582}
578 583
579/** coroutine stack handling ************************************************/ 584/** coroutine stack handling ************************************************/
580 585
581static void 586static void
582setup_coro (pTHX_ struct coro *coro) 587coro_setup (pTHX_ struct coro *coro)
583{ 588{
584 /* 589 /*
585 * emulate part of the perl startup here. 590 * emulate part of the perl startup here.
586 */ 591 */
587 coro_init_stacks (aTHX); 592 coro_init_stacks (aTHX);
588 593
594 PL_runops = RUNOPS_DEFAULT;
589 PL_curcop = &PL_compiling; 595 PL_curcop = &PL_compiling;
590 PL_in_eval = EVAL_NULL; 596 PL_in_eval = EVAL_NULL;
591 PL_comppad = 0; 597 PL_comppad = 0;
592 PL_curpm = 0; 598 PL_curpm = 0;
593 PL_localizing = 0; 599 PL_localizing = 0;
594 PL_dirty = 0; 600 PL_dirty = 0;
595 PL_restartop = 0; 601 PL_restartop = 0;
602
603 GvSV (PL_defgv) = NEWSV (0, 0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0);
606 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVsv (GvSV (irsgv));
608
609 {
610 IO *io = newIO ();
611 PL_defoutgv = newGVgen ("Coro");
612 GvIOp(PL_defoutgv) = io;
613 IoTYPE (io) = IoTYPE_WRONLY;
614 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
615 IoFLAGS (io) |= IOf_FLUSH;
616 }
596 617
597 { 618 {
598 dSP; 619 dSP;
599 LOGOP myop; 620 LOGOP myop;
600
601 SvREFCNT_dec (GvAV (PL_defgv));
602 GvAV (PL_defgv) = coro->args; coro->args = 0;
603 621
604 Zero (&myop, 1, LOGOP); 622 Zero (&myop, 1, LOGOP);
605 myop.op_next = Nullop; 623 myop.op_next = Nullop;
606 myop.op_flags = OPf_WANT_VOID; 624 myop.op_flags = OPf_WANT_VOID;
607 625
… …
615 633
616 ENTER; /* necessary e.g. for dounwind */ 634 ENTER; /* necessary e.g. for dounwind */
617} 635}
618 636
619static void 637static void
638coro_destroy (pTHX_ struct coro *coro)
639{
640 if (!IN_DESTRUCT)
641 {
642 /* restore all saved variables and stuff */
643 LEAVE_SCOPE (0);
644 assert (PL_tmps_floor == -1);
645
646 /* free all temporaries */
647 FREETMPS;
648 assert (PL_tmps_ix == -1);
649
650 /* unwind all extra stacks */
651 POPSTACK_TO (PL_mainstack);
652
653 /* unwind main stack */
654 dounwind (-1);
655 }
656
657 SvREFCNT_dec (GvSV (PL_defgv));
658 SvREFCNT_dec (GvAV (PL_defgv));
659 SvREFCNT_dec (GvSV (PL_errgv));
660 SvREFCNT_dec (PL_defoutgv);
661 SvREFCNT_dec (PL_rs);
662 SvREFCNT_dec (GvSV (irsgv));
663
664 coro_destroy_stacks (aTHX);
665}
666
667static void
620free_coro_mortal (pTHX) 668free_coro_mortal (pTHX)
621{ 669{
622 if (coro_mortal) 670 if (coro_mortal)
623 { 671 {
624 SvREFCNT_dec (coro_mortal); 672 SvREFCNT_dec (coro_mortal);
625 coro_mortal = 0; 673 coro_mortal = 0;
626 } 674 }
675}
676
677static int
678runops_trace (pTHX)
679{
680 COP *oldcop = 0;
681 int oldcxix = -2;
682 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
683 coro_cctx *cctx = coro->cctx;
684
685 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
686 {
687 PERL_ASYNC_CHECK ();
688
689 if (cctx->flags & CC_TRACE_ALL)
690 {
691 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
692 {
693 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
694 SV **bot, **top;
695 AV *av = newAV (); /* return values */
696 SV **cb;
697 dSP;
698
699 GV *gv = CvGV (cx->blk_sub.cv);
700 SV *fullname = sv_2mortal (newSV (0));
701 if (isGV (gv))
702 gv_efullname3 (fullname, gv, 0);
703
704 bot = PL_stack_base + cx->blk_oldsp + 1;
705 top = cx->blk_gimme == G_ARRAY ? SP + 1
706 : cx->blk_gimme == G_SCALAR ? bot + 1
707 : bot;
708
709 while (bot < top)
710 av_push (av, SvREFCNT_inc (*bot++));
711
712 PL_runops = RUNOPS_DEFAULT;
713 ENTER;
714 SAVETMPS;
715 EXTEND (SP, 3);
716 PUSHMARK (SP);
717 PUSHs (&PL_sv_no);
718 PUSHs (fullname);
719 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
720 PUTBACK;
721 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
722 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
723 SPAGAIN;
724 FREETMPS;
725 LEAVE;
726 PL_runops = runops_trace;
727 }
728
729 if (oldcop != PL_curcop)
730 {
731 oldcop = PL_curcop;
732
733 if (PL_curcop != &PL_compiling)
734 {
735 SV **cb;
736
737 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
738 {
739 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
740
741 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
742 {
743 runops_proc_t old_runops = PL_runops;
744 dSP;
745 GV *gv = CvGV (cx->blk_sub.cv);
746 SV *fullname = sv_2mortal (newSV (0));
747
748 if (isGV (gv))
749 gv_efullname3 (fullname, gv, 0);
750
751 PL_runops = RUNOPS_DEFAULT;
752 ENTER;
753 SAVETMPS;
754 EXTEND (SP, 3);
755 PUSHMARK (SP);
756 PUSHs (&PL_sv_yes);
757 PUSHs (fullname);
758 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
759 PUTBACK;
760 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
761 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
762 SPAGAIN;
763 FREETMPS;
764 LEAVE;
765 PL_runops = runops_trace;
766 }
767
768 oldcxix = cxstack_ix;
769 }
770
771 if (cctx->flags & CC_TRACE_LINE)
772 {
773 dSP;
774
775 PL_runops = RUNOPS_DEFAULT;
776 ENTER;
777 SAVETMPS;
778 EXTEND (SP, 3);
779 PL_runops = RUNOPS_DEFAULT;
780 PUSHMARK (SP);
781 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
782 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
783 PUTBACK;
784 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
785 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
786 SPAGAIN;
787 FREETMPS;
788 LEAVE;
789 PL_runops = runops_trace;
790 }
791 }
792 }
793 }
794 }
795
796 TAINT_NOT;
797 return 0;
627} 798}
628 799
629/* inject a fake call to Coro::State::_cctx_init into the execution */ 800/* inject a fake call to Coro::State::_cctx_init into the execution */
630/* _cctx_init should be careful, as it could be called at almost any time */ 801/* _cctx_init should be careful, as it could be called at almost any time */
631/* during execution of a perl program */ 802/* during execution of a perl program */
632static void NOINLINE 803static void NOINLINE
633prepare_cctx (pTHX_ coro_cctx *cctx) 804prepare_cctx (pTHX_ coro_cctx *cctx)
634{ 805{
635 dSP; 806 dSP;
636 LOGOP myop; 807 LOGOP myop;
808
809 PL_top_env = &PL_start_env;
810
811 if (cctx->flags & CC_TRACE)
812 PL_runops = runops_trace;
637 813
638 Zero (&myop, 1, LOGOP); 814 Zero (&myop, 1, LOGOP);
639 myop.op_next = PL_op; 815 myop.op_next = PL_op;
640 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 816 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
641 817
… …
658 dTHX; 834 dTHX;
659 835
660 /* coro_run is the alternative tail of transfer(), so unlock here. */ 836 /* coro_run is the alternative tail of transfer(), so unlock here. */
661 UNLOCK; 837 UNLOCK;
662 838
663 PL_top_env = &PL_start_env; 839 /* we now skip the entersub that lead to transfer() */
840 PL_op = PL_op->op_next;
664 841
665 /* inject a fake subroutine call to cctx_init */ 842 /* inject a fake subroutine call to cctx_init */
666 prepare_cctx (aTHX_ (coro_cctx *)arg); 843 prepare_cctx (aTHX_ (coro_cctx *)arg);
667 844
668 /* somebody or something will hit me for both perl_run and PL_restartop */ 845 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
702# if CORO_STACKGUARD 879# if CORO_STACKGUARD
703 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 880 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
704# endif 881# endif
705 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 882 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
706 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 883 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
707 cctx->mapped = 1; 884 cctx->flags |= CC_MAPPED;
708 } 885 }
709 else 886 else
710#endif 887#endif
711 { 888 {
712 cctx->ssize = coro_stacksize * (long)sizeof (long); 889 cctx->ssize = coro_stacksize * (long)sizeof (long);
… …
739#if CORO_USE_VALGRIND 916#if CORO_USE_VALGRIND
740 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 917 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
741#endif 918#endif
742 919
743#if HAVE_MMAP 920#if HAVE_MMAP
744 if (cctx->mapped) 921 if (cctx->flags & CC_MAPPED)
745 munmap (cctx->sptr, cctx->ssize); 922 munmap (cctx->sptr, cctx->ssize);
746 else 923 else
747#endif 924#endif
748 Safefree (cctx->sptr); 925 Safefree (cctx->sptr);
749 926
… …
757 { 934 {
758 coro_cctx *cctx = cctx_first; 935 coro_cctx *cctx = cctx_first;
759 cctx_first = cctx->next; 936 cctx_first = cctx->next;
760 --cctx_idle; 937 --cctx_idle;
761 938
762 if (cctx->ssize >= coro_stacksize) 939 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE))
763 return cctx; 940 return cctx;
764 941
765 cctx_destroy (cctx); 942 cctx_destroy (cctx);
766 } 943 }
767 944
768 PL_op = PL_op->op_next;
769 return cctx_new (); 945 return cctx_new ();
770} 946}
771 947
772static void 948static void
773cctx_put (coro_cctx *cctx) 949cctx_put (coro_cctx *cctx)
… …
777 { 953 {
778 coro_cctx *first = cctx_first; 954 coro_cctx *first = cctx_first;
779 cctx_first = first->next; 955 cctx_first = first->next;
780 --cctx_idle; 956 --cctx_idle;
781 957
782 assert (!first->inuse);
783 cctx_destroy (first); 958 cctx_destroy (first);
784 } 959 }
785 960
786 ++cctx_idle; 961 ++cctx_idle;
787 cctx->next = cctx_first; 962 cctx->next = cctx_first;
788 cctx_first = cctx; 963 cctx_first = cctx;
789} 964}
790 965
791/** coroutine switching *****************************************************/ 966/** coroutine switching *****************************************************/
792 967
793/* never call directly, always through the coro_state_transfer global variable */ 968static void NOINLINE
969transfer_check (pTHX_ struct coro *prev, struct coro *next)
970{
971 if (prev != next)
972 {
973 if (!(prev->flags & (CF_RUNNING | CF_NEW)))
974 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
975
976 if (next->flags & CF_RUNNING)
977 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
978
979 if (next->flags & CF_DESTROYED)
980 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
981
982 if (PL_lex_state != LEX_NOTPARSING)
983 croak ("Coro::State::transfer called while parsing, but this is not supported");
984 }
985}
986
987/* always use the TRANSFER macro */
794static void NOINLINE 988static void NOINLINE
795transfer (pTHX_ struct coro *prev, struct coro *next) 989transfer (pTHX_ struct coro *prev, struct coro *next)
796{ 990{
797 dSTACKLEVEL; 991 dSTACKLEVEL;
798 992
… …
808 1002
809 if (prev->flags & CF_NEW) 1003 if (prev->flags & CF_NEW)
810 { 1004 {
811 /* create a new empty context */ 1005 /* create a new empty context */
812 Newz (0, prev->cctx, 1, coro_cctx); 1006 Newz (0, prev->cctx, 1, coro_cctx);
813 prev->cctx->inuse = 1;
814 prev->flags &= ~CF_NEW; 1007 prev->flags &= ~CF_NEW;
815 prev->flags |= CF_RUNNING; 1008 prev->flags |= CF_RUNNING;
816 } 1009 }
817
818 /*TODO: must not croak here */
819 if (!prev->flags & CF_RUNNING)
820 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
821
822 if (next->flags & CF_RUNNING)
823 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
824
825 if (next->flags & CF_DESTROYED)
826 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
827 1010
828 prev->flags &= ~CF_RUNNING; 1011 prev->flags &= ~CF_RUNNING;
829 next->flags |= CF_RUNNING; 1012 next->flags |= CF_RUNNING;
830 1013
831 LOCK; 1014 LOCK;
… …
835 /* need to start coroutine */ 1018 /* need to start coroutine */
836 next->flags &= ~CF_NEW; 1019 next->flags &= ~CF_NEW;
837 /* first get rid of the old state */ 1020 /* first get rid of the old state */
838 save_perl (aTHX_ prev); 1021 save_perl (aTHX_ prev);
839 /* setup coroutine call */ 1022 /* setup coroutine call */
840 setup_coro (aTHX_ next); 1023 coro_setup (aTHX_ next);
841 /* need a new stack */
842 assert (!next->cctx);
843 } 1024 }
844 else 1025 else
845 { 1026 {
846 /* coroutine already started */ 1027 /* coroutine already started */
847 save_perl (aTHX_ prev); 1028 save_perl (aTHX_ prev);
… …
849 } 1030 }
850 1031
851 prev__cctx = prev->cctx; 1032 prev__cctx = prev->cctx;
852 1033
853 /* possibly "free" the cctx */ 1034 /* possibly "free" the cctx */
854 if (prev__cctx->idle_sp == STACKLEVEL) 1035 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))
855 { 1036 {
856 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1037 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
857 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1038 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
858 1039
859 prev->cctx = 0; 1040 prev->cctx = 0;
860 1041
861 cctx_put (prev__cctx); 1042 cctx_put (prev__cctx);
862 prev__cctx->inuse = 0;
863 } 1043 }
864 1044
1045 ++next->usecount;
1046
865 if (!next->cctx) 1047 if (!next->cctx)
866 {
867 next->cctx = cctx_get (aTHX); 1048 next->cctx = cctx_get (aTHX);
868 assert (!next->cctx->inuse);
869 next->cctx->inuse = 1;
870 }
871 1049
872 if (prev__cctx != next->cctx) 1050 if (prev__cctx != next->cctx)
873 { 1051 {
874 prev__cctx->top_env = PL_top_env; 1052 prev__cctx->top_env = PL_top_env;
875 PL_top_env = next->cctx->top_env; 1053 PL_top_env = next->cctx->top_env;
… …
885{ 1063{
886 struct coro *prev, *next; 1064 struct coro *prev, *next;
887}; 1065};
888 1066
889#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1067#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1068#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
890 1069
891/** high level stuff ********************************************************/ 1070/** high level stuff ********************************************************/
892 1071
893static int 1072static int
894coro_state_destroy (pTHX_ struct coro *coro) 1073coro_state_destroy (pTHX_ struct coro *coro)
… …
911 1090
912 if (coro->mainstack && coro->mainstack != main_mainstack) 1091 if (coro->mainstack && coro->mainstack != main_mainstack)
913 { 1092 {
914 struct coro temp; 1093 struct coro temp;
915 1094
916 assert (!(coro->flags & CF_RUNNING));
917
918 Zero (&temp, 1, struct coro);
919 temp.save = CORO_SAVE_ALL;
920
921 if (coro->flags & CF_RUNNING) 1095 if (coro->flags & CF_RUNNING)
922 croak ("FATAL: tried to destroy currently running coroutine"); 1096 croak ("FATAL: tried to destroy currently running coroutine");
923 1097
924 save_perl (aTHX_ &temp); 1098 save_perl (aTHX_ &temp);
925 load_perl (aTHX_ coro); 1099 load_perl (aTHX_ coro);
926 1100
927 coro_destroy_stacks (aTHX); 1101 coro_destroy (aTHX_ coro);
928 1102
929 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1103 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
930 1104
931 coro->mainstack = 0; 1105 coro->mainstack = 0;
932 } 1106 }
… …
977#else 1151#else
978# define MGf_DUP 0 1152# define MGf_DUP 0
979#endif 1153#endif
980}; 1154};
981 1155
982static struct coro *
983SvSTATE_ (pTHX_ SV *coro)
984{
985 HV *stash;
986 MAGIC *mg;
987
988 if (SvROK (coro))
989 coro = SvRV (coro);
990
991 stash = SvSTASH (coro);
992 if (stash != coro_stash && stash != coro_state_stash)
993 {
994 /* very slow, but rare, check */
995 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
996 croak ("Coro::State object required");
997 }
998
999 mg = CORO_MAGIC (coro);
1000 return (struct coro *)mg->mg_ptr;
1001}
1002
1003#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1004
1005static void 1156static void
1006prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1157prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1007{ 1158{
1008 ta->prev = SvSTATE (prev_sv); 1159 ta->prev = SvSTATE (prev_sv);
1009 ta->next = SvSTATE (next_sv); 1160 ta->next = SvSTATE (next_sv);
1161 TRANSFER_CHECK (*ta);
1010} 1162}
1011 1163
1012static void 1164static void
1013api_transfer (SV *prev_sv, SV *next_sv) 1165api_transfer (SV *prev_sv, SV *next_sv)
1014{ 1166{
1015 dTHX; 1167 dTHX;
1016 struct transfer_args ta; 1168 struct transfer_args ta;
1017 1169
1018 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1170 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1019 TRANSFER (ta); 1171 TRANSFER (ta);
1020}
1021
1022static int
1023api_save (SV *coro_sv, int new_save)
1024{
1025 dTHX;
1026 struct coro *coro = SvSTATE (coro_sv);
1027 int old_save = coro->save;
1028
1029 if (new_save >= 0)
1030 coro->save = new_save;
1031
1032 return old_save;
1033} 1172}
1034 1173
1035/** Coro ********************************************************************/ 1174/** Coro ********************************************************************/
1036 1175
1037static void 1176static void
… …
1131 break; 1270 break;
1132 } 1271 }
1133 1272
1134 /* free this only after the transfer */ 1273 /* free this only after the transfer */
1135 prev_sv = SvRV (coro_current); 1274 prev_sv = SvRV (coro_current);
1136 SvRV_set (coro_current, next_sv);
1137 ta->prev = SvSTATE (prev_sv); 1275 ta->prev = SvSTATE (prev_sv);
1138 1276 TRANSFER_CHECK (*ta);
1139 assert (ta->next->flags & CF_READY); 1277 assert (ta->next->flags & CF_READY);
1140 ta->next->flags &= ~CF_READY; 1278 ta->next->flags &= ~CF_READY;
1279 SvRV_set (coro_current, next_sv);
1141 1280
1142 LOCK; 1281 LOCK;
1143 free_coro_mortal (aTHX); 1282 free_coro_mortal (aTHX);
1144 coro_mortal = prev_sv; 1283 coro_mortal = prev_sv;
1145 UNLOCK; 1284 UNLOCK;
… …
1206 } 1345 }
1207 else 1346 else
1208 return 0; 1347 return 0;
1209} 1348}
1210 1349
1350static void
1351api_trace (SV *coro_sv, int flags)
1352{
1353 dTHX;
1354 struct coro *coro = SvSTATE (coro_sv);
1355
1356 if (flags & CC_TRACE)
1357 {
1358 if (!coro->cctx)
1359 coro->cctx = cctx_new ();
1360 else if (!(coro->cctx->flags & CC_TRACE))
1361 croak ("cannot enable tracing on coroutine with custom stack");
1362
1363 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1364 }
1365 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1366 {
1367 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1368
1369 if (coro->flags & CF_RUNNING)
1370 PL_runops = RUNOPS_DEFAULT;
1371 else
1372 coro->runops = RUNOPS_DEFAULT;
1373 }
1374}
1375
1211MODULE = Coro::State PACKAGE = Coro::State 1376MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1212 1377
1213PROTOTYPES: DISABLE 1378PROTOTYPES: DISABLE
1214 1379
1215BOOT: 1380BOOT:
1216{ 1381{
1217#ifdef USE_ITHREADS 1382#ifdef USE_ITHREADS
1218 MUTEX_INIT (&coro_mutex); 1383 MUTEX_INIT (&coro_mutex);
1219#endif 1384#endif
1220 BOOT_PAGESIZE; 1385 BOOT_PAGESIZE;
1221 1386
1387 irsgv = gv_fetchpv ("/", 1, SVt_PV);
1388
1222 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1389 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1223 1390
1224 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1391 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1225 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1392 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1226 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1227 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1228 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1229 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF)); 1393 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1230 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1394 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1231 1395
1232 main_mainstack = PL_mainstack; 1396 main_mainstack = PL_mainstack;
1233 main_top_env = PL_top_env; 1397 main_top_env = PL_top_env;
1234 1398
1235 while (main_top_env->je_prev) 1399 while (main_top_env->je_prev)
… …
1248 struct coro *coro; 1412 struct coro *coro;
1249 HV *hv; 1413 HV *hv;
1250 int i; 1414 int i;
1251 1415
1252 Newz (0, coro, 1, struct coro); 1416 Newz (0, coro, 1, struct coro);
1253 coro->args = newAV (); 1417 coro->args = newAV ();
1254 coro->save = CORO_SAVE_DEF;
1255 coro->flags = CF_NEW; 1418 coro->flags = CF_NEW;
1256 1419
1257 if (coro_first) coro_first->prev = coro; 1420 if (coro_first) coro_first->prev = coro;
1258 coro->next = coro_first; 1421 coro->next = coro_first;
1259 coro_first = coro; 1422 coro_first = coro;
… …
1266 av_push (coro->args, newSVsv (ST (i))); 1429 av_push (coro->args, newSVsv (ST (i)));
1267} 1430}
1268 OUTPUT: 1431 OUTPUT:
1269 RETVAL 1432 RETVAL
1270 1433
1271int 1434# these not obviously related functions are all rolled into the same xs
1272save (SV *coro, int new_save = -1) 1435# function to increase chances that they all will call transfer with the same
1273 CODE: 1436# stack offset
1274 RETVAL = api_save (coro, new_save);
1275 OUTPUT:
1276 RETVAL
1277
1278int
1279save_also (SV *coro_sv, int save_also)
1280 CODE:
1281{
1282 struct coro *coro = SvSTATE (coro_sv);
1283 RETVAL = coro->save;
1284 coro->save |= save_also;
1285}
1286 OUTPUT:
1287 RETVAL
1288
1289void 1437void
1290_set_stacklevel (...) 1438_set_stacklevel (...)
1291 ALIAS: 1439 ALIAS:
1292 Coro::State::transfer = 1 1440 Coro::State::transfer = 1
1293 Coro::schedule = 2 1441 Coro::schedule = 2
… …
1379 if (coro->hv) 1527 if (coro->hv)
1380 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 1528 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1381} 1529}
1382 1530
1383void 1531void
1384_eval (Coro::State coro, SV *coderef) 1532call (Coro::State coro, SV *coderef)
1533 ALIAS:
1534 eval = 1
1385 CODE: 1535 CODE:
1386{ 1536{
1387 if (coro->mainstack) 1537 if (coro->mainstack)
1388 { 1538 {
1389 struct coro temp; 1539 struct coro temp;
1390 Zero (&temp, 1, struct coro); 1540 Zero (&temp, 1, struct coro);
1391 temp.save = CORO_SAVE_ALL;
1392 1541
1393 if (!(coro->flags & CF_RUNNING)) 1542 if (!(coro->flags & CF_RUNNING))
1394 { 1543 {
1395 save_perl (aTHX_ &temp); 1544 save_perl (aTHX_ &temp);
1396 load_perl (aTHX_ coro); 1545 load_perl (aTHX_ coro);
… …
1400 dSP; 1549 dSP;
1401 ENTER; 1550 ENTER;
1402 SAVETMPS; 1551 SAVETMPS;
1403 PUSHMARK (SP); 1552 PUSHMARK (SP);
1404 PUTBACK; 1553 PUTBACK;
1554 if (ix)
1555 eval_sv (coderef, 0);
1556 else
1405 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1557 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1406 SPAGAIN; 1558 SPAGAIN;
1407 FREETMPS; 1559 FREETMPS;
1408 LEAVE; 1560 LEAVE;
1409 PUTBACK; 1561 PUTBACK;
1410 } 1562 }
… …
1414 save_perl (aTHX_ coro); 1566 save_perl (aTHX_ coro);
1415 load_perl (aTHX_ &temp); 1567 load_perl (aTHX_ &temp);
1416 } 1568 }
1417 } 1569 }
1418} 1570}
1419 1571
1420SV * 1572SV *
1421is_ready (Coro::State coro) 1573is_ready (Coro::State coro)
1422 PROTOTYPE: $ 1574 PROTOTYPE: $
1423 ALIAS: 1575 ALIAS:
1424 is_ready = CF_READY 1576 is_ready = CF_READY
… …
1428 CODE: 1580 CODE:
1429 RETVAL = boolSV (coro->flags & ix); 1581 RETVAL = boolSV (coro->flags & ix);
1430 OUTPUT: 1582 OUTPUT:
1431 RETVAL 1583 RETVAL
1432 1584
1585void
1586api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1587
1588SV *
1589has_stack (Coro::State coro)
1590 PROTOTYPE: $
1591 CODE:
1592 RETVAL = boolSV (!!coro->cctx);
1593 OUTPUT:
1594 RETVAL
1595
1596int
1597is_traced (Coro::State coro)
1598 PROTOTYPE: $
1599 CODE:
1600 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1601 OUTPUT:
1602 RETVAL
1603
1433IV 1604IV
1434rss (Coro::State coro) 1605rss (Coro::State coro)
1435 PROTOTYPE: $ 1606 PROTOTYPE: $
1607 ALIAS:
1608 usecount = 1
1436 CODE: 1609 CODE:
1437 RETVAL = coro_rss (coro); 1610 switch (ix)
1611 {
1612 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1613 case 1: RETVAL = coro->usecount; break;
1614 }
1438 OUTPUT: 1615 OUTPUT:
1439 RETVAL 1616 RETVAL
1440 1617
1441 1618
1442MODULE = Coro::State PACKAGE = Coro 1619MODULE = Coro::State PACKAGE = Coro
… …
1466 1643
1467 { 1644 {
1468 SV *sv = perl_get_sv("Coro::API", 1); 1645 SV *sv = perl_get_sv("Coro::API", 1);
1469 1646
1470 coroapi.schedule = api_schedule; 1647 coroapi.schedule = api_schedule;
1471 coroapi.save = api_save;
1472 coroapi.cede = api_cede; 1648 coroapi.cede = api_cede;
1473 coroapi.cede_notself = api_cede_notself; 1649 coroapi.cede_notself = api_cede_notself;
1474 coroapi.ready = api_ready; 1650 coroapi.ready = api_ready;
1475 coroapi.is_ready = api_is_ready; 1651 coroapi.is_ready = api_is_ready;
1476 coroapi.nready = &coro_nready; 1652 coroapi.nready = &coro_nready;
… …
1526 RETVAL = coro_nready; 1702 RETVAL = coro_nready;
1527 OUTPUT: 1703 OUTPUT:
1528 RETVAL 1704 RETVAL
1529 1705
1530# for async_pool speedup 1706# for async_pool speedup
1531SV * 1707void
1532_pool_1 (...) 1708_pool_1 (SV *cb)
1533 CODE: 1709 CODE:
1534{ 1710{
1535 int i, len; 1711 int i, len;
1536 HV *hv = (HV *)SvRV (coro_current); 1712 HV *hv = (HV *)SvRV (coro_current);
1537 AV *defav = GvAV (PL_defgv); 1713 AV *defav = GvAV (PL_defgv);
1538 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1714 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1539 AV *invoke_av; 1715 AV *invoke_av;
1540 1716
1541 if (!invoke) 1717 if (!invoke)
1542 XSRETURN_EMPTY; 1718 croak ("\3terminate\2\n");
1543 1719
1544 hv_store (hv, "desc", sizeof ("desc") - 1, 1720 hv_store (hv, "desc", sizeof ("desc") - 1,
1545 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1721 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1546 1722
1547 invoke_av = (AV *)SvRV (invoke); 1723 invoke_av = (AV *)SvRV (invoke);
1548 len = av_len (invoke_av); 1724 len = av_len (invoke_av);
1549 1725
1550 av_clear (defav); 1726 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1551
1552 RETVAL = sv_2mortal (SvREFCNT_inc (AvARRAY (invoke_av)[0]));
1553 1727
1554 if (len > 0) 1728 if (len > 0)
1555 { 1729 {
1556 av_extend (defav, len); 1730 av_fill (defav, len - 1);
1557 for (i = 0; i < len; ++i) 1731 for (i = 0; i < len; ++i)
1558 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 1732 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1]));
1559 } 1733 }
1560 1734
1561 SvREFCNT_dec (invoke); 1735 SvREFCNT_dec (invoke);
1562} 1736}
1563 OUTPUT:
1564 RETVAL
1565 1737
1566void 1738void
1567_pool_2 (...) 1739_pool_2 (SV *cb)
1568 CODE: 1740 CODE:
1569{ 1741{
1570 struct coro *coro = SvSTATE (coro_current); 1742 struct coro *coro = SvSTATE (coro_current);
1571 1743
1744 sv_setsv (cb, &PL_sv_undef);
1745
1572 if (coro_rss (coro) > SvIV (sv_pool_rss) 1746 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1573 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1747 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1574 XSRETURN_YES; 1748 croak ("\3terminate\2\n");
1575 1749
1576 av_clear (GvAV (PL_defgv)); 1750 av_clear (GvAV (PL_defgv));
1577 hv_store (SvRV (coro_current), "desc", sizeof ("desc") - 1, 1751 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1578 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1752 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1579 coro->save = CORO_SAVE_DEF; 1753
1580 coro->prio = 0; 1754 coro->prio = 0;
1755
1756 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1757 api_trace (coro_current, 0);
1758
1581 av_push (av_async_pool, newSVsv (coro_current)); 1759 av_push (av_async_pool, newSVsv (coro_current));
1582
1583 XSRETURN_NO;
1584} 1760}
1585 1761
1586 1762
1587MODULE = Coro::State PACKAGE = Coro::AIO 1763MODULE = Coro::State PACKAGE = Coro::AIO
1588 1764

Diff Legend

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