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.235 by root, Sat May 10 00:13:18 2008 UTC vs.
Revision 1.241 by root, Mon Jul 21 02:39:15 2008 UTC

… …
683 683
684/** coroutine stack handling ************************************************/ 684/** coroutine stack handling ************************************************/
685 685
686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg); 687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
688static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
689
690/* apparently < 5.8.8 */
691#ifndef MgPV_nolen_const
692#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
693 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
694 (const char*)(mg)->mg_ptr)
695#endif
688 696
689/* 697/*
690 * This overrides the default magic get method of %SIG elements. 698 * This overrides the default magic get method of %SIG elements.
691 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 699 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
692 * and instead of tryign to save and restore the hash elements, we just provide 700 * and instead of tryign to save and restore the hash elements, we just provide
… …
700{ 708{
701 const char *s = MgPV_nolen_const (mg); 709 const char *s = MgPV_nolen_const (mg);
702 710
703 if (*s == '_') 711 if (*s == '_')
704 { 712 {
705 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 713 SV **svp = 0;
706 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 714
715 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
716 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
717
718 if (svp)
719 {
720 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
721 return 0;
722 }
707 } 723 }
708 724
709 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 725 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
726}
727
728static int
729coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
730{
731 const char *s = MgPV_nolen_const (mg);
732
733 if (*s == '_')
734 {
735 SV **svp = 0;
736
737 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
738 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
739
740 if (svp)
741 {
742 SV *old = *svp;
743 *svp = 0;
744 SvREFCNT_dec (old);
745 return 0;
746 }
747 }
748
749 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
710} 750}
711 751
712static int 752static int
713coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 753coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
714{ 754{
… …
1383static int 1423static int
1384api_ready (SV *coro_sv) 1424api_ready (SV *coro_sv)
1385{ 1425{
1386 dTHX; 1426 dTHX;
1387 struct coro *coro; 1427 struct coro *coro;
1388 SV *hook; 1428 SV *sv_hook;
1429 void (*xs_hook)(void);
1389 1430
1390 if (SvROK (coro_sv)) 1431 if (SvROK (coro_sv))
1391 coro_sv = SvRV (coro_sv); 1432 coro_sv = SvRV (coro_sv);
1392 1433
1393 coro = SvSTATE (coro_sv); 1434 coro = SvSTATE (coro_sv);
… …
1397 1438
1398 coro->flags |= CF_READY; 1439 coro->flags |= CF_READY;
1399 1440
1400 LOCK; 1441 LOCK;
1401 1442
1402 hook = coro_nready ? 0 : coro_readyhook; 1443 sv_hook = coro_nready ? 0 : coro_readyhook;
1444 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1403 1445
1404 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1446 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1405 ++coro_nready; 1447 ++coro_nready;
1406 1448
1407 UNLOCK; 1449 UNLOCK;
1408 1450
1409 if (hook) 1451 if (sv_hook)
1410 { 1452 {
1411 dSP; 1453 dSP;
1412 1454
1413 ENTER; 1455 ENTER;
1414 SAVETMPS; 1456 SAVETMPS;
1415 1457
1416 PUSHMARK (SP); 1458 PUSHMARK (SP);
1417 PUTBACK; 1459 PUTBACK;
1418 call_sv (hook, G_DISCARD); 1460 call_sv (sv_hook, G_DISCARD);
1419 SPAGAIN; 1461 SPAGAIN;
1420 1462
1421 FREETMPS; 1463 FREETMPS;
1422 LEAVE; 1464 LEAVE;
1423 } 1465 }
1466
1467 if (xs_hook)
1468 xs_hook ();
1424 1469
1425 return 1; 1470 return 1;
1426} 1471}
1427 1472
1428static int 1473static int
… …
1592 BOOT_PAGESIZE; 1637 BOOT_PAGESIZE;
1593 1638
1594 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1639 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1595 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1640 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1596 1641
1597 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1642 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1598 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1643 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1599 orig_sigelem_set = PL_vtbl_sigelem.svt_set; 1644 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1600 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1601 1645
1602 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1646 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1603 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1647 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1604 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 1648 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1605 1649
… …
1614 main_top_env = PL_top_env; 1658 main_top_env = PL_top_env;
1615 1659
1616 while (main_top_env->je_prev) 1660 while (main_top_env->je_prev)
1617 main_top_env = main_top_env->je_prev; 1661 main_top_env = main_top_env->je_prev;
1618 1662
1619 coroapi.ver = CORO_API_VERSION; 1663 coroapi.ver = CORO_API_VERSION;
1620 coroapi.rev = CORO_API_REVISION; 1664 coroapi.rev = CORO_API_REVISION;
1621 coroapi.transfer = api_transfer; 1665 coroapi.transfer = api_transfer;
1622 1666
1623 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1667 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1624} 1668}
1625 1669
1626SV * 1670SV *
… …
1901void 1945void
1902_set_readyhook (SV *hook) 1946_set_readyhook (SV *hook)
1903 PROTOTYPE: $ 1947 PROTOTYPE: $
1904 CODE: 1948 CODE:
1905 LOCK; 1949 LOCK;
1906 if (coro_readyhook)
1907 SvREFCNT_dec (coro_readyhook); 1950 SvREFCNT_dec (coro_readyhook);
1908 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 1951 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1909 UNLOCK; 1952 UNLOCK;
1910 1953
1911int 1954int
1912prio (Coro::State coro, int newprio = 0) 1955prio (Coro::State coro, int newprio = 0)
… …
1981 AV *invoke_av; 2024 AV *invoke_av;
1982 int i, len; 2025 int i, len;
1983 2026
1984 if (!invoke) 2027 if (!invoke)
1985 { 2028 {
1986 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2029 SV *old = PL_diehook;
2030 PL_diehook = 0;
2031 SvREFCNT_dec (old);
1987 croak ("\3async_pool terminate\2\n"); 2032 croak ("\3async_pool terminate\2\n");
1988 } 2033 }
1989 2034
1990 SvREFCNT_dec (coro->saved_deffh); 2035 SvREFCNT_dec (coro->saved_deffh);
1991 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2036 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
… …
2020 coro->saved_deffh = 0; 2065 coro->saved_deffh = 0;
2021 2066
2022 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2067 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
2023 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2068 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2024 { 2069 {
2025 SvREFCNT_dec (PL_diehook); PL_diehook = 0; 2070 SV *old = PL_diehook;
2071 PL_diehook = 0;
2072 SvREFCNT_dec (old);
2026 croak ("\3async_pool terminate\2\n"); 2073 croak ("\3async_pool terminate\2\n");
2027 } 2074 }
2028 2075
2029 av_clear (GvAV (PL_defgv)); 2076 av_clear (GvAV (PL_defgv));
2030 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2077 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
… …
2078 2125
2079BOOT: 2126BOOT:
2080 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE); 2127 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2081 2128
2082SV * 2129SV *
2083_schedule () 2130_schedule (...)
2084 PROTOTYPE: @ 2131 PROTOTYPE: @
2085 CODE: 2132 CODE:
2086{ 2133{
2087 static int incede; 2134 static int incede;
2088 2135

Diff Legend

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