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.214 by root, Sat Oct 13 23:19:10 2007 UTC vs.
Revision 1.220 by root, Thu Jan 10 05:43:14 2008 UTC

… …
145static size_t coro_stacksize = CORO_STACKSIZE; 145static size_t coro_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 148static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 150static volatile SV *coro_mortal; /* will be freed after next transfer */
151 151
152static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook; 154static SV *rv_diehook;
155static SV *rv_warnhook; 155static SV *rv_warnhook;
… …
665} 665}
666 666
667/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
668 668
669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
670static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
670 671
671/* 672/*
672 * This overrides the default magic get method of %SIG elements. 673 * This overrides the default magic get method of %SIG elements.
673 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
674 * and instead of tryign to save and restore the hash elements, we just provide 675 * and instead of tryign to save and restore the hash elements, we just provide
… …
686 { 687 {
687 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 688 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
688 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 689 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
689 } 690 }
690 691
691 return orig_sigelem_get (aTHX_ sv, mg); 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;
692} 717}
693 718
694static void 719static void
695coro_setup (pTHX_ struct coro *coro) 720coro_setup (pTHX_ struct coro *coro)
696{ 721{
… …
708 PL_localizing = 0; 733 PL_localizing = 0;
709 PL_dirty = 0; 734 PL_dirty = 0;
710 PL_restartop = 0; 735 PL_restartop = 0;
711 736
712 /* recreate the die/warn hooks */ 737 /* recreate the die/warn hooks */
713 PL_diehook = 0; 738 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
714 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0); 739 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
715 PL_diehook = SvREFCNT_inc (rv_diehook);
716
717 PL_warnhook = 0;
718 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
719 PL_warnhook = SvREFCNT_inc (rv_warnhook);
720 740
721 GvSV (PL_defgv) = newSV (0); 741 GvSV (PL_defgv) = newSV (0);
722 GvAV (PL_defgv) = coro->args; coro->args = 0; 742 GvAV (PL_defgv) = coro->args; coro->args = 0;
723 GvSV (PL_errgv) = newSV (0); 743 GvSV (PL_errgv) = newSV (0);
724 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);
… …
1117/* always use the TRANSFER macro */ 1137/* always use the TRANSFER macro */
1118static void NOINLINE 1138static void NOINLINE
1119transfer (pTHX_ struct coro *prev, struct coro *next) 1139transfer (pTHX_ struct coro *prev, struct coro *next)
1120{ 1140{
1121 dSTACKLEVEL; 1141 dSTACKLEVEL;
1142 static volatile int has_throw;
1122 1143
1123 /* sometimes transfer is only called to set idle_sp */ 1144 /* sometimes transfer is only called to set idle_sp */
1124 if (expect_false (!next)) 1145 if (expect_false (!next))
1125 { 1146 {
1126 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1147 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1178 ++next->usecount; 1199 ++next->usecount;
1179 1200
1180 if (expect_true (!next->cctx)) 1201 if (expect_true (!next->cctx))
1181 next->cctx = cctx_get (aTHX); 1202 next->cctx = cctx_get (aTHX);
1182 1203
1204 has_throw = !!next->throw;
1205
1183 if (expect_false (prev__cctx != next->cctx)) 1206 if (expect_false (prev__cctx != next->cctx))
1184 { 1207 {
1185 prev__cctx->top_env = PL_top_env; 1208 prev__cctx->top_env = PL_top_env;
1186 PL_top_env = next->cctx->top_env; 1209 PL_top_env = next->cctx->top_env;
1187 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1210 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1188 } 1211 }
1189 1212
1190 free_coro_mortal (aTHX); 1213 free_coro_mortal (aTHX);
1191 UNLOCK; 1214 UNLOCK;
1192 1215
1193 if (expect_false (prev->throw || next->throw)) 1216 if (expect_false (has_throw))
1194 { 1217 {
1195 struct coro *coro = SvSTATE (coro_current); 1218 struct coro *coro = SvSTATE (coro_current);
1196 1219
1197 if (coro->throw) 1220 if (coro->throw)
1198 { 1221 {
… …
1324{ 1347{
1325 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);
1326} 1349}
1327 1350
1328static SV * 1351static SV *
1329coro_deq (pTHX_ int min_prio) 1352coro_deq (pTHX)
1330{ 1353{
1331 int prio = PRIO_MAX - PRIO_MIN; 1354 int prio;
1332 1355
1333 min_prio -= PRIO_MIN;
1334 if (min_prio < 0)
1335 min_prio = 0;
1336
1337 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1356 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1338 if (AvFILLp (coro_ready [prio]) >= 0) 1357 if (AvFILLp (coro_ready [prio]) >= 0)
1339 return av_shift (coro_ready [prio]); 1358 return av_shift (coro_ready [prio]);
1340 1359
1341 return 0; 1360 return 0;
1342} 1361}
… …
1378 SV *prev_sv, *next_sv; 1397 SV *prev_sv, *next_sv;
1379 1398
1380 for (;;) 1399 for (;;)
1381 { 1400 {
1382 LOCK; 1401 LOCK;
1383 next_sv = coro_deq (aTHX_ PRIO_MIN); 1402 next_sv = coro_deq (aTHX);
1384 1403
1385 /* nothing to schedule: call the idle handler */ 1404 /* nothing to schedule: call the idle handler */
1386 if (expect_false (!next_sv)) 1405 if (expect_false (!next_sv))
1387 { 1406 {
1388 dSP; 1407 dSP;
… …
1392 SAVETMPS; 1411 SAVETMPS;
1393 1412
1394 PUSHMARK (SP); 1413 PUSHMARK (SP);
1395 PUTBACK; 1414 PUTBACK;
1396 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1415 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1416 SPAGAIN;
1397 1417
1398 FREETMPS; 1418 FREETMPS;
1399 LEAVE; 1419 LEAVE;
1400 continue; 1420 continue;
1401 } 1421 }
… …
1533 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1534 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1535 1555
1536 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1556 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1537 PL_vtbl_sigelem.svt_get = coro_sigelem_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;
1538 1560
1539 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1561 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1540 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1562 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1541 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 1563 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1542 1564
… …
1601 Coro::cede_notself = 4 1623 Coro::cede_notself = 4
1602 CODE: 1624 CODE:
1603{ 1625{
1604 struct transfer_args ta; 1626 struct transfer_args ta;
1605 1627
1628 PUTBACK;
1606 switch (ix) 1629 switch (ix)
1607 { 1630 {
1608 case 0: 1631 case 0:
1609 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1632 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1610 ta.next = 0; 1633 ta.next = 0;
… …
1629 if (!prepare_cede_notself (aTHX_ &ta)) 1652 if (!prepare_cede_notself (aTHX_ &ta))
1630 XSRETURN_EMPTY; 1653 XSRETURN_EMPTY;
1631 1654
1632 break; 1655 break;
1633 } 1656 }
1657 SPAGAIN;
1634 1658
1635 BARRIER; 1659 BARRIER;
1636 PUTBACK; 1660 PUTBACK;
1637 TRANSFER (ta); 1661 TRANSFER (ta);
1638 SPAGAIN; /* might be the sp of a different coroutine now */ 1662 SPAGAIN; /* might be the sp of a different coroutine now */
… …
1696 { 1720 {
1697 struct coro temp; 1721 struct coro temp;
1698 1722
1699 if (!(coro->flags & CF_RUNNING)) 1723 if (!(coro->flags & CF_RUNNING))
1700 { 1724 {
1725 PUTBACK;
1701 save_perl (aTHX_ &temp); 1726 save_perl (aTHX_ &temp);
1702 load_perl (aTHX_ coro); 1727 load_perl (aTHX_ coro);
1703 } 1728 }
1704 1729
1705 { 1730 {
… …
1724 1749
1725 if (!(coro->flags & CF_RUNNING)) 1750 if (!(coro->flags & CF_RUNNING))
1726 { 1751 {
1727 save_perl (aTHX_ coro); 1752 save_perl (aTHX_ coro);
1728 load_perl (aTHX_ &temp); 1753 load_perl (aTHX_ &temp);
1754 SPAGAIN;
1729 } 1755 }
1730 } 1756 }
1731} 1757}
1732 1758
1733SV * 1759SV *

Diff Legend

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