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.218 by root, Mon Dec 3 00:41:45 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
… …
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");
… …
1394 SAVETMPS; 1416 SAVETMPS;
1395 1417
1396 PUSHMARK (SP); 1418 PUSHMARK (SP);
1397 PUTBACK; 1419 PUTBACK;
1398 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1399 1422
1400 FREETMPS; 1423 FREETMPS;
1401 LEAVE; 1424 LEAVE;
1402 continue; 1425 continue;
1403 } 1426 }
… …
1532#endif 1555#endif
1533 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1534 1557
1535 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1536 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1537#if 0 1560
1538 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1561 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1539 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1562 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1540#endif 1563 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1564 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1565
1541 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1566 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1542 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1567 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1543 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 1568 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1544 1569
1545 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1546 1571
1547 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1548 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1603 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1604 CODE: 1629 CODE:
1605{ 1630{
1606 struct transfer_args ta; 1631 struct transfer_args ta;
1607 1632
1633 PUTBACK;
1608 switch (ix) 1634 switch (ix)
1609 { 1635 {
1610 case 0: 1636 case 0:
1611 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1612 ta.next = 0; 1638 ta.next = 0;
… …
1631 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1632 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1633 1659
1634 break; 1660 break;
1635 } 1661 }
1662 SPAGAIN;
1636 1663
1637 BARRIER; 1664 BARRIER;
1638 PUTBACK; 1665 PUTBACK;
1639 TRANSFER (ta); 1666 TRANSFER (ta);
1640 SPAGAIN; /* might be the sp of a different coroutine now */ 1667 SPAGAIN; /* might be the sp of a different coroutine now */
… …
1698 { 1725 {
1699 struct coro temp; 1726 struct coro temp;
1700 1727
1701 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1702 { 1729 {
1730 PUTBACK;
1703 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1704 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1705 } 1733 }
1706 1734
1707 { 1735 {
… …
1726 1754
1727 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1728 { 1756 {
1729 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1730 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1731 } 1760 }
1732 } 1761 }
1733} 1762}
1734 1763
1735SV * 1764SV *
… …
1776 case 1: RETVAL = coro->usecount; break; 1805 case 1: RETVAL = coro->usecount; break;
1777 } 1806 }
1778 OUTPUT: 1807 OUTPUT:
1779 RETVAL 1808 RETVAL
1780 1809
1810void
1811force_cctx ()
1812 CODE:
1813 struct coro *coro = SvSTATE (coro_current);
1814 coro->cctx->idle_sp = 0;
1781 1815
1782MODULE = Coro::State PACKAGE = Coro 1816MODULE = Coro::State PACKAGE = Coro
1783 1817
1784BOOT: 1818BOOT:
1785{ 1819{
… …
1872 PROTOTYPE: $;$ 1906 PROTOTYPE: $;$
1873 CODE: 1907 CODE:
1874 SvREFCNT_dec (self->throw); 1908 SvREFCNT_dec (self->throw);
1875 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1909 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1876 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
1877# for async_pool speedup 1927# for async_pool speedup
1878void 1928void
1879_pool_1 (SV *cb) 1929_pool_1 (SV *cb)
1880 CODE: 1930 CODE:
1881{ 1931{
… …
1885 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1935 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1886 AV *invoke_av; 1936 AV *invoke_av;
1887 int i, len; 1937 int i, len;
1888 1938
1889 if (!invoke) 1939 if (!invoke)
1940 {
1941 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1890 croak ("\3async_pool terminate\2\n"); 1942 croak ("\3async_pool terminate\2\n");
1943 }
1891 1944
1892 SvREFCNT_dec (coro->saved_deffh); 1945 SvREFCNT_dec (coro->saved_deffh);
1893 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1946 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1894 1947
1895 hv_store (hv, "desc", sizeof ("desc") - 1, 1948 hv_store (hv, "desc", sizeof ("desc") - 1,
… …
1921 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1974 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1922 coro->saved_deffh = 0; 1975 coro->saved_deffh = 0;
1923 1976
1924 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1977 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1925 || 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;
1926 croak ("\3async_pool terminate\2\n"); 1981 croak ("\3async_pool terminate\2\n");
1982 }
1927 1983
1928 av_clear (GvAV (PL_defgv)); 1984 av_clear (GvAV (PL_defgv));
1929 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1985 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1930 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1986 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1931 1987

Diff Legend

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