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.215 by root, Sun Oct 14 19:34:09 2007 UTC vs.
Revision 1.230 by root, Mon Apr 14 11:28:59 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 */
154static SV *rv_diehook; 159static SV *rv_diehook;
155static SV *rv_warnhook; 160static SV *rv_warnhook;
261/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
262 267
263static SV * 268static SV *
264coro_get_sv (pTHX_ const char *name, int create) 269coro_get_sv (pTHX_ const char *name, int create)
265{ 270{
266#if PERL_VERSION_ATLEAST (5,9,0) 271#if PERL_VERSION_ATLEAST (5,10,0)
267 /* 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 */
268 get_sv (name, create); 273 get_sv (name, create);
269#endif 274#endif
270 return get_sv (name, create); 275 return get_sv (name, create);
271} 276}
272 277
273static AV * 278static AV *
274coro_get_av (pTHX_ const char *name, int create) 279coro_get_av (pTHX_ const char *name, int create)
275{ 280{
276#if PERL_VERSION_ATLEAST (5,9,0) 281#if PERL_VERSION_ATLEAST (5,10,0)
277 /* 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 */
278 get_av (name, create); 283 get_av (name, create);
279#endif 284#endif
280 return get_av (name, create); 285 return get_av (name, create);
281} 286}
282 287
283static HV * 288static HV *
284coro_get_hv (pTHX_ const char *name, int create) 289coro_get_hv (pTHX_ const char *name, int create)
285{ 290{
286#if PERL_VERSION_ATLEAST (5,9,0) 291#if PERL_VERSION_ATLEAST (5,10,0)
287 /* 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 */
288 get_hv (name, create); 293 get_hv (name, create);
289#endif 294#endif
290 return get_hv (name, create); 295 return get_hv (name, create);
291} 296}
296 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
297 AV *newpadlist, *newpad; 302 AV *newpadlist, *newpad;
298 303
299 newpadlist = newAV (); 304 newpadlist = newAV ();
300 AvREAL_off (newpadlist); 305 AvREAL_off (newpadlist);
301#if PERL_VERSION_ATLEAST (5,9,0) 306#if PERL_VERSION_ATLEAST (5,10,0)
302 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
303#else 308#else
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 309 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
305#endif 310#endif
306 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 311 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
587 592
588 New(54,PL_savestack,24,ANY); 593 New(54,PL_savestack,24,ANY);
589 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
590 PL_savestack_max = 24; 595 PL_savestack_max = 24;
591 596
592#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,10,0)
593 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
594 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
595 PL_retstack_max = 4; 600 PL_retstack_max = 4;
596#endif 601#endif
597} 602}
620 625
621 Safefree (PL_tmps_stack); 626 Safefree (PL_tmps_stack);
622 Safefree (PL_markstack); 627 Safefree (PL_markstack);
623 Safefree (PL_scopestack); 628 Safefree (PL_scopestack);
624 Safefree (PL_savestack); 629 Safefree (PL_savestack);
625#if !PERL_VERSION_ATLEAST (5,9,0) 630#if !PERL_VERSION_ATLEAST (5,10,0)
626 Safefree (PL_retstack); 631 Safefree (PL_retstack);
627#endif 632#endif
628} 633}
629 634
630static size_t 635static size_t
654 rss += slot->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
656 rss += slot->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
657 rss += slot->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
658 663
659#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,10,0)
660 rss += slot->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
661#endif 666#endif
662 } 667 }
663 668
664 return rss; 669 return rss;
665} 670}
666 671
667/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
668 673
669#if 0
670static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 674static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
675static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
671 676
672/* 677/*
673 * This overrides the default magic get method of %SIG elements. 678 * 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 679 * 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 680 * and instead of tryign to save and restore the hash elements, we just provide
679 * when a schedule happens then, but we ignore this. 684 * when a schedule happens then, but we ignore this.
680 */ 685 */
681static int 686static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 687coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{ 688{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg); 689 const char *s = MgPV_nolen_const (mg);
686 690
687 if (*s == '_') 691 if (*s == '_')
688 { 692 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 693 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; 694 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691 } 695 }
692 696
693 return orig_sigelem_get (aTHX_ sv, mg); 697 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
694} 698}
695#endif 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}
696 723
697static void 724static void
698coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
699{ 726{
700 /* 727 /*
709 PL_curpm = 0; 736 PL_curpm = 0;
710 PL_curpad = 0; 737 PL_curpad = 0;
711 PL_localizing = 0; 738 PL_localizing = 0;
712 PL_dirty = 0; 739 PL_dirty = 0;
713 PL_restartop = 0; 740 PL_restartop = 0;
741#if PERL_VERSION_ATLEAST (5,10,0)
742 PL_parser = 0;
743#endif
714 744
715 /* recreate the die/warn hooks */ 745 /* recreate the die/warn hooks */
716 PL_diehook = 0; 746 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
717 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0); 747 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
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);
723 748
724 GvSV (PL_defgv) = newSV (0); 749 GvSV (PL_defgv) = newSV (0);
725 GvAV (PL_defgv) = coro->args; coro->args = 0; 750 GvAV (PL_defgv) = coro->args; coro->args = 0;
726 GvSV (PL_errgv) = newSV (0); 751 GvSV (PL_errgv) = newSV (0);
727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 752 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
878 SAVETMPS; 903 SAVETMPS;
879 EXTEND (SP, 3); 904 EXTEND (SP, 3);
880 PUSHMARK (SP); 905 PUSHMARK (SP);
881 PUSHs (&PL_sv_yes); 906 PUSHs (&PL_sv_yes);
882 PUSHs (fullname); 907 PUSHs (fullname);
883 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 908 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
884 PUTBACK; 909 PUTBACK;
885 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 910 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
886 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 911 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
887 SPAGAIN; 912 SPAGAIN;
888 FREETMPS; 913 FREETMPS;
1104 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1129 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1105 1130
1106 if (expect_false (next->flags & CF_DESTROYED)) 1131 if (expect_false (next->flags & CF_DESTROYED))
1107 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1132 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1108 1133
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0) 1134#if !PERL_VERSION_ATLEAST (5,10,0)
1111 expect_false (PL_parser)
1112#else
1113 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1114#endif
1115 )
1116 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1136 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1137#endif
1117 } 1138 }
1118} 1139}
1119 1140
1120/* always use the TRANSFER macro */ 1141/* always use the TRANSFER macro */
1121static void NOINLINE 1142static void NOINLINE
1122transfer (pTHX_ struct coro *prev, struct coro *next) 1143transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1123{ 1144{
1124 dSTACKLEVEL; 1145 dSTACKLEVEL;
1146 static volatile int has_throw;
1125 1147
1126 /* sometimes transfer is only called to set idle_sp */ 1148 /* sometimes transfer is only called to set idle_sp */
1127 if (expect_false (!next)) 1149 if (expect_false (!next))
1128 { 1150 {
1129 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1151 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1160 load_perl (aTHX_ next); 1182 load_perl (aTHX_ next);
1161 1183
1162 prev__cctx = prev->cctx; 1184 prev__cctx = prev->cctx;
1163 1185
1164 /* possibly "free" the cctx */ 1186 /* possibly "free" the cctx */
1165 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1187 if (expect_true (
1188 prev__cctx->idle_sp == STACKLEVEL
1189 && !(prev__cctx->flags & CC_TRACE)
1190 && !force_cctx
1191 ))
1166 { 1192 {
1167 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1193 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1168 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1194 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1169 1195
1170 prev->cctx = 0; 1196 prev->cctx = 0;
1180 1206
1181 ++next->usecount; 1207 ++next->usecount;
1182 1208
1183 if (expect_true (!next->cctx)) 1209 if (expect_true (!next->cctx))
1184 next->cctx = cctx_get (aTHX); 1210 next->cctx = cctx_get (aTHX);
1211
1212 has_throw = !!next->throw;
1185 1213
1186 if (expect_false (prev__cctx != next->cctx)) 1214 if (expect_false (prev__cctx != next->cctx))
1187 { 1215 {
1188 prev__cctx->top_env = PL_top_env; 1216 prev__cctx->top_env = PL_top_env;
1189 PL_top_env = next->cctx->top_env; 1217 PL_top_env = next->cctx->top_env;
1191 } 1219 }
1192 1220
1193 free_coro_mortal (aTHX); 1221 free_coro_mortal (aTHX);
1194 UNLOCK; 1222 UNLOCK;
1195 1223
1196 if (expect_false (prev->throw || next->throw)) 1224 if (expect_false (has_throw))
1197 { 1225 {
1198 struct coro *coro = SvSTATE (coro_current); 1226 struct coro *coro = SvSTATE (coro_current);
1199 1227
1200 if (coro->throw) 1228 if (coro->throw)
1201 { 1229 {
1211struct transfer_args 1239struct transfer_args
1212{ 1240{
1213 struct coro *prev, *next; 1241 struct coro *prev, *next;
1214}; 1242};
1215 1243
1216#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1244#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1217#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1245#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1218 1246
1219/** high level stuff ********************************************************/ 1247/** high level stuff ********************************************************/
1220 1248
1221static int 1249static int
1315{ 1343{
1316 dTHX; 1344 dTHX;
1317 struct transfer_args ta; 1345 struct transfer_args ta;
1318 1346
1319 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1347 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1320 TRANSFER (ta); 1348 TRANSFER (ta, 1);
1321} 1349}
1322 1350
1323/** Coro ********************************************************************/ 1351/** Coro ********************************************************************/
1324 1352
1325static void 1353static void
1327{ 1355{
1328 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1356 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1329} 1357}
1330 1358
1331static SV * 1359static SV *
1332coro_deq (pTHX_ int min_prio) 1360coro_deq (pTHX)
1333{ 1361{
1334 int prio = PRIO_MAX - PRIO_MIN; 1362 int prio;
1335 1363
1336 min_prio -= PRIO_MIN;
1337 if (min_prio < 0)
1338 min_prio = 0;
1339
1340 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1364 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1341 if (AvFILLp (coro_ready [prio]) >= 0) 1365 if (AvFILLp (coro_ready [prio]) >= 0)
1342 return av_shift (coro_ready [prio]); 1366 return av_shift (coro_ready [prio]);
1343 1367
1344 return 0; 1368 return 0;
1345} 1369}
1381 SV *prev_sv, *next_sv; 1405 SV *prev_sv, *next_sv;
1382 1406
1383 for (;;) 1407 for (;;)
1384 { 1408 {
1385 LOCK; 1409 LOCK;
1386 next_sv = coro_deq (aTHX_ PRIO_MIN); 1410 next_sv = coro_deq (aTHX);
1387 1411
1388 /* nothing to schedule: call the idle handler */ 1412 /* nothing to schedule: call the idle handler */
1389 if (expect_false (!next_sv)) 1413 if (expect_false (!next_sv))
1390 { 1414 {
1391 dSP; 1415 dSP;
1395 SAVETMPS; 1419 SAVETMPS;
1396 1420
1397 PUSHMARK (SP); 1421 PUSHMARK (SP);
1398 PUTBACK; 1422 PUTBACK;
1399 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1423 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1424 SPAGAIN;
1400 1425
1401 FREETMPS; 1426 FREETMPS;
1402 LEAVE; 1427 LEAVE;
1403 continue; 1428 continue;
1404 } 1429 }
1459{ 1484{
1460 dTHX; 1485 dTHX;
1461 struct transfer_args ta; 1486 struct transfer_args ta;
1462 1487
1463 prepare_schedule (aTHX_ &ta); 1488 prepare_schedule (aTHX_ &ta);
1464 TRANSFER (ta); 1489 TRANSFER (ta, 1);
1465} 1490}
1466 1491
1467static int 1492static int
1468api_cede (void) 1493api_cede (void)
1469{ 1494{
1472 1497
1473 prepare_cede (aTHX_ &ta); 1498 prepare_cede (aTHX_ &ta);
1474 1499
1475 if (expect_true (ta.prev != ta.next)) 1500 if (expect_true (ta.prev != ta.next))
1476 { 1501 {
1477 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1478 return 1; 1503 return 1;
1479 } 1504 }
1480 else 1505 else
1481 return 0; 1506 return 0;
1482} 1507}
1487 dTHX; 1512 dTHX;
1488 struct transfer_args ta; 1513 struct transfer_args ta;
1489 1514
1490 if (prepare_cede_notself (aTHX_ &ta)) 1515 if (prepare_cede_notself (aTHX_ &ta))
1491 { 1516 {
1492 TRANSFER (ta); 1517 TRANSFER (ta, 1);
1493 return 1; 1518 return 1;
1494 } 1519 }
1495 else 1520 else
1496 return 0; 1521 return 0;
1497} 1522}
1533#endif 1558#endif
1534 BOOT_PAGESIZE; 1559 BOOT_PAGESIZE;
1535 1560
1536 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1561 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1537 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1562 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1538#if 0 1563
1539 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1564 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1540 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1565 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1541#endif 1566 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1567 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1568
1542 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1569 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1543 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1570 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1544 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 1571 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1545 1572
1546 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1573 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1547 1574
1548 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1575 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1549 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1576 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1604 Coro::cede_notself = 4 1631 Coro::cede_notself = 4
1605 CODE: 1632 CODE:
1606{ 1633{
1607 struct transfer_args ta; 1634 struct transfer_args ta;
1608 1635
1636 PUTBACK;
1609 switch (ix) 1637 switch (ix)
1610 { 1638 {
1611 case 0: 1639 case 0:
1612 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1640 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1613 ta.next = 0; 1641 ta.next = 0;
1632 if (!prepare_cede_notself (aTHX_ &ta)) 1660 if (!prepare_cede_notself (aTHX_ &ta))
1633 XSRETURN_EMPTY; 1661 XSRETURN_EMPTY;
1634 1662
1635 break; 1663 break;
1636 } 1664 }
1665 SPAGAIN;
1637 1666
1638 BARRIER; 1667 BARRIER;
1639 PUTBACK; 1668 PUTBACK;
1640 TRANSFER (ta); 1669 TRANSFER (ta, 0);
1641 SPAGAIN; /* might be the sp of a different coroutine now */ 1670 SPAGAIN; /* might be the sp of a different coroutine now */
1642 /* be extra careful not to ever do anything after TRANSFER */ 1671 /* be extra careful not to ever do anything after TRANSFER */
1643} 1672}
1644 1673
1645bool 1674bool
1699 { 1728 {
1700 struct coro temp; 1729 struct coro temp;
1701 1730
1702 if (!(coro->flags & CF_RUNNING)) 1731 if (!(coro->flags & CF_RUNNING))
1703 { 1732 {
1733 PUTBACK;
1704 save_perl (aTHX_ &temp); 1734 save_perl (aTHX_ &temp);
1705 load_perl (aTHX_ coro); 1735 load_perl (aTHX_ coro);
1706 } 1736 }
1707 1737
1708 { 1738 {
1727 1757
1728 if (!(coro->flags & CF_RUNNING)) 1758 if (!(coro->flags & CF_RUNNING))
1729 { 1759 {
1730 save_perl (aTHX_ coro); 1760 save_perl (aTHX_ coro);
1731 load_perl (aTHX_ &temp); 1761 load_perl (aTHX_ &temp);
1762 SPAGAIN;
1732 } 1763 }
1733 } 1764 }
1734} 1765}
1735 1766
1736SV * 1767SV *
1777 case 1: RETVAL = coro->usecount; break; 1808 case 1: RETVAL = coro->usecount; break;
1778 } 1809 }
1779 OUTPUT: 1810 OUTPUT:
1780 RETVAL 1811 RETVAL
1781 1812
1813void
1814force_cctx ()
1815 CODE:
1816 struct coro *coro = SvSTATE (coro_current);
1817 coro->cctx->idle_sp = 0;
1782 1818
1783MODULE = Coro::State PACKAGE = Coro 1819MODULE = Coro::State PACKAGE = Coro
1784 1820
1785BOOT: 1821BOOT:
1786{ 1822{
1873 PROTOTYPE: $;$ 1909 PROTOTYPE: $;$
1874 CODE: 1910 CODE:
1875 SvREFCNT_dec (self->throw); 1911 SvREFCNT_dec (self->throw);
1876 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1912 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1877 1913
1914void
1915swap_defsv (Coro::State self)
1916 PROTOTYPE: $
1917 ALIAS:
1918 swap_defav = 1
1919 CODE:
1920 if (!self->slot)
1921 croak ("cannot swap state with coroutine that has no saved state");
1922 else
1923 {
1924 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1925 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1926
1927 SV *tmp = *src; *src = *dst; *dst = tmp;
1928 }
1929
1878# for async_pool speedup 1930# for async_pool speedup
1879void 1931void
1880_pool_1 (SV *cb) 1932_pool_1 (SV *cb)
1881 CODE: 1933 CODE:
1882{ 1934{
1886 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1938 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1887 AV *invoke_av; 1939 AV *invoke_av;
1888 int i, len; 1940 int i, len;
1889 1941
1890 if (!invoke) 1942 if (!invoke)
1943 {
1944 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1891 croak ("\3async_pool terminate\2\n"); 1945 croak ("\3async_pool terminate\2\n");
1946 }
1892 1947
1893 SvREFCNT_dec (coro->saved_deffh); 1948 SvREFCNT_dec (coro->saved_deffh);
1894 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1949 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1895 1950
1896 hv_store (hv, "desc", sizeof ("desc") - 1, 1951 hv_store (hv, "desc", sizeof ("desc") - 1,
1922 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1977 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1923 coro->saved_deffh = 0; 1978 coro->saved_deffh = 0;
1924 1979
1925 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1980 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1926 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1981 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1982 {
1983 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1927 croak ("\3async_pool terminate\2\n"); 1984 croak ("\3async_pool terminate\2\n");
1985 }
1928 1986
1929 av_clear (GvAV (PL_defgv)); 1987 av_clear (GvAV (PL_defgv));
1930 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1988 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1931 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1989 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1932 1990

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines