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.210 by root, Wed Oct 10 03:24:40 2007 UTC vs.
Revision 1.225 by root, Wed Mar 12 14:13:11 2008 UTC

… …
72# ifndef IS_PADCONST 72# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
74# endif 74# endif
75#endif 75#endif
76 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
77/* 5.8.7 */ 90/* 5.8.7 */
78#ifndef SvRV_set 91#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 92# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif 93#endif
89 94
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 95#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 96# undef CORO_STACKGUARD
92#endif 97#endif
… …
131#else 136#else
132# define LOCK (void)0 137# define LOCK (void)0
133# define UNLOCK (void)0 138# define UNLOCK (void)0
134#endif 139#endif
135 140
136#define strpair(const) const, sizeof (const) - 1
137
138/* helper storage struct for Coro::AIO */ 141/* helper storage struct for Coro::AIO */
139struct io_state 142struct io_state
140{ 143{
141 int errorno; 144 int errorno;
142 I32 laststype; 145 I32 laststype;
… …
147static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 153static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
152static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
153 156
154static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
156 159static SV *rv_diehook;
160static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 161static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 162
161/* async_pool helper stuff */ 163/* async_pool helper stuff */
162static SV *sv_pool_rss; 164static SV *sv_pool_rss;
163static SV *sv_pool_size; 165static SV *sv_pool_size;
164static AV *av_async_pool; 166static AV *av_async_pool;
165 167
166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */ 168static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle[3]; 169static int cctx_count, cctx_idle;
168 170
169enum { 171enum {
170 CC_MAPPED = 0x01, 172 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 173 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 174 CC_TRACE = 0x04,
… …
217 219
218/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
219struct coro { 221struct coro {
220 /* the c coroutine allocated to this perl coroutine, if any */ 222 /* the c coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 223 coro_cctx *cctx;
222 int gimme;
223 224
224 /* process data */ 225 /* process data */
225 AV *mainstack; 226 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */ 227 perl_slots *slot; /* basically the saved sp */
227 228
… …
263static struct coro *coro_first; 264static struct coro *coro_first;
264 265
265/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
266 267
267static SV * 268static SV *
268coro_get_sv (const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
269{ 270{
270#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,9,0)
271 /* 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 */
272 get_sv (name, create); 273 get_sv (name, create);
273#endif 274#endif
274 return get_sv (name, create); 275 return get_sv (name, create);
275} 276}
276 277
277static AV * 278static AV *
278coro_get_av (const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
279{ 280{
280#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,9,0)
281 /* 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 */
282 get_av (name, create); 283 get_av (name, create);
283#endif 284#endif
284 return get_av (name, create); 285 return get_av (name, create);
285} 286}
286 287
287static HV * 288static HV *
288coro_get_hv (const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
289{ 290{
290#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,9,0)
291 /* 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 */
292 get_hv (name, create); 293 get_hv (name, create);
293#endif 294#endif
… …
348 349
349 /* casting is fun. */ 350 /* casting is fun. */
350 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
351 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
352 353
353 SvREFCNT_dec (av);
354
355 return 0; 354 return 0;
356} 355}
357 356
358#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
359 359
360static 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};
361 364
362#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
363 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
364 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
365 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
366 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
367 : 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)
368 374
369static struct coro * 375static struct coro *
370SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
371{ 377{
372 HV *stash; 378 HV *stash;
… …
384 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
386 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
387 } 393 }
388 394
389 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
390 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
391} 397}
392 398
393#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
394 400
395/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
396static void 402static void
397get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
398{ 404{
399 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
400 AV *av; 406 AV *av;
401 407
402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
404 else 410 else
… …
416} 422}
417 423
418static void 424static void
419put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
420{ 426{
421 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
422 AV *av; 428 AV *av;
423 429
424 if (expect_false (!mg)) 430 if (expect_false (!mg))
425 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
428 mg->mg_virtual = &vtbl_coro;
429 mg->mg_obj = (SV *)newAV ();
430 }
431 432
432 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
433 434
434 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
435 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
… …
453 GvSV (irsgv) = slot->irsgv; 454 GvSV (irsgv) = slot->irsgv;
454 455
455 #define VAR(name,type) PL_ ## name = slot->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
456 # include "state.h" 457 # include "state.h"
457 #undef VAR 458 #undef VAR
458
459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
461 459
462 { 460 {
463 dSP; 461 dSP;
464 462
465 CV *cv; 463 CV *cv;
… …
671 return rss; 669 return rss;
672} 670}
673 671
674/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
675 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}
723
676static void 724static void
677coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
678{ 726{
679 /* 727 /*
680 * emulate part of the perl startup here. 728 * emulate part of the perl startup here.
… …
688 PL_curpm = 0; 736 PL_curpm = 0;
689 PL_curpad = 0; 737 PL_curpad = 0;
690 PL_localizing = 0; 738 PL_localizing = 0;
691 PL_dirty = 0; 739 PL_dirty = 0;
692 PL_restartop = 0; 740 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 741
694 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);
695 745
696 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
699 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);
… …
712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 762 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 PUTBACK; 763 PUTBACK;
714 PL_op = (OP *)&myop; 764 PL_op = (OP *)&myop;
715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
716 SPAGAIN; 766 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
731 } 767 }
732 768
733 /* this newly created coroutine might be run on an existing cctx which most 769 /* this newly created coroutine might be run on an existing cctx which most
734 * likely was suspended in set_stacklevel, called from entersub. 770 * likely was suspended in set_stacklevel, called from entersub.
735 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 771 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
… …
827 PUSHMARK (SP); 863 PUSHMARK (SP);
828 PUSHs (&PL_sv_no); 864 PUSHs (&PL_sv_no);
829 PUSHs (fullname); 865 PUSHs (fullname);
830 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 866 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
831 PUTBACK; 867 PUTBACK;
832 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);
833 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);
834 SPAGAIN; 870 SPAGAIN;
835 FREETMPS; 871 FREETMPS;
836 LEAVE; 872 LEAVE;
837 PL_runops = runops_trace; 873 PL_runops = runops_trace;
… …
864 SAVETMPS; 900 SAVETMPS;
865 EXTEND (SP, 3); 901 EXTEND (SP, 3);
866 PUSHMARK (SP); 902 PUSHMARK (SP);
867 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
868 PUSHs (fullname); 904 PUSHs (fullname);
869 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);
870 PUTBACK; 906 PUTBACK;
871 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);
872 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);
873 SPAGAIN; 909 SPAGAIN;
874 FREETMPS; 910 FREETMPS;
875 LEAVE; 911 LEAVE;
876 PL_runops = runops_trace; 912 PL_runops = runops_trace;
… …
890 PL_runops = RUNOPS_DEFAULT; 926 PL_runops = RUNOPS_DEFAULT;
891 PUSHMARK (SP); 927 PUSHMARK (SP);
892 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 928 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
893 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 929 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
894 PUTBACK; 930 PUTBACK;
895 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);
896 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);
897 SPAGAIN; 933 SPAGAIN;
898 FREETMPS; 934 FREETMPS;
899 LEAVE; 935 LEAVE;
900 PL_runops = runops_trace; 936 PL_runops = runops_trace;
… …
1039 1075
1040/* wether this cctx should be destructed */ 1076/* wether this cctx should be destructed */
1041#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1077#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1042 1078
1043static coro_cctx * 1079static coro_cctx *
1044cctx_get (pTHX_ int gimme) 1080cctx_get (pTHX)
1045{ 1081{
1046 while (expect_true (cctx_first[gimme])) 1082 while (expect_true (cctx_first))
1047 { 1083 {
1048 coro_cctx *cctx = cctx_first[gimme]; 1084 coro_cctx *cctx = cctx_first;
1049 cctx_first[gimme] = cctx->next; 1085 cctx_first = cctx->next;
1050 --cctx_idle[gimme]; 1086 --cctx_idle;
1051 1087
1052 if (expect_true (!CCTX_EXPIRED (cctx))) 1088 if (expect_true (!CCTX_EXPIRED (cctx)))
1053 return cctx; 1089 return cctx;
1054 1090
1055 cctx_destroy (cctx); 1091 cctx_destroy (cctx);
1056 } 1092 }
1057 1093
1058 assert (!gimme);
1059 return cctx_new (); 1094 return cctx_new ();
1060} 1095}
1061 1096
1062static void 1097static void
1063cctx_put (coro_cctx *cctx, int gimme) 1098cctx_put (coro_cctx *cctx)
1064{ 1099{
1065 /* free another cctx if overlimit */ 1100 /* free another cctx if overlimit */
1066 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX)) 1101 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
1067 { 1102 {
1068 coro_cctx *first = cctx_first[gimme]; 1103 coro_cctx *first = cctx_first;
1069 cctx_first[gimme] = first->next; 1104 cctx_first = first->next;
1070 --cctx_idle[gimme]; 1105 --cctx_idle;
1071 1106
1072 cctx_destroy (first); 1107 cctx_destroy (first);
1073 } 1108 }
1074 1109
1075 ++cctx_idle[gimme]; 1110 ++cctx_idle;
1076 cctx->next = cctx_first[gimme]; 1111 cctx->next = cctx_first;
1077 cctx_first[gimme] = cctx; 1112 cctx_first = cctx;
1078} 1113}
1079 1114
1080/** coroutine switching *****************************************************/ 1115/** coroutine switching *****************************************************/
1081 1116
1082static void 1117static void
… …
1093 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
1094 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");
1095 1130
1096 if ( 1131 if (
1097#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1098 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1099#else 1134#else
1100 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1101#endif 1136#endif
1102 ) 1137 )
1103 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");
… …
1107/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1108static void NOINLINE 1143static void NOINLINE
1109transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1110{ 1145{
1111 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1112 1148
1113 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1114 if (expect_false (!next)) 1150 if (expect_false (!next))
1115 { 1151 {
1116 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1131 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1132 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1133 1169
1134 LOCK; 1170 LOCK;
1135 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1136 if (expect_false (next->flags & CF_NEW)) 1175 if (expect_false (next->flags & CF_NEW))
1137 { 1176 {
1138 /* need to start coroutine */ 1177 /* need to start coroutine */
1139 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1140 /* first get rid of the old state */
1141 save_perl (aTHX_ prev);
1142 /* setup coroutine call */ 1179 /* setup coroutine call */
1143 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1144 } 1181 }
1145 else 1182 else
1146 {
1147 /* coroutine already started */
1148 save_perl (aTHX_ prev);
1149 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1150 }
1151 1184
1152 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1153 1186
1154 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1155 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)))
… …
1161 1194
1162 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1195 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1163 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1196 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1164 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1197 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1165 if (!next->cctx) 1198 if (!next->cctx)
1166 next->cctx = cctx_get (aTHX_ next->gimme); 1199 next->cctx = cctx_get (aTHX);
1167 1200
1168 cctx_put (prev__cctx, prev->gimme); 1201 cctx_put (prev__cctx);
1169 } 1202 }
1170 1203
1171 ++next->usecount; 1204 ++next->usecount;
1172 1205
1173 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1174 next->cctx = cctx_get (aTHX_ next->gimme); 1207 next->cctx = cctx_get (aTHX);
1208
1209 has_throw = !!next->throw;
1175 1210
1176 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1177 { 1212 {
1178 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1179 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
… …
1181 } 1216 }
1182 1217
1183 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1184 UNLOCK; 1219 UNLOCK;
1185 1220
1186 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1187 { 1222 {
1188 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1189 1224
1190 if (coro->throw) 1225 if (coro->throw)
1191 { 1226 {
… …
1317{ 1352{
1318 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);
1319} 1354}
1320 1355
1321static SV * 1356static SV *
1322coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1323{ 1358{
1324 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1325 1360
1326 min_prio -= PRIO_MIN;
1327 if (min_prio < 0)
1328 min_prio = 0;
1329
1330 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1331 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1332 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1333 1364
1334 return 0; 1365 return 0;
1335} 1366}
… …
1371 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1372 1403
1373 for (;;) 1404 for (;;)
1374 { 1405 {
1375 LOCK; 1406 LOCK;
1376 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1377 1408
1378 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1379 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1380 { 1411 {
1381 dSP; 1412 dSP;
… …
1385 SAVETMPS; 1416 SAVETMPS;
1386 1417
1387 PUSHMARK (SP); 1418 PUSHMARK (SP);
1388 PUTBACK; 1419 PUTBACK;
1389 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1390 1422
1391 FREETMPS; 1423 FREETMPS;
1392 LEAVE; 1424 LEAVE;
1393 continue; 1425 continue;
1394 } 1426 }
… …
1524 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1525 1557
1526 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1527 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1528 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
1529 hv_sig = coro_get_hv ("SIG", TRUE); 1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1530 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1531 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1532
1533 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1534 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1535 1569
1536 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1537 1571
1538 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1539 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1556SV * 1590SV *
1557new (char *klass, ...) 1591new (char *klass, ...)
1558 CODE: 1592 CODE:
1559{ 1593{
1560 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1561 HV *hv; 1596 HV *hv;
1562 int i; 1597 int i;
1563 1598
1564 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1565 coro->args = newAV (); 1600 coro->args = newAV ();
… …
1568 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1569 coro->next = coro_first; 1604 coro->next = coro_first;
1570 coro_first = coro; 1605 coro_first = coro;
1571 1606
1572 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1573 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;
1574 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1575 1611
1576 av_extend (coro->args, items - 1); 1612 av_extend (coro->args, items - 1);
1577 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1578 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
… …
1592 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1593 CODE: 1629 CODE:
1594{ 1630{
1595 struct transfer_args ta; 1631 struct transfer_args ta;
1596 1632
1633 PUTBACK;
1597 switch (ix) 1634 switch (ix)
1598 { 1635 {
1599 case 0: 1636 case 0:
1600 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1601 ta.next = 0; 1638 ta.next = 0;
… …
1620 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1621 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1622 1659
1623 break; 1660 break;
1624 } 1661 }
1662 SPAGAIN;
1625 1663
1626 BARRIER; 1664 BARRIER;
1627 PUTBACK; 1665 PUTBACK;
1628 TRANSFER (ta); 1666 TRANSFER (ta);
1629 SPAGAIN; /* might be the sp of a different coroutine now */ 1667 SPAGAIN; /* might be the sp of a different coroutine now */
… …
1661 RETVAL 1699 RETVAL
1662 1700
1663int 1701int
1664cctx_idle () 1702cctx_idle ()
1665 CODE: 1703 CODE:
1666 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2]; 1704 RETVAL = cctx_idle;
1667 OUTPUT: 1705 OUTPUT:
1668 RETVAL 1706 RETVAL
1669 1707
1670void 1708void
1671list () 1709list ()
… …
1687 { 1725 {
1688 struct coro temp; 1726 struct coro temp;
1689 1727
1690 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1691 { 1729 {
1730 PUTBACK;
1692 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1693 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1694 } 1733 }
1695 1734
1696 { 1735 {
… …
1705 eval_sv (coderef, 0); 1744 eval_sv (coderef, 0);
1706 else 1745 else
1707 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1746 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1708 1747
1709 POPSTACK; 1748 POPSTACK;
1749 SPAGAIN;
1710 FREETMPS; 1750 FREETMPS;
1711 LEAVE; 1751 LEAVE;
1712 PUTBACK; 1752 PUTBACK;
1713 } 1753 }
1714 1754
1715 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1716 { 1756 {
1717 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1718 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1719 } 1760 }
1720 } 1761 }
1721} 1762}
1722 1763
1723SV * 1764SV *
… …
1771 1812
1772BOOT: 1813BOOT:
1773{ 1814{
1774 int i; 1815 int i;
1775 1816
1776 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1817 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1777 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1818 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1778 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1779 1820
1780 coro_current = coro_get_sv ("Coro::current", FALSE); 1821 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1781 SvREADONLY_on (coro_current); 1822 SvREADONLY_on (coro_current);
1782 1823
1783 coro_stash = gv_stashpv ("Coro", TRUE); 1824 coro_stash = gv_stashpv ("Coro", TRUE);
1784 1825
1785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1860 PROTOTYPE: $;$ 1901 PROTOTYPE: $;$
1861 CODE: 1902 CODE:
1862 SvREFCNT_dec (self->throw); 1903 SvREFCNT_dec (self->throw);
1863 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1904 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1864 1905
1906void
1907swap_defsv (Coro::State self)
1908 PROTOTYPE: $
1909 ALIAS:
1910 swap_defav = 1
1911 CODE:
1912 if (!self->slot)
1913 croak ("cannot swap state with coroutine that has no saved state");
1914 else
1915 {
1916 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1917 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1918
1919 SV *tmp = *src; *src = *dst; *dst = tmp;
1920 }
1921
1865# for async_pool speedup 1922# for async_pool speedup
1866void 1923void
1867_pool_1 (SV *cb) 1924_pool_1 (SV *cb)
1868 CODE: 1925 CODE:
1869{ 1926{
1870 struct coro *coro = SvSTATE (coro_current); 1927 struct coro *coro = SvSTATE (coro_current);
1871 HV *hv = (HV *)SvRV (coro_current); 1928 HV *hv = (HV *)SvRV (coro_current);
1872 AV *defav = GvAV (PL_defgv); 1929 AV *defav = GvAV (PL_defgv);
1873 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1930 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1874 AV *invoke_av; 1931 AV *invoke_av;
1875 int i, len; 1932 int i, len;
1876 1933
1877 if (!invoke) 1934 if (!invoke)
1935 {
1936 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1878 croak ("\3async_pool terminate\2\n"); 1937 croak ("\3async_pool terminate\2\n");
1938 }
1879 1939
1880 SvREFCNT_dec (coro->saved_deffh); 1940 SvREFCNT_dec (coro->saved_deffh);
1881 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1941 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1882 1942
1883 hv_store (hv, "desc", sizeof ("desc") - 1, 1943 hv_store (hv, "desc", sizeof ("desc") - 1,
1884 newSVpvn (strpair ("[async_pool]")), 0); 1944 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1885 1945
1886 invoke_av = (AV *)SvRV (invoke); 1946 invoke_av = (AV *)SvRV (invoke);
1887 len = av_len (invoke_av); 1947 len = av_len (invoke_av);
1888 1948
1889 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1949 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1909 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1969 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1910 coro->saved_deffh = 0; 1970 coro->saved_deffh = 0;
1911 1971
1912 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1972 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1913 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1973 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1974 {
1975 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1914 croak ("\3async_pool terminate\2\n"); 1976 croak ("\3async_pool terminate\2\n");
1977 }
1915 1978
1916 av_clear (GvAV (PL_defgv)); 1979 av_clear (GvAV (PL_defgv));
1917 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1980 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1918 newSVpvn (strpair ("[async_pool idle]")), 0); 1981 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1919 1982
1920 coro->prio = 0; 1983 coro->prio = 0;
1921 1984
1922 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1985 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1923 api_trace (coro_current, 0); 1986 api_trace (coro_current, 0);

Diff Legend

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