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.221 by root, Sun Jan 13 09:47:22 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);
1394 SAVETMPS; 1411 SAVETMPS;
1395 1412
1396 PUSHMARK (SP); 1413 PUSHMARK (SP);
1397 PUTBACK; 1414 PUTBACK;
1398 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1415 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1416 SPAGAIN;
1399 1417
1400 FREETMPS; 1418 FREETMPS;
1401 LEAVE; 1419 LEAVE;
1402 continue; 1420 continue;
1403 } 1421 }
1532#endif 1550#endif
1533 BOOT_PAGESIZE; 1551 BOOT_PAGESIZE;
1534 1552
1535 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1536 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1537#if 0 1555
1538 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1556 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1539 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1557 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1540#endif 1558 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1559 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1560
1541 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1561 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1542 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));
1543 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));
1544 1564
1545 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1565 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1546 1566
1547 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1567 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1548 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1568 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1603 Coro::cede_notself = 4 1623 Coro::cede_notself = 4
1604 CODE: 1624 CODE:
1605{ 1625{
1606 struct transfer_args ta; 1626 struct transfer_args ta;
1607 1627
1628 PUTBACK;
1608 switch (ix) 1629 switch (ix)
1609 { 1630 {
1610 case 0: 1631 case 0:
1611 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1632 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1612 ta.next = 0; 1633 ta.next = 0;
1631 if (!prepare_cede_notself (aTHX_ &ta)) 1652 if (!prepare_cede_notself (aTHX_ &ta))
1632 XSRETURN_EMPTY; 1653 XSRETURN_EMPTY;
1633 1654
1634 break; 1655 break;
1635 } 1656 }
1657 SPAGAIN;
1636 1658
1637 BARRIER; 1659 BARRIER;
1638 PUTBACK; 1660 PUTBACK;
1639 TRANSFER (ta); 1661 TRANSFER (ta);
1640 SPAGAIN; /* might be the sp of a different coroutine now */ 1662 SPAGAIN; /* might be the sp of a different coroutine now */
1698 { 1720 {
1699 struct coro temp; 1721 struct coro temp;
1700 1722
1701 if (!(coro->flags & CF_RUNNING)) 1723 if (!(coro->flags & CF_RUNNING))
1702 { 1724 {
1725 PUTBACK;
1703 save_perl (aTHX_ &temp); 1726 save_perl (aTHX_ &temp);
1704 load_perl (aTHX_ coro); 1727 load_perl (aTHX_ coro);
1705 } 1728 }
1706 1729
1707 { 1730 {
1726 1749
1727 if (!(coro->flags & CF_RUNNING)) 1750 if (!(coro->flags & CF_RUNNING))
1728 { 1751 {
1729 save_perl (aTHX_ coro); 1752 save_perl (aTHX_ coro);
1730 load_perl (aTHX_ &temp); 1753 load_perl (aTHX_ &temp);
1754 SPAGAIN;
1731 } 1755 }
1732 } 1756 }
1733} 1757}
1734 1758
1735SV * 1759SV *
1885 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1909 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1886 AV *invoke_av; 1910 AV *invoke_av;
1887 int i, len; 1911 int i, len;
1888 1912
1889 if (!invoke) 1913 if (!invoke)
1914 {
1915 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1890 croak ("\3async_pool terminate\2\n"); 1916 croak ("\3async_pool terminate\2\n");
1917 }
1891 1918
1892 SvREFCNT_dec (coro->saved_deffh); 1919 SvREFCNT_dec (coro->saved_deffh);
1893 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1920 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1894 1921
1895 hv_store (hv, "desc", sizeof ("desc") - 1, 1922 hv_store (hv, "desc", sizeof ("desc") - 1,
1921 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1948 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1922 coro->saved_deffh = 0; 1949 coro->saved_deffh = 0;
1923 1950
1924 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1951 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1925 || 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;
1926 croak ("\3async_pool terminate\2\n"); 1955 croak ("\3async_pool terminate\2\n");
1956 }
1927 1957
1928 av_clear (GvAV (PL_defgv)); 1958 av_clear (GvAV (PL_defgv));
1929 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1959 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1930 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1960 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1931 1961

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines