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.211 by root, Wed Oct 10 03:37:58 2007 UTC vs.
Revision 1.226 by root, Fri Apr 4 20:07:35 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;
… …
262static struct coro *coro_first; 264static struct coro *coro_first;
263 265
264/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
265 267
266static SV * 268static SV *
267coro_get_sv (const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
268{ 270{
269#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,9,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create); 273 get_sv (name, create);
272#endif 274#endif
273 return get_sv (name, create); 275 return get_sv (name, create);
274} 276}
275 277
276static AV * 278static AV *
277coro_get_av (const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
278{ 280{
279#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,9,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create); 283 get_av (name, create);
282#endif 284#endif
283 return get_av (name, create); 285 return get_av (name, create);
284} 286}
285 287
286static HV * 288static HV *
287coro_get_hv (const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
288{ 290{
289#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,9,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create); 293 get_hv (name, create);
292#endif 294#endif
… …
347 349
348 /* casting is fun. */ 350 /* casting is fun. */
349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
350 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
351 353
352 SvREFCNT_dec (av);
353
354 return 0; 354 return 0;
355} 355}
356 356
357#define PERL_MAGIC_coro PERL_MAGIC_ext 357#define CORO_MAGIC_type_cv PERL_MAGIC_ext
358#define CORO_MAGIC_type_state PERL_MAGIC_ext
358 359
359static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 360static MGVTBL coro_cv_vtbl = {
361 0, 0, 0, 0,
362 coro_cv_free
363};
360 364
361#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
362 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
364 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
366 : 0 370 : 0
371
372#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
373#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
367 374
368static struct coro * 375static struct coro *
369SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
370{ 377{
371 HV *stash; 378 HV *stash;
… …
383 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
386 } 393 }
387 394
388 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
389 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
390} 397}
391 398
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393 400
394/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
395static void 402static void
396get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
397{ 404{
398 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
399 AV *av; 406 AV *av;
400 407
401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
403 else 410 else
… …
415} 422}
416 423
417static void 424static void
418put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
419{ 426{
420 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
421 AV *av; 428 AV *av;
422 429
423 if (expect_false (!mg)) 430 if (expect_false (!mg))
424 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
427 mg->mg_virtual = &vtbl_coro;
428 mg->mg_obj = (SV *)newAV ();
429 }
430 432
431 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
432 434
433 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
434 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
… …
452 GvSV (irsgv) = slot->irsgv; 454 GvSV (irsgv) = slot->irsgv;
453 455
454 #define VAR(name,type) PL_ ## name = slot->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
455 # include "state.h" 457 # include "state.h"
456 #undef VAR 458 #undef VAR
457
458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
460 459
461 { 460 {
462 dSP; 461 dSP;
463 462
464 CV *cv; 463 CV *cv;
… …
670 return rss; 669 return rss;
671} 670}
672 671
673/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
674 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
675static void 724static void
676coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
677{ 726{
678 /* 727 /*
679 * emulate part of the perl startup here. 728 * emulate part of the perl startup here.
… …
687 PL_curpm = 0; 736 PL_curpm = 0;
688 PL_curpad = 0; 737 PL_curpad = 0;
689 PL_localizing = 0; 738 PL_localizing = 0;
690 PL_dirty = 0; 739 PL_dirty = 0;
691 PL_restartop = 0; 740 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 741
693 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 742 /* recreate the die/warn hooks */
743 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
744 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
694 745
695 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
698 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 749 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
812 PUSHMARK (SP); 863 PUSHMARK (SP);
813 PUSHs (&PL_sv_no); 864 PUSHs (&PL_sv_no);
814 PUSHs (fullname); 865 PUSHs (fullname);
815 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 866 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
816 PUTBACK; 867 PUTBACK;
817 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);
818 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);
819 SPAGAIN; 870 SPAGAIN;
820 FREETMPS; 871 FREETMPS;
821 LEAVE; 872 LEAVE;
822 PL_runops = runops_trace; 873 PL_runops = runops_trace;
… …
849 SAVETMPS; 900 SAVETMPS;
850 EXTEND (SP, 3); 901 EXTEND (SP, 3);
851 PUSHMARK (SP); 902 PUSHMARK (SP);
852 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
853 PUSHs (fullname); 904 PUSHs (fullname);
854 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);
855 PUTBACK; 906 PUTBACK;
856 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);
857 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);
858 SPAGAIN; 909 SPAGAIN;
859 FREETMPS; 910 FREETMPS;
860 LEAVE; 911 LEAVE;
861 PL_runops = runops_trace; 912 PL_runops = runops_trace;
… …
875 PL_runops = RUNOPS_DEFAULT; 926 PL_runops = RUNOPS_DEFAULT;
876 PUSHMARK (SP); 927 PUSHMARK (SP);
877 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 928 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
878 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 929 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
879 PUTBACK; 930 PUTBACK;
880 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);
881 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);
882 SPAGAIN; 933 SPAGAIN;
883 FREETMPS; 934 FREETMPS;
884 LEAVE; 935 LEAVE;
885 PL_runops = runops_trace; 936 PL_runops = runops_trace;
… …
1077 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
1078 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");
1079 1130
1080 if ( 1131 if (
1081#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1082 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1083#else 1134#else
1084 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1085#endif 1136#endif
1086 ) 1137 )
1087 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");
… …
1091/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1092static void NOINLINE 1143static void NOINLINE
1093transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1094{ 1145{
1095 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1096 1148
1097 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1098 if (expect_false (!next)) 1150 if (expect_false (!next))
1099 { 1151 {
1100 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1115 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1116 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1117 1169
1118 LOCK; 1170 LOCK;
1119 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1120 if (expect_false (next->flags & CF_NEW)) 1175 if (expect_false (next->flags & CF_NEW))
1121 { 1176 {
1122 /* need to start coroutine */ 1177 /* need to start coroutine */
1123 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1124 /* first get rid of the old state */
1125 save_perl (aTHX_ prev);
1126 /* setup coroutine call */ 1179 /* setup coroutine call */
1127 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1128 } 1181 }
1129 else 1182 else
1130 {
1131 /* coroutine already started */
1132 save_perl (aTHX_ prev);
1133 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1134 }
1135 1184
1136 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1137 1186
1138 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1139 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)))
… …
1154 1203
1155 ++next->usecount; 1204 ++next->usecount;
1156 1205
1157 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1158 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1208
1209 has_throw = !!next->throw;
1159 1210
1160 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1161 { 1212 {
1162 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1163 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
… …
1165 } 1216 }
1166 1217
1167 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1168 UNLOCK; 1219 UNLOCK;
1169 1220
1170 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1171 { 1222 {
1172 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1173 1224
1174 if (coro->throw) 1225 if (coro->throw)
1175 { 1226 {
… …
1301{ 1352{
1302 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);
1303} 1354}
1304 1355
1305static SV * 1356static SV *
1306coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1307{ 1358{
1308 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1309 1360
1310 min_prio -= PRIO_MIN;
1311 if (min_prio < 0)
1312 min_prio = 0;
1313
1314 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1315 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1316 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1317 1364
1318 return 0; 1365 return 0;
1319} 1366}
… …
1355 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1356 1403
1357 for (;;) 1404 for (;;)
1358 { 1405 {
1359 LOCK; 1406 LOCK;
1360 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1361 1408
1362 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1363 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1364 { 1411 {
1365 dSP; 1412 dSP;
… …
1369 SAVETMPS; 1416 SAVETMPS;
1370 1417
1371 PUSHMARK (SP); 1418 PUSHMARK (SP);
1372 PUTBACK; 1419 PUTBACK;
1373 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1374 1422
1375 FREETMPS; 1423 FREETMPS;
1376 LEAVE; 1424 LEAVE;
1377 continue; 1425 continue;
1378 } 1426 }
… …
1508 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1509 1557
1510 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1511 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1512 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
1513 hv_sig = coro_get_hv ("SIG", TRUE); 1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1514 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1515 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1516
1517 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1518 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1519 1569
1520 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1521 1571
1522 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1523 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1540SV * 1590SV *
1541new (char *klass, ...) 1591new (char *klass, ...)
1542 CODE: 1592 CODE:
1543{ 1593{
1544 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1545 HV *hv; 1596 HV *hv;
1546 int i; 1597 int i;
1547 1598
1548 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1549 coro->args = newAV (); 1600 coro->args = newAV ();
… …
1552 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1553 coro->next = coro_first; 1604 coro->next = coro_first;
1554 coro_first = coro; 1605 coro_first = coro;
1555 1606
1556 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1557 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;
1558 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1559 1611
1560 av_extend (coro->args, items - 1); 1612 av_extend (coro->args, items - 1);
1561 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1562 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
… …
1576 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1577 CODE: 1629 CODE:
1578{ 1630{
1579 struct transfer_args ta; 1631 struct transfer_args ta;
1580 1632
1633 PUTBACK;
1581 switch (ix) 1634 switch (ix)
1582 { 1635 {
1583 case 0: 1636 case 0:
1584 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1585 ta.next = 0; 1638 ta.next = 0;
… …
1604 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1605 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1606 1659
1607 break; 1660 break;
1608 } 1661 }
1662 SPAGAIN;
1609 1663
1610 BARRIER; 1664 BARRIER;
1611 PUTBACK; 1665 PUTBACK;
1612 TRANSFER (ta); 1666 TRANSFER (ta);
1613 SPAGAIN; /* might be the sp of a different coroutine now */ 1667 SPAGAIN; /* might be the sp of a different coroutine now */
… …
1671 { 1725 {
1672 struct coro temp; 1726 struct coro temp;
1673 1727
1674 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1675 { 1729 {
1730 PUTBACK;
1676 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1677 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1678 } 1733 }
1679 1734
1680 { 1735 {
… …
1699 1754
1700 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1701 { 1756 {
1702 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1703 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1704 } 1760 }
1705 } 1761 }
1706} 1762}
1707 1763
1708SV * 1764SV *
… …
1749 case 1: RETVAL = coro->usecount; break; 1805 case 1: RETVAL = coro->usecount; break;
1750 } 1806 }
1751 OUTPUT: 1807 OUTPUT:
1752 RETVAL 1808 RETVAL
1753 1809
1810void
1811force_cctx ()
1812 CODE:
1813 struct coro *coro = SvSTATE (coro_current);
1814 coro->cctx->idle_sp = 0;
1754 1815
1755MODULE = Coro::State PACKAGE = Coro 1816MODULE = Coro::State PACKAGE = Coro
1756 1817
1757BOOT: 1818BOOT:
1758{ 1819{
1759 int i; 1820 int i;
1760 1821
1761 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1822 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1762 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1823 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1763 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1824 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1764 1825
1765 coro_current = coro_get_sv ("Coro::current", FALSE); 1826 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1766 SvREADONLY_on (coro_current); 1827 SvREADONLY_on (coro_current);
1767 1828
1768 coro_stash = gv_stashpv ("Coro", TRUE); 1829 coro_stash = gv_stashpv ("Coro", TRUE);
1769 1830
1770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1845 PROTOTYPE: $;$ 1906 PROTOTYPE: $;$
1846 CODE: 1907 CODE:
1847 SvREFCNT_dec (self->throw); 1908 SvREFCNT_dec (self->throw);
1848 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1909 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1849 1910
1911void
1912swap_defsv (Coro::State self)
1913 PROTOTYPE: $
1914 ALIAS:
1915 swap_defav = 1
1916 CODE:
1917 if (!self->slot)
1918 croak ("cannot swap state with coroutine that has no saved state");
1919 else
1920 {
1921 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1922 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1923
1924 SV *tmp = *src; *src = *dst; *dst = tmp;
1925 }
1926
1850# for async_pool speedup 1927# for async_pool speedup
1851void 1928void
1852_pool_1 (SV *cb) 1929_pool_1 (SV *cb)
1853 CODE: 1930 CODE:
1854{ 1931{
1855 struct coro *coro = SvSTATE (coro_current); 1932 struct coro *coro = SvSTATE (coro_current);
1856 HV *hv = (HV *)SvRV (coro_current); 1933 HV *hv = (HV *)SvRV (coro_current);
1857 AV *defav = GvAV (PL_defgv); 1934 AV *defav = GvAV (PL_defgv);
1858 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1935 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1859 AV *invoke_av; 1936 AV *invoke_av;
1860 int i, len; 1937 int i, len;
1861 1938
1862 if (!invoke) 1939 if (!invoke)
1940 {
1941 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1863 croak ("\3async_pool terminate\2\n"); 1942 croak ("\3async_pool terminate\2\n");
1943 }
1864 1944
1865 SvREFCNT_dec (coro->saved_deffh); 1945 SvREFCNT_dec (coro->saved_deffh);
1866 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1946 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1867 1947
1868 hv_store (hv, "desc", sizeof ("desc") - 1, 1948 hv_store (hv, "desc", sizeof ("desc") - 1,
1869 newSVpvn (strpair ("[async_pool]")), 0); 1949 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1870 1950
1871 invoke_av = (AV *)SvRV (invoke); 1951 invoke_av = (AV *)SvRV (invoke);
1872 len = av_len (invoke_av); 1952 len = av_len (invoke_av);
1873 1953
1874 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1954 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1894 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1974 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1895 coro->saved_deffh = 0; 1975 coro->saved_deffh = 0;
1896 1976
1897 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1977 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1898 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1978 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1979 {
1980 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1899 croak ("\3async_pool terminate\2\n"); 1981 croak ("\3async_pool terminate\2\n");
1982 }
1900 1983
1901 av_clear (GvAV (PL_defgv)); 1984 av_clear (GvAV (PL_defgv));
1902 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1985 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1903 newSVpvn (strpair ("[async_pool idle]")), 0); 1986 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1904 1987
1905 coro->prio = 0; 1988 coro->prio = 0;
1906 1989
1907 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1990 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1908 api_trace (coro_current, 0); 1991 api_trace (coro_current, 0);

Diff Legend

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