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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines