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.194 by root, Sat Oct 6 00:08:04 2007 UTC vs.
Revision 1.211 by root, Wed Oct 10 03:37:58 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
129#else 131#else
130# define LOCK (void)0 132# define LOCK (void)0
131# define UNLOCK (void)0 133# define UNLOCK (void)0
132#endif 134#endif
133 135
136#define strpair(const) const, sizeof (const) - 1
137
134/* helper storage struct for Coro::AIO */ 138/* helper storage struct for Coro::AIO */
135struct io_state 139struct io_state
136{ 140{
137 int errorno; 141 int errorno;
138 I32 laststype; 142 I32 laststype;
147static HV *coro_state_stash, *coro_stash; 151static HV *coro_state_stash, *coro_stash;
148static SV *coro_mortal; /* will be freed after next transfer */ 152static SV *coro_mortal; /* will be freed after next transfer */
149 153
150static GV *irsgv; /* $/ */ 154static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */ 155static GV *stdoutgv; /* *STDOUT */
156
157static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
152 160
153/* async_pool helper stuff */ 161/* async_pool helper stuff */
154static SV *sv_pool_rss; 162static SV *sv_pool_rss;
155static SV *sv_pool_size; 163static SV *sv_pool_size;
156static AV *av_async_pool; 164static AV *av_async_pool;
192 CF_READY = 0x0002, /* coroutine is ready */ 200 CF_READY = 0x0002, /* coroutine is ready */
193 CF_NEW = 0x0004, /* has never been switched to */ 201 CF_NEW = 0x0004, /* has never been switched to */
194 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 202 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195}; 203};
196 204
205/* the structure where most of the perl state is stored, overlaid on the cxstack */
206typedef struct {
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211#define VAR(name,type) type name;
212# include "state.h"
213#undef VAR
214} perl_slots;
215
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217
197/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
198struct coro { 219struct coro {
199 /* the c coroutine allocated to this perl coroutine, if any */ 220 /* the c coroutine allocated to this perl coroutine, if any */
200 coro_cctx *cctx; 221 coro_cctx *cctx;
201 222
223 /* process data */
224 AV *mainstack;
225 perl_slots *slot; /* basically the saved sp */
226
202 /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
203 AV *args; 228 int refcnt; /* coroutines are refcounted, yes */
204 int refcnt;
205 int flags; /* CF_ flags */ 229 int flags; /* CF_ flags */
206 230 HV *hv; /* the perl hash associated with this coro, if any */
207 /* optionally saved, might be zero */
208 AV *defav; /* @_ */
209 SV *defsv; /* $_ */
210 SV *errsv; /* $@ */
211 SV *deffh; /* default filehandle */
212 SV *irssv; /* $/ */
213 SV *irssv_sv; /* real $/ cache */
214
215#define VAR(name,type) type name;
216# include "state.h"
217#undef VAR
218 231
219 /* statistics */ 232 /* statistics */
220 int usecount; /* number of transfers to this coro */ 233 int usecount; /* number of transfers to this coro */
221 234
222 /* coro process data */ 235 /* coro process data */
223 int prio; 236 int prio;
224 //SV *throw; 237 SV *throw; /* exception to be thrown */
225 238
226 /* async_pool */ 239 /* async_pool */
227 SV *saved_deffh; 240 SV *saved_deffh;
228 241
229 /* linked list */ 242 /* linked list */
230 struct coro *next, *prev; 243 struct coro *next, *prev;
231 HV *hv; /* the perl hash associated with this coro, if any */
232}; 244};
233 245
234typedef struct coro *Coro__State; 246typedef struct coro *Coro__State;
235typedef struct coro *Coro__State_or_hashref; 247typedef struct coro *Coro__State_or_hashref;
236 248
248static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
249static int coro_nready; 261static int coro_nready;
250static struct coro *coro_first; 262static struct coro *coro_first;
251 263
252/** lowlevel stuff **********************************************************/ 264/** lowlevel stuff **********************************************************/
265
266static SV *
267coro_get_sv (const char *name, int create)
268{
269#if PERL_VERSION_ATLEAST (5,9,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create);
272#endif
273 return get_sv (name, create);
274}
275
276static AV *
277coro_get_av (const char *name, int create)
278{
279#if PERL_VERSION_ATLEAST (5,9,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create);
282#endif
283 return get_av (name, create);
284}
285
286static HV *
287coro_get_hv (const char *name, int create)
288{
289#if PERL_VERSION_ATLEAST (5,9,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create);
292#endif
293 return get_hv (name, create);
294}
253 295
254static AV * 296static AV *
255coro_clone_padlist (pTHX_ CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
256{ 298{
257 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
397/** load & save, init *******************************************************/ 439/** load & save, init *******************************************************/
398 440
399static void 441static void
400load_perl (pTHX_ Coro__State c) 442load_perl (pTHX_ Coro__State c)
401{ 443{
444 perl_slots *slot = c->slot;
445 c->slot = 0;
446
447 PL_mainstack = c->mainstack;
448
449 GvSV (PL_defgv) = slot->defsv;
450 GvAV (PL_defgv) = slot->defav;
451 GvSV (PL_errgv) = slot->errsv;
452 GvSV (irsgv) = slot->irsgv;
453
402#define VAR(name,type) PL_ ## name = c->name; 454 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 455 # include "state.h"
404#undef VAR 456 #undef VAR
405 457
406 GvSV (PL_defgv) = c->defsv; 458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
407 GvAV (PL_defgv) = c->defav; 459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
408 GvSV (PL_errgv) = c->errsv;
409 GvSV (irsgv) = c->irssv_sv;
410 460
411 { 461 {
412 dSP; 462 dSP;
463
413 CV *cv; 464 CV *cv;
414 465
415 /* now do the ugly restore mess */ 466 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 467 while (expect_true (cv = (CV *)POPs))
417 { 468 {
472 } 523 }
473 524
474 PUTBACK; 525 PUTBACK;
475 } 526 }
476 527
528 /* allocate some space on the context stack for our purposes */
529 /* we manually unroll here, as usually 2 slots is enough */
530 if (SLOT_COUNT >= 1) CXINC;
531 if (SLOT_COUNT >= 2) CXINC;
532 if (SLOT_COUNT >= 3) CXINC;
533 {
534 int i;
535 for (i = 3; i < SLOT_COUNT; ++i)
536 CXINC;
537 }
538 cxstack_ix -= SLOT_COUNT; /* undo allocation */
539
540 c->mainstack = PL_mainstack;
541
542 {
543 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
544
477 c->defav = GvAV (PL_defgv); 545 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 546 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 547 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 548 slot->irsgv = GvSV (irsgv);
481 549
482#define VAR(name,type)c->name = PL_ ## name; 550 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 551 # include "state.h"
484#undef VAR 552 #undef VAR
553 }
485} 554}
486 555
487/* 556/*
488 * allocate various perl stacks. This is an exact copy 557 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 558 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 563# define coro_init_stacks init_stacks
495#else 564#else
496static void 565static void
497coro_init_stacks (pTHX) 566coro_init_stacks (pTHX)
498{ 567{
499 PL_curstackinfo = new_stackinfo(64, 6); 568 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 569 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 570 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 571 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 572
504 PL_stack_base = AvARRAY(PL_curstack); 573 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 574 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 575 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 576
508 New(50,PL_tmps_stack,64,SV*); 577 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 578 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 579 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 580 PL_tmps_max = 32;
512 581
513 New(54,PL_markstack,16,I32); 582 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 583 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 584 PL_markstack_max = PL_markstack + 16;
516 585
517#ifdef SET_MARK_OFFSET 586#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 587 SET_MARK_OFFSET;
519#endif 588#endif
520 589
521 New(54,PL_scopestack,16,I32); 590 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 591 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 592 PL_scopestack_max = 8;
524 593
525 New(54,PL_savestack,64,ANY); 594 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 595 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 596 PL_savestack_max = 24;
528 597
529#if !PERL_VERSION_ATLEAST (5,9,0) 598#if !PERL_VERSION_ATLEAST (5,9,0)
530 New(54,PL_retstack,4,OP*); 599 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 600 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 601 PL_retstack_max = 4;
569{ 638{
570 size_t rss = sizeof (*coro); 639 size_t rss = sizeof (*coro);
571 640
572 if (coro->mainstack) 641 if (coro->mainstack)
573 { 642 {
643 perl_slots tmp_slot;
644 perl_slots *slot;
645
574 if (coro->flags & CF_RUNNING) 646 if (coro->flags & CF_RUNNING)
575 { 647 {
648 slot = &tmp_slot;
649
576 #define VAR(name,type)coro->name = PL_ ## name; 650 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 651 # include "state.h"
578 #undef VAR 652 #undef VAR
579 } 653 }
654 else
655 slot = coro->slot;
580 656
581 rss += sizeof (coro->curstackinfo); 657 rss += sizeof (slot->curstackinfo);
582 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
583 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 658 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 659 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 660 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 662 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 663 rss += slot->savestack_max * sizeof (ANY);
589 664
590#if !PERL_VERSION_ATLEAST (5,9,0) 665#if !PERL_VERSION_ATLEAST (5,9,0)
591 rss += coro->retstack_max * sizeof (OP *); 666 rss += slot->retstack_max * sizeof (OP *);
592#endif 667#endif
593 } 668 }
594 669
595 return rss; 670 return rss;
596} 671}
608 PL_runops = RUNOPS_DEFAULT; 683 PL_runops = RUNOPS_DEFAULT;
609 PL_curcop = &PL_compiling; 684 PL_curcop = &PL_compiling;
610 PL_in_eval = EVAL_NULL; 685 PL_in_eval = EVAL_NULL;
611 PL_comppad = 0; 686 PL_comppad = 0;
612 PL_curpm = 0; 687 PL_curpm = 0;
688 PL_curpad = 0;
613 PL_localizing = 0; 689 PL_localizing = 0;
614 PL_dirty = 0; 690 PL_dirty = 0;
615 PL_restartop = 0; 691 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
693 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
616 694
617 GvSV (PL_defgv) = newSV (0); 695 GvSV (PL_defgv) = newSV (0);
618 GvAV (PL_defgv) = coro->args; coro->args = 0; 696 GvAV (PL_defgv) = coro->args; coro->args = 0;
619 GvSV (PL_errgv) = newSV (0); 697 GvSV (PL_errgv) = newSV (0);
620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 698 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
621 PL_rs = newSVsv (GvSV (irsgv)); 699 PL_rs = newSVsv (GvSV (irsgv));
622 PL_defoutgv = SvREFCNT_inc (stdoutgv); 700 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
623
624 ENTER; /* necessary e.g. for dounwind */
625 701
626 { 702 {
627 dSP; 703 dSP;
628 LOGOP myop; 704 LOGOP myop;
629 705
636 PUTBACK; 712 PUTBACK;
637 PL_op = (OP *)&myop; 713 PL_op = (OP *)&myop;
638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 714 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
639 SPAGAIN; 715 SPAGAIN;
640 } 716 }
717
718 /* this newly created coroutine might be run on an existing cctx which most
719 * likely was suspended in set_stacklevel, called from entersub.
720 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
721 * so we ENTER here for symmetry
722 */
723 ENTER;
641} 724}
642 725
643static void 726static void
644coro_destroy (pTHX_ struct coro *coro) 727coro_destroy (pTHX_ struct coro *coro)
645{ 728{
665 SvREFCNT_dec (GvSV (PL_errgv)); 748 SvREFCNT_dec (GvSV (PL_errgv));
666 SvREFCNT_dec (PL_defoutgv); 749 SvREFCNT_dec (PL_defoutgv);
667 SvREFCNT_dec (PL_rs); 750 SvREFCNT_dec (PL_rs);
668 SvREFCNT_dec (GvSV (irsgv)); 751 SvREFCNT_dec (GvSV (irsgv));
669 752
753 SvREFCNT_dec (PL_diehook);
754 SvREFCNT_dec (PL_warnhook);
755
670 SvREFCNT_dec (coro->saved_deffh); 756 SvREFCNT_dec (coro->saved_deffh);
671 //SvREFCNT_dec (coro->throw); 757 SvREFCNT_dec (coro->throw);
672 758
673 coro_destroy_stacks (aTHX); 759 coro_destroy_stacks (aTHX);
674} 760}
675 761
676static void 762static void
726 PUSHMARK (SP); 812 PUSHMARK (SP);
727 PUSHs (&PL_sv_no); 813 PUSHs (&PL_sv_no);
728 PUSHs (fullname); 814 PUSHs (fullname);
729 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 815 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
730 PUTBACK; 816 PUTBACK;
731 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 817 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
732 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 818 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
733 SPAGAIN; 819 SPAGAIN;
734 FREETMPS; 820 FREETMPS;
735 LEAVE; 821 LEAVE;
736 PL_runops = runops_trace; 822 PL_runops = runops_trace;
765 PUSHMARK (SP); 851 PUSHMARK (SP);
766 PUSHs (&PL_sv_yes); 852 PUSHs (&PL_sv_yes);
767 PUSHs (fullname); 853 PUSHs (fullname);
768 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 854 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
769 PUTBACK; 855 PUTBACK;
770 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 856 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
771 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 857 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
772 SPAGAIN; 858 SPAGAIN;
773 FREETMPS; 859 FREETMPS;
774 LEAVE; 860 LEAVE;
775 PL_runops = runops_trace; 861 PL_runops = runops_trace;
789 PL_runops = RUNOPS_DEFAULT; 875 PL_runops = RUNOPS_DEFAULT;
790 PUSHMARK (SP); 876 PUSHMARK (SP);
791 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 877 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
792 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 878 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
793 PUTBACK; 879 PUTBACK;
794 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 880 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
795 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 881 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
796 SPAGAIN; 882 SPAGAIN;
797 FREETMPS; 883 FREETMPS;
798 LEAVE; 884 LEAVE;
799 PL_runops = runops_trace; 885 PL_runops = runops_trace;
809 895
810/* inject a fake call to Coro::State::_cctx_init into the execution */ 896/* inject a fake call to Coro::State::_cctx_init into the execution */
811/* _cctx_init should be careful, as it could be called at almost any time */ 897/* _cctx_init should be careful, as it could be called at almost any time */
812/* during execution of a perl program */ 898/* during execution of a perl program */
813static void NOINLINE 899static void NOINLINE
814prepare_cctx (pTHX_ coro_cctx *cctx) 900cctx_prepare (pTHX_ coro_cctx *cctx)
815{ 901{
816 dSP; 902 dSP;
817 LOGOP myop; 903 LOGOP myop;
818 904
819 PL_top_env = &PL_start_env; 905 PL_top_env = &PL_start_env;
837 923
838/* 924/*
839 * this is a _very_ stripped down perl interpreter ;) 925 * this is a _very_ stripped down perl interpreter ;)
840 */ 926 */
841static void 927static void
842coro_run (void *arg) 928cctx_run (void *arg)
843{ 929{
844 dTHX; 930 dTHX;
845 931
846 /* coro_run is the alternative tail of transfer(), so unlock here. */ 932 /* cctx_run is the alternative tail of transfer(), so unlock here. */
847 UNLOCK; 933 UNLOCK;
848 934
849 /* we now skip the entersub that lead to transfer() */ 935 /* we now skip the entersub that lead to transfer() */
850 PL_op = PL_op->op_next; 936 PL_op = PL_op->op_next;
851 937
852 /* inject a fake subroutine call to cctx_init */ 938 /* inject a fake subroutine call to cctx_init */
853 prepare_cctx (aTHX_ (coro_cctx *)arg); 939 cctx_prepare (aTHX_ (coro_cctx *)arg);
854 940
855 /* somebody or something will hit me for both perl_run and PL_restartop */ 941 /* somebody or something will hit me for both perl_run and PL_restartop */
856 PL_restartop = PL_op; 942 PL_restartop = PL_op;
857 perl_run (PL_curinterp); 943 perl_run (PL_curinterp);
858 944
877 ++cctx_count; 963 ++cctx_count;
878 964
879 Newz (0, cctx, 1, coro_cctx); 965 Newz (0, cctx, 1, coro_cctx);
880 966
881#if HAVE_MMAP 967#if HAVE_MMAP
882
883 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 968 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
884 /* mmap supposedly does allocate-on-write for us */ 969 /* mmap supposedly does allocate-on-write for us */
885 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 970 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
886 971
887 if (cctx->sptr != (void *)-1) 972 if (cctx->sptr != (void *)-1)
908 stack_start = cctx->sptr; 993 stack_start = cctx->sptr;
909 stack_size = cctx->ssize; 994 stack_size = cctx->ssize;
910 } 995 }
911 996
912 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 997 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
913 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 998 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
914 999
915 return cctx; 1000 return cctx;
916} 1001}
917 1002
918static void 1003static void
990 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1075 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
991 1076
992 if (expect_false (next->flags & CF_DESTROYED)) 1077 if (expect_false (next->flags & CF_DESTROYED))
993 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1078 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
994 1079
1080 if (
1081#if PERL_VERSION_ATLEAST (5,9,0)
1082 expect_false (PL_parser)
1083#else
995 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1084 expect_false (PL_lex_state != LEX_NOTPARSING)
1085#endif
1086 )
996 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1087 croak ("Coro::State::transfer called while parsing, but this is not supported");
997 } 1088 }
998} 1089}
999 1090
1000/* always use the TRANSFER macro */ 1091/* always use the TRANSFER macro */
1053 prev->cctx = 0; 1144 prev->cctx = 0;
1054 1145
1055 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1146 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1056 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1147 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1057 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1148 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1149 if (!next->cctx)
1058 next->cctx = cctx_get (aTHX); 1150 next->cctx = cctx_get (aTHX);
1059 1151
1060 cctx_put (prev__cctx); 1152 cctx_put (prev__cctx);
1061 } 1153 }
1062 1154
1063 ++next->usecount; 1155 ++next->usecount;
1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1164 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1073 } 1165 }
1074 1166
1075 free_coro_mortal (aTHX); 1167 free_coro_mortal (aTHX);
1076 UNLOCK; 1168 UNLOCK;
1169
1170 if (expect_false (prev->throw || next->throw))
1171 {
1172 struct coro *coro = SvSTATE (coro_current);
1173
1174 if (coro->throw)
1175 {
1176 SV *exception = coro->throw;
1177 coro->throw = 0;
1178 sv_setsv (ERRSV, exception);
1179 croak (0);
1180 }
1181 }
1077 } 1182 }
1078} 1183}
1079 1184
1080struct transfer_args 1185struct transfer_args
1081{ 1186{
1116 save_perl (aTHX_ &temp); 1221 save_perl (aTHX_ &temp);
1117 load_perl (aTHX_ coro); 1222 load_perl (aTHX_ coro);
1118 1223
1119 coro_destroy (aTHX_ coro); 1224 coro_destroy (aTHX_ coro);
1120 1225
1121 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1226 load_perl (aTHX_ &temp);
1122 1227
1123 coro->mainstack = 0; 1228 coro->slot = 0;
1124 } 1229 }
1125 1230
1126 cctx_destroy (coro->cctx); 1231 cctx_destroy (coro->cctx);
1127 SvREFCNT_dec (coro->args); 1232 SvREFCNT_dec (coro->args);
1128 1233
1385 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1490 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1386 1491
1387 if (coro->flags & CF_RUNNING) 1492 if (coro->flags & CF_RUNNING)
1388 PL_runops = RUNOPS_DEFAULT; 1493 PL_runops = RUNOPS_DEFAULT;
1389 else 1494 else
1390 coro->runops = RUNOPS_DEFAULT; 1495 coro->slot->runops = RUNOPS_DEFAULT;
1391 } 1496 }
1392} 1497}
1393 1498
1394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1499MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1395 1500
1402#endif 1507#endif
1403 BOOT_PAGESIZE; 1508 BOOT_PAGESIZE;
1404 1509
1405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1510 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1511 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1512
1513 hv_sig = coro_get_hv ("SIG", TRUE);
1514 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1515 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1516
1517 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1518 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1407 1519
1408 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1520 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1409 1521
1410 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1522 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1411 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1523 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1417 1529
1418 while (main_top_env->je_prev) 1530 while (main_top_env->je_prev)
1419 main_top_env = main_top_env->je_prev; 1531 main_top_env = main_top_env->je_prev;
1420 1532
1421 coroapi.ver = CORO_API_VERSION; 1533 coroapi.ver = CORO_API_VERSION;
1534 coroapi.rev = CORO_API_REVISION;
1422 coroapi.transfer = api_transfer; 1535 coroapi.transfer = api_transfer;
1423 1536
1424 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1537 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1425} 1538}
1426 1539
1493 1606
1494 break; 1607 break;
1495 } 1608 }
1496 1609
1497 BARRIER; 1610 BARRIER;
1611 PUTBACK;
1498 TRANSFER (ta); 1612 TRANSFER (ta);
1499 1613 SPAGAIN; /* might be the sp of a different coroutine now */
1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1614 /* be extra careful not to ever do anything after TRANSFER */
1501 XSRETURN_YES;
1502} 1615}
1503 1616
1504bool 1617bool
1505_destroy (SV *coro_sv) 1618_destroy (SV *coro_sv)
1506 CODE: 1619 CODE:
1555 CODE: 1668 CODE:
1556{ 1669{
1557 if (coro->mainstack) 1670 if (coro->mainstack)
1558 { 1671 {
1559 struct coro temp; 1672 struct coro temp;
1560 Zero (&temp, 1, struct coro);
1561 1673
1562 if (!(coro->flags & CF_RUNNING)) 1674 if (!(coro->flags & CF_RUNNING))
1563 { 1675 {
1564 save_perl (aTHX_ &temp); 1676 save_perl (aTHX_ &temp);
1565 load_perl (aTHX_ coro); 1677 load_perl (aTHX_ coro);
1567 1679
1568 { 1680 {
1569 dSP; 1681 dSP;
1570 ENTER; 1682 ENTER;
1571 SAVETMPS; 1683 SAVETMPS;
1684 PUTBACK;
1685 PUSHSTACK;
1572 PUSHMARK (SP); 1686 PUSHMARK (SP);
1573 PUTBACK; 1687
1574 if (ix) 1688 if (ix)
1575 eval_sv (coderef, 0); 1689 eval_sv (coderef, 0);
1576 else 1690 else
1577 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1691 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1692
1693 POPSTACK;
1578 SPAGAIN; 1694 SPAGAIN;
1579 FREETMPS; 1695 FREETMPS;
1580 LEAVE; 1696 LEAVE;
1581 PUTBACK; 1697 PUTBACK;
1582 } 1698 }
1640 1756
1641BOOT: 1757BOOT:
1642{ 1758{
1643 int i; 1759 int i;
1644 1760
1645 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1761 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1646 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1762 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1647 av_async_pool = get_av ("Coro::async_pool", TRUE); 1763 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1648 1764
1649 coro_current = get_sv ("Coro::current", FALSE); 1765 coro_current = coro_get_sv ("Coro::current", FALSE);
1650 SvREADONLY_on (coro_current); 1766 SvREADONLY_on (coro_current);
1651 1767
1652 coro_stash = gv_stashpv ("Coro", TRUE); 1768 coro_stash = gv_stashpv ("Coro", TRUE);
1653 1769
1654 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1655 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1771 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1656 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1772 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1657 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1773 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1660 1776
1661 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1777 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1662 coro_ready[i] = newAV (); 1778 coro_ready[i] = newAV ();
1663 1779
1664 { 1780 {
1665 SV *sv = perl_get_sv("Coro::API", 1); 1781 SV *sv = perl_get_sv ("Coro::API", TRUE);
1782 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1666 1783
1667 coroapi.schedule = api_schedule; 1784 coroapi.schedule = api_schedule;
1668 coroapi.cede = api_cede; 1785 coroapi.cede = api_cede;
1669 coroapi.cede_notself = api_cede_notself; 1786 coroapi.cede_notself = api_cede_notself;
1670 coroapi.ready = api_ready; 1787 coroapi.ready = api_ready;
1721 CODE: 1838 CODE:
1722 RETVAL = coro_nready; 1839 RETVAL = coro_nready;
1723 OUTPUT: 1840 OUTPUT:
1724 RETVAL 1841 RETVAL
1725 1842
1843void
1844throw (Coro::State self, SV *throw = &PL_sv_undef)
1845 PROTOTYPE: $;$
1846 CODE:
1847 SvREFCNT_dec (self->throw);
1848 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1849
1726# for async_pool speedup 1850# for async_pool speedup
1727void 1851void
1728_pool_1 (SV *cb) 1852_pool_1 (SV *cb)
1729 CODE: 1853 CODE:
1730{ 1854{
1731 struct coro *coro = SvSTATE (coro_current); 1855 struct coro *coro = SvSTATE (coro_current);
1732 HV *hv = (HV *)SvRV (coro_current); 1856 HV *hv = (HV *)SvRV (coro_current);
1733 AV *defav = GvAV (PL_defgv); 1857 AV *defav = GvAV (PL_defgv);
1734 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1858 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1735 AV *invoke_av; 1859 AV *invoke_av;
1736 int i, len; 1860 int i, len;
1737 1861
1738 if (!invoke) 1862 if (!invoke)
1739 croak ("\3terminate\2\n"); 1863 croak ("\3async_pool terminate\2\n");
1740 1864
1741 SvREFCNT_dec (coro->saved_deffh); 1865 SvREFCNT_dec (coro->saved_deffh);
1742 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1866 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1743 1867
1744 hv_store (hv, "desc", sizeof ("desc") - 1, 1868 hv_store (hv, "desc", sizeof ("desc") - 1,
1745 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1869 newSVpvn (strpair ("[async_pool]")), 0);
1746 1870
1747 invoke_av = (AV *)SvRV (invoke); 1871 invoke_av = (AV *)SvRV (invoke);
1748 len = av_len (invoke_av); 1872 len = av_len (invoke_av);
1749 1873
1750 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1874 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1770 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1894 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1771 coro->saved_deffh = 0; 1895 coro->saved_deffh = 0;
1772 1896
1773 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1897 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1774 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1898 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1775 croak ("\3terminate\2\n"); 1899 croak ("\3async_pool terminate\2\n");
1776 1900
1777 av_clear (GvAV (PL_defgv)); 1901 av_clear (GvAV (PL_defgv));
1778 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1902 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1779 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1903 newSVpvn (strpair ("[async_pool idle]")), 0);
1780 1904
1781 coro->prio = 0; 1905 coro->prio = 0;
1782 1906
1783 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1907 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1784 api_trace (coro_current, 0); 1908 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines