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.213 by root, Thu Oct 11 00:40:48 2007 UTC vs.
Revision 1.224 by root, Sun Mar 2 16:10:22 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
… …
145static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 153static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
151 156
152static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
154 159static SV *rv_diehook;
160static SV *rv_warnhook;
155static HV *hv_sig; /* %SIG */ 161static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158 162
159/* async_pool helper stuff */ 163/* async_pool helper stuff */
160static SV *sv_pool_rss; 164static SV *sv_pool_rss;
161static SV *sv_pool_size; 165static SV *sv_pool_size;
162static AV *av_async_pool; 166static AV *av_async_pool;
… …
345 349
346 /* casting is fun. */ 350 /* casting is fun. */
347 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
348 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
349 353
350 SvREFCNT_dec (av);
351
352 return 0; 354 return 0;
353} 355}
354 356
355#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
356 359
357static 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};
358 364
359#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
360 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
362 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
364 : 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)
365 374
366static struct coro * 375static struct coro *
367SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
368{ 377{
369 HV *stash; 378 HV *stash;
… …
381 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
384 } 393 }
385 394
386 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
387 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
388} 397}
389 398
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391 400
392/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
393static void 402static void
394get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
395{ 404{
396 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
397 AV *av; 406 AV *av;
398 407
399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
401 else 410 else
… …
413} 422}
414 423
415static void 424static void
416put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
417{ 426{
418 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
419 AV *av; 428 AV *av;
420 429
421 if (expect_false (!mg)) 430 if (expect_false (!mg))
422 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
425 mg->mg_virtual = &vtbl_coro;
426 mg->mg_obj = (SV *)newAV ();
427 }
428 432
429 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
430 434
431 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
432 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
… …
450 GvSV (irsgv) = slot->irsgv; 454 GvSV (irsgv) = slot->irsgv;
451 455
452 #define VAR(name,type) PL_ ## name = slot->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
453 # include "state.h" 457 # include "state.h"
454 #undef VAR 458 #undef VAR
455
456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
458 459
459 { 460 {
460 dSP; 461 dSP;
461 462
462 CV *cv; 463 CV *cv;
… …
668 return rss; 669 return rss;
669} 670}
670 671
671/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
672 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
673static void 724static void
674coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
675{ 726{
676 /* 727 /*
677 * emulate part of the perl startup here. 728 * emulate part of the perl startup here.
… …
685 PL_curpm = 0; 736 PL_curpm = 0;
686 PL_curpad = 0; 737 PL_curpad = 0;
687 PL_localizing = 0; 738 PL_localizing = 0;
688 PL_dirty = 0; 739 PL_dirty = 0;
689 PL_restartop = 0; 740 PL_restartop = 0;
741
742 /* recreate the die/warn hooks */
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0); 743 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0); 744 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
692 745
693 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
696 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);
… …
847 SAVETMPS; 900 SAVETMPS;
848 EXTEND (SP, 3); 901 EXTEND (SP, 3);
849 PUSHMARK (SP); 902 PUSHMARK (SP);
850 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
851 PUSHs (fullname); 904 PUSHs (fullname);
852 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);
853 PUTBACK; 906 PUTBACK;
854 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 907 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
855 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);
856 SPAGAIN; 909 SPAGAIN;
857 FREETMPS; 910 FREETMPS;
… …
1075 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
1076 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");
1077 1130
1078 if ( 1131 if (
1079#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1080 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1081#else 1134#else
1082 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1083#endif 1136#endif
1084 ) 1137 )
1085 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");
… …
1089/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1090static void NOINLINE 1143static void NOINLINE
1091transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1092{ 1145{
1093 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1094 1148
1095 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1096 if (expect_false (!next)) 1150 if (expect_false (!next))
1097 { 1151 {
1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1113 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1114 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1115 1169
1116 LOCK; 1170 LOCK;
1117 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1118 if (expect_false (next->flags & CF_NEW)) 1175 if (expect_false (next->flags & CF_NEW))
1119 { 1176 {
1120 /* need to start coroutine */ 1177 /* need to start coroutine */
1121 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1122 /* first get rid of the old state */
1123 save_perl (aTHX_ prev);
1124 /* setup coroutine call */ 1179 /* setup coroutine call */
1125 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1126 } 1181 }
1127 else 1182 else
1128 {
1129 /* coroutine already started */
1130 save_perl (aTHX_ prev);
1131 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1132 }
1133 1184
1134 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1135 1186
1136 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1137 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)))
… …
1152 1203
1153 ++next->usecount; 1204 ++next->usecount;
1154 1205
1155 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1156 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1208
1209 has_throw = !!next->throw;
1157 1210
1158 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1159 { 1212 {
1160 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1161 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
… …
1163 } 1216 }
1164 1217
1165 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1166 UNLOCK; 1219 UNLOCK;
1167 1220
1168 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1169 { 1222 {
1170 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1171 1224
1172 if (coro->throw) 1225 if (coro->throw)
1173 { 1226 {
… …
1299{ 1352{
1300 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);
1301} 1354}
1302 1355
1303static SV * 1356static SV *
1304coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1305{ 1358{
1306 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1307 1360
1308 min_prio -= PRIO_MIN;
1309 if (min_prio < 0)
1310 min_prio = 0;
1311
1312 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1313 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1314 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1315 1364
1316 return 0; 1365 return 0;
1317} 1366}
… …
1353 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1354 1403
1355 for (;;) 1404 for (;;)
1356 { 1405 {
1357 LOCK; 1406 LOCK;
1358 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1359 1408
1360 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1361 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1362 { 1411 {
1363 dSP; 1412 dSP;
… …
1367 SAVETMPS; 1416 SAVETMPS;
1368 1417
1369 PUSHMARK (SP); 1418 PUSHMARK (SP);
1370 PUTBACK; 1419 PUTBACK;
1371 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1372 1422
1373 FREETMPS; 1423 FREETMPS;
1374 LEAVE; 1424 LEAVE;
1375 continue; 1425 continue;
1376 } 1426 }
… …
1506 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1507 1557
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510 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
1511 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv (aTHX_ "Coro::State::DIEHOOK" , TRUE); 1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1513 sv_warnhook = coro_get_sv (aTHX_ "Coro::State::WARNHOOK", TRUE); 1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1517 1569
1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1519 1571
1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1538SV * 1590SV *
1539new (char *klass, ...) 1591new (char *klass, ...)
1540 CODE: 1592 CODE:
1541{ 1593{
1542 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1543 HV *hv; 1596 HV *hv;
1544 int i; 1597 int i;
1545 1598
1546 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1547 coro->args = newAV (); 1600 coro->args = newAV ();
… …
1550 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1551 coro->next = coro_first; 1604 coro->next = coro_first;
1552 coro_first = coro; 1605 coro_first = coro;
1553 1606
1554 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1555 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;
1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1557 1611
1558 av_extend (coro->args, items - 1); 1612 av_extend (coro->args, items - 1);
1559 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1560 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
… …
1574 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1575 CODE: 1629 CODE:
1576{ 1630{
1577 struct transfer_args ta; 1631 struct transfer_args ta;
1578 1632
1633 PUTBACK;
1579 switch (ix) 1634 switch (ix)
1580 { 1635 {
1581 case 0: 1636 case 0:
1582 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1583 ta.next = 0; 1638 ta.next = 0;
… …
1602 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1603 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1604 1659
1605 break; 1660 break;
1606 } 1661 }
1662 SPAGAIN;
1607 1663
1608 BARRIER; 1664 BARRIER;
1609 PUTBACK; 1665 PUTBACK;
1610 TRANSFER (ta); 1666 TRANSFER (ta);
1611 SPAGAIN; /* might be the sp of a different coroutine now */ 1667 SPAGAIN; /* might be the sp of a different coroutine now */
… …
1669 { 1725 {
1670 struct coro temp; 1726 struct coro temp;
1671 1727
1672 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1673 { 1729 {
1730 PUTBACK;
1674 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1675 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1676 } 1733 }
1677 1734
1678 { 1735 {
… …
1697 1754
1698 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1699 { 1756 {
1700 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1701 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1702 } 1760 }
1703 } 1761 }
1704} 1762}
1705 1763
1706SV * 1764SV *
… …
1843 PROTOTYPE: $;$ 1901 PROTOTYPE: $;$
1844 CODE: 1902 CODE:
1845 SvREFCNT_dec (self->throw); 1903 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1904 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847 1905
1906void
1907swap_defsv (Coro::State self)
1908 PROTOTYPE: $
1909 ALIAS:
1910 swap_defav = 1
1911 CODE:
1912 if (!self->slot)
1913 croak ("cannot swap state with coroutine that has no saved state");
1914 else
1915 {
1916 SV **src = ix ? (SV *)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1917 SV **dst = ix ? self->slot->defav : self->slot->defsv;
1918
1919 SV *tmp = *src; *src = *dst; *dst = tmp;
1920 }
1921
1848# for async_pool speedup 1922# for async_pool speedup
1849void 1923void
1850_pool_1 (SV *cb) 1924_pool_1 (SV *cb)
1851 CODE: 1925 CODE:
1852{ 1926{
… …
1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1930 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1857 AV *invoke_av; 1931 AV *invoke_av;
1858 int i, len; 1932 int i, len;
1859 1933
1860 if (!invoke) 1934 if (!invoke)
1935 {
1936 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1861 croak ("\3async_pool terminate\2\n"); 1937 croak ("\3async_pool terminate\2\n");
1938 }
1862 1939
1863 SvREFCNT_dec (coro->saved_deffh); 1940 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1941 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1865 1942
1866 hv_store (hv, "desc", sizeof ("desc") - 1, 1943 hv_store (hv, "desc", sizeof ("desc") - 1,
… …
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1969 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0; 1970 coro->saved_deffh = 0;
1894 1971
1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1972 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1973 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1974 {
1975 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1897 croak ("\3async_pool terminate\2\n"); 1976 croak ("\3async_pool terminate\2\n");
1977 }
1898 1978
1899 av_clear (GvAV (PL_defgv)); 1979 av_clear (GvAV (PL_defgv));
1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1980 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1981 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1902 1982

Diff Legend

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