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.202 by root, Mon Oct 8 02:50:23 2007 UTC vs.
Revision 1.226 by root, Fri Apr 4 20:07:35 2008 UTC

10#include "patchlevel.h" 10#include "patchlevel.h"
11 11
12#include <stdio.h> 12#include <stdio.h>
13#include <errno.h> 13#include <errno.h>
14#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
15 16
16#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
17# include <unistd.h> 18# include <unistd.h>
18# include <sys/mman.h> 19# include <sys/mman.h>
19# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
71# ifndef IS_PADCONST 72# ifndef IS_PADCONST
72# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
73# endif 74# endif
74#endif 75#endif
75 76
77/* 5.8.8 */
78#ifndef GV_NOTQUAL
79# define GV_NOTQUAL 0
80#endif
81#ifndef newSV
82# define newSV(l) NEWSV(0,l)
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
76/* 5.8.7 */ 90/* 5.8.7 */
77#ifndef SvRV_set 91#ifndef SvRV_set
78# define SvRV_set(s,v) SvRV(s) = (v) 92# define SvRV_set(s,v) SvRV(s) = (v)
79#endif
80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif 93#endif
88 94
89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 95#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
90# undef CORO_STACKGUARD 96# undef CORO_STACKGUARD
91#endif 97#endif
130#else 136#else
131# define LOCK (void)0 137# define LOCK (void)0
132# define UNLOCK (void)0 138# define UNLOCK (void)0
133#endif 139#endif
134 140
135#define strpair(const) const, sizeof (const) - 1
136
137/* helper storage struct for Coro::AIO */ 141/* helper storage struct for Coro::AIO */
138struct io_state 142struct io_state
139{ 143{
140 int errorno; 144 int errorno;
141 I32 laststype; 145 I32 laststype;
146static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
147static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
148static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
149static JMPENV *main_top_env; 153static JMPENV *main_top_env;
150static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
151static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
152 156
153static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
155 159static SV *rv_diehook;
160static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */ 161static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
159 162
160/* async_pool helper stuff */ 163/* async_pool helper stuff */
161static SV *sv_pool_rss; 164static SV *sv_pool_rss;
162static SV *sv_pool_size; 165static SV *sv_pool_size;
163static AV *av_async_pool; 166static AV *av_async_pool;
221 224
222 /* process data */ 225 /* process data */
223 AV *mainstack; 226 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */ 227 perl_slots *slot; /* basically the saved sp */
225 228
226 /* data associated with this coroutine (initial args) */ 229 AV *args; /* data associated with this coroutine (initial args) */
227 AV *args; 230 int refcnt; /* coroutines are refcounted, yes */
228 int refcnt;
229 int flags; /* CF_ flags */ 231 int flags; /* CF_ flags */
232 HV *hv; /* the perl hash associated with this coro, if any */
230 233
231 /* statistics */ 234 /* statistics */
232 int usecount; /* number of transfers to this coro */ 235 int usecount; /* number of transfers to this coro */
233 236
234 /* coro process data */ 237 /* coro process data */
235 int prio; 238 int prio;
236 SV *throw; 239 SV *throw; /* exception to be thrown */
237 240
238 /* async_pool */ 241 /* async_pool */
239 SV *saved_deffh; 242 SV *saved_deffh;
240 243
241 /* linked list */ 244 /* linked list */
242 struct coro *next, *prev; 245 struct coro *next, *prev;
243 HV *hv; /* the perl hash associated with this coro, if any */
244}; 246};
245 247
246typedef struct coro *Coro__State; 248typedef struct coro *Coro__State;
247typedef struct coro *Coro__State_or_hashref; 249typedef struct coro *Coro__State_or_hashref;
248 250
262static struct coro *coro_first; 264static struct coro *coro_first;
263 265
264/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
265 267
266static SV * 268static SV *
267coro_get_sv (const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
268{ 270{
269#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,9,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create); 273 get_sv (name, create);
272#endif 274#endif
273 return get_sv (name, create); 275 return get_sv (name, create);
274} 276}
275 277
276static AV * 278static AV *
277coro_get_av (const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
278{ 280{
279#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,9,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create); 283 get_av (name, create);
282#endif 284#endif
283 return get_av (name, create); 285 return get_av (name, create);
284} 286}
285 287
286static HV * 288static HV *
287coro_get_hv (const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
288{ 290{
289#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,9,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create); 293 get_hv (name, create);
292#endif 294#endif
347 349
348 /* casting is fun. */ 350 /* casting is fun. */
349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
350 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
351 353
352 SvREFCNT_dec (av);
353
354 return 0; 354 return 0;
355} 355}
356 356
357#define PERL_MAGIC_coro PERL_MAGIC_ext 357#define CORO_MAGIC_type_cv PERL_MAGIC_ext
358#define CORO_MAGIC_type_state PERL_MAGIC_ext
358 359
359static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 360static MGVTBL coro_cv_vtbl = {
361 0, 0, 0, 0,
362 coro_cv_free
363};
360 364
361#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
362 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
364 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
366 : 0 370 : 0
371
372#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
373#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
367 374
368static struct coro * 375static struct coro *
369SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
370{ 377{
371 HV *stash; 378 HV *stash;
383 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
386 } 393 }
387 394
388 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
389 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
390} 397}
391 398
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393 400
394/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
395static void 402static void
396get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
397{ 404{
398 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
399 AV *av; 406 AV *av;
400 407
401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
403 else 410 else
415} 422}
416 423
417static void 424static void
418put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
419{ 426{
420 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
421 AV *av; 428 AV *av;
422 429
423 if (expect_false (!mg)) 430 if (expect_false (!mg))
424 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
427 mg->mg_virtual = &vtbl_coro;
428 mg->mg_obj = (SV *)newAV ();
429 }
430 432
431 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
432 434
433 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
434 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
452 GvSV (irsgv) = slot->irsgv; 454 GvSV (irsgv) = slot->irsgv;
453 455
454 #define VAR(name,type) PL_ ## name = slot->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
455 # include "state.h" 457 # include "state.h"
456 #undef VAR 458 #undef VAR
457
458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
460 459
461 { 460 {
462 dSP; 461 dSP;
463 462
464 CV *cv; 463 CV *cv;
557 * allocate various perl stacks. This is an exact copy 556 * allocate various perl stacks. This is an exact copy
558 * of perl.c:init_stacks, except that it uses less memory 557 * of perl.c:init_stacks, except that it uses less memory
559 * on the (sometimes correct) assumption that coroutines do 558 * on the (sometimes correct) assumption that coroutines do
560 * not usually need a lot of stackspace. 559 * not usually need a lot of stackspace.
561 */ 560 */
562#if 1 561#if CORO_PREFER_PERL_FUNCTIONS
563# define coro_init_stacks init_stacks 562# define coro_init_stacks init_stacks
564#else 563#else
565static void 564static void
566coro_init_stacks (pTHX) 565coro_init_stacks (pTHX)
567{ 566{
669 668
670 return rss; 669 return rss;
671} 670}
672 671
673/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
673
674static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
675static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
676
677/*
678 * This overrides the default magic get method of %SIG elements.
679 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
680 * and instead of tryign to save and restore the hash elements, we just provide
681 * readback here.
682 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
683 * not expecting this to actually change the hook. This is a potential problem
684 * when a schedule happens then, but we ignore this.
685 */
686static int
687coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
688{
689 const char *s = MgPV_nolen_const (mg);
690
691 if (*s == '_')
692 {
693 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
694 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
695 }
696
697 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
698}
699
700static int
701coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
702{
703 const char *s = MgPV_nolen_const (mg);
704
705 if (*s == '_')
706 {
707 SV **svp = 0;
708
709 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
710 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
711
712 if (svp)
713 {
714 SV *old = *svp;
715 *svp = newSVsv (sv);
716 SvREFCNT_dec (old);
717 return;
718 }
719 }
720
721 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
722}
674 723
675static void 724static void
676coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
677{ 726{
678 /* 727 /*
687 PL_curpm = 0; 736 PL_curpm = 0;
688 PL_curpad = 0; 737 PL_curpad = 0;
689 PL_localizing = 0; 738 PL_localizing = 0;
690 PL_dirty = 0; 739 PL_dirty = 0;
691 PL_restartop = 0; 740 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 741
693 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 742 /* recreate the die/warn hooks */
743 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
744 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
694 745
695 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
698 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 749 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
713 PL_op = (OP *)&myop; 764 PL_op = (OP *)&myop;
714 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
715 SPAGAIN; 766 SPAGAIN;
716 } 767 }
717 768
718 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 769 /* this newly created coroutine might be run on an existing cctx which most
770 * likely was suspended in set_stacklevel, called from entersub.
771 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
772 * so we ENTER here for symmetry
773 */
774 ENTER;
719} 775}
720 776
721static void 777static void
722coro_destroy (pTHX_ struct coro *coro) 778coro_destroy (pTHX_ struct coro *coro)
723{ 779{
807 PUSHMARK (SP); 863 PUSHMARK (SP);
808 PUSHs (&PL_sv_no); 864 PUSHs (&PL_sv_no);
809 PUSHs (fullname); 865 PUSHs (fullname);
810 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 866 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
811 PUTBACK; 867 PUTBACK;
812 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 868 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
813 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 869 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
814 SPAGAIN; 870 SPAGAIN;
815 FREETMPS; 871 FREETMPS;
816 LEAVE; 872 LEAVE;
817 PL_runops = runops_trace; 873 PL_runops = runops_trace;
844 SAVETMPS; 900 SAVETMPS;
845 EXTEND (SP, 3); 901 EXTEND (SP, 3);
846 PUSHMARK (SP); 902 PUSHMARK (SP);
847 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
848 PUSHs (fullname); 904 PUSHs (fullname);
849 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 905 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
850 PUTBACK; 906 PUTBACK;
851 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 907 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
852 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 908 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
853 SPAGAIN; 909 SPAGAIN;
854 FREETMPS; 910 FREETMPS;
855 LEAVE; 911 LEAVE;
856 PL_runops = runops_trace; 912 PL_runops = runops_trace;
870 PL_runops = RUNOPS_DEFAULT; 926 PL_runops = RUNOPS_DEFAULT;
871 PUSHMARK (SP); 927 PUSHMARK (SP);
872 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 928 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
873 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 929 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
874 PUTBACK; 930 PUTBACK;
875 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 931 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
876 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 932 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
877 SPAGAIN; 933 SPAGAIN;
878 FREETMPS; 934 FREETMPS;
879 LEAVE; 935 LEAVE;
880 PL_runops = runops_trace; 936 PL_runops = runops_trace;
1072 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
1073 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1129 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1074 1130
1075 if ( 1131 if (
1076#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1077 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1078#else 1134#else
1079 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1080#endif 1136#endif
1081 ) 1137 )
1082 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1138 croak ("Coro::State::transfer called while parsing, but this is not supported");
1086/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1087static void NOINLINE 1143static void NOINLINE
1088transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1089{ 1145{
1090 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1091 1148
1092 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1093 if (expect_false (!next)) 1150 if (expect_false (!next))
1094 { 1151 {
1095 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1110 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1111 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1112 1169
1113 LOCK; 1170 LOCK;
1114 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1115 if (expect_false (next->flags & CF_NEW)) 1175 if (expect_false (next->flags & CF_NEW))
1116 { 1176 {
1117 /* need to start coroutine */ 1177 /* need to start coroutine */
1118 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1119 /* first get rid of the old state */
1120 save_perl (aTHX_ prev);
1121 /* setup coroutine call */ 1179 /* setup coroutine call */
1122 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1123 } 1181 }
1124 else 1182 else
1125 {
1126 /* coroutine already started */
1127 save_perl (aTHX_ prev);
1128 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1129 }
1130 1184
1131 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1132 1186
1133 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1134 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1188 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1149 1203
1150 ++next->usecount; 1204 ++next->usecount;
1151 1205
1152 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1153 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1208
1209 has_throw = !!next->throw;
1154 1210
1155 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1156 { 1212 {
1157 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1158 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
1160 } 1216 }
1161 1217
1162 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1163 UNLOCK; 1219 UNLOCK;
1164 1220
1165 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1166 { 1222 {
1167 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1168 1224
1169 if (coro->throw) 1225 if (coro->throw)
1170 { 1226 {
1296{ 1352{
1297 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1353 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1298} 1354}
1299 1355
1300static SV * 1356static SV *
1301coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1302{ 1358{
1303 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1304 1360
1305 min_prio -= PRIO_MIN;
1306 if (min_prio < 0)
1307 min_prio = 0;
1308
1309 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1310 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1311 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1312 1364
1313 return 0; 1365 return 0;
1314} 1366}
1350 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1351 1403
1352 for (;;) 1404 for (;;)
1353 { 1405 {
1354 LOCK; 1406 LOCK;
1355 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1356 1408
1357 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1358 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1359 { 1411 {
1360 dSP; 1412 dSP;
1364 SAVETMPS; 1416 SAVETMPS;
1365 1417
1366 PUSHMARK (SP); 1418 PUSHMARK (SP);
1367 PUTBACK; 1419 PUTBACK;
1368 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1369 1422
1370 FREETMPS; 1423 FREETMPS;
1371 LEAVE; 1424 LEAVE;
1372 continue; 1425 continue;
1373 } 1426 }
1503 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1504 1557
1505 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1506 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1507 1560
1561 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1562 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1563 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1564 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1565
1508 hv_sig = coro_get_hv ("SIG", TRUE); 1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1509 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1510 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1511
1512 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1513 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1514 1569
1515 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1516 1571
1517 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1518 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1524 1579
1525 while (main_top_env->je_prev) 1580 while (main_top_env->je_prev)
1526 main_top_env = main_top_env->je_prev; 1581 main_top_env = main_top_env->je_prev;
1527 1582
1528 coroapi.ver = CORO_API_VERSION; 1583 coroapi.ver = CORO_API_VERSION;
1584 coroapi.rev = CORO_API_REVISION;
1529 coroapi.transfer = api_transfer; 1585 coroapi.transfer = api_transfer;
1530 1586
1531 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1587 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1532} 1588}
1533 1589
1534SV * 1590SV *
1535new (char *klass, ...) 1591new (char *klass, ...)
1536 CODE: 1592 CODE:
1537{ 1593{
1538 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1539 HV *hv; 1596 HV *hv;
1540 int i; 1597 int i;
1541 1598
1542 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1543 coro->args = newAV (); 1600 coro->args = newAV ();
1546 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1547 coro->next = coro_first; 1604 coro->next = coro_first;
1548 coro_first = coro; 1605 coro_first = coro;
1549 1606
1550 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1551 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1608 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1609 mg->mg_flags |= MGf_DUP;
1552 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1553 1611
1554 av_extend (coro->args, items - 1); 1612 av_extend (coro->args, items - 1);
1555 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1556 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
1570 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1571 CODE: 1629 CODE:
1572{ 1630{
1573 struct transfer_args ta; 1631 struct transfer_args ta;
1574 1632
1633 PUTBACK;
1575 switch (ix) 1634 switch (ix)
1576 { 1635 {
1577 case 0: 1636 case 0:
1578 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1579 ta.next = 0; 1638 ta.next = 0;
1598 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1599 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1600 1659
1601 break; 1660 break;
1602 } 1661 }
1662 SPAGAIN;
1603 1663
1604 BARRIER; 1664 BARRIER;
1665 PUTBACK;
1605 TRANSFER (ta); 1666 TRANSFER (ta);
1606 1667 SPAGAIN; /* might be the sp of a different coroutine now */
1607 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1668 /* be extra careful not to ever do anything after TRANSFER */
1608 XSRETURN_YES;
1609} 1669}
1610 1670
1611bool 1671bool
1612_destroy (SV *coro_sv) 1672_destroy (SV *coro_sv)
1613 CODE: 1673 CODE:
1665 { 1725 {
1666 struct coro temp; 1726 struct coro temp;
1667 1727
1668 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1669 { 1729 {
1730 PUTBACK;
1670 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1671 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1672 } 1733 }
1673 1734
1674 { 1735 {
1675 dSP; 1736 dSP;
1676 ENTER; 1737 ENTER;
1677 SAVETMPS; 1738 SAVETMPS;
1739 PUTBACK;
1740 PUSHSTACK;
1678 PUSHMARK (SP); 1741 PUSHMARK (SP);
1679 PUTBACK;
1680 1742
1681 if (ix) 1743 if (ix)
1682 eval_sv (coderef, 0); 1744 eval_sv (coderef, 0);
1683 else 1745 else
1684 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1746 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1685 1747
1748 POPSTACK;
1686 SPAGAIN; 1749 SPAGAIN;
1687 FREETMPS; 1750 FREETMPS;
1688 LEAVE; 1751 LEAVE;
1689 PUTBACK; 1752 PUTBACK;
1690 } 1753 }
1691 1754
1692 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1693 { 1756 {
1694 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1695 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1696 } 1760 }
1697 } 1761 }
1698} 1762}
1699 1763
1700SV * 1764SV *
1741 case 1: RETVAL = coro->usecount; break; 1805 case 1: RETVAL = coro->usecount; break;
1742 } 1806 }
1743 OUTPUT: 1807 OUTPUT:
1744 RETVAL 1808 RETVAL
1745 1809
1810void
1811force_cctx ()
1812 CODE:
1813 struct coro *coro = SvSTATE (coro_current);
1814 coro->cctx->idle_sp = 0;
1746 1815
1747MODULE = Coro::State PACKAGE = Coro 1816MODULE = Coro::State PACKAGE = Coro
1748 1817
1749BOOT: 1818BOOT:
1750{ 1819{
1751 int i; 1820 int i;
1752 1821
1753 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1822 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1754 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1823 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1755 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1824 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1756 1825
1757 coro_current = coro_get_sv ("Coro::current", FALSE); 1826 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1758 SvREADONLY_on (coro_current); 1827 SvREADONLY_on (coro_current);
1759 1828
1760 coro_stash = gv_stashpv ("Coro", TRUE); 1829 coro_stash = gv_stashpv ("Coro", TRUE);
1761 1830
1762 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1837 PROTOTYPE: $;$ 1906 PROTOTYPE: $;$
1838 CODE: 1907 CODE:
1839 SvREFCNT_dec (self->throw); 1908 SvREFCNT_dec (self->throw);
1840 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1909 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1841 1910
1911void
1912swap_defsv (Coro::State self)
1913 PROTOTYPE: $
1914 ALIAS:
1915 swap_defav = 1
1916 CODE:
1917 if (!self->slot)
1918 croak ("cannot swap state with coroutine that has no saved state");
1919 else
1920 {
1921 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1922 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1923
1924 SV *tmp = *src; *src = *dst; *dst = tmp;
1925 }
1926
1842# for async_pool speedup 1927# for async_pool speedup
1843void 1928void
1844_pool_1 (SV *cb) 1929_pool_1 (SV *cb)
1845 CODE: 1930 CODE:
1846{ 1931{
1847 struct coro *coro = SvSTATE (coro_current); 1932 struct coro *coro = SvSTATE (coro_current);
1848 HV *hv = (HV *)SvRV (coro_current); 1933 HV *hv = (HV *)SvRV (coro_current);
1849 AV *defav = GvAV (PL_defgv); 1934 AV *defav = GvAV (PL_defgv);
1850 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1935 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1851 AV *invoke_av; 1936 AV *invoke_av;
1852 int i, len; 1937 int i, len;
1853 1938
1854 if (!invoke) 1939 if (!invoke)
1940 {
1941 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1855 croak ("\3async_pool terminate\2\n"); 1942 croak ("\3async_pool terminate\2\n");
1943 }
1856 1944
1857 SvREFCNT_dec (coro->saved_deffh); 1945 SvREFCNT_dec (coro->saved_deffh);
1858 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1946 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1859 1947
1860 hv_store (hv, "desc", sizeof ("desc") - 1, 1948 hv_store (hv, "desc", sizeof ("desc") - 1,
1861 newSVpvn (strpair ("[async_pool]")), 0); 1949 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1862 1950
1863 invoke_av = (AV *)SvRV (invoke); 1951 invoke_av = (AV *)SvRV (invoke);
1864 len = av_len (invoke_av); 1952 len = av_len (invoke_av);
1865 1953
1866 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1954 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1886 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1974 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1887 coro->saved_deffh = 0; 1975 coro->saved_deffh = 0;
1888 1976
1889 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1977 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1890 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1978 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1979 {
1980 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1891 croak ("\3async_pool terminate\2\n"); 1981 croak ("\3async_pool terminate\2\n");
1982 }
1892 1983
1893 av_clear (GvAV (PL_defgv)); 1984 av_clear (GvAV (PL_defgv));
1894 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1985 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1895 newSVpvn (strpair ("[async_pool idle]")), 0); 1986 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1896 1987
1897 coro->prio = 0; 1988 coro->prio = 0;
1898 1989
1899 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1990 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1900 api_trace (coro_current, 0); 1991 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines