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.312 by root, Thu Nov 20 03:10:30 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
… …
176static HV *hv_sig; /* %SIG */ 176static HV *hv_sig; /* %SIG */
177 177
178/* async_pool helper stuff */ 178/* async_pool helper stuff */
179static SV *sv_pool_rss; 179static SV *sv_pool_rss;
180static SV *sv_pool_size; 180static SV *sv_pool_size;
181static SV *sv_async_pool_idle;
181static AV *av_async_pool; 182static AV *av_async_pool;
183static SV *sv_Coro;
184static CV *cv_pool_handler;
185static CV *cv_coro_new;
182 186
183/* Coro::AnyEvent */ 187/* Coro::AnyEvent */
184static SV *sv_activity; 188static SV *sv_activity;
185 189
186static struct coro_cctx *cctx_first; 190static struct coro_cctx *cctx_first;
… …
263 SV *except; /* exception to be thrown */ 267 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 268 SV *rouse_cb;
265 269
266 /* async_pool */ 270 /* async_pool */
267 SV *saved_deffh; 271 SV *saved_deffh;
272 SV *invoke_cb;
273 AV *invoke_av;
268 274
269 /* linked list */ 275 /* linked list */
270 struct coro *next, *prev; 276 struct coro *next, *prev;
271}; 277};
272 278
… …
289 295
290/* for Coro.pm */ 296/* for Coro.pm */
291static SV *coro_current; 297static SV *coro_current;
292static SV *coro_readyhook; 298static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 299static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
294static CV *cv_coro_run; 300static CV *cv_coro_run, *cv_coro_terminate;
295static struct coro *coro_first; 301static struct coro *coro_first;
296#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
297 303
298/** lowlevel stuff **********************************************************/ 304/** lowlevel stuff **********************************************************/
299 305
… …
687#if !PERL_VERSION_ATLEAST (5,10,0) 693#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 694 Safefree (PL_retstack);
689#endif 695#endif
690} 696}
691 697
698#define CORO_RSS \
699 rss += sizeof (SYM (curstackinfo)); \
700 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
701 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
702 rss += SYM (tmps_max) * sizeof (SV *); \
703 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
704 rss += SYM (scopestack_max) * sizeof (I32); \
705 rss += SYM (savestack_max) * sizeof (ANY);
706
692static size_t 707static size_t
693coro_rss (pTHX_ struct coro *coro) 708coro_rss (pTHX_ struct coro *coro)
694{ 709{
695 size_t rss = sizeof (*coro); 710 size_t rss = sizeof (*coro);
696 711
697 if (coro->mainstack) 712 if (coro->mainstack)
698 { 713 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 714 if (coro->flags & CF_RUNNING)
703 { 715 {
704 slot = &tmp_slot; 716 #define SYM(sym) PL_ ## sym
705 717 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 718 #undef SYM
709 } 719 }
710 else 720 else
711 slot = coro->slot;
712
713 if (slot)
714 { 721 {
715 rss += sizeof (slot->curstackinfo); 722 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 723 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 724 #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 } 725 }
727 } 726 }
728 727
729 return rss; 728 return rss;
730} 729}
… …
932 SvREFCNT_dec (PL_diehook); 931 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook); 932 SvREFCNT_dec (PL_warnhook);
934 933
935 SvREFCNT_dec (coro->saved_deffh); 934 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 935 SvREFCNT_dec (coro->rouse_cb);
936 SvREFCNT_dec (coro->invoke_cb);
937 SvREFCNT_dec (coro->invoke_av);
937 938
938 coro_destruct_stacks (aTHX); 939 coro_destruct_stacks (aTHX);
939} 940}
940 941
941INLINE void 942INLINE void
… …
1744 if (coro->flags & CF_RUNNING) 1745 if (coro->flags & CF_RUNNING)
1745 PL_runops = RUNOPS_DEFAULT; 1746 PL_runops = RUNOPS_DEFAULT;
1746 else 1747 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 1748 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1749 }
1750}
1751
1752/*****************************************************************************/
1753/* async pool handler */
1754
1755static int
1756slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1757{
1758 HV *hv = (HV *)SvRV (coro_current);
1759 struct coro *coro = (struct coro *)frame->data;
1760
1761 if (!coro->invoke_cb)
1762 return 1; /* loop till we have invoke */
1763 else
1764 {
1765 int i, len;
1766
1767 hv_store (hv, "desc", sizeof ("desc") - 1,
1768 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1769
1770 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1771
1772 len = av_len (coro->invoke_av);
1773
1774 {
1775 dSP;
1776 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1777 PUTBACK;
1778 }
1779
1780 SvREFCNT_dec (GvAV (PL_defgv));
1781 GvAV (PL_defgv) = coro->invoke_av;
1782 coro->invoke_av = 0;
1783
1784 return 0;
1785 }
1786}
1787
1788static void
1789slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1790{
1791 HV *hv = (HV *)SvRV (coro_current);
1792 struct coro *coro = SvSTATE_hv ((SV *)hv);
1793
1794 if (expect_true (coro->saved_deffh))
1795 {
1796 /* subsequent iteration */
1797 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1798 coro->saved_deffh = 0;
1799
1800 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1801 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1802 {
1803 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1804 coro->invoke_av = newAV ();
1805
1806 frame->prepare = prepare_nop;
1807 }
1808 else
1809 {
1810 av_clear (GvAV (PL_defgv));
1811 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1812
1813 coro->prio = 0;
1814
1815 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1816 api_trace (aTHX_ coro_current, 0);
1817
1818 frame->prepare = prepare_schedule;
1819 av_push (av_async_pool, SvREFCNT_inc (hv));
1820 }
1821 }
1822 else
1823 {
1824 /* first iteration, simply fall through */
1825 frame->prepare = prepare_nop;
1826 }
1827
1828 frame->check = slf_check_pool_handler;
1829 frame->data = (void *)coro;
1749} 1830}
1750 1831
1751/*****************************************************************************/ 1832/*****************************************************************************/
1752/* rouse callback */ 1833/* rouse callback */
1753 1834
… …
2395 dXSARGS; 2476 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2477 AV *state = (AV *)GENSUB_ARG;
2397 SV *coro = av_pop (state); 2478 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2479 SV *data_sv = newSV (sizeof (struct io_state));
2399 2480
2400 av_extend (state, items); 2481 av_extend (state, items - 1);
2401 2482
2402 sv_upgrade (data_sv, SVt_PV); 2483 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2484 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
2405 2486
… …
2654 mg->mg_flags |= MGf_DUP; 2735 mg->mg_flags |= MGf_DUP;
2655 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2736 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2656 2737
2657 if (items > 1) 2738 if (items > 1)
2658 { 2739 {
2659 av_extend (coro->args, items - 1 + ix); 2740 av_extend (coro->args, items - 1 + ix - 1);
2660 2741
2661 if (ix) 2742 if (ix)
2662 { 2743 {
2663 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 2744 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2664 cb = cv_coro_run; 2745 cb = cv_coro_run;
… …
2874 2955
2875BOOT: 2956BOOT:
2876{ 2957{
2877 int i; 2958 int i;
2878 2959
2879 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 2960 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2880 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 2961 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2881 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 2962 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2882 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 2963 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
2964 cv_coro_terminate = get_cv ( "Coro::terminate", GV_ADD);
2883 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 2965 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE);
2884 SvREADONLY_on (coro_current); 2966 SvREADONLY_on (coro_current);
2967
2968 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2969 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2970 cv_pool_handler = get_cv ("Coro::_pool_handler", 0); SvREADONLY_on (cv_pool_handler);
2971 cv_coro_new = get_cv ("Coro::new", 0); SvREADONLY_on (cv_coro_new);
2885 2972
2886 coro_stash = gv_stashpv ("Coro", TRUE); 2973 coro_stash = gv_stashpv ("Coro", TRUE);
2887 2974
2888 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2975 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2889 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2976 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2978 CODE: 3065 CODE:
2979 RETVAL = coro_nready; 3066 RETVAL = coro_nready;
2980 OUTPUT: 3067 OUTPUT:
2981 RETVAL 3068 RETVAL
2982 3069
2983# for async_pool speedup
2984void 3070void
2985_pool_1 (SV *cb) 3071_pool_handler (...)
2986 CODE: 3072 CODE:
2987{ 3073 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 3074
2995 if (!invoke) 3075void
3076async_pool (SV *cv, ...)
3077 PROTOTYPE: &@
3078 PPCODE:
3079{
3080 HV *hv = (HV *)av_pop (av_async_pool);
3081 AV *av = newAV ();
3082 SV *cb = ST (0);
3083 int i;
3084
3085 av_extend (av, items - 2);
3086 for (i = 1; i < items; ++i)
3087 av_push (av, SvREFCNT_inc_NN (ST (i)));
3088
3089 if ((SV *)hv == &PL_sv_undef)
2996 { 3090 {
2997 SV *old = PL_diehook; 3091 PUSHMARK (SP);
2998 PL_diehook = 0; 3092 EXTEND (SP, 2);
2999 SvREFCNT_dec (old); 3093 PUSHs (sv_Coro);
3000 croak ("\3async_pool terminate\2\n"); 3094 PUSHs ((SV *)cv_pool_handler);
3095 PUTBACK;
3096 call_sv (cv_coro_new, G_SCALAR);
3097 SPAGAIN;
3098
3099 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
3001 } 3100 }
3002 3101
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 { 3102 {
3016 av_fill (defav, len - 1); 3103 struct coro *coro = SvSTATE_hv (hv);
3017 for (i = 0; i < len; ++i) 3104
3018 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3105 assert (!coro->invoke_cb);
3106 assert (!coro->invoke_av);
3107 coro->invoke_cb = SvREFCNT_inc (cb);
3108 coro->invoke_av = av;
3019 } 3109 }
3020}
3021 3110
3022void 3111 api_ready ((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 3112
3029 sv_setsv (cb, &PL_sv_undef); 3113 if (GIMME_V != G_VOID)
3030 3114 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3115 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); 3116 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} 3117}
3054 3118
3055SV * 3119SV *
3056rouse_cb () 3120rouse_cb ()
3057 PROTOTYPE: 3121 PROTOTYPE:

Diff Legend

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