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.227 by root, Sat Apr 5 22:29:54 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;
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 /*
711 PL_localizing = 0; 738 PL_localizing = 0;
712 PL_dirty = 0; 739 PL_dirty = 0;
713 PL_restartop = 0; 740 PL_restartop = 0;
714 741
715 /* recreate the die/warn hooks */ 742 /* recreate the die/warn hooks */
716 PL_diehook = 0; 743 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); 744 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 745
724 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
725 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
726 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
727 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);
878 SAVETMPS; 900 SAVETMPS;
879 EXTEND (SP, 3); 901 EXTEND (SP, 3);
880 PUSHMARK (SP); 902 PUSHMARK (SP);
881 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
882 PUSHs (fullname); 904 PUSHs (fullname);
883 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);
884 PUTBACK; 906 PUTBACK;
885 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);
886 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);
887 SPAGAIN; 909 SPAGAIN;
888 FREETMPS; 910 FREETMPS;
1106 if (expect_false (next->flags & CF_DESTROYED)) 1128 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"); 1129 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1108 1130
1109 if ( 1131 if (
1110#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1111 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1112#else 1134#else
1113 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1114#endif 1136#endif
1115 ) 1137 )
1116 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");
1117 } 1139 }
1118} 1140}
1119 1141
1120/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1121static void NOINLINE 1143static void NOINLINE
1122transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1123{ 1145{
1124 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1125 1148
1126 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1127 if (expect_false (!next)) 1150 if (expect_false (!next))
1128 { 1151 {
1129 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1160 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1161 1184
1162 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1163 1186
1164 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1165 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1188 if (expect_true (
1189 prev__cctx->idle_sp == STACKLEVEL
1190 && !(prev__cctx->flags & CC_TRACE)
1191 && !force_cctx
1192 ))
1166 { 1193 {
1167 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1194 /* 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)); 1195 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1169 1196
1170 prev->cctx = 0; 1197 prev->cctx = 0;
1180 1207
1181 ++next->usecount; 1208 ++next->usecount;
1182 1209
1183 if (expect_true (!next->cctx)) 1210 if (expect_true (!next->cctx))
1184 next->cctx = cctx_get (aTHX); 1211 next->cctx = cctx_get (aTHX);
1212
1213 has_throw = !!next->throw;
1185 1214
1186 if (expect_false (prev__cctx != next->cctx)) 1215 if (expect_false (prev__cctx != next->cctx))
1187 { 1216 {
1188 prev__cctx->top_env = PL_top_env; 1217 prev__cctx->top_env = PL_top_env;
1189 PL_top_env = next->cctx->top_env; 1218 PL_top_env = next->cctx->top_env;
1191 } 1220 }
1192 1221
1193 free_coro_mortal (aTHX); 1222 free_coro_mortal (aTHX);
1194 UNLOCK; 1223 UNLOCK;
1195 1224
1196 if (expect_false (prev->throw || next->throw)) 1225 if (expect_false (has_throw))
1197 { 1226 {
1198 struct coro *coro = SvSTATE (coro_current); 1227 struct coro *coro = SvSTATE (coro_current);
1199 1228
1200 if (coro->throw) 1229 if (coro->throw)
1201 { 1230 {
1211struct transfer_args 1240struct transfer_args
1212{ 1241{
1213 struct coro *prev, *next; 1242 struct coro *prev, *next;
1214}; 1243};
1215 1244
1216#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1245#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) 1246#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1218 1247
1219/** high level stuff ********************************************************/ 1248/** high level stuff ********************************************************/
1220 1249
1221static int 1250static int
1315{ 1344{
1316 dTHX; 1345 dTHX;
1317 struct transfer_args ta; 1346 struct transfer_args ta;
1318 1347
1319 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1348 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1320 TRANSFER (ta); 1349 TRANSFER (ta, 1);
1321} 1350}
1322 1351
1323/** Coro ********************************************************************/ 1352/** Coro ********************************************************************/
1324 1353
1325static void 1354static void
1327{ 1356{
1328 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1357 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1329} 1358}
1330 1359
1331static SV * 1360static SV *
1332coro_deq (pTHX_ int min_prio) 1361coro_deq (pTHX)
1333{ 1362{
1334 int prio = PRIO_MAX - PRIO_MIN; 1363 int prio;
1335 1364
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; ) 1365 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1341 if (AvFILLp (coro_ready [prio]) >= 0) 1366 if (AvFILLp (coro_ready [prio]) >= 0)
1342 return av_shift (coro_ready [prio]); 1367 return av_shift (coro_ready [prio]);
1343 1368
1344 return 0; 1369 return 0;
1345} 1370}
1381 SV *prev_sv, *next_sv; 1406 SV *prev_sv, *next_sv;
1382 1407
1383 for (;;) 1408 for (;;)
1384 { 1409 {
1385 LOCK; 1410 LOCK;
1386 next_sv = coro_deq (aTHX_ PRIO_MIN); 1411 next_sv = coro_deq (aTHX);
1387 1412
1388 /* nothing to schedule: call the idle handler */ 1413 /* nothing to schedule: call the idle handler */
1389 if (expect_false (!next_sv)) 1414 if (expect_false (!next_sv))
1390 { 1415 {
1391 dSP; 1416 dSP;
1395 SAVETMPS; 1420 SAVETMPS;
1396 1421
1397 PUSHMARK (SP); 1422 PUSHMARK (SP);
1398 PUTBACK; 1423 PUTBACK;
1399 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1424 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1425 SPAGAIN;
1400 1426
1401 FREETMPS; 1427 FREETMPS;
1402 LEAVE; 1428 LEAVE;
1403 continue; 1429 continue;
1404 } 1430 }
1459{ 1485{
1460 dTHX; 1486 dTHX;
1461 struct transfer_args ta; 1487 struct transfer_args ta;
1462 1488
1463 prepare_schedule (aTHX_ &ta); 1489 prepare_schedule (aTHX_ &ta);
1464 TRANSFER (ta); 1490 TRANSFER (ta, 1);
1465} 1491}
1466 1492
1467static int 1493static int
1468api_cede (void) 1494api_cede (void)
1469{ 1495{
1472 1498
1473 prepare_cede (aTHX_ &ta); 1499 prepare_cede (aTHX_ &ta);
1474 1500
1475 if (expect_true (ta.prev != ta.next)) 1501 if (expect_true (ta.prev != ta.next))
1476 { 1502 {
1477 TRANSFER (ta); 1503 TRANSFER (ta, 1);
1478 return 1; 1504 return 1;
1479 } 1505 }
1480 else 1506 else
1481 return 0; 1507 return 0;
1482} 1508}
1487 dTHX; 1513 dTHX;
1488 struct transfer_args ta; 1514 struct transfer_args ta;
1489 1515
1490 if (prepare_cede_notself (aTHX_ &ta)) 1516 if (prepare_cede_notself (aTHX_ &ta))
1491 { 1517 {
1492 TRANSFER (ta); 1518 TRANSFER (ta, 1);
1493 return 1; 1519 return 1;
1494 } 1520 }
1495 else 1521 else
1496 return 0; 1522 return 0;
1497} 1523}
1533#endif 1559#endif
1534 BOOT_PAGESIZE; 1560 BOOT_PAGESIZE;
1535 1561
1536 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1562 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1537 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1563 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1538#if 0 1564
1539 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1565 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1540 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1566 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1541#endif 1567 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1568 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1569
1542 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1570 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1543 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1571 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)); 1572 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1545 1573
1546 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1574 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1547 1575
1548 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1576 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1549 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1577 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1604 Coro::cede_notself = 4 1632 Coro::cede_notself = 4
1605 CODE: 1633 CODE:
1606{ 1634{
1607 struct transfer_args ta; 1635 struct transfer_args ta;
1608 1636
1637 PUTBACK;
1609 switch (ix) 1638 switch (ix)
1610 { 1639 {
1611 case 0: 1640 case 0:
1612 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1641 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1613 ta.next = 0; 1642 ta.next = 0;
1632 if (!prepare_cede_notself (aTHX_ &ta)) 1661 if (!prepare_cede_notself (aTHX_ &ta))
1633 XSRETURN_EMPTY; 1662 XSRETURN_EMPTY;
1634 1663
1635 break; 1664 break;
1636 } 1665 }
1666 SPAGAIN;
1637 1667
1638 BARRIER; 1668 BARRIER;
1639 PUTBACK; 1669 PUTBACK;
1640 TRANSFER (ta); 1670 TRANSFER (ta, 0);
1641 SPAGAIN; /* might be the sp of a different coroutine now */ 1671 SPAGAIN; /* might be the sp of a different coroutine now */
1642 /* be extra careful not to ever do anything after TRANSFER */ 1672 /* be extra careful not to ever do anything after TRANSFER */
1643} 1673}
1644 1674
1645bool 1675bool
1699 { 1729 {
1700 struct coro temp; 1730 struct coro temp;
1701 1731
1702 if (!(coro->flags & CF_RUNNING)) 1732 if (!(coro->flags & CF_RUNNING))
1703 { 1733 {
1734 PUTBACK;
1704 save_perl (aTHX_ &temp); 1735 save_perl (aTHX_ &temp);
1705 load_perl (aTHX_ coro); 1736 load_perl (aTHX_ coro);
1706 } 1737 }
1707 1738
1708 { 1739 {
1727 1758
1728 if (!(coro->flags & CF_RUNNING)) 1759 if (!(coro->flags & CF_RUNNING))
1729 { 1760 {
1730 save_perl (aTHX_ coro); 1761 save_perl (aTHX_ coro);
1731 load_perl (aTHX_ &temp); 1762 load_perl (aTHX_ &temp);
1763 SPAGAIN;
1732 } 1764 }
1733 } 1765 }
1734} 1766}
1735 1767
1736SV * 1768SV *
1777 case 1: RETVAL = coro->usecount; break; 1809 case 1: RETVAL = coro->usecount; break;
1778 } 1810 }
1779 OUTPUT: 1811 OUTPUT:
1780 RETVAL 1812 RETVAL
1781 1813
1814void
1815force_cctx ()
1816 CODE:
1817 struct coro *coro = SvSTATE (coro_current);
1818 coro->cctx->idle_sp = 0;
1782 1819
1783MODULE = Coro::State PACKAGE = Coro 1820MODULE = Coro::State PACKAGE = Coro
1784 1821
1785BOOT: 1822BOOT:
1786{ 1823{
1873 PROTOTYPE: $;$ 1910 PROTOTYPE: $;$
1874 CODE: 1911 CODE:
1875 SvREFCNT_dec (self->throw); 1912 SvREFCNT_dec (self->throw);
1876 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1913 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1877 1914
1915void
1916swap_defsv (Coro::State self)
1917 PROTOTYPE: $
1918 ALIAS:
1919 swap_defav = 1
1920 CODE:
1921 if (!self->slot)
1922 croak ("cannot swap state with coroutine that has no saved state");
1923 else
1924 {
1925 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1926 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1927
1928 SV *tmp = *src; *src = *dst; *dst = tmp;
1929 }
1930
1878# for async_pool speedup 1931# for async_pool speedup
1879void 1932void
1880_pool_1 (SV *cb) 1933_pool_1 (SV *cb)
1881 CODE: 1934 CODE:
1882{ 1935{
1886 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1939 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1887 AV *invoke_av; 1940 AV *invoke_av;
1888 int i, len; 1941 int i, len;
1889 1942
1890 if (!invoke) 1943 if (!invoke)
1944 {
1945 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1891 croak ("\3async_pool terminate\2\n"); 1946 croak ("\3async_pool terminate\2\n");
1947 }
1892 1948
1893 SvREFCNT_dec (coro->saved_deffh); 1949 SvREFCNT_dec (coro->saved_deffh);
1894 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1950 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1895 1951
1896 hv_store (hv, "desc", sizeof ("desc") - 1, 1952 hv_store (hv, "desc", sizeof ("desc") - 1,
1922 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1978 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1923 coro->saved_deffh = 0; 1979 coro->saved_deffh = 0;
1924 1980
1925 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1981 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1926 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1982 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1983 {
1984 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1927 croak ("\3async_pool terminate\2\n"); 1985 croak ("\3async_pool terminate\2\n");
1986 }
1928 1987
1929 av_clear (GvAV (PL_defgv)); 1988 av_clear (GvAV (PL_defgv));
1930 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1989 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1931 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1990 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1932 1991

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines