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.152 by root, Thu Sep 20 12:02:25 2007 UTC vs.
Revision 1.170 by root, Thu Sep 27 20:14:49 2007 UTC

… …
88/* prefer perl internal functions over our own? */ 88/* prefer perl internal functions over our own? */
89#ifndef CORO_PREFER_PERL_FUNCTIONS 89#ifndef CORO_PREFER_PERL_FUNCTIONS
90# define CORO_PREFER_PERL_FUNCTIONS 0 90# define CORO_PREFER_PERL_FUNCTIONS 0
91#endif 91#endif
92 92
93/* The next macro should declare a variable stacklevel that contains and approximation 93/* The next macros try to return the current stack pointer, in an as
94 * to the current C stack pointer. Its property is that it changes with each call 94 * portable way as possible. */
95 * and should be unique. */
96#define dSTACKLEVEL int stacklevel 95#define dSTACKLEVEL volatile char stacklevel
97#define STACKLEVEL ((void *)&stacklevel) 96#define STACKLEVEL ((void *)&stacklevel)
98 97
99#define IN_DESTRUCT (PL_main_cv == Nullcv) 98#define IN_DESTRUCT (PL_main_cv == Nullcv)
100 99
101#if __GNUC__ >= 3 100#if __GNUC__ >= 3
… …
133static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
134static JMPENV *main_top_env; 133static JMPENV *main_top_env;
135static HV *coro_state_stash, *coro_stash; 134static HV *coro_state_stash, *coro_stash;
136static SV *coro_mortal; /* will be freed after next transfer */ 135static SV *coro_mortal; /* will be freed after next transfer */
137 136
137/* async_pool helper stuff */
138static SV *sv_pool_rss;
139static SV *sv_pool_size;
140static AV *av_async_pool;
141
138static struct coro_cctx *cctx_first; 142static struct coro_cctx *cctx_first;
139static int cctx_count, cctx_idle; 143static int cctx_count, cctx_idle;
144
145enum {
146 CC_MAPPED = 0x01,
147 CC_NOREUSE = 0x02, /* throw this away after tracing */
148 CC_TRACE = 0x04,
149 CC_TRACE_SUB = 0x08, /* trace sub calls */
150 CC_TRACE_LINE = 0x10, /* trace each statement */
151 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
152};
140 153
141/* this is a structure representing a c-level coroutine */ 154/* this is a structure representing a c-level coroutine */
142typedef struct coro_cctx { 155typedef struct coro_cctx {
143 struct coro_cctx *next; 156 struct coro_cctx *next;
144 157
… …
153 coro_context cctx; 166 coro_context cctx;
154 167
155#if CORO_USE_VALGRIND 168#if CORO_USE_VALGRIND
156 int valgrind_id; 169 int valgrind_id;
157#endif 170#endif
158 char inuse, mapped; 171 unsigned char flags;
159} coro_cctx; 172} coro_cctx;
160 173
161enum { 174enum {
162 CF_RUNNING = 0x0001, /* coroutine is running */ 175 CF_RUNNING = 0x0001, /* coroutine is running */
163 CF_READY = 0x0002, /* coroutine is ready */ 176 CF_READY = 0x0002, /* coroutine is ready */
… …
210 223
211/* for Coro.pm */ 224/* for Coro.pm */
212static SV *coro_current; 225static SV *coro_current;
213static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 226static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
214static int coro_nready; 227static int coro_nready;
215static struct coro *first; 228static struct coro *coro_first;
216 229
217/** lowlevel stuff **********************************************************/ 230/** lowlevel stuff **********************************************************/
218 231
219static AV * 232static AV *
220coro_clone_padlist (pTHX_ CV *cv) 233coro_clone_padlist (pTHX_ CV *cv)
… …
285 SvMAGIC (cv) \ 298 SvMAGIC (cv) \
286 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 299 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
287 ? SvMAGIC (cv) \ 300 ? SvMAGIC (cv) \
288 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 301 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
289 : 0 302 : 0
303
304static struct coro *
305SvSTATE_ (pTHX_ SV *coro)
306{
307 HV *stash;
308 MAGIC *mg;
309
310 if (SvROK (coro))
311 coro = SvRV (coro);
312
313 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash)
315 {
316 /* very slow, but rare, check */
317 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
318 croak ("Coro::State object required");
319 }
320
321 mg = CORO_MAGIC (coro);
322 return (struct coro *)mg->mg_ptr;
323}
324
325#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
290 326
291/* the next two functions merely cache the padlists */ 327/* the next two functions merely cache the padlists */
292static void 328static void
293get_padlist (pTHX_ CV *cv) 329get_padlist (pTHX_ CV *cv)
294{ 330{
… …
395 /* 431 /*
396 * the worst thing you can imagine happens first - we have to save 432 * the worst thing you can imagine happens first - we have to save
397 * (and reinitialize) all cv's in the whole callchain :( 433 * (and reinitialize) all cv's in the whole callchain :(
398 */ 434 */
399 435
400 EXTEND (SP, 3 + 1);
401 PUSHs (Nullsv); 436 XPUSHs (Nullsv);
402 /* this loop was inspired by pp_caller */ 437 /* this loop was inspired by pp_caller */
403 for (;;) 438 for (;;)
404 { 439 {
405 while (cxix >= 0) 440 while (cxix >= 0)
406 { 441 {
… …
425 460
426 if (top_si->si_type == PERLSI_MAIN) 461 if (top_si->si_type == PERLSI_MAIN)
427 break; 462 break;
428 463
429 top_si = top_si->si_prev; 464 top_si = top_si->si_prev;
430 ccstk = top_si->si_cxstack; 465 ccstk = top_si->si_cxstack;
431 cxix = top_si->si_cxix; 466 cxix = top_si->si_cxix;
432 } 467 }
433 468
434 PUTBACK; 469 PUTBACK;
435 } 470 }
436 471
… …
455# define coro_init_stacks init_stacks 490# define coro_init_stacks init_stacks
456#else 491#else
457static void 492static void
458coro_init_stacks (pTHX) 493coro_init_stacks (pTHX)
459{ 494{
460 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 495 PL_curstackinfo = new_stackinfo(64, 6);
461 PL_curstackinfo->si_type = PERLSI_MAIN; 496 PL_curstackinfo->si_type = PERLSI_MAIN;
462 PL_curstack = PL_curstackinfo->si_stack; 497 PL_curstack = PL_curstackinfo->si_stack;
463 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 498 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
464 499
465 PL_stack_base = AvARRAY(PL_curstack); 500 PL_stack_base = AvARRAY(PL_curstack);
466 PL_stack_sp = PL_stack_base; 501 PL_stack_sp = PL_stack_base;
467 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 502 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
468 503
469 New(50,PL_tmps_stack,128,SV*); 504 New(50,PL_tmps_stack,64,SV*);
470 PL_tmps_floor = -1; 505 PL_tmps_floor = -1;
471 PL_tmps_ix = -1; 506 PL_tmps_ix = -1;
472 PL_tmps_max = 128; 507 PL_tmps_max = 64;
473 508
474 New(54,PL_markstack,32,I32); 509 New(54,PL_markstack,16,I32);
475 PL_markstack_ptr = PL_markstack; 510 PL_markstack_ptr = PL_markstack;
476 PL_markstack_max = PL_markstack + 32; 511 PL_markstack_max = PL_markstack + 16;
477 512
478#ifdef SET_MARK_OFFSET 513#ifdef SET_MARK_OFFSET
479 SET_MARK_OFFSET; 514 SET_MARK_OFFSET;
480#endif 515#endif
481 516
482 New(54,PL_scopestack,32,I32); 517 New(54,PL_scopestack,16,I32);
483 PL_scopestack_ix = 0; 518 PL_scopestack_ix = 0;
484 PL_scopestack_max = 32; 519 PL_scopestack_max = 16;
485 520
486 New(54,PL_savestack,64,ANY); 521 New(54,PL_savestack,64,ANY);
487 PL_savestack_ix = 0; 522 PL_savestack_ix = 0;
488 PL_savestack_max = 64; 523 PL_savestack_max = 64;
489 524
490#if !PERL_VERSION_ATLEAST (5,9,0) 525#if !PERL_VERSION_ATLEAST (5,9,0)
491 New(54,PL_retstack,16,OP*); 526 New(54,PL_retstack,4,OP*);
492 PL_retstack_ix = 0; 527 PL_retstack_ix = 0;
493 PL_retstack_max = 16; 528 PL_retstack_max = 4;
494#endif 529#endif
495} 530}
496#endif 531#endif
497 532
498/* 533/*
… …
547{ 582{
548 size_t rss = sizeof (coro); 583 size_t rss = sizeof (coro);
549 584
550 if (coro->mainstack) 585 if (coro->mainstack)
551 { 586 {
587 if (coro->flags & CF_RUNNING)
588 {
589 #define VAR(name,type)coro->name = PL_ ## name;
590 # include "state.h"
591 #undef VAR
592 }
593
552 rss += sizeof (coro->curstackinfo); 594 rss += sizeof (coro->curstackinfo);
553 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *); 595 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
554 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 596 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
555
556 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 597 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
557
558 rss += coro->tmps_max * sizeof (SV *); 598 rss += coro->tmps_max * sizeof (SV *);
559
560 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 599 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
561
562 rss += coro->scopestack_max * sizeof (I32); 600 rss += coro->scopestack_max * sizeof (I32);
563
564 rss += coro->savestack_max * sizeof (ANY); 601 rss += coro->savestack_max * sizeof (ANY);
565 602
566#if !PERL_VERSION_ATLEAST (5,9,0) 603#if !PERL_VERSION_ATLEAST (5,9,0)
567 rss += coro->retstack_max * sizeof (OP *); 604 rss += coro->retstack_max * sizeof (OP *);
568#endif 605#endif
… …
579 /* 616 /*
580 * emulate part of the perl startup here. 617 * emulate part of the perl startup here.
581 */ 618 */
582 coro_init_stacks (aTHX); 619 coro_init_stacks (aTHX);
583 620
621 PL_runops = RUNOPS_DEFAULT;
584 PL_curcop = &PL_compiling; 622 PL_curcop = &PL_compiling;
585 PL_in_eval = EVAL_NULL; 623 PL_in_eval = EVAL_NULL;
586 PL_comppad = 0; 624 PL_comppad = 0;
587 PL_curpm = 0; 625 PL_curpm = 0;
588 PL_localizing = 0; 626 PL_localizing = 0;
… …
619 SvREFCNT_dec (coro_mortal); 657 SvREFCNT_dec (coro_mortal);
620 coro_mortal = 0; 658 coro_mortal = 0;
621 } 659 }
622} 660}
623 661
662static int
663runops_trace (pTHX)
664{
665 COP *oldcop = 0;
666 int oldcxix = -2;
667 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
668 coro_cctx *cctx = coro->cctx;
669
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 {
672 PERL_ASYNC_CHECK ();
673
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
675 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 {
720 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 dSP;
723 ENTER;
724 SAVETMPS;
725 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT;
727
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
729 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
731
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
733 {
734 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0));
736 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0);
738
739 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes);
741 PUSHs (fullname);
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN;
747 }
748
749 oldcxix = cxstack_ix;
750 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 }
767 }
768 }
769
770 TAINT_NOT;
771 return 0;
772}
773
624/* inject a fake call to Coro::State::_cctx_init into the execution */ 774/* inject a fake call to Coro::State::_cctx_init into the execution */
625/* _cctx_init should be careful, as it could be called at almost any time */ 775/* _cctx_init should be careful, as it could be called at almost any time */
626/* during execution of a perl program */ 776/* during execution of a perl program */
627static void NOINLINE 777static void NOINLINE
628prepare_cctx (pTHX_ coro_cctx *cctx) 778prepare_cctx (pTHX_ coro_cctx *cctx)
629{ 779{
630 dSP; 780 dSP;
631 LOGOP myop; 781 LOGOP myop;
782
783 PL_top_env = &PL_start_env;
784
785 if (cctx->flags & CC_TRACE)
786 PL_runops = runops_trace;
632 787
633 Zero (&myop, 1, LOGOP); 788 Zero (&myop, 1, LOGOP);
634 myop.op_next = PL_op; 789 myop.op_next = PL_op;
635 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 790 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
636 791
… …
653 dTHX; 808 dTHX;
654 809
655 /* coro_run is the alternative tail of transfer(), so unlock here. */ 810 /* coro_run is the alternative tail of transfer(), so unlock here. */
656 UNLOCK; 811 UNLOCK;
657 812
658 PL_top_env = &PL_start_env; 813 /* we now skip the entersub that lead to transfer() */
814 PL_op = PL_op->op_next;
659 815
660 /* inject a fake subroutine call to cctx_init */ 816 /* inject a fake subroutine call to cctx_init */
661 prepare_cctx (aTHX_ (coro_cctx *)arg); 817 prepare_cctx (aTHX_ (coro_cctx *)arg);
662 818
663 /* somebody or something will hit me for both perl_run and PL_restartop */ 819 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
697# if CORO_STACKGUARD 853# if CORO_STACKGUARD
698 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 854 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
699# endif 855# endif
700 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 856 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
701 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 857 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
702 cctx->mapped = 1; 858 cctx->flags |= CC_MAPPED;
703 } 859 }
704 else 860 else
705#endif 861#endif
706 { 862 {
707 cctx->ssize = coro_stacksize * (long)sizeof (long); 863 cctx->ssize = coro_stacksize * (long)sizeof (long);
… …
734#if CORO_USE_VALGRIND 890#if CORO_USE_VALGRIND
735 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 891 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
736#endif 892#endif
737 893
738#if HAVE_MMAP 894#if HAVE_MMAP
739 if (cctx->mapped) 895 if (cctx->flags & CC_MAPPED)
740 munmap (cctx->sptr, cctx->ssize); 896 munmap (cctx->sptr, cctx->ssize);
741 else 897 else
742#endif 898#endif
743 Safefree (cctx->sptr); 899 Safefree (cctx->sptr);
744 900
… …
752 { 908 {
753 coro_cctx *cctx = cctx_first; 909 coro_cctx *cctx = cctx_first;
754 cctx_first = cctx->next; 910 cctx_first = cctx->next;
755 --cctx_idle; 911 --cctx_idle;
756 912
757 if (cctx->ssize >= coro_stacksize) 913 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE))
758 return cctx; 914 return cctx;
759 915
760 cctx_destroy (cctx); 916 cctx_destroy (cctx);
761 } 917 }
762 918
763 PL_op = PL_op->op_next;
764 return cctx_new (); 919 return cctx_new ();
765} 920}
766 921
767static void 922static void
768cctx_put (coro_cctx *cctx) 923cctx_put (coro_cctx *cctx)
… …
772 { 927 {
773 coro_cctx *first = cctx_first; 928 coro_cctx *first = cctx_first;
774 cctx_first = first->next; 929 cctx_first = first->next;
775 --cctx_idle; 930 --cctx_idle;
776 931
777 assert (!first->inuse);
778 cctx_destroy (first); 932 cctx_destroy (first);
779 } 933 }
780 934
781 ++cctx_idle; 935 ++cctx_idle;
782 cctx->next = cctx_first; 936 cctx->next = cctx_first;
783 cctx_first = cctx; 937 cctx_first = cctx;
784} 938}
785 939
786/** coroutine switching *****************************************************/ 940/** coroutine switching *****************************************************/
787 941
788/* never call directly, always through the coro_state_transfer global variable */ 942static void NOINLINE
943transfer_check (pTHX_ struct coro *prev, struct coro *next)
944{
945 if (prev != next)
946 {
947 if (!(prev->flags & (CF_RUNNING | CF_NEW)))
948 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
949
950 if (next->flags & CF_RUNNING)
951 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
952
953 if (next->flags & CF_DESTROYED)
954 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
955
956 if (PL_lex_state != LEX_NOTPARSING)
957 croak ("Coro::State::transfer called while parsing, but this is not supported");
958 }
959}
960
961/* always use the TRANSFER macro */
789static void NOINLINE 962static void NOINLINE
790transfer (pTHX_ struct coro *prev, struct coro *next) 963transfer (pTHX_ struct coro *prev, struct coro *next)
791{ 964{
792 dSTACKLEVEL; 965 dSTACKLEVEL;
793 966
… …
803 976
804 if (prev->flags & CF_NEW) 977 if (prev->flags & CF_NEW)
805 { 978 {
806 /* create a new empty context */ 979 /* create a new empty context */
807 Newz (0, prev->cctx, 1, coro_cctx); 980 Newz (0, prev->cctx, 1, coro_cctx);
808 prev->cctx->inuse = 1;
809 prev->flags &= ~CF_NEW; 981 prev->flags &= ~CF_NEW;
810 prev->flags |= CF_RUNNING; 982 prev->flags |= CF_RUNNING;
811 } 983 }
812
813 /*TODO: must not croak here */
814 if (!prev->flags & CF_RUNNING)
815 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
816
817 if (next->flags & CF_RUNNING)
818 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
819
820 if (next->flags & CF_DESTROYED)
821 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
822 984
823 prev->flags &= ~CF_RUNNING; 985 prev->flags &= ~CF_RUNNING;
824 next->flags |= CF_RUNNING; 986 next->flags |= CF_RUNNING;
825 987
826 LOCK; 988 LOCK;
… …
831 next->flags &= ~CF_NEW; 993 next->flags &= ~CF_NEW;
832 /* first get rid of the old state */ 994 /* first get rid of the old state */
833 save_perl (aTHX_ prev); 995 save_perl (aTHX_ prev);
834 /* setup coroutine call */ 996 /* setup coroutine call */
835 setup_coro (aTHX_ next); 997 setup_coro (aTHX_ next);
836 /* need a new stack */
837 assert (!next->cctx);
838 } 998 }
839 else 999 else
840 { 1000 {
841 /* coroutine already started */ 1001 /* coroutine already started */
842 save_perl (aTHX_ prev); 1002 save_perl (aTHX_ prev);
… …
844 } 1004 }
845 1005
846 prev__cctx = prev->cctx; 1006 prev__cctx = prev->cctx;
847 1007
848 /* possibly "free" the cctx */ 1008 /* possibly "free" the cctx */
849 if (prev__cctx->idle_sp == STACKLEVEL) 1009 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))
850 { 1010 {
851 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1011 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
852 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1012 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
853 1013
854 prev->cctx = 0; 1014 prev->cctx = 0;
855 1015
856 cctx_put (prev__cctx); 1016 cctx_put (prev__cctx);
857 prev__cctx->inuse = 0;
858 } 1017 }
859 1018
860 if (!next->cctx) 1019 if (!next->cctx)
861 {
862 next->cctx = cctx_get (aTHX); 1020 next->cctx = cctx_get (aTHX);
863 assert (!next->cctx->inuse);
864 next->cctx->inuse = 1;
865 }
866 1021
867 if (prev__cctx != next->cctx) 1022 if (prev__cctx != next->cctx)
868 { 1023 {
869 prev__cctx->top_env = PL_top_env; 1024 prev__cctx->top_env = PL_top_env;
870 PL_top_env = next->cctx->top_env; 1025 PL_top_env = next->cctx->top_env;
… …
880{ 1035{
881 struct coro *prev, *next; 1036 struct coro *prev, *next;
882}; 1037};
883 1038
884#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1039#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1040#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
885 1041
886/** high level stuff ********************************************************/ 1042/** high level stuff ********************************************************/
887 1043
888static int 1044static int
889coro_state_destroy (pTHX_ struct coro *coro) 1045coro_state_destroy (pTHX_ struct coro *coro)
… …
929 cctx_destroy (coro->cctx); 1085 cctx_destroy (coro->cctx);
930 SvREFCNT_dec (coro->args); 1086 SvREFCNT_dec (coro->args);
931 1087
932 if (coro->next) coro->next->prev = coro->prev; 1088 if (coro->next) coro->next->prev = coro->prev;
933 if (coro->prev) coro->prev->next = coro->next; 1089 if (coro->prev) coro->prev->next = coro->next;
934 if (coro == first) first = coro->next; 1090 if (coro == coro_first) coro_first = coro->next;
935 1091
936 return 1; 1092 return 1;
937} 1093}
938 1094
939static int 1095static int
… …
972#else 1128#else
973# define MGf_DUP 0 1129# define MGf_DUP 0
974#endif 1130#endif
975}; 1131};
976 1132
977static struct coro *
978SvSTATE_ (pTHX_ SV *coro)
979{
980 HV *stash;
981 MAGIC *mg;
982
983 if (SvROK (coro))
984 coro = SvRV (coro);
985
986 stash = SvSTASH (coro);
987 if (stash != coro_stash && stash != coro_state_stash)
988 {
989 /* very slow, but rare, check */
990 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
991 croak ("Coro::State object required");
992 }
993
994 mg = CORO_MAGIC (coro);
995 return (struct coro *)mg->mg_ptr;
996}
997
998#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
999
1000static void 1133static void
1001prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1134prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1002{ 1135{
1003 ta->prev = SvSTATE (prev_sv); 1136 ta->prev = SvSTATE (prev_sv);
1004 ta->next = SvSTATE (next_sv); 1137 ta->next = SvSTATE (next_sv);
1138 TRANSFER_CHECK (*ta);
1005} 1139}
1006 1140
1007static void 1141static void
1008api_transfer (SV *prev_sv, SV *next_sv) 1142api_transfer (SV *prev_sv, SV *next_sv)
1009{ 1143{
… …
1126 break; 1260 break;
1127 } 1261 }
1128 1262
1129 /* free this only after the transfer */ 1263 /* free this only after the transfer */
1130 prev_sv = SvRV (coro_current); 1264 prev_sv = SvRV (coro_current);
1131 SvRV_set (coro_current, next_sv);
1132 ta->prev = SvSTATE (prev_sv); 1265 ta->prev = SvSTATE (prev_sv);
1133 1266 TRANSFER_CHECK (*ta);
1134 assert (ta->next->flags & CF_READY); 1267 assert (ta->next->flags & CF_READY);
1135 ta->next->flags &= ~CF_READY; 1268 ta->next->flags &= ~CF_READY;
1269 SvRV_set (coro_current, next_sv);
1136 1270
1137 LOCK; 1271 LOCK;
1138 free_coro_mortal (aTHX); 1272 free_coro_mortal (aTHX);
1139 coro_mortal = prev_sv; 1273 coro_mortal = prev_sv;
1140 UNLOCK; 1274 UNLOCK;
… …
1213 MUTEX_INIT (&coro_mutex); 1347 MUTEX_INIT (&coro_mutex);
1214#endif 1348#endif
1215 BOOT_PAGESIZE; 1349 BOOT_PAGESIZE;
1216 1350
1217 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1351 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1352
1353 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1354 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1355 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1356 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1218 1357
1219 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1358 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1220 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1359 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1221 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1360 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1222 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1361 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
… …
1247 Newz (0, coro, 1, struct coro); 1386 Newz (0, coro, 1, struct coro);
1248 coro->args = newAV (); 1387 coro->args = newAV ();
1249 coro->save = CORO_SAVE_DEF; 1388 coro->save = CORO_SAVE_DEF;
1250 coro->flags = CF_NEW; 1389 coro->flags = CF_NEW;
1251 1390
1252 if (first) first->prev = coro; 1391 if (coro_first) coro_first->prev = coro;
1253 coro->next = first; 1392 coro->next = coro_first;
1254 first = coro; 1393 coro_first = coro;
1255 1394
1256 coro->hv = hv = newHV (); 1395 coro->hv = hv = newHV ();
1257 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1396 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1258 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1397 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1259 1398
… …
1368void 1507void
1369list () 1508list ()
1370 PPCODE: 1509 PPCODE:
1371{ 1510{
1372 struct coro *coro; 1511 struct coro *coro;
1373 for (coro = first; coro; coro = coro->next) 1512 for (coro = coro_first; coro; coro = coro->next)
1374 if (coro->hv) 1513 if (coro->hv)
1375 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 1514 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1376} 1515}
1377 1516
1378void 1517void
1379_eval (Coro::State coro, SV *coderef) 1518call (Coro::State coro, SV *coderef)
1519 ALIAS:
1520 eval = 1
1380 CODE: 1521 CODE:
1381{ 1522{
1382 if (coro->mainstack) 1523 if (coro->mainstack)
1383 { 1524 {
1384 struct coro temp; 1525 struct coro temp;
… …
1395 dSP; 1536 dSP;
1396 ENTER; 1537 ENTER;
1397 SAVETMPS; 1538 SAVETMPS;
1398 PUSHMARK (SP); 1539 PUSHMARK (SP);
1399 PUTBACK; 1540 PUTBACK;
1541 if (ix)
1542 eval_sv (coderef, 0);
1543 else
1400 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1544 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1401 SPAGAIN; 1545 SPAGAIN;
1402 FREETMPS; 1546 FREETMPS;
1403 LEAVE; 1547 LEAVE;
1404 PUTBACK; 1548 PUTBACK;
1405 } 1549 }
… …
1423 CODE: 1567 CODE:
1424 RETVAL = boolSV (coro->flags & ix); 1568 RETVAL = boolSV (coro->flags & ix);
1425 OUTPUT: 1569 OUTPUT:
1426 RETVAL 1570 RETVAL
1427 1571
1572void
1573trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB)
1574 CODE:
1575 if (flags & CC_TRACE)
1576 {
1577 if (!coro->cctx)
1578 coro->cctx = cctx_new ();
1579 else if (!(coro->cctx->flags & CC_TRACE))
1580 croak ("cannot enable tracing on coroutine with custom stack");
1581
1582 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1583 }
1584 else
1585 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1586 {
1587 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1588 coro->cctx->flags |= CC_NOREUSE;
1589
1590 if (coro->flags & CF_RUNNING)
1591 PL_runops = RUNOPS_DEFAULT;
1592 else
1593 coro->runops = RUNOPS_DEFAULT;
1594 }
1595
1596SV *
1597has_stack (Coro::State coro)
1598 PROTOTYPE: $
1599 CODE:
1600 RETVAL = boolSV (!!coro->cctx);
1601 OUTPUT:
1602 RETVAL
1603
1604int
1605is_traced (Coro::State coro)
1606 PROTOTYPE: $
1607 CODE:
1608 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1609 OUTPUT:
1610 RETVAL
1611
1428IV 1612IV
1429rss (Coro::State coro) 1613rss (Coro::State coro)
1430 PROTOTYPE: $ 1614 PROTOTYPE: $
1431 CODE: 1615 CODE:
1432 RETVAL = coro_rss (coro); 1616 RETVAL = coro_rss (coro);
… …
1438 1622
1439BOOT: 1623BOOT:
1440{ 1624{
1441 int i; 1625 int i;
1442 1626
1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1629 av_async_pool = get_av ("Coro::async_pool", TRUE);
1630
1631 coro_current = get_sv ("Coro::current", FALSE);
1632 SvREADONLY_on (coro_current);
1633
1443 coro_stash = gv_stashpv ("Coro", TRUE); 1634 coro_stash = gv_stashpv ("Coro", TRUE);
1444 1635
1445 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1446 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1447 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1448 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1449 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1640 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1450 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1641 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1451
1452 coro_current = get_sv ("Coro::current", FALSE);
1453 SvREADONLY_on (coro_current);
1454 1642
1455 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1456 coro_ready[i] = newAV (); 1644 coro_ready[i] = newAV ();
1457 1645
1458 { 1646 {
… …
1516 CODE: 1704 CODE:
1517 RETVAL = coro_nready; 1705 RETVAL = coro_nready;
1518 OUTPUT: 1706 OUTPUT:
1519 RETVAL 1707 RETVAL
1520 1708
1709# for async_pool speedup
1710void
1711_pool_1 (SV *cb)
1712 CODE:
1713{
1714 int i, len;
1715 HV *hv = (HV *)SvRV (coro_current);
1716 AV *defav = GvAV (PL_defgv);
1717 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1718 AV *invoke_av;
1719
1720 if (!invoke)
1721 croak ("\3terminate\2\n");
1722
1723 hv_store (hv, "desc", sizeof ("desc") - 1,
1724 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1725
1726 invoke_av = (AV *)SvRV (invoke);
1727 len = av_len (invoke_av);
1728
1729 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1730
1731 if (len > 0)
1732 {
1733 av_fill (defav, len - 1);
1734 for (i = 0; i < len; ++i)
1735 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1]));
1736 }
1737
1738 SvREFCNT_dec (invoke);
1739}
1740
1741void
1742_pool_2 (SV *cb)
1743 CODE:
1744{
1745 struct coro *coro = SvSTATE (coro_current);
1746
1747 sv_setsv (cb, &PL_sv_undef);
1748
1749 if (coro_rss (coro) > SvIV (sv_pool_rss)
1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1751 croak ("\3terminate\2\n");
1752
1753 av_clear (GvAV (PL_defgv));
1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1756 coro->save = CORO_SAVE_DEF;
1757 coro->prio = 0;
1758 av_push (av_async_pool, newSVsv (coro_current));
1759}
1760
1761
1521MODULE = Coro::State PACKAGE = Coro::AIO 1762MODULE = Coro::State PACKAGE = Coro::AIO
1522 1763
1523SV * 1764SV *
1524_get_state () 1765_get_state ()
1525 CODE: 1766 CODE:

Diff Legend

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