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.311 by root, Thu Nov 20 01:12:08 2008 UTC vs.
Revision 1.316 by root, Thu Nov 20 06:01:40 2008 UTC

… …
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
… …
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
103 106
104/* 5.8.7 */ 107/* 5.8.7 */
105#ifndef SvRV_set 108#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 109# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 110#endif
… …
176static HV *hv_sig; /* %SIG */ 179static HV *hv_sig; /* %SIG */
177 180
178/* async_pool helper stuff */ 181/* async_pool helper stuff */
179static SV *sv_pool_rss; 182static SV *sv_pool_rss;
180static SV *sv_pool_size; 183static SV *sv_pool_size;
184static SV *sv_async_pool_idle;
181static AV *av_async_pool; 185static AV *av_async_pool;
186static SV *sv_Coro;
187static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
182 189
183/* Coro::AnyEvent */ 190/* Coro::AnyEvent */
184static SV *sv_activity; 191static SV *sv_activity;
185 192
186static struct coro_cctx *cctx_first; 193static struct coro_cctx *cctx_first;
… …
263 SV *except; /* exception to be thrown */ 270 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 271 SV *rouse_cb;
265 272
266 /* async_pool */ 273 /* async_pool */
267 SV *saved_deffh; 274 SV *saved_deffh;
275 SV *invoke_cb;
276 AV *invoke_av;
268 277
269 /* linked list */ 278 /* linked list */
270 struct coro *next, *prev; 279 struct coro *next, *prev;
271}; 280};
272 281
… …
289 298
290/* for Coro.pm */ 299/* for Coro.pm */
291static SV *coro_current; 300static SV *coro_current;
292static SV *coro_readyhook; 301static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
294static CV *cv_coro_run; 303static CV *cv_coro_run, *cv_coro_terminate;
295static struct coro *coro_first; 304static struct coro *coro_first;
296#define coro_nready coroapi.nready 305#define coro_nready coroapi.nready
297 306
298/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
299 308
… …
687#if !PERL_VERSION_ATLEAST (5,10,0) 696#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 697 Safefree (PL_retstack);
689#endif 698#endif
690} 699}
691 700
701#define CORO_RSS \
702 rss += sizeof (SYM (curstackinfo)); \
703 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
704 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
705 rss += SYM (tmps_max) * sizeof (SV *); \
706 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
707 rss += SYM (scopestack_max) * sizeof (I32); \
708 rss += SYM (savestack_max) * sizeof (ANY);
709
692static size_t 710static size_t
693coro_rss (pTHX_ struct coro *coro) 711coro_rss (pTHX_ struct coro *coro)
694{ 712{
695 size_t rss = sizeof (*coro); 713 size_t rss = sizeof (*coro);
696 714
697 if (coro->mainstack) 715 if (coro->mainstack)
698 { 716 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 717 if (coro->flags & CF_RUNNING)
703 { 718 {
704 slot = &tmp_slot; 719 #define SYM(sym) PL_ ## sym
705 720 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 721 #undef SYM
709 } 722 }
710 else 723 else
711 slot = coro->slot;
712
713 if (slot)
714 { 724 {
715 rss += sizeof (slot->curstackinfo); 725 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 726 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 727 #undef SYM
718 rss += slot->tmps_max * sizeof (SV *);
719 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
720 rss += slot->scopestack_max * sizeof (I32);
721 rss += slot->savestack_max * sizeof (ANY);
722
723#if !PERL_VERSION_ATLEAST (5,10,0)
724 rss += slot->retstack_max * sizeof (OP *);
725#endif
726 } 728 }
727 } 729 }
728 730
729 return rss; 731 return rss;
730} 732}
… …
932 SvREFCNT_dec (PL_diehook); 934 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook); 935 SvREFCNT_dec (PL_warnhook);
934 936
935 SvREFCNT_dec (coro->saved_deffh); 937 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 938 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av);
937 941
938 coro_destruct_stacks (aTHX); 942 coro_destruct_stacks (aTHX);
939} 943}
940 944
941INLINE void 945INLINE void
… …
1608api_is_ready (pTHX_ SV *coro_sv) 1612api_is_ready (pTHX_ SV *coro_sv)
1609{ 1613{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1614 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1615}
1612 1616
1617/* expects to own a reference to next->hv */
1613INLINE void 1618INLINE void
1619prepare_cede_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1620{
1621 SV *prev_sv = SvRV (coro_current);
1622
1623 ta->prev = SvSTATE_hv (prev_sv);
1624 ta->next = next;
1625
1626 TRANSFER_CHECK (*ta);
1627
1628 SvRV_set (coro_current, next->hv);
1629
1630 free_coro_mortal (aTHX);
1631 coro_mortal = prev_sv;
1632}
1633
1634static void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1635prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1615{ 1636{
1616 SV *prev_sv, *next_sv;
1617
1618 for (;;) 1637 for (;;)
1619 { 1638 {
1620 next_sv = coro_deq (aTHX); 1639 SV *next_sv = coro_deq (aTHX);
1621 1640
1622 /* nothing to schedule: call the idle handler */
1623 if (expect_false (!next_sv)) 1641 if (expect_false (!next_sv))
1624 { 1642 {
1643 /* nothing to schedule: call the idle handler */
1625 dSP; 1644 dSP;
1626 1645
1627 ENTER; 1646 ENTER;
1628 SAVETMPS; 1647 SAVETMPS;
1629 1648
… …
1631 PUTBACK; 1650 PUTBACK;
1632 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1651 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1633 1652
1634 FREETMPS; 1653 FREETMPS;
1635 LEAVE; 1654 LEAVE;
1636 continue;
1637 } 1655 }
1638 1656 else
1639 ta->next = SvSTATE_hv (next_sv);
1640
1641 /* cannot transfer to destroyed coros, skip and look for next */
1642 if (expect_false (ta->next->flags & CF_DESTROYED))
1643 { 1657 {
1644 SvREFCNT_dec (next_sv); 1658 struct coro *next = SvSTATE_hv (next_sv);
1659
1660 /* cannot transfer to destroyed coros, skip and look for next */
1661 if (expect_false (next->flags & CF_DESTROYED))
1645 /* coro_nready has already been taken care of by destroy */ 1662 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1646 continue; 1663 else
1664 {
1665 next->flags &= ~CF_READY;
1666 --coro_nready;
1667
1668 return prepare_cede_to (aTHX_ ta, next);
1669 }
1647 } 1670 }
1648
1649 --coro_nready;
1650 break;
1651 } 1671 }
1652
1653 /* free this only after the transfer */
1654 prev_sv = SvRV (coro_current);
1655 ta->prev = SvSTATE_hv (prev_sv);
1656 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv);
1660
1661 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv;
1663} 1672}
1664 1673
1665INLINE void 1674INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1675prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1676{
… …
1747 coro->slot->runops = RUNOPS_DEFAULT; 1756 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1757 }
1749} 1758}
1750 1759
1751/*****************************************************************************/ 1760/*****************************************************************************/
1761/* async pool handler */
1762
1763static int
1764slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1765{
1766 HV *hv = (HV *)SvRV (coro_current);
1767 struct coro *coro = (struct coro *)frame->data;
1768
1769 if (!coro->invoke_cb)
1770 return 1; /* loop till we have invoke */
1771 else
1772 {
1773 hv_store (hv, "desc", sizeof ("desc") - 1,
1774 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1775
1776 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1777
1778 {
1779 dSP;
1780 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1781 PUTBACK;
1782 }
1783
1784 SvREFCNT_dec (GvAV (PL_defgv));
1785 GvAV (PL_defgv) = coro->invoke_av;
1786 coro->invoke_av = 0;
1787
1788 return 0;
1789 }
1790}
1791
1792static void
1793slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1794{
1795 HV *hv = (HV *)SvRV (coro_current);
1796 struct coro *coro = SvSTATE_hv ((SV *)hv);
1797
1798 if (expect_true (coro->saved_deffh))
1799 {
1800 /* subsequent iteration */
1801 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1802 coro->saved_deffh = 0;
1803
1804 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1805 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1806 {
1807 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1808 coro->invoke_av = newAV ();
1809
1810 frame->prepare = prepare_nop;
1811 }
1812 else
1813 {
1814 av_clear (GvAV (PL_defgv));
1815 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1816
1817 coro->prio = 0;
1818
1819 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1820 api_trace (aTHX_ coro_current, 0);
1821
1822 frame->prepare = prepare_schedule;
1823 av_push (av_async_pool, SvREFCNT_inc (hv));
1824 }
1825 }
1826 else
1827 {
1828 /* first iteration, simply fall through */
1829 frame->prepare = prepare_nop;
1830 }
1831
1832 frame->check = slf_check_pool_handler;
1833 frame->data = (void *)coro;
1834}
1835
1836/*****************************************************************************/
1752/* rouse callback */ 1837/* rouse callback */
1753 1838
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1839#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 1840
1756static void 1841static void
… …
1760 SV *data = (SV *)GENSUB_ARG; 1845 SV *data = (SV *)GENSUB_ARG;
1761 1846
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1847 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 1848 {
1764 /* first call, set args */ 1849 /* first call, set args */
1765 int i;
1766 AV *av = newAV (); 1850 AV *av = newAV ();
1767 SV *coro = SvRV (data); 1851 SV *coro = SvRV (data);
1768 1852
1769 SvRV_set (data, (SV *)av); 1853 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro); 1854 api_ready (aTHX_ coro);
… …
2395 dXSARGS; 2479 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2480 AV *state = (AV *)GENSUB_ARG;
2397 SV *coro = av_pop (state); 2481 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2482 SV *data_sv = newSV (sizeof (struct io_state));
2399 2483
2400 av_extend (state, items); 2484 av_extend (state, items - 1);
2401 2485
2402 sv_upgrade (data_sv, SVt_PV); 2486 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2487 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2488 SvPOK_only (data_sv);
2405 2489
… …
2654 mg->mg_flags |= MGf_DUP; 2738 mg->mg_flags |= MGf_DUP;
2655 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2739 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2656 2740
2657 if (items > 1) 2741 if (items > 1)
2658 { 2742 {
2659 av_extend (coro->args, items - 1 + ix); 2743 av_extend (coro->args, items - 1 + ix - 1);
2660 2744
2661 if (ix) 2745 if (ix)
2662 { 2746 {
2663 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 2747 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2664 cb = cv_coro_run; 2748 cb = cv_coro_run;
… …
2874 2958
2875BOOT: 2959BOOT:
2876{ 2960{
2877 int i; 2961 int i;
2878 2962
2879 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 2963 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2880 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 2964 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2881 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 2965 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2882 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 2966 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
2967 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2883 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 2968 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2884 SvREADONLY_on (coro_current); 2969
2970 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2971 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2972 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2973 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2885 2974
2886 coro_stash = gv_stashpv ("Coro", TRUE); 2975 coro_stash = gv_stashpv ("Coro", TRUE);
2887 2976
2888 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2977 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2889 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2978 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2978 CODE: 3067 CODE:
2979 RETVAL = coro_nready; 3068 RETVAL = coro_nready;
2980 OUTPUT: 3069 OUTPUT:
2981 RETVAL 3070 RETVAL
2982 3071
2983# for async_pool speedup
2984void 3072void
2985_pool_1 (SV *cb) 3073_pool_handler (...)
2986 CODE: 3074 CODE:
2987{ 3075 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2988 HV *hv = (HV *)SvRV (coro_current);
2989 struct coro *coro = SvSTATE_hv ((SV *)hv);
2990 AV *defav = GvAV (PL_defgv);
2991 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2992 AV *invoke_av;
2993 int i, len;
2994 3076
2995 if (!invoke) 3077void
3078async_pool (SV *cv, ...)
3079 PROTOTYPE: &@
3080 PPCODE:
3081{
3082 HV *hv = (HV *)av_pop (av_async_pool);
3083 AV *av = newAV ();
3084 SV *cb = ST (0);
3085 int i;
3086
3087 av_extend (av, items - 2);
3088 for (i = 1; i < items; ++i)
3089 av_push (av, SvREFCNT_inc_NN (ST (i)));
3090
3091 if ((SV *)hv == &PL_sv_undef)
2996 { 3092 {
2997 SV *old = PL_diehook; 3093 PUSHMARK (SP);
2998 PL_diehook = 0; 3094 EXTEND (SP, 2);
2999 SvREFCNT_dec (old); 3095 PUSHs (sv_Coro);
3000 croak ("\3async_pool terminate\2\n"); 3096 PUSHs ((SV *)cv_pool_handler);
3097 PUTBACK;
3098 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3099 SPAGAIN;
3100
3101 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
3001 } 3102 }
3002 3103
3003 SvREFCNT_dec (coro->saved_deffh);
3004 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
3005
3006 hv_store (hv, "desc", sizeof ("desc") - 1,
3007 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
3008
3009 invoke_av = (AV *)SvRV (invoke);
3010 len = av_len (invoke_av);
3011
3012 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3013
3014 if (len > 0)
3015 { 3104 {
3016 av_fill (defav, len - 1); 3105 struct coro *coro = SvSTATE_hv (hv);
3017 for (i = 0; i < len; ++i) 3106
3018 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3107 assert (!coro->invoke_cb);
3108 assert (!coro->invoke_av);
3109 coro->invoke_cb = SvREFCNT_inc (cb);
3110 coro->invoke_av = av;
3019 } 3111 }
3020}
3021 3112
3022void 3113 api_ready (aTHX_ (SV *)hv);
3023_pool_2 (SV *cb)
3024 CODE:
3025{
3026 HV *hv = (HV *)SvRV (coro_current);
3027 struct coro *coro = SvSTATE_hv ((SV *)hv);
3028 3114
3029 sv_setsv (cb, &PL_sv_undef); 3115 if (GIMME_V != G_VOID)
3030 3116 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3117 else
3032 coro->saved_deffh = 0;
3033
3034 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3035 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3036 {
3037 SV *old = PL_diehook;
3038 PL_diehook = 0;
3039 SvREFCNT_dec (old); 3118 SvREFCNT_dec (hv);
3040 croak ("\3async_pool terminate\2\n");
3041 }
3042
3043 av_clear (GvAV (PL_defgv));
3044 hv_store (hv, "desc", sizeof ("desc") - 1,
3045 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3046
3047 coro->prio = 0;
3048
3049 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3050 api_trace (aTHX_ coro_current, 0);
3051
3052 av_push (av_async_pool, newSVsv (coro_current));
3053} 3119}
3054 3120
3055SV * 3121SV *
3056rouse_cb () 3122rouse_cb ()
3057 PROTOTYPE: 3123 PROTOTYPE:

Diff Legend

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