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.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;
… …
262static struct coro *coro_first; 259static struct coro *coro_first;
263 260
264/** lowlevel stuff **********************************************************/ 261/** lowlevel stuff **********************************************************/
265 262
266static SV * 263static SV *
267coro_get_sv (const char *name, int create) 264coro_get_sv (pTHX_ const char *name, int create)
268{ 265{
269#if PERL_VERSION_ATLEAST (5,9,0) 266#if PERL_VERSION_ATLEAST (5,9,0)
270 /* 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 */
271 get_sv (name, create); 268 get_sv (name, create);
272#endif 269#endif
273 return get_sv (name, create); 270 return get_sv (name, create);
274} 271}
275 272
276static AV * 273static AV *
277coro_get_av (const char *name, int create) 274coro_get_av (pTHX_ const char *name, int create)
278{ 275{
279#if PERL_VERSION_ATLEAST (5,9,0) 276#if PERL_VERSION_ATLEAST (5,9,0)
280 /* 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 */
281 get_av (name, create); 278 get_av (name, create);
282#endif 279#endif
283 return get_av (name, create); 280 return get_av (name, create);
284} 281}
285 282
286static HV * 283static HV *
287coro_get_hv (const char *name, int create) 284coro_get_hv (pTHX_ const char *name, int create)
288{ 285{
289#if PERL_VERSION_ATLEAST (5,9,0) 286#if PERL_VERSION_ATLEAST (5,9,0)
290 /* 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 */
291 get_hv (name, create); 288 get_hv (name, create);
292#endif 289#endif
… …
347 344
348 /* casting is fun. */ 345 /* casting is fun. */
349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
350 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
351 348
352 SvREFCNT_dec (av);
353
354 return 0; 349 return 0;
355} 350}
356 351
357#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
358 354
359static 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};
360 359
361#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
362 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
364 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
366 : 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)
367 369
368static struct coro * 370static struct coro *
369SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
370{ 372{
371 HV *stash; 373 HV *stash;
… …
383 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
386 } 388 }
387 389
388 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
389 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
390} 392}
391 393
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393 395
394/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
395static void 397static void
396get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
397{ 399{
398 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
399 AV *av; 401 AV *av;
400 402
401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
403 else 405 else
… …
415} 417}
416 418
417static void 419static void
418put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
419{ 421{
420 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
421 AV *av; 423 AV *av;
422 424
423 if (expect_false (!mg)) 425 if (expect_false (!mg))
424 { 426 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 427
431 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
432 429
433 if (expect_false (AvFILLp (av) >= AvMAX (av))) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
434 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
… …
452 GvSV (irsgv) = slot->irsgv; 449 GvSV (irsgv) = slot->irsgv;
453 450
454 #define VAR(name,type) PL_ ## name = slot->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
455 # include "state.h" 452 # include "state.h"
456 #undef VAR 453 #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 454
461 { 455 {
462 dSP; 456 dSP;
463 457
464 CV *cv; 458 CV *cv;
… …
670 return rss; 664 return rss;
671} 665}
672 666
673/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
674 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
675static void 719static void
676coro_setup (pTHX_ struct coro *coro) 720coro_setup (pTHX_ struct coro *coro)
677{ 721{
678 /* 722 /*
679 * emulate part of the perl startup here. 723 * emulate part of the perl startup here.
… …
687 PL_curpm = 0; 731 PL_curpm = 0;
688 PL_curpad = 0; 732 PL_curpad = 0;
689 PL_localizing = 0; 733 PL_localizing = 0;
690 PL_dirty = 0; 734 PL_dirty = 0;
691 PL_restartop = 0; 735 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 736
693 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);
694 740
695 GvSV (PL_defgv) = newSV (0); 741 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0; 742 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0); 743 GvSV (PL_errgv) = newSV (0);
698 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);
… …
812 PUSHMARK (SP); 858 PUSHMARK (SP);
813 PUSHs (&PL_sv_no); 859 PUSHs (&PL_sv_no);
814 PUSHs (fullname); 860 PUSHs (fullname);
815 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 861 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
816 PUTBACK; 862 PUTBACK;
817 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);
818 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);
819 SPAGAIN; 865 SPAGAIN;
820 FREETMPS; 866 FREETMPS;
821 LEAVE; 867 LEAVE;
822 PL_runops = runops_trace; 868 PL_runops = runops_trace;
… …
851 PUSHMARK (SP); 897 PUSHMARK (SP);
852 PUSHs (&PL_sv_yes); 898 PUSHs (&PL_sv_yes);
853 PUSHs (fullname); 899 PUSHs (fullname);
854 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);
855 PUTBACK; 901 PUTBACK;
856 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);
857 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);
858 SPAGAIN; 904 SPAGAIN;
859 FREETMPS; 905 FREETMPS;
860 LEAVE; 906 LEAVE;
861 PL_runops = runops_trace; 907 PL_runops = runops_trace;
… …
875 PL_runops = RUNOPS_DEFAULT; 921 PL_runops = RUNOPS_DEFAULT;
876 PUSHMARK (SP); 922 PUSHMARK (SP);
877 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 923 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
878 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 924 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
879 PUTBACK; 925 PUTBACK;
880 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);
881 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);
882 SPAGAIN; 928 SPAGAIN;
883 FREETMPS; 929 FREETMPS;
884 LEAVE; 930 LEAVE;
885 PL_runops = runops_trace; 931 PL_runops = runops_trace;
… …
1091/* always use the TRANSFER macro */ 1137/* always use the TRANSFER macro */
1092static void NOINLINE 1138static void NOINLINE
1093transfer (pTHX_ struct coro *prev, struct coro *next) 1139transfer (pTHX_ struct coro *prev, struct coro *next)
1094{ 1140{
1095 dSTACKLEVEL; 1141 dSTACKLEVEL;
1142 static volatile int has_throw;
1096 1143
1097 /* sometimes transfer is only called to set idle_sp */ 1144 /* sometimes transfer is only called to set idle_sp */
1098 if (expect_false (!next)) 1145 if (expect_false (!next))
1099 { 1146 {
1100 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1147 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1115 prev->flags &= ~CF_RUNNING; 1162 prev->flags &= ~CF_RUNNING;
1116 next->flags |= CF_RUNNING; 1163 next->flags |= CF_RUNNING;
1117 1164
1118 LOCK; 1165 LOCK;
1119 1166
1167 /* first get rid of the old state */
1168 save_perl (aTHX_ prev);
1169
1120 if (expect_false (next->flags & CF_NEW)) 1170 if (expect_false (next->flags & CF_NEW))
1121 { 1171 {
1122 /* need to start coroutine */ 1172 /* need to start coroutine */
1123 next->flags &= ~CF_NEW; 1173 next->flags &= ~CF_NEW;
1124 /* first get rid of the old state */
1125 save_perl (aTHX_ prev);
1126 /* setup coroutine call */ 1174 /* setup coroutine call */
1127 coro_setup (aTHX_ next); 1175 coro_setup (aTHX_ next);
1128 } 1176 }
1129 else 1177 else
1130 {
1131 /* coroutine already started */
1132 save_perl (aTHX_ prev);
1133 load_perl (aTHX_ next); 1178 load_perl (aTHX_ next);
1134 }
1135 1179
1136 prev__cctx = prev->cctx; 1180 prev__cctx = prev->cctx;
1137 1181
1138 /* possibly "free" the cctx */ 1182 /* possibly "free" the cctx */
1139 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 1198
1155 ++next->usecount; 1199 ++next->usecount;
1156 1200
1157 if (expect_true (!next->cctx)) 1201 if (expect_true (!next->cctx))
1158 next->cctx = cctx_get (aTHX); 1202 next->cctx = cctx_get (aTHX);
1203
1204 has_throw = !!next->throw;
1159 1205
1160 if (expect_false (prev__cctx != next->cctx)) 1206 if (expect_false (prev__cctx != next->cctx))
1161 { 1207 {
1162 prev__cctx->top_env = PL_top_env; 1208 prev__cctx->top_env = PL_top_env;
1163 PL_top_env = next->cctx->top_env; 1209 PL_top_env = next->cctx->top_env;
… …
1165 } 1211 }
1166 1212
1167 free_coro_mortal (aTHX); 1213 free_coro_mortal (aTHX);
1168 UNLOCK; 1214 UNLOCK;
1169 1215
1170 if (expect_false (prev->throw || next->throw)) 1216 if (expect_false (has_throw))
1171 { 1217 {
1172 struct coro *coro = SvSTATE (coro_current); 1218 struct coro *coro = SvSTATE (coro_current);
1173 1219
1174 if (coro->throw) 1220 if (coro->throw)
1175 { 1221 {
… …
1301{ 1347{
1302 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);
1303} 1349}
1304 1350
1305static SV * 1351static SV *
1306coro_deq (pTHX_ int min_prio) 1352coro_deq (pTHX)
1307{ 1353{
1308 int prio = PRIO_MAX - PRIO_MIN; 1354 int prio;
1309 1355
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; ) 1356 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1315 if (AvFILLp (coro_ready [prio]) >= 0) 1357 if (AvFILLp (coro_ready [prio]) >= 0)
1316 return av_shift (coro_ready [prio]); 1358 return av_shift (coro_ready [prio]);
1317 1359
1318 return 0; 1360 return 0;
1319} 1361}
… …
1355 SV *prev_sv, *next_sv; 1397 SV *prev_sv, *next_sv;
1356 1398
1357 for (;;) 1399 for (;;)
1358 { 1400 {
1359 LOCK; 1401 LOCK;
1360 next_sv = coro_deq (aTHX_ PRIO_MIN); 1402 next_sv = coro_deq (aTHX);
1361 1403
1362 /* nothing to schedule: call the idle handler */ 1404 /* nothing to schedule: call the idle handler */
1363 if (expect_false (!next_sv)) 1405 if (expect_false (!next_sv))
1364 { 1406 {
1365 dSP; 1407 dSP;
… …
1369 SAVETMPS; 1411 SAVETMPS;
1370 1412
1371 PUSHMARK (SP); 1413 PUSHMARK (SP);
1372 PUTBACK; 1414 PUTBACK;
1373 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1415 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1416 SPAGAIN;
1374 1417
1375 FREETMPS; 1418 FREETMPS;
1376 LEAVE; 1419 LEAVE;
1377 continue; 1420 continue;
1378 } 1421 }
… …
1508 BOOT_PAGESIZE; 1551 BOOT_PAGESIZE;
1509 1552
1510 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1511 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1512 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
1513 hv_sig = coro_get_hv ("SIG", TRUE); 1561 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1514 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1562 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1515 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1563 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 1564
1520 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1565 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1521 1566
1522 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1567 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1523 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1568 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1540SV * 1585SV *
1541new (char *klass, ...) 1586new (char *klass, ...)
1542 CODE: 1587 CODE:
1543{ 1588{
1544 struct coro *coro; 1589 struct coro *coro;
1590 MAGIC *mg;
1545 HV *hv; 1591 HV *hv;
1546 int i; 1592 int i;
1547 1593
1548 Newz (0, coro, 1, struct coro); 1594 Newz (0, coro, 1, struct coro);
1549 coro->args = newAV (); 1595 coro->args = newAV ();
… …
1552 if (coro_first) coro_first->prev = coro; 1598 if (coro_first) coro_first->prev = coro;
1553 coro->next = coro_first; 1599 coro->next = coro_first;
1554 coro_first = coro; 1600 coro_first = coro;
1555 1601
1556 coro->hv = hv = newHV (); 1602 coro->hv = hv = newHV ();
1557 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;
1558 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1605 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1559 1606
1560 av_extend (coro->args, items - 1); 1607 av_extend (coro->args, items - 1);
1561 for (i = 1; i < items; i++) 1608 for (i = 1; i < items; i++)
1562 av_push (coro->args, newSVsv (ST (i))); 1609 av_push (coro->args, newSVsv (ST (i)));
… …
1576 Coro::cede_notself = 4 1623 Coro::cede_notself = 4
1577 CODE: 1624 CODE:
1578{ 1625{
1579 struct transfer_args ta; 1626 struct transfer_args ta;
1580 1627
1628 PUTBACK;
1581 switch (ix) 1629 switch (ix)
1582 { 1630 {
1583 case 0: 1631 case 0:
1584 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1632 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1585 ta.next = 0; 1633 ta.next = 0;
… …
1604 if (!prepare_cede_notself (aTHX_ &ta)) 1652 if (!prepare_cede_notself (aTHX_ &ta))
1605 XSRETURN_EMPTY; 1653 XSRETURN_EMPTY;
1606 1654
1607 break; 1655 break;
1608 } 1656 }
1657 SPAGAIN;
1609 1658
1610 BARRIER; 1659 BARRIER;
1611 PUTBACK; 1660 PUTBACK;
1612 TRANSFER (ta); 1661 TRANSFER (ta);
1613 SPAGAIN; /* might be the sp of a different coroutine now */ 1662 SPAGAIN; /* might be the sp of a different coroutine now */
… …
1671 { 1720 {
1672 struct coro temp; 1721 struct coro temp;
1673 1722
1674 if (!(coro->flags & CF_RUNNING)) 1723 if (!(coro->flags & CF_RUNNING))
1675 { 1724 {
1725 PUTBACK;
1676 save_perl (aTHX_ &temp); 1726 save_perl (aTHX_ &temp);
1677 load_perl (aTHX_ coro); 1727 load_perl (aTHX_ coro);
1678 } 1728 }
1679 1729
1680 { 1730 {
… …
1699 1749
1700 if (!(coro->flags & CF_RUNNING)) 1750 if (!(coro->flags & CF_RUNNING))
1701 { 1751 {
1702 save_perl (aTHX_ coro); 1752 save_perl (aTHX_ coro);
1703 load_perl (aTHX_ &temp); 1753 load_perl (aTHX_ &temp);
1754 SPAGAIN;
1704 } 1755 }
1705 } 1756 }
1706} 1757}
1707 1758
1708SV * 1759SV *
… …
1756 1807
1757BOOT: 1808BOOT:
1758{ 1809{
1759 int i; 1810 int i;
1760 1811
1761 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE); 1812 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1762 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE); 1813 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1763 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 1814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1764 1815
1765 coro_current = coro_get_sv ("Coro::current", FALSE); 1816 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1766 SvREADONLY_on (coro_current); 1817 SvREADONLY_on (coro_current);
1767 1818
1768 coro_stash = gv_stashpv ("Coro", TRUE); 1819 coro_stash = gv_stashpv ("Coro", TRUE);
1769 1820
1770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1821 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1853 CODE: 1904 CODE:
1854{ 1905{
1855 struct coro *coro = SvSTATE (coro_current); 1906 struct coro *coro = SvSTATE (coro_current);
1856 HV *hv = (HV *)SvRV (coro_current); 1907 HV *hv = (HV *)SvRV (coro_current);
1857 AV *defav = GvAV (PL_defgv); 1908 AV *defav = GvAV (PL_defgv);
1858 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 1909 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1859 AV *invoke_av; 1910 AV *invoke_av;
1860 int i, len; 1911 int i, len;
1861 1912
1862 if (!invoke) 1913 if (!invoke)
1914 {
1915 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1863 croak ("\3async_pool terminate\2\n"); 1916 croak ("\3async_pool terminate\2\n");
1917 }
1864 1918
1865 SvREFCNT_dec (coro->saved_deffh); 1919 SvREFCNT_dec (coro->saved_deffh);
1866 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1920 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1867 1921
1868 hv_store (hv, "desc", sizeof ("desc") - 1, 1922 hv_store (hv, "desc", sizeof ("desc") - 1,
1869 newSVpvn (strpair ("[async_pool]")), 0); 1923 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1870 1924
1871 invoke_av = (AV *)SvRV (invoke); 1925 invoke_av = (AV *)SvRV (invoke);
1872 len = av_len (invoke_av); 1926 len = av_len (invoke_av);
1873 1927
1874 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1928 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1894 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1948 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1895 coro->saved_deffh = 0; 1949 coro->saved_deffh = 0;
1896 1950
1897 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1951 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1898 || 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;
1899 croak ("\3async_pool terminate\2\n"); 1955 croak ("\3async_pool terminate\2\n");
1956 }
1900 1957
1901 av_clear (GvAV (PL_defgv)); 1958 av_clear (GvAV (PL_defgv));
1902 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 1959 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1903 newSVpvn (strpair ("[async_pool idle]")), 0); 1960 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1904 1961
1905 coro->prio = 0; 1962 coro->prio = 0;
1906 1963
1907 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1964 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1908 api_trace (coro_current, 0); 1965 api_trace (coro_current, 0);

Diff Legend

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