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.209 by root, Wed Oct 10 02:58:17 2007 UTC vs.
Revision 1.221 by root, Sun Jan 13 09:47:22 2008 UTC

… …
131#else 131#else
132# define LOCK (void)0 132# define LOCK (void)0
133# define UNLOCK (void)0 133# define UNLOCK (void)0
134#endif 134#endif
135 135
136#define strpair(const) const, sizeof (const) - 1
137
138/* helper storage struct for Coro::AIO */ 136/* helper storage struct for Coro::AIO */
139struct io_state 137struct io_state
140{ 138{
141 int errorno; 139 int errorno;
142 I32 laststype; 140 I32 laststype;
… …
147static size_t coro_stacksize = CORO_STACKSIZE; 145static size_t coro_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 148static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
152static SV *coro_mortal; /* will be freed after next transfer */ 150static volatile SV *coro_mortal; /* will be freed after next transfer */
153 151
154static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
156 154static SV *rv_diehook;
155static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 156static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 157
161/* async_pool helper stuff */ 158/* async_pool helper stuff */
162static SV *sv_pool_rss; 159static SV *sv_pool_rss;
163static SV *sv_pool_size; 160static SV *sv_pool_size;
164static AV *av_async_pool; 161static AV *av_async_pool;
165 162
166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */ 163static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle[3]; 164static int cctx_count, cctx_idle;
168 165
169enum { 166enum {
170 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
… …
217 214
218/* this is a structure representing a perl-level coroutine */ 215/* this is a structure representing a perl-level coroutine */
219struct coro { 216struct coro {
220 /* the c coroutine allocated to this perl coroutine, if any */ 217 /* the c coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 218 coro_cctx *cctx;
222 int gimme;
223 219
224 /* process data */ 220 /* process data */
225 AV *mainstack; 221 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */ 222 perl_slots *slot; /* basically the saved sp */
227 223
… …
263static struct coro *coro_first; 259static struct coro *coro_first;
264 260
265/** lowlevel stuff **********************************************************/ 261/** lowlevel stuff **********************************************************/
266 262
267static SV * 263static SV *
268coro_get_sv (const char *name, int create) 264coro_get_sv (pTHX_ const char *name, int create)
269{ 265{
270#if PERL_VERSION_ATLEAST (5,9,0) 266#if PERL_VERSION_ATLEAST (5,9,0)
271 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
272 get_sv (name, create); 268 get_sv (name, create);
273#endif 269#endif
274 return get_sv (name, create); 270 return get_sv (name, create);
275} 271}
276 272
277static AV * 273static AV *
278coro_get_av (const char *name, int create) 274coro_get_av (pTHX_ const char *name, int create)
279{ 275{
280#if PERL_VERSION_ATLEAST (5,9,0) 276#if PERL_VERSION_ATLEAST (5,9,0)
281 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
282 get_av (name, create); 278 get_av (name, create);
283#endif 279#endif
284 return get_av (name, create); 280 return get_av (name, create);
285} 281}
286 282
287static HV * 283static HV *
288coro_get_hv (const char *name, int create) 284coro_get_hv (pTHX_ const char *name, int create)
289{ 285{
290#if PERL_VERSION_ATLEAST (5,9,0) 286#if PERL_VERSION_ATLEAST (5,9,0)
291 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
292 get_hv (name, create); 288 get_hv (name, create);
293#endif 289#endif
… …
348 344
349 /* casting is fun. */ 345 /* casting is fun. */
350 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
351 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
352 348
353 SvREFCNT_dec (av);
354
355 return 0; 349 return 0;
356} 350}
357 351
358#define PERL_MAGIC_coro PERL_MAGIC_ext 352#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext
359 354
360static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 355static MGVTBL coro_cv_vtbl = {
356 0, 0, 0, 0,
357 coro_cv_free
358};
361 359
362#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
363 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
364 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
365 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
366 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
367 : 0 365 : 0
366
367#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
368#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
368 369
369static struct coro * 370static struct coro *
370SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
371{ 372{
372 HV *stash; 373 HV *stash;
… …
384 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
386 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
387 } 388 }
388 389
389 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
390 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
391} 392}
392 393
393#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
394 395
395/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
396static void 397static void
397get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
398{ 399{
399 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
400 AV *av; 401 AV *av;
401 402
402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
404 else 405 else
… …
416} 417}
417 418
418static void 419static void
419put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
420{ 421{
421 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
422 AV *av; 423 AV *av;
423 424
424 if (expect_false (!mg)) 425 if (expect_false (!mg))
425 { 426 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 427
432 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
433 429
434 if (expect_false (AvFILLp (av) >= AvMAX (av))) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
435 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
… …
453 GvSV (irsgv) = slot->irsgv; 449 GvSV (irsgv) = slot->irsgv;
454 450
455 #define VAR(name,type) PL_ ## name = slot->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
456 # include "state.h" 452 # include "state.h"
457 #undef VAR 453 #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 454
462 { 455 {
463 dSP; 456 dSP;
464 457
465 CV *cv; 458 CV *cv;
… …
671 return rss; 664 return rss;
672} 665}
673 666
674/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
675 668
669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
670static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
671
672/*
673 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide
676 * readback here.
677 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
678 * not expecting this to actually change the hook. This is a potential problem
679 * when a schedule happens then, but we ignore this.
680 */
681static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{
684 const char *s = MgPV_nolen_const (mg);
685
686 if (*s == '_')
687 {
688 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
689 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
690 }
691
692 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
693}
694
695static int
696coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
697{
698 const char *s = MgPV_nolen_const (mg);
699
700 if (*s == '_')
701 {
702 SV **svp = 0;
703
704 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
705 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
706
707 if (svp)
708 {
709 SV *old = *svp;
710 *svp = newSVsv (sv);
711 SvREFCNT_dec (old);
712 return;
713 }
714 }
715
716 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
717}
718
676static void 719static void
677coro_setup (pTHX_ struct coro *coro) 720coro_setup (pTHX_ struct coro *coro)
678{ 721{
679 /* 722 /*
680 * emulate part of the perl startup here. 723 * emulate part of the perl startup here.
… …
688 PL_curpm = 0; 731 PL_curpm = 0;
689 PL_curpad = 0; 732 PL_curpad = 0;
690 PL_localizing = 0; 733 PL_localizing = 0;
691 PL_dirty = 0; 734 PL_dirty = 0;
692 PL_restartop = 0; 735 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 736
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 737 /* recreate the die/warn hooks */
738 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
739 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
695 740
696 GvSV (PL_defgv) = newSV (0); 741 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0; 742 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0); 743 GvSV (PL_errgv) = newSV (0);
699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 744 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 757 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 PUTBACK; 758 PUTBACK;
714 PL_op = (OP *)&myop; 759 PL_op = (OP *)&myop;
715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 760 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
716 SPAGAIN; 761 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 } 762 }
763
764 /* this newly created coroutine might be run on an existing cctx which most
765 * likely was suspended in set_stacklevel, called from entersub.
766 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
767 * so we ENTER here for symmetry
768 */
769 ENTER;
732} 770}
733 771
734static void 772static void
735coro_destroy (pTHX_ struct coro *coro) 773coro_destroy (pTHX_ struct coro *coro)
736{ 774{
… …
820 PUSHMARK (SP); 858 PUSHMARK (SP);
821 PUSHs (&PL_sv_no); 859 PUSHs (&PL_sv_no);
822 PUSHs (fullname); 860 PUSHs (fullname);
823 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 861 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
824 PUTBACK; 862 PUTBACK;
825 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 863 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
826 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 864 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
827 SPAGAIN; 865 SPAGAIN;
828 FREETMPS; 866 FREETMPS;
829 LEAVE; 867 LEAVE;
830 PL_runops = runops_trace; 868 PL_runops = runops_trace;
… …
859 PUSHMARK (SP); 897 PUSHMARK (SP);
860 PUSHs (&PL_sv_yes); 898 PUSHs (&PL_sv_yes);
861 PUSHs (fullname); 899 PUSHs (fullname);
862 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 900 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
863 PUTBACK; 901 PUTBACK;
864 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 902 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
865 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 903 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
866 SPAGAIN; 904 SPAGAIN;
867 FREETMPS; 905 FREETMPS;
868 LEAVE; 906 LEAVE;
869 PL_runops = runops_trace; 907 PL_runops = runops_trace;
… …
883 PL_runops = RUNOPS_DEFAULT; 921 PL_runops = RUNOPS_DEFAULT;
884 PUSHMARK (SP); 922 PUSHMARK (SP);
885 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 923 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
886 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 924 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
887 PUTBACK; 925 PUTBACK;
888 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 926 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
889 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 927 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
890 SPAGAIN; 928 SPAGAIN;
891 FREETMPS; 929 FREETMPS;
892 LEAVE; 930 LEAVE;
893 PL_runops = runops_trace; 931 PL_runops = runops_trace;
… …
1032 1070
1033/* wether this cctx should be destructed */ 1071/* wether this cctx should be destructed */
1034#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1072#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1035 1073
1036static coro_cctx * 1074static coro_cctx *
1037cctx_get (pTHX_ int gimme) 1075cctx_get (pTHX)
1038{ 1076{
1039 while (expect_true (cctx_first[gimme])) 1077 while (expect_true (cctx_first))
1040 { 1078 {
1041 coro_cctx *cctx = cctx_first[gimme]; 1079 coro_cctx *cctx = cctx_first;
1042 cctx_first[gimme] = cctx->next; 1080 cctx_first = cctx->next;
1043 --cctx_idle[gimme]; 1081 --cctx_idle;
1044 1082
1045 if (expect_true (!CCTX_EXPIRED (cctx))) 1083 if (expect_true (!CCTX_EXPIRED (cctx)))
1046 return cctx; 1084 return cctx;
1047 1085
1048 cctx_destroy (cctx); 1086 cctx_destroy (cctx);
1049 } 1087 }
1050 1088
1051 assert (!gimme);
1052 return cctx_new (); 1089 return cctx_new ();
1053} 1090}
1054 1091
1055static void 1092static void
1056cctx_put (coro_cctx *cctx, int gimme) 1093cctx_put (coro_cctx *cctx)
1057{ 1094{
1058 /* free another cctx if overlimit */ 1095 /* free another cctx if overlimit */
1059 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX)) 1096 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
1060 { 1097 {
1061 coro_cctx *first = cctx_first[gimme]; 1098 coro_cctx *first = cctx_first;
1062 cctx_first[gimme] = first->next; 1099 cctx_first = first->next;
1063 --cctx_idle[gimme]; 1100 --cctx_idle;
1064 1101
1065 cctx_destroy (first); 1102 cctx_destroy (first);
1066 } 1103 }
1067 1104
1068 ++cctx_idle[gimme]; 1105 ++cctx_idle;
1069 cctx->next = cctx_first[gimme]; 1106 cctx->next = cctx_first;
1070 cctx_first[gimme] = cctx; 1107 cctx_first = cctx;
1071} 1108}
1072 1109
1073/** coroutine switching *****************************************************/ 1110/** coroutine switching *****************************************************/
1074 1111
1075static void 1112static void
… …
1100/* always use the TRANSFER macro */ 1137/* always use the TRANSFER macro */
1101static void NOINLINE 1138static void NOINLINE
1102transfer (pTHX_ struct coro *prev, struct coro *next) 1139transfer (pTHX_ struct coro *prev, struct coro *next)
1103{ 1140{
1104 dSTACKLEVEL; 1141 dSTACKLEVEL;
1142 static volatile int has_throw;
1105 1143
1106 /* sometimes transfer is only called to set idle_sp */ 1144 /* sometimes transfer is only called to set idle_sp */
1107 if (expect_false (!next)) 1145 if (expect_false (!next))
1108 { 1146 {
1109 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1147 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1124 prev->flags &= ~CF_RUNNING; 1162 prev->flags &= ~CF_RUNNING;
1125 next->flags |= CF_RUNNING; 1163 next->flags |= CF_RUNNING;
1126 1164
1127 LOCK; 1165 LOCK;
1128 1166
1167 /* first get rid of the old state */
1168 save_perl (aTHX_ prev);
1169
1129 if (expect_false (next->flags & CF_NEW)) 1170 if (expect_false (next->flags & CF_NEW))
1130 { 1171 {
1131 /* need to start coroutine */ 1172 /* need to start coroutine */
1132 next->flags &= ~CF_NEW; 1173 next->flags &= ~CF_NEW;
1133 /* first get rid of the old state */
1134 save_perl (aTHX_ prev);
1135 /* setup coroutine call */ 1174 /* setup coroutine call */
1136 coro_setup (aTHX_ next); 1175 coro_setup (aTHX_ next);
1137 } 1176 }
1138 else 1177 else
1139 {
1140 /* coroutine already started */
1141 save_perl (aTHX_ prev);
1142 load_perl (aTHX_ next); 1178 load_perl (aTHX_ next);
1143 }
1144 1179
1145 prev__cctx = prev->cctx; 1180 prev__cctx = prev->cctx;
1146 1181
1147 /* possibly "free" the cctx */ 1182 /* possibly "free" the cctx */
1148 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1183 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
… …
1154 1189
1155 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1190 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1156 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1191 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1157 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1192 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1158 if (!next->cctx) 1193 if (!next->cctx)
1159 next->cctx = cctx_get (aTHX_ next->gimme); 1194 next->cctx = cctx_get (aTHX);
1160 1195
1161 cctx_put (prev__cctx, prev->gimme); 1196 cctx_put (prev__cctx);
1162 } 1197 }
1163 1198
1164 ++next->usecount; 1199 ++next->usecount;
1165 1200
1166 if (expect_true (!next->cctx)) 1201 if (expect_true (!next->cctx))
1167 next->cctx = cctx_get (aTHX_ next->gimme); 1202 next->cctx = cctx_get (aTHX);
1203
1204 has_throw = !!next->throw;
1168 1205
1169 if (expect_false (prev__cctx != next->cctx)) 1206 if (expect_false (prev__cctx != next->cctx))
1170 { 1207 {
1171 prev__cctx->top_env = PL_top_env; 1208 prev__cctx->top_env = PL_top_env;
1172 PL_top_env = next->cctx->top_env; 1209 PL_top_env = next->cctx->top_env;
… …
1174 } 1211 }
1175 1212
1176 free_coro_mortal (aTHX); 1213 free_coro_mortal (aTHX);
1177 UNLOCK; 1214 UNLOCK;
1178 1215
1179 if (expect_false (prev->throw || next->throw)) 1216 if (expect_false (has_throw))
1180 { 1217 {
1181 struct coro *coro = SvSTATE (coro_current); 1218 struct coro *coro = SvSTATE (coro_current);
1182 1219
1183 if (coro->throw) 1220 if (coro->throw)
1184 { 1221 {
… …
1310{ 1347{
1311 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1348 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1312} 1349}
1313 1350
1314static SV * 1351static SV *
1315coro_deq (pTHX_ int min_prio) 1352coro_deq (pTHX)
1316{ 1353{
1317 int prio = PRIO_MAX - PRIO_MIN; 1354 int prio;
1318 1355
1319 min_prio -= PRIO_MIN;
1320 if (min_prio < 0)
1321 min_prio = 0;
1322
1323 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1356 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1324 if (AvFILLp (coro_ready [prio]) >= 0) 1357 if (AvFILLp (coro_ready [prio]) >= 0)
1325 return av_shift (coro_ready [prio]); 1358 return av_shift (coro_ready [prio]);
1326 1359
1327 return 0; 1360 return 0;
1328} 1361}
… …
1364 SV *prev_sv, *next_sv; 1397 SV *prev_sv, *next_sv;
1365 1398
1366 for (;;) 1399 for (;;)
1367 { 1400 {
1368 LOCK; 1401 LOCK;
1369 next_sv = coro_deq (aTHX_ PRIO_MIN); 1402 next_sv = coro_deq (aTHX);
1370 1403
1371 /* nothing to schedule: call the idle handler */ 1404 /* nothing to schedule: call the idle handler */
1372 if (expect_false (!next_sv)) 1405 if (expect_false (!next_sv))
1373 { 1406 {
1374 dSP; 1407 dSP;
… …
1378 SAVETMPS; 1411 SAVETMPS;
1379 1412
1380 PUSHMARK (SP); 1413 PUSHMARK (SP);
1381 PUTBACK; 1414 PUTBACK;
1382 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1415 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1416 SPAGAIN;
1383 1417
1384 FREETMPS; 1418 FREETMPS;
1385 LEAVE; 1419 LEAVE;
1386 continue; 1420 continue;
1387 } 1421 }
… …
1517 BOOT_PAGESIZE; 1551 BOOT_PAGESIZE;
1518 1552
1519 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1520 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1521 1555
1556 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1557 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1558 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1559 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1560
1522 hv_sig = coro_get_hv ("SIG", TRUE); 1561 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1523 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1562 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1524 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1563 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1525
1526 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1527 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1528 1564
1529 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1565 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1530 1566
1531 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1567 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1532 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1568 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1538 1574
1539 while (main_top_env->je_prev) 1575 while (main_top_env->je_prev)
1540 main_top_env = main_top_env->je_prev; 1576 main_top_env = main_top_env->je_prev;
1541 1577
1542 coroapi.ver = CORO_API_VERSION; 1578 coroapi.ver = CORO_API_VERSION;
1579 coroapi.rev = CORO_API_REVISION;
1543 coroapi.transfer = api_transfer; 1580 coroapi.transfer = api_transfer;
1544 1581
1545 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1582 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1546} 1583}
1547 1584
1548SV * 1585SV *
1549new (char *klass, ...) 1586new (char *klass, ...)
1550 CODE: 1587 CODE:
1551{ 1588{
1552 struct coro *coro; 1589 struct coro *coro;
1590 MAGIC *mg;
1553 HV *hv; 1591 HV *hv;
1554 int i; 1592 int i;
1555 1593
1556 Newz (0, coro, 1, struct coro); 1594 Newz (0, coro, 1, struct coro);
1557 coro->args = newAV (); 1595 coro->args = newAV ();
… …
1560 if (coro_first) coro_first->prev = coro; 1598 if (coro_first) coro_first->prev = coro;
1561 coro->next = coro_first; 1599 coro->next = coro_first;
1562 coro_first = coro; 1600 coro_first = coro;
1563 1601
1564 coro->hv = hv = newHV (); 1602 coro->hv = hv = newHV ();
1565 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1603 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1604 mg->mg_flags |= MGf_DUP;
1566 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1605 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1567 1606
1568 av_extend (coro->args, items - 1); 1607 av_extend (coro->args, items - 1);
1569 for (i = 1; i < items; i++) 1608 for (i = 1; i < items; i++)
1570 av_push (coro->args, newSVsv (ST (i))); 1609 av_push (coro->args, newSVsv (ST (i)));
… …
1576# function to increase chances that they all will call transfer with the same 1615# function to increase chances that they all will call transfer with the same
1577# stack offset 1616# stack offset
1578void 1617void
1579_set_stacklevel (...) 1618_set_stacklevel (...)
1580 ALIAS: 1619 ALIAS:
1581 Coro::State::transfer = 1 1620 Coro::State::transfer = 1
1582 Coro::schedule = 2 1621 Coro::schedule = 2
1583 Coro::cede = 3 1622 Coro::cede = 3
1584 Coro::cede_notself = 4 1623 Coro::cede_notself = 4
1585 Coro::Event::next = 5
1586 Coro::Event::next_cancel = 6
1587 PPCODE: 1624 CODE:
1588{ 1625{
1589 struct transfer_args ta; 1626 struct transfer_args ta;
1590 int again = 0;
1591 1627
1592 do 1628 PUTBACK;
1629 switch (ix)
1593 { 1630 {
1594 switch (ix)
1595 {
1596 case 0: 1631 case 0:
1597 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1632 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1598 ta.next = 0; 1633 ta.next = 0;
1599 break; 1634 break;
1600 1635
1601 case 1: 1636 case 1:
1602 if (items != 2) 1637 if (items != 2)
1603 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1638 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1604 1639
1605 prepare_transfer (aTHX_ &ta, ST(0), ST(1)); 1640 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1606 break; 1641 break;
1607 1642
1608 case 2: 1643 case 2:
1609 prepare_schedule (aTHX_ &ta); 1644 prepare_schedule (aTHX_ &ta);
1610 break; 1645 break;
1611 1646
1612 case 3: 1647 case 3:
1613 prepare_cede (aTHX_ &ta); 1648 prepare_cede (aTHX_ &ta);
1614 break; 1649 break;
1615 1650
1616 case 4: 1651 case 4:
1617 if (!prepare_cede_notself (aTHX_ &ta)) 1652 if (!prepare_cede_notself (aTHX_ &ta))
1618 XSRETURN_EMPTY; 1653 XSRETURN_EMPTY;
1619 1654
1620 break; 1655 break;
1621
1622 case 5:
1623 case 6:
1624 if (items != 1)
1625 croak ("Coro::Event::next (watcher) expects one argument, not %d", items);
1626
1627 {
1628 SV *ev = coroapi.coro_event_next (ST (0), ix == 6, GIMME_V != G_VOID);
1629
1630 if (ev)
1631 {
1632 if (GIMME_V != G_VOID)
1633 {
1634 XPUSHs (ev);
1635 XSRETURN (1);
1636 }
1637 else
1638 XSRETURN_EMPTY;
1639 }
1640 }
1641
1642 prepare_schedule (aTHX_ &ta);
1643 again = 1;
1644 break;
1645 }
1646
1647 /* our caller, entersub, caches *only* this value */
1648 ta.prev->gimme = GIMME_V == G_VOID ? 0
1649 : GIMME_V == G_SCALAR ? 1
1650 : 2;
1651
1652 /* we need to save all local variables, as we might execute a different coroutine when transfer returns */
1653 sp += 2; /* save args */
1654 EXTEND (SP, 4);
1655 PUSHs ((SV *)(intptr_t)items);
1656 PUSHs ((SV *)(intptr_t)ix);
1657 PUSHs ((SV *)(intptr_t)ax);
1658 PUSHs ((SV *)(intptr_t)again);
1659 PUTBACK;
1660 BARRIER;
1661 TRANSFER (ta);
1662 BARRIER;
1663 SPAGAIN;
1664 again = (intptr_t)POPs;
1665 ax = (intptr_t)POPs;
1666 ix = (intptr_t)POPs;
1667 items = (intptr_t)POPs;
1668 sp -= 2; /* restore args */
1669 } 1656 }
1670 while (again); 1657 SPAGAIN;
1671 1658
1672 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1659 BARRIER;
1673 XSRETURN_YES; 1660 PUTBACK;
1674 1661 TRANSFER (ta);
1675 XSRETURN_EMPTY; /* not understood why this is necessary, likely some stack handling bug */ 1662 SPAGAIN; /* might be the sp of a different coroutine now */
1663 /* be extra careful not to ever do anything after TRANSFER */
1676} 1664}
1677 1665
1678bool 1666bool
1679_destroy (SV *coro_sv) 1667_destroy (SV *coro_sv)
1680 CODE: 1668 CODE:
… …
1706 RETVAL 1694 RETVAL
1707 1695
1708int 1696int
1709cctx_idle () 1697cctx_idle ()
1710 CODE: 1698 CODE:
1711 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2]; 1699 RETVAL = cctx_idle;
1712 OUTPUT: 1700 OUTPUT:
1713 RETVAL 1701 RETVAL
1714 1702
1715void 1703void
1716list () 1704list ()
… …
1732 { 1720 {
1733 struct coro temp; 1721 struct coro temp;
1734 1722
1735 if (!(coro->flags & CF_RUNNING)) 1723 if (!(coro->flags & CF_RUNNING))
1736 { 1724 {
1725 PUTBACK;
1737 save_perl (aTHX_ &temp); 1726 save_perl (aTHX_ &temp);
1738 load_perl (aTHX_ coro); 1727 load_perl (aTHX_ coro);
1739 } 1728 }
1740 1729
1741 { 1730 {
… …
1750 eval_sv (coderef, 0); 1739 eval_sv (coderef, 0);
1751 else 1740 else
1752 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1741 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1753 1742
1754 POPSTACK; 1743 POPSTACK;
1744 SPAGAIN;
1755 FREETMPS; 1745 FREETMPS;
1756 LEAVE; 1746 LEAVE;
1747 PUTBACK;
1757 } 1748 }
1758 1749
1759 if (!(coro->flags & CF_RUNNING)) 1750 if (!(coro->flags & CF_RUNNING))
1760 { 1751 {
1761 save_perl (aTHX_ coro); 1752 save_perl (aTHX_ coro);
1762 load_perl (aTHX_ &temp); 1753 load_perl (aTHX_ &temp);
1754 SPAGAIN;
1763 } 1755 }
1764 } 1756 }
1765} 1757}
1766 1758
1767SV * 1759SV *
… …
1815 1807
1816BOOT: 1808BOOT:
1817{ 1809{
1818 int i; 1810 int i;
1819 1811
1820 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1812 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1821 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1813 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1822 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1823 1815
1824 coro_current = coro_get_sv ("Coro::current", FALSE); 1816 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1825 SvREADONLY_on (coro_current); 1817 SvREADONLY_on (coro_current);
1826 1818
1827 coro_stash = gv_stashpv ("Coro", TRUE); 1819 coro_stash = gv_stashpv ("Coro", TRUE);
1828 1820
1829 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1821 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1912 CODE: 1904 CODE:
1913{ 1905{
1914 struct coro *coro = SvSTATE (coro_current); 1906 struct coro *coro = SvSTATE (coro_current);
1915 HV *hv = (HV *)SvRV (coro_current); 1907 HV *hv = (HV *)SvRV (coro_current);
1916 AV *defav = GvAV (PL_defgv); 1908 AV *defav = GvAV (PL_defgv);
1917 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1909 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1918 AV *invoke_av; 1910 AV *invoke_av;
1919 int i, len; 1911 int i, len;
1920 1912
1921 if (!invoke) 1913 if (!invoke)
1914 {
1915 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1922 croak ("\3async_pool terminate\2\n"); 1916 croak ("\3async_pool terminate\2\n");
1917 }
1923 1918
1924 SvREFCNT_dec (coro->saved_deffh); 1919 SvREFCNT_dec (coro->saved_deffh);
1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1920 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1926 1921
1927 hv_store (hv, "desc", sizeof ("desc") - 1, 1922 hv_store (hv, "desc", sizeof ("desc") - 1,
1928 newSVpvn (strpair ("[async_pool]")), 0); 1923 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1929 1924
1930 invoke_av = (AV *)SvRV (invoke); 1925 invoke_av = (AV *)SvRV (invoke);
1931 len = av_len (invoke_av); 1926 len = av_len (invoke_av);
1932 1927
1933 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1928 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1948 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1954 coro->saved_deffh = 0; 1949 coro->saved_deffh = 0;
1955 1950
1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1951 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1952 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1953 {
1954 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1958 croak ("\3async_pool terminate\2\n"); 1955 croak ("\3async_pool terminate\2\n");
1956 }
1959 1957
1960 av_clear (GvAV (PL_defgv)); 1958 av_clear (GvAV (PL_defgv));
1961 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1959 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1962 newSVpvn (strpair ("[async_pool idle]")), 0); 1960 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1963 1961
1964 coro->prio = 0; 1962 coro->prio = 0;
1965 1963
1966 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1964 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1967 api_trace (coro_current, 0); 1965 api_trace (coro_current, 0);

Diff Legend

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