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.219 by root, Tue Dec 4 19:33:45 2007 UTC vs.
Revision 1.222 by root, Sun Jan 20 10:22:07 2008 UTC

… …
664 return rss; 664 return rss;
665} 665}
666 666
667/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
668 668
669#if 0
670static 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);
671 671
672/* 672/*
673 * This overrides the default magic get method of %SIG elements. 673 * 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 674 * 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 675 * and instead of tryign to save and restore the hash elements, we just provide
… …
679 * when a schedule happens then, but we ignore this. 679 * when a schedule happens then, but we ignore this.
680 */ 680 */
681static int 681static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{ 683{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg); 684 const char *s = MgPV_nolen_const (mg);
686 685
687 if (*s == '_') 686 if (*s == '_')
688 { 687 {
689 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;
690 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;
691 } 690 }
692 691
693 return orig_sigelem_get (aTHX_ sv, mg); 692 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
694} 693}
695#endif 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;
717}
696 718
697static void 719static void
698coro_setup (pTHX_ struct coro *coro) 720coro_setup (pTHX_ struct coro *coro)
699{ 721{
700 /* 722 /*
… …
711 PL_localizing = 0; 733 PL_localizing = 0;
712 PL_dirty = 0; 734 PL_dirty = 0;
713 PL_restartop = 0; 735 PL_restartop = 0;
714 736
715 /* recreate the die/warn hooks */ 737 /* recreate the die/warn hooks */
716 PL_diehook = 0; 738 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); 739 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 740
724 GvSV (PL_defgv) = newSV (0); 741 GvSV (PL_defgv) = newSV (0);
725 GvAV (PL_defgv) = coro->args; coro->args = 0; 742 GvAV (PL_defgv) = coro->args; coro->args = 0;
726 GvSV (PL_errgv) = newSV (0); 743 GvSV (PL_errgv) = newSV (0);
727 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);
… …
1106 if (expect_false (next->flags & CF_DESTROYED)) 1123 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"); 1124 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1108 1125
1109 if ( 1126 if (
1110#if PERL_VERSION_ATLEAST (5,9,0) 1127#if PERL_VERSION_ATLEAST (5,9,0)
1111 expect_false (PL_parser) 1128 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1112#else 1129#else
1113 expect_false (PL_lex_state != LEX_NOTPARSING) 1130 expect_false (PL_lex_state != LEX_NOTPARSING)
1114#endif 1131#endif
1115 ) 1132 )
1116 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1133 croak ("Coro::State::transfer called while parsing, but this is not supported");
… …
1533#endif 1550#endif
1534 BOOT_PAGESIZE; 1551 BOOT_PAGESIZE;
1535 1552
1536 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1537 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1538#if 0 1555
1539 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1556 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1540 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1557 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1541#endif 1558 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1559 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1560
1542 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1561 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1543 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1562 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)); 1563 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1545 1564
1546 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1565 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1547 1566
1548 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1567 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1549 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1568 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1890 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1909 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1891 AV *invoke_av; 1910 AV *invoke_av;
1892 int i, len; 1911 int i, len;
1893 1912
1894 if (!invoke) 1913 if (!invoke)
1914 {
1915 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1895 croak ("\3async_pool terminate\2\n"); 1916 croak ("\3async_pool terminate\2\n");
1917 }
1896 1918
1897 SvREFCNT_dec (coro->saved_deffh); 1919 SvREFCNT_dec (coro->saved_deffh);
1898 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1920 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1899 1921
1900 hv_store (hv, "desc", sizeof ("desc") - 1, 1922 hv_store (hv, "desc", sizeof ("desc") - 1,
… …
1926 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1948 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1927 coro->saved_deffh = 0; 1949 coro->saved_deffh = 0;
1928 1950
1929 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1951 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1930 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1952 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1953 {
1954 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1931 croak ("\3async_pool terminate\2\n"); 1955 croak ("\3async_pool terminate\2\n");
1956 }
1932 1957
1933 av_clear (GvAV (PL_defgv)); 1958 av_clear (GvAV (PL_defgv));
1934 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1959 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1935 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1960 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1936 1961

Diff Legend

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