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.226 by root, Fri Apr 4 20:07:35 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;
… …
665} 670}
666 671
667/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
668 673
669static 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);
670 676
671/* 677/*
672 * This overrides the default magic get method of %SIG elements. 678 * 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 679 * 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 680 * and instead of tryign to save and restore the hash elements, we just provide
… …
686 { 692 {
687 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;
688 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;
689 } 695 }
690 696
691 return orig_sigelem_get (aTHX_ sv, mg); 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;
692} 722}
693 723
694static void 724static void
695coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
696{ 726{
… …
708 PL_localizing = 0; 738 PL_localizing = 0;
709 PL_dirty = 0; 739 PL_dirty = 0;
710 PL_restartop = 0; 740 PL_restartop = 0;
711 741
712 /* recreate the die/warn hooks */ 742 /* recreate the die/warn hooks */
713 PL_diehook = 0; 743 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); 744 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 745
721 GvSV (PL_defgv) = newSV (0); 746 GvSV (PL_defgv) = newSV (0);
722 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
723 GvSV (PL_errgv) = newSV (0); 748 GvSV (PL_errgv) = newSV (0);
724 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);
… …
875 SAVETMPS; 900 SAVETMPS;
876 EXTEND (SP, 3); 901 EXTEND (SP, 3);
877 PUSHMARK (SP); 902 PUSHMARK (SP);
878 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
879 PUSHs (fullname); 904 PUSHs (fullname);
880 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);
881 PUTBACK; 906 PUTBACK;
882 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);
883 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);
884 SPAGAIN; 909 SPAGAIN;
885 FREETMPS; 910 FREETMPS;
… …
1103 if (expect_false (next->flags & CF_DESTROYED)) 1128 if (expect_false (next->flags & CF_DESTROYED))
1104 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");
1105 1130
1106 if ( 1131 if (
1107#if PERL_VERSION_ATLEAST (5,9,0) 1132#if PERL_VERSION_ATLEAST (5,9,0)
1108 expect_false (PL_parser) 1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1109#else 1134#else
1110 expect_false (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1111#endif 1136#endif
1112 ) 1137 )
1113 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/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
1118static void NOINLINE 1143static void NOINLINE
1119transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
1120{ 1145{
1121 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
1122 1148
1123 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1124 if (expect_false (!next)) 1150 if (expect_false (!next))
1125 { 1151 {
1126 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1178 ++next->usecount; 1204 ++next->usecount;
1179 1205
1180 if (expect_true (!next->cctx)) 1206 if (expect_true (!next->cctx))
1181 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1182 1208
1209 has_throw = !!next->throw;
1210
1183 if (expect_false (prev__cctx != next->cctx)) 1211 if (expect_false (prev__cctx != next->cctx))
1184 { 1212 {
1185 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1186 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
1187 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1215 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1188 } 1216 }
1189 1217
1190 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1191 UNLOCK; 1219 UNLOCK;
1192 1220
1193 if (expect_false (prev->throw || next->throw)) 1221 if (expect_false (has_throw))
1194 { 1222 {
1195 struct coro *coro = SvSTATE (coro_current); 1223 struct coro *coro = SvSTATE (coro_current);
1196 1224
1197 if (coro->throw) 1225 if (coro->throw)
1198 { 1226 {
… …
1324{ 1352{
1325 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);
1326} 1354}
1327 1355
1328static SV * 1356static SV *
1329coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1330{ 1358{
1331 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1332 1360
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; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1338 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1339 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1340 1364
1341 return 0; 1365 return 0;
1342} 1366}
… …
1378 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1379 1403
1380 for (;;) 1404 for (;;)
1381 { 1405 {
1382 LOCK; 1406 LOCK;
1383 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1384 1408
1385 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1386 if (expect_false (!next_sv)) 1410 if (expect_false (!next_sv))
1387 { 1411 {
1388 dSP; 1412 dSP;
… …
1392 SAVETMPS; 1416 SAVETMPS;
1393 1417
1394 PUSHMARK (SP); 1418 PUSHMARK (SP);
1395 PUTBACK; 1419 PUTBACK;
1396 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1397 1422
1398 FREETMPS; 1423 FREETMPS;
1399 LEAVE; 1424 LEAVE;
1400 continue; 1425 continue;
1401 } 1426 }
… …
1533 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1534 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1535 1560
1536 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1561 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1537 PL_vtbl_sigelem.svt_get = coro_sigelem_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;
1538 1565
1539 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1540 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1567 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)); 1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1542 1569
… …
1601 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1602 CODE: 1629 CODE:
1603{ 1630{
1604 struct transfer_args ta; 1631 struct transfer_args ta;
1605 1632
1633 PUTBACK;
1606 switch (ix) 1634 switch (ix)
1607 { 1635 {
1608 case 0: 1636 case 0:
1609 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1610 ta.next = 0; 1638 ta.next = 0;
… …
1629 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1630 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1631 1659
1632 break; 1660 break;
1633 } 1661 }
1662 SPAGAIN;
1634 1663
1635 BARRIER; 1664 BARRIER;
1636 PUTBACK; 1665 PUTBACK;
1637 TRANSFER (ta); 1666 TRANSFER (ta);
1638 SPAGAIN; /* might be the sp of a different coroutine now */ 1667 SPAGAIN; /* might be the sp of a different coroutine now */
… …
1696 { 1725 {
1697 struct coro temp; 1726 struct coro temp;
1698 1727
1699 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1700 { 1729 {
1730 PUTBACK;
1701 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1702 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1703 } 1733 }
1704 1734
1705 { 1735 {
… …
1724 1754
1725 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1726 { 1756 {
1727 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1728 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1729 } 1760 }
1730 } 1761 }
1731} 1762}
1732 1763
1733SV * 1764SV *
… …
1774 case 1: RETVAL = coro->usecount; break; 1805 case 1: RETVAL = coro->usecount; break;
1775 } 1806 }
1776 OUTPUT: 1807 OUTPUT:
1777 RETVAL 1808 RETVAL
1778 1809
1810void
1811force_cctx ()
1812 CODE:
1813 struct coro *coro = SvSTATE (coro_current);
1814 coro->cctx->idle_sp = 0;
1779 1815
1780MODULE = Coro::State PACKAGE = Coro 1816MODULE = Coro::State PACKAGE = Coro
1781 1817
1782BOOT: 1818BOOT:
1783{ 1819{
… …
1870 PROTOTYPE: $;$ 1906 PROTOTYPE: $;$
1871 CODE: 1907 CODE:
1872 SvREFCNT_dec (self->throw); 1908 SvREFCNT_dec (self->throw);
1873 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1909 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1874 1910
1911void
1912swap_defsv (Coro::State self)
1913 PROTOTYPE: $
1914 ALIAS:
1915 swap_defav = 1
1916 CODE:
1917 if (!self->slot)
1918 croak ("cannot swap state with coroutine that has no saved state");
1919 else
1920 {
1921 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1922 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1923
1924 SV *tmp = *src; *src = *dst; *dst = tmp;
1925 }
1926
1875# for async_pool speedup 1927# for async_pool speedup
1876void 1928void
1877_pool_1 (SV *cb) 1929_pool_1 (SV *cb)
1878 CODE: 1930 CODE:
1879{ 1931{
… …
1883 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1935 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1884 AV *invoke_av; 1936 AV *invoke_av;
1885 int i, len; 1937 int i, len;
1886 1938
1887 if (!invoke) 1939 if (!invoke)
1940 {
1941 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1888 croak ("\3async_pool terminate\2\n"); 1942 croak ("\3async_pool terminate\2\n");
1943 }
1889 1944
1890 SvREFCNT_dec (coro->saved_deffh); 1945 SvREFCNT_dec (coro->saved_deffh);
1891 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1946 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1892 1947
1893 hv_store (hv, "desc", sizeof ("desc") - 1, 1948 hv_store (hv, "desc", sizeof ("desc") - 1,
… …
1919 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1974 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1920 coro->saved_deffh = 0; 1975 coro->saved_deffh = 0;
1921 1976
1922 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1977 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1923 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1978 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1979 {
1980 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1924 croak ("\3async_pool terminate\2\n"); 1981 croak ("\3async_pool terminate\2\n");
1982 }
1925 1983
1926 av_clear (GvAV (PL_defgv)); 1984 av_clear (GvAV (PL_defgv));
1927 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1985 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1928 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1986 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1929 1987

Diff Legend

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