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.215 by root, Sun Oct 14 19:34:09 2007 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;
… …
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 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
669#if 0
670static int (*orig_sigelem_get) (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 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg);
686
687 if (*s == '_')
688 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
690 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691 }
692
693 return orig_sigelem_get (aTHX_ sv, mg);
694}
695#endif
696
676static void 697static void
677coro_setup (pTHX_ struct coro *coro) 698coro_setup (pTHX_ struct coro *coro)
678{ 699{
679 /* 700 /*
680 * emulate part of the perl startup here. 701 * emulate part of the perl startup here.
… …
688 PL_curpm = 0; 709 PL_curpm = 0;
689 PL_curpad = 0; 710 PL_curpad = 0;
690 PL_localizing = 0; 711 PL_localizing = 0;
691 PL_dirty = 0; 712 PL_dirty = 0;
692 PL_restartop = 0; 713 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 714
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 715 /* recreate the die/warn hooks */
716 PL_diehook = 0;
717 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0);
718 PL_diehook = SvREFCNT_inc (rv_diehook);
719
720 PL_warnhook = 0;
721 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
722 PL_warnhook = SvREFCNT_inc (rv_warnhook);
695 723
696 GvSV (PL_defgv) = newSV (0); 724 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0; 725 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0); 726 GvSV (PL_errgv) = newSV (0);
699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 740 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 PUTBACK; 741 PUTBACK;
714 PL_op = (OP *)&myop; 742 PL_op = (OP *)&myop;
715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 743 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
716 SPAGAIN; 744 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 } 745 }
746
747 /* this newly created coroutine might be run on an existing cctx which most
748 * likely was suspended in set_stacklevel, called from entersub.
749 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
750 * so we ENTER here for symmetry
751 */
752 ENTER;
732} 753}
733 754
734static void 755static void
735coro_destroy (pTHX_ struct coro *coro) 756coro_destroy (pTHX_ struct coro *coro)
736{ 757{
… …
820 PUSHMARK (SP); 841 PUSHMARK (SP);
821 PUSHs (&PL_sv_no); 842 PUSHs (&PL_sv_no);
822 PUSHs (fullname); 843 PUSHs (fullname);
823 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 844 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
824 PUTBACK; 845 PUTBACK;
825 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 846 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); 847 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
827 SPAGAIN; 848 SPAGAIN;
828 FREETMPS; 849 FREETMPS;
829 LEAVE; 850 LEAVE;
830 PL_runops = runops_trace; 851 PL_runops = runops_trace;
… …
859 PUSHMARK (SP); 880 PUSHMARK (SP);
860 PUSHs (&PL_sv_yes); 881 PUSHs (&PL_sv_yes);
861 PUSHs (fullname); 882 PUSHs (fullname);
862 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 883 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
863 PUTBACK; 884 PUTBACK;
864 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 885 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); 886 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
866 SPAGAIN; 887 SPAGAIN;
867 FREETMPS; 888 FREETMPS;
868 LEAVE; 889 LEAVE;
869 PL_runops = runops_trace; 890 PL_runops = runops_trace;
… …
883 PL_runops = RUNOPS_DEFAULT; 904 PL_runops = RUNOPS_DEFAULT;
884 PUSHMARK (SP); 905 PUSHMARK (SP);
885 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 906 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
886 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 907 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
887 PUTBACK; 908 PUTBACK;
888 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 909 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); 910 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
890 SPAGAIN; 911 SPAGAIN;
891 FREETMPS; 912 FREETMPS;
892 LEAVE; 913 LEAVE;
893 PL_runops = runops_trace; 914 PL_runops = runops_trace;
… …
1032 1053
1033/* wether this cctx should be destructed */ 1054/* wether this cctx should be destructed */
1034#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1055#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1035 1056
1036static coro_cctx * 1057static coro_cctx *
1037cctx_get (pTHX_ int gimme) 1058cctx_get (pTHX)
1038{ 1059{
1039 while (expect_true (cctx_first[gimme])) 1060 while (expect_true (cctx_first))
1040 { 1061 {
1041 coro_cctx *cctx = cctx_first[gimme]; 1062 coro_cctx *cctx = cctx_first;
1042 cctx_first[gimme] = cctx->next; 1063 cctx_first = cctx->next;
1043 --cctx_idle[gimme]; 1064 --cctx_idle;
1044 1065
1045 if (expect_true (!CCTX_EXPIRED (cctx))) 1066 if (expect_true (!CCTX_EXPIRED (cctx)))
1046 return cctx; 1067 return cctx;
1047 1068
1048 cctx_destroy (cctx); 1069 cctx_destroy (cctx);
1049 } 1070 }
1050 1071
1051 assert (!gimme);
1052 return cctx_new (); 1072 return cctx_new ();
1053} 1073}
1054 1074
1055static void 1075static void
1056cctx_put (coro_cctx *cctx, int gimme) 1076cctx_put (coro_cctx *cctx)
1057{ 1077{
1058 /* free another cctx if overlimit */ 1078 /* free another cctx if overlimit */
1059 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX)) 1079 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
1060 { 1080 {
1061 coro_cctx *first = cctx_first[gimme]; 1081 coro_cctx *first = cctx_first;
1062 cctx_first[gimme] = first->next; 1082 cctx_first = first->next;
1063 --cctx_idle[gimme]; 1083 --cctx_idle;
1064 1084
1065 cctx_destroy (first); 1085 cctx_destroy (first);
1066 } 1086 }
1067 1087
1068 ++cctx_idle[gimme]; 1088 ++cctx_idle;
1069 cctx->next = cctx_first[gimme]; 1089 cctx->next = cctx_first;
1070 cctx_first[gimme] = cctx; 1090 cctx_first = cctx;
1071} 1091}
1072 1092
1073/** coroutine switching *****************************************************/ 1093/** coroutine switching *****************************************************/
1074 1094
1075static void 1095static void
… …
1124 prev->flags &= ~CF_RUNNING; 1144 prev->flags &= ~CF_RUNNING;
1125 next->flags |= CF_RUNNING; 1145 next->flags |= CF_RUNNING;
1126 1146
1127 LOCK; 1147 LOCK;
1128 1148
1149 /* first get rid of the old state */
1150 save_perl (aTHX_ prev);
1151
1129 if (expect_false (next->flags & CF_NEW)) 1152 if (expect_false (next->flags & CF_NEW))
1130 { 1153 {
1131 /* need to start coroutine */ 1154 /* need to start coroutine */
1132 next->flags &= ~CF_NEW; 1155 next->flags &= ~CF_NEW;
1133 /* first get rid of the old state */
1134 save_perl (aTHX_ prev);
1135 /* setup coroutine call */ 1156 /* setup coroutine call */
1136 coro_setup (aTHX_ next); 1157 coro_setup (aTHX_ next);
1137 } 1158 }
1138 else 1159 else
1139 {
1140 /* coroutine already started */
1141 save_perl (aTHX_ prev);
1142 load_perl (aTHX_ next); 1160 load_perl (aTHX_ next);
1143 }
1144 1161
1145 prev__cctx = prev->cctx; 1162 prev__cctx = prev->cctx;
1146 1163
1147 /* possibly "free" the cctx */ 1164 /* possibly "free" the cctx */
1148 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1165 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
… …
1154 1171
1155 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1172 /* 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 */ 1173 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1157 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1174 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1158 if (!next->cctx) 1175 if (!next->cctx)
1159 next->cctx = cctx_get (aTHX_ next->gimme); 1176 next->cctx = cctx_get (aTHX);
1160 1177
1161 cctx_put (prev__cctx, prev->gimme); 1178 cctx_put (prev__cctx);
1162 } 1179 }
1163 1180
1164 ++next->usecount; 1181 ++next->usecount;
1165 1182
1166 if (expect_true (!next->cctx)) 1183 if (expect_true (!next->cctx))
1167 next->cctx = cctx_get (aTHX_ next->gimme); 1184 next->cctx = cctx_get (aTHX);
1168 1185
1169 if (expect_false (prev__cctx != next->cctx)) 1186 if (expect_false (prev__cctx != next->cctx))
1170 { 1187 {
1171 prev__cctx->top_env = PL_top_env; 1188 prev__cctx->top_env = PL_top_env;
1172 PL_top_env = next->cctx->top_env; 1189 PL_top_env = next->cctx->top_env;
… …
1516#endif 1533#endif
1517 BOOT_PAGESIZE; 1534 BOOT_PAGESIZE;
1518 1535
1519 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1536 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1520 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1537 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1521 1538#if 0
1539 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1540 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1541#endif
1522 hv_sig = coro_get_hv ("SIG", TRUE); 1542 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1523 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1543 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1524 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1544 rv_warnhook = SvREFCNT_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 1545
1529 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1546 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1530 1547
1531 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1548 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1532 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1549 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1538 1555
1539 while (main_top_env->je_prev) 1556 while (main_top_env->je_prev)
1540 main_top_env = main_top_env->je_prev; 1557 main_top_env = main_top_env->je_prev;
1541 1558
1542 coroapi.ver = CORO_API_VERSION; 1559 coroapi.ver = CORO_API_VERSION;
1560 coroapi.rev = CORO_API_REVISION;
1543 coroapi.transfer = api_transfer; 1561 coroapi.transfer = api_transfer;
1544 1562
1545 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1563 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1546} 1564}
1547 1565
1548SV * 1566SV *
1549new (char *klass, ...) 1567new (char *klass, ...)
1550 CODE: 1568 CODE:
1551{ 1569{
1552 struct coro *coro; 1570 struct coro *coro;
1571 MAGIC *mg;
1553 HV *hv; 1572 HV *hv;
1554 int i; 1573 int i;
1555 1574
1556 Newz (0, coro, 1, struct coro); 1575 Newz (0, coro, 1, struct coro);
1557 coro->args = newAV (); 1576 coro->args = newAV ();
… …
1560 if (coro_first) coro_first->prev = coro; 1579 if (coro_first) coro_first->prev = coro;
1561 coro->next = coro_first; 1580 coro->next = coro_first;
1562 coro_first = coro; 1581 coro_first = coro;
1563 1582
1564 coro->hv = hv = newHV (); 1583 coro->hv = hv = newHV ();
1565 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1584 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1585 mg->mg_flags |= MGf_DUP;
1566 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1586 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1567 1587
1568 av_extend (coro->args, items - 1); 1588 av_extend (coro->args, items - 1);
1569 for (i = 1; i < items; i++) 1589 for (i = 1; i < items; i++)
1570 av_push (coro->args, newSVsv (ST (i))); 1590 av_push (coro->args, newSVsv (ST (i)));
… …
1576# function to increase chances that they all will call transfer with the same 1596# function to increase chances that they all will call transfer with the same
1577# stack offset 1597# stack offset
1578void 1598void
1579_set_stacklevel (...) 1599_set_stacklevel (...)
1580 ALIAS: 1600 ALIAS:
1581 Coro::State::transfer = 1 1601 Coro::State::transfer = 1
1582 Coro::schedule = 2 1602 Coro::schedule = 2
1583 Coro::cede = 3 1603 Coro::cede = 3
1584 Coro::cede_notself = 4 1604 Coro::cede_notself = 4
1585 Coro::Event::next = 5
1586 Coro::Event::next_cancel = 6
1587 PPCODE: 1605 CODE:
1588{ 1606{
1589 struct transfer_args ta; 1607 struct transfer_args ta;
1590 int again = 0;
1591 1608
1592 do 1609 switch (ix)
1593 { 1610 {
1594 switch (ix)
1595 {
1596 case 0: 1611 case 0:
1597 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1612 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1598 ta.next = 0; 1613 ta.next = 0;
1599 break; 1614 break;
1600 1615
1601 case 1: 1616 case 1:
1602 if (items != 2) 1617 if (items != 2)
1603 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1618 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1604 1619
1605 prepare_transfer (aTHX_ &ta, ST(0), ST(1)); 1620 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1606 break; 1621 break;
1607 1622
1608 case 2: 1623 case 2:
1609 prepare_schedule (aTHX_ &ta); 1624 prepare_schedule (aTHX_ &ta);
1610 break; 1625 break;
1611 1626
1612 case 3: 1627 case 3:
1613 prepare_cede (aTHX_ &ta); 1628 prepare_cede (aTHX_ &ta);
1614 break; 1629 break;
1615 1630
1616 case 4: 1631 case 4:
1617 if (!prepare_cede_notself (aTHX_ &ta)) 1632 if (!prepare_cede_notself (aTHX_ &ta))
1618 XSRETURN_EMPTY; 1633 XSRETURN_EMPTY;
1619 1634
1620 break; 1635 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 } 1636 }
1670 while (again);
1671 1637
1672 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1638 BARRIER;
1673 XSRETURN_YES; 1639 PUTBACK;
1674 1640 TRANSFER (ta);
1675 XSRETURN_EMPTY; /* not understood why this is necessary, likely some stack handling bug */ 1641 SPAGAIN; /* might be the sp of a different coroutine now */
1642 /* be extra careful not to ever do anything after TRANSFER */
1676} 1643}
1677 1644
1678bool 1645bool
1679_destroy (SV *coro_sv) 1646_destroy (SV *coro_sv)
1680 CODE: 1647 CODE:
… …
1706 RETVAL 1673 RETVAL
1707 1674
1708int 1675int
1709cctx_idle () 1676cctx_idle ()
1710 CODE: 1677 CODE:
1711 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2]; 1678 RETVAL = cctx_idle;
1712 OUTPUT: 1679 OUTPUT:
1713 RETVAL 1680 RETVAL
1714 1681
1715void 1682void
1716list () 1683list ()
… …
1750 eval_sv (coderef, 0); 1717 eval_sv (coderef, 0);
1751 else 1718 else
1752 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1719 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1753 1720
1754 POPSTACK; 1721 POPSTACK;
1722 SPAGAIN;
1755 FREETMPS; 1723 FREETMPS;
1756 LEAVE; 1724 LEAVE;
1725 PUTBACK;
1757 } 1726 }
1758 1727
1759 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1760 { 1729 {
1761 save_perl (aTHX_ coro); 1730 save_perl (aTHX_ coro);
… …
1815 1784
1816BOOT: 1785BOOT:
1817{ 1786{
1818 int i; 1787 int i;
1819 1788
1820 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1789 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1821 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1790 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1822 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1791 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1823 1792
1824 coro_current = coro_get_sv ("Coro::current", FALSE); 1793 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1825 SvREADONLY_on (coro_current); 1794 SvREADONLY_on (coro_current);
1826 1795
1827 coro_stash = gv_stashpv ("Coro", TRUE); 1796 coro_stash = gv_stashpv ("Coro", TRUE);
1828 1797
1829 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1798 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1912 CODE: 1881 CODE:
1913{ 1882{
1914 struct coro *coro = SvSTATE (coro_current); 1883 struct coro *coro = SvSTATE (coro_current);
1915 HV *hv = (HV *)SvRV (coro_current); 1884 HV *hv = (HV *)SvRV (coro_current);
1916 AV *defav = GvAV (PL_defgv); 1885 AV *defav = GvAV (PL_defgv);
1917 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1886 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1918 AV *invoke_av; 1887 AV *invoke_av;
1919 int i, len; 1888 int i, len;
1920 1889
1921 if (!invoke) 1890 if (!invoke)
1922 croak ("\3async_pool terminate\2\n"); 1891 croak ("\3async_pool terminate\2\n");
1923 1892
1924 SvREFCNT_dec (coro->saved_deffh); 1893 SvREFCNT_dec (coro->saved_deffh);
1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1894 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1926 1895
1927 hv_store (hv, "desc", sizeof ("desc") - 1, 1896 hv_store (hv, "desc", sizeof ("desc") - 1,
1928 newSVpvn (strpair ("[async_pool]")), 0); 1897 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1929 1898
1930 invoke_av = (AV *)SvRV (invoke); 1899 invoke_av = (AV *)SvRV (invoke);
1931 len = av_len (invoke_av); 1900 len = av_len (invoke_av);
1932 1901
1933 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1902 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1925 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1926 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1958 croak ("\3async_pool terminate\2\n"); 1927 croak ("\3async_pool terminate\2\n");
1959 1928
1960 av_clear (GvAV (PL_defgv)); 1929 av_clear (GvAV (PL_defgv));
1961 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1930 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1962 newSVpvn (strpair ("[async_pool idle]")), 0); 1931 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1963 1932
1964 coro->prio = 0; 1933 coro->prio = 0;
1965 1934
1966 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1935 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1967 api_trace (coro_current, 0); 1936 api_trace (coro_current, 0);

Diff Legend

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