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.303 by root, Wed Nov 19 05:52:42 2008 UTC vs.
Revision 1.314 by root, Thu Nov 20 03:24:39 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_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;
… …
246 /* state data */ 253 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 254 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 255 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 256 perl_slots *slot; /* basically the saved sp */
250 257
258 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 259 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 260 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 261 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 262 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 263 void (*on_destroy)(pTHX_ struct coro *coro);
256 264
257 /* statistics */ 265 /* statistics */
258 int usecount; /* number of transfers to this coro */ 266 int usecount; /* number of transfers to this coro */
259 267
… …
262 SV *except; /* exception to be thrown */ 270 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 271 SV *rouse_cb;
264 272
265 /* async_pool */ 273 /* async_pool */
266 SV *saved_deffh; 274 SV *saved_deffh;
275 SV *invoke_cb;
276 AV *invoke_av;
267 277
268 /* linked list */ 278 /* linked list */
269 struct coro *next, *prev; 279 struct coro *next, *prev;
270}; 280};
271 281
… …
288 298
289/* for Coro.pm */ 299/* for Coro.pm */
290static SV *coro_current; 300static SV *coro_current;
291static SV *coro_readyhook; 301static SV *coro_readyhook;
292static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
303static CV *cv_coro_run, *cv_coro_terminate;
293static struct coro *coro_first; 304static struct coro *coro_first;
294#define coro_nready coroapi.nready 305#define coro_nready coroapi.nready
295 306
296/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
297 308
… …
321#if PERL_VERSION_ATLEAST (5,10,0) 332#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_hv (name, create); 334 get_hv (name, create);
324#endif 335#endif
325 return get_hv (name, create); 336 return get_hv (name, create);
337}
338
339/* may croak */
340INLINE CV *
341coro_sv_2cv (pTHX_ SV *sv)
342{
343 HV *st;
344 GV *gvp;
345 return sv_2cv (sv, &st, &gvp, 0);
326} 346}
327 347
328static AV * 348static AV *
329coro_clone_padlist (pTHX_ CV *cv) 349coro_clone_padlist (pTHX_ CV *cv)
330{ 350{
… …
449 else 469 else
450 { 470 {
451#if CORO_PREFER_PERL_FUNCTIONS 471#if CORO_PREFER_PERL_FUNCTIONS
452 /* this is probably cleaner? but also slower! */ 472 /* this is probably cleaner? but also slower! */
453 /* in practise, it seems to be less stable */ 473 /* in practise, it seems to be less stable */
454 CV *cp = Perl_cv_clone (cv); 474 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 475 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 476 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 477 SvREFCNT_dec (cp);
458#else 478#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
… …
603 * of perl.c:init_stacks, except that it uses less memory 623 * of perl.c:init_stacks, except that it uses less memory
604 * on the (sometimes correct) assumption that coroutines do 624 * on the (sometimes correct) assumption that coroutines do
605 * not usually need a lot of stackspace. 625 * not usually need a lot of stackspace.
606 */ 626 */
607#if CORO_PREFER_PERL_FUNCTIONS 627#if CORO_PREFER_PERL_FUNCTIONS
608# define coro_init_stacks init_stacks 628# define coro_init_stacks(thx) init_stacks ()
609#else 629#else
610static void 630static void
611coro_init_stacks (pTHX) 631coro_init_stacks (pTHX)
612{ 632{
613 PL_curstackinfo = new_stackinfo(32, 8); 633 PL_curstackinfo = new_stackinfo(32, 8);
… …
676#if !PERL_VERSION_ATLEAST (5,10,0) 696#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 697 Safefree (PL_retstack);
678#endif 698#endif
679} 699}
680 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
681static size_t 710static size_t
682coro_rss (pTHX_ struct coro *coro) 711coro_rss (pTHX_ struct coro *coro)
683{ 712{
684 size_t rss = sizeof (*coro); 713 size_t rss = sizeof (*coro);
685 714
686 if (coro->mainstack) 715 if (coro->mainstack)
687 { 716 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 717 if (coro->flags & CF_RUNNING)
692 { 718 {
693 slot = &tmp_slot; 719 #define SYM(sym) PL_ ## sym
694 720 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 721 #undef SYM
698 } 722 }
699 else 723 else
700 slot = coro->slot;
701
702 if (slot)
703 { 724 {
704 rss += sizeof (slot->curstackinfo); 725 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 726 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 727 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 728 }
716 } 729 }
717 730
718 return rss; 731 return rss;
719} 732}
… …
861 dSP; 874 dSP;
862 UNOP myop; 875 UNOP myop;
863 876
864 Zero (&myop, 1, UNOP); 877 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 878 myop.op_next = Nullop;
879 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 880 myop.op_flags = OPf_WANT_VOID;
867 881
868 PUSHMARK (SP); 882 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 883 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 884 PUTBACK;
871 PL_op = (OP *)&myop; 885 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 886 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 887 }
875 888
876 /* this newly created coroutine might be run on an existing cctx which most 889 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 890 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 891 */
… …
881 894
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
883 coro_setup_op.op_next = PL_op; 896 coro_setup_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 897 coro_setup_op.op_type = OP_CUSTOM;
885 coro_setup_op.op_ppaddr = pp_slf; 898 coro_setup_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 899 /* no flags etc. required, as an init function won't be called */
887 900
888 PL_op = (OP *)&coro_setup_op; 901 PL_op = (OP *)&coro_setup_op;
889 902
890 /* copy throw, in case it was set before coro_setup */ 903 /* copy throw, in case it was set before coro_setup */
891 CORO_THROW = coro->except; 904 CORO_THROW = coro->except;
… …
919 SvREFCNT_dec (GvSV (irsgv)); 932 SvREFCNT_dec (GvSV (irsgv));
920 933
921 SvREFCNT_dec (PL_diehook); 934 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook); 935 SvREFCNT_dec (PL_warnhook);
923 936
924 SvREFCNT_dec (CORO_THROW);
925 SvREFCNT_dec (coro->saved_deffh); 937 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 938 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av);
927 941
928 coro_destruct_stacks (aTHX); 942 coro_destruct_stacks (aTHX);
929} 943}
930 944
931INLINE void 945INLINE void
… …
1018 SAVETMPS; 1032 SAVETMPS;
1019 EXTEND (SP, 3); 1033 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1034 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1035 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1036 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1037 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1038 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1039 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1040 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1041 SPAGAIN;
1028 FREETMPS; 1042 FREETMPS;
… …
1134 transfer_tail (aTHX); 1148 transfer_tail (aTHX);
1135 1149
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1150 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1151 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1152 perl_run (PL_curinterp);
1153 /*
1154 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these
1156 */
1139 1157
1140 /* 1158 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1159 * If perl-run returns we assume exit() was being called or the coro
1142 * fell off the end, which seems to be the only valid (non-bug) 1160 * fell off the end, which seems to be the only valid (non-bug)
1143 * reason for perl_run to return. We try to exit by jumping to the 1161 * reason for perl_run to return. We try to exit by jumping to the
… …
1435 1453
1436 coro->slot = 0; 1454 coro->slot = 0;
1437 } 1455 }
1438 1456
1439 cctx_destroy (coro->cctx); 1457 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv);
1440 SvREFCNT_dec (coro->args); 1459 SvREFCNT_dec (coro->args);
1460 SvREFCNT_dec (CORO_THROW);
1441 1461
1442 if (coro->next) coro->next->prev = coro->prev; 1462 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1463 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1464 if (coro == coro_first) coro_first = coro->next;
1445 1465
… …
1731 coro->slot->runops = RUNOPS_DEFAULT; 1751 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1752 }
1733} 1753}
1734 1754
1735/*****************************************************************************/ 1755/*****************************************************************************/
1756/* async pool handler */
1757
1758static int
1759slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1760{
1761 HV *hv = (HV *)SvRV (coro_current);
1762 struct coro *coro = (struct coro *)frame->data;
1763
1764 if (!coro->invoke_cb)
1765 return 1; /* loop till we have invoke */
1766 else
1767 {
1768 hv_store (hv, "desc", sizeof ("desc") - 1,
1769 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1770
1771 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1772
1773 {
1774 dSP;
1775 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1776 PUTBACK;
1777 }
1778
1779 SvREFCNT_dec (GvAV (PL_defgv));
1780 GvAV (PL_defgv) = coro->invoke_av;
1781 coro->invoke_av = 0;
1782
1783 return 0;
1784 }
1785}
1786
1787static void
1788slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1789{
1790 HV *hv = (HV *)SvRV (coro_current);
1791 struct coro *coro = SvSTATE_hv ((SV *)hv);
1792
1793 if (expect_true (coro->saved_deffh))
1794 {
1795 /* subsequent iteration */
1796 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1797 coro->saved_deffh = 0;
1798
1799 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1800 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1801 {
1802 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1803 coro->invoke_av = newAV ();
1804
1805 frame->prepare = prepare_nop;
1806 }
1807 else
1808 {
1809 av_clear (GvAV (PL_defgv));
1810 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1811
1812 coro->prio = 0;
1813
1814 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1815 api_trace (aTHX_ coro_current, 0);
1816
1817 frame->prepare = prepare_schedule;
1818 av_push (av_async_pool, SvREFCNT_inc (hv));
1819 }
1820 }
1821 else
1822 {
1823 /* first iteration, simply fall through */
1824 frame->prepare = prepare_nop;
1825 }
1826
1827 frame->check = slf_check_pool_handler;
1828 frame->data = (void *)coro;
1829}
1830
1831/*****************************************************************************/
1736/* rouse callback */ 1832/* rouse callback */
1737 1833
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1834#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 1835
1740static void 1836static void
… …
1744 SV *data = (SV *)GENSUB_ARG; 1840 SV *data = (SV *)GENSUB_ARG;
1745 1841
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1842 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 1843 {
1748 /* first call, set args */ 1844 /* first call, set args */
1749 int i;
1750 AV *av = newAV (); 1845 AV *av = newAV ();
1751 SV *coro = SvRV (data); 1846 SV *coro = SvRV (data);
1752 1847
1753 SvRV_set (data, (SV *)av); 1848 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro); 1849 api_ready (aTHX_ coro);
… …
2143 SV **ary; 2238 SV **ary;
2144 2239
2145 /* unfortunately, building manually saves memory */ 2240 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2241 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2242 AvALLOC (av) = ary;
2148 AvARRAY (av) = ary; 2243 /*AvARRAY (av) = ary;*/
2244 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */
2149 AvMAX (av) = 1; 2245 AvMAX (av) = 1;
2150 AvFILLp (av) = 0; 2246 AvFILLp (av) = 0;
2151 ary [0] = newSViv (count); 2247 ary [0] = newSViv (count);
2152 2248
2153 return newRV_noinc ((SV *)av); 2249 return newRV_noinc ((SV *)av);
… …
2173 AvARRAY (av)[0] = AvARRAY (av)[1]; 2269 AvARRAY (av)[0] = AvARRAY (av)[1];
2174 AvARRAY (av)[1] = count_sv; 2270 AvARRAY (av)[1] = count_sv;
2175 cb = av_shift (av); 2271 cb = av_shift (av);
2176 2272
2177 if (SvOBJECT (cb)) 2273 if (SvOBJECT (cb))
2274 {
2178 api_ready (aTHX_ cb); 2275 api_ready (aTHX_ cb);
2179 else 2276 --count;
2180 croak ("callbacks not yet supported"); 2277 }
2278 else if (SvTYPE (cb) == SVt_PVCV)
2279 {
2280 dSP;
2281 PUSHMARK (SP);
2282 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2283 PUTBACK;
2284 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2285 }
2181 2286
2182 SvREFCNT_dec (cb); 2287 SvREFCNT_dec (cb);
2183
2184 --count;
2185 } 2288 }
2186} 2289}
2187 2290
2188static void 2291static void
2189coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2292coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2271} 2374}
2272 2375
2273static void 2376static void
2274slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2377slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2275{ 2378{
2379 if (items >= 2)
2380 {
2381 /* callback form */
2382 AV *av = (AV *)SvRV (arg [0]);
2383 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2384
2385 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2386
2387 if (SvIVX (AvARRAY (av)[0]) > 0)
2388 coro_semaphore_adjust (aTHX_ av, 0);
2389
2390 frame->prepare = prepare_nop;
2391 frame->check = slf_check_nop;
2392 }
2393 else
2394 {
2276 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2395 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277 frame->check = slf_check_semaphore_wait; 2396 frame->check = slf_check_semaphore_wait;
2397 }
2278} 2398}
2279 2399
2280/* signal */ 2400/* signal */
2281 2401
2282static void 2402static void
… …
2354 dXSARGS; 2474 dXSARGS;
2355 AV *state = (AV *)GENSUB_ARG; 2475 AV *state = (AV *)GENSUB_ARG;
2356 SV *coro = av_pop (state); 2476 SV *coro = av_pop (state);
2357 SV *data_sv = newSV (sizeof (struct io_state)); 2477 SV *data_sv = newSV (sizeof (struct io_state));
2358 2478
2359 av_extend (state, items); 2479 av_extend (state, items - 1);
2360 2480
2361 sv_upgrade (data_sv, SVt_PV); 2481 sv_upgrade (data_sv, SVt_PV);
2362 SvCUR_set (data_sv, sizeof (struct io_state)); 2482 SvCUR_set (data_sv, sizeof (struct io_state));
2363 SvPOK_only (data_sv); 2483 SvPOK_only (data_sv);
2364 2484
… …
2574 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2694 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2575} 2695}
2576 2696
2577SV * 2697SV *
2578new (char *klass, ...) 2698new (char *klass, ...)
2699 ALIAS:
2700 Coro::new = 1
2579 CODE: 2701 CODE:
2580{ 2702{
2581 struct coro *coro; 2703 struct coro *coro;
2582 MAGIC *mg; 2704 MAGIC *mg;
2583 HV *hv; 2705 HV *hv;
2706 CV *cb;
2584 int i; 2707 int i;
2708
2709 if (items > 1)
2710 {
2711 cb = coro_sv_2cv (aTHX_ ST (1));
2712
2713 if (!ix)
2714 {
2715 if (CvISXSUB (cb))
2716 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2717
2718 if (!CvROOT (cb))
2719 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2720 }
2721 }
2585 2722
2586 Newz (0, coro, 1, struct coro); 2723 Newz (0, coro, 1, struct coro);
2587 coro->args = newAV (); 2724 coro->args = newAV ();
2588 coro->flags = CF_NEW; 2725 coro->flags = CF_NEW;
2589 2726
… …
2594 coro->hv = hv = newHV (); 2731 coro->hv = hv = newHV ();
2595 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2732 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2596 mg->mg_flags |= MGf_DUP; 2733 mg->mg_flags |= MGf_DUP;
2597 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2734 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598 2735
2736 if (items > 1)
2737 {
2599 av_extend (coro->args, items - 1); 2738 av_extend (coro->args, items - 1 + ix - 1);
2739
2740 if (ix)
2741 {
2742 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2743 cb = cv_coro_run;
2744 }
2745
2746 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2747
2600 for (i = 1; i < items; i++) 2748 for (i = 2; i < items; i++)
2601 av_push (coro->args, newSVsv (ST (i))); 2749 av_push (coro->args, newSVsv (ST (i)));
2750 }
2602} 2751}
2603 OUTPUT: 2752 OUTPUT:
2604 RETVAL 2753 RETVAL
2605 2754
2606void 2755void
… …
2804 2953
2805BOOT: 2954BOOT:
2806{ 2955{
2807 int i; 2956 int i;
2808 2957
2809 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 2958 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 2959 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 2960 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812 2961 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
2962 cv_coro_terminate = get_cv ( "Coro::terminate", GV_ADD);
2813 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 2963 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE);
2814 SvREADONLY_on (coro_current); 2964 SvREADONLY_on (coro_current);
2965
2966 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2967 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2968 cv_pool_handler = get_cv ("Coro::_pool_handler", 0); SvREADONLY_on (cv_pool_handler);
2969 cv_coro_new = get_cv ("Coro::new", 0); SvREADONLY_on (cv_coro_new);
2815 2970
2816 coro_stash = gv_stashpv ("Coro", TRUE); 2971 coro_stash = gv_stashpv ("Coro", TRUE);
2817 2972
2818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2973 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2974 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2908 CODE: 3063 CODE:
2909 RETVAL = coro_nready; 3064 RETVAL = coro_nready;
2910 OUTPUT: 3065 OUTPUT:
2911 RETVAL 3066 RETVAL
2912 3067
2913# for async_pool speedup
2914void 3068void
2915_pool_1 (SV *cb) 3069_pool_handler (...)
2916 CODE: 3070 CODE:
2917{ 3071 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2918 HV *hv = (HV *)SvRV (coro_current);
2919 struct coro *coro = SvSTATE_hv ((SV *)hv);
2920 AV *defav = GvAV (PL_defgv);
2921 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2922 AV *invoke_av;
2923 int i, len;
2924 3072
2925 if (!invoke) 3073void
3074async_pool (SV *cv, ...)
3075 PROTOTYPE: &@
3076 PPCODE:
3077{
3078 HV *hv = (HV *)av_pop (av_async_pool);
3079 AV *av = newAV ();
3080 SV *cb = ST (0);
3081 int i;
3082
3083 av_extend (av, items - 2);
3084 for (i = 1; i < items; ++i)
3085 av_push (av, SvREFCNT_inc_NN (ST (i)));
3086
3087 if ((SV *)hv == &PL_sv_undef)
2926 { 3088 {
2927 SV *old = PL_diehook; 3089 PUSHMARK (SP);
2928 PL_diehook = 0; 3090 EXTEND (SP, 2);
2929 SvREFCNT_dec (old); 3091 PUSHs (sv_Coro);
2930 croak ("\3async_pool terminate\2\n"); 3092 PUSHs ((SV *)cv_pool_handler);
3093 PUTBACK;
3094 call_sv ((SV *)cv_coro_new, G_SCALAR);
3095 SPAGAIN;
3096
3097 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2931 } 3098 }
2932 3099
2933 SvREFCNT_dec (coro->saved_deffh);
2934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2935
2936 hv_store (hv, "desc", sizeof ("desc") - 1,
2937 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2938
2939 invoke_av = (AV *)SvRV (invoke);
2940 len = av_len (invoke_av);
2941
2942 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2943
2944 if (len > 0)
2945 { 3100 {
2946 av_fill (defav, len - 1); 3101 struct coro *coro = SvSTATE_hv (hv);
2947 for (i = 0; i < len; ++i) 3102
2948 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3103 assert (!coro->invoke_cb);
3104 assert (!coro->invoke_av);
3105 coro->invoke_cb = SvREFCNT_inc (cb);
3106 coro->invoke_av = av;
2949 } 3107 }
2950}
2951 3108
2952void 3109 api_ready (aTHX_ (SV *)hv);
2953_pool_2 (SV *cb)
2954 CODE:
2955{
2956 HV *hv = (HV *)SvRV (coro_current);
2957 struct coro *coro = SvSTATE_hv ((SV *)hv);
2958 3110
2959 sv_setsv (cb, &PL_sv_undef); 3111 if (GIMME_V != G_VOID)
2960 3112 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3113 else
2962 coro->saved_deffh = 0;
2963
2964 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2965 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2966 {
2967 SV *old = PL_diehook;
2968 PL_diehook = 0;
2969 SvREFCNT_dec (old); 3114 SvREFCNT_dec (hv);
2970 croak ("\3async_pool terminate\2\n");
2971 }
2972
2973 av_clear (GvAV (PL_defgv));
2974 hv_store (hv, "desc", sizeof ("desc") - 1,
2975 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2976
2977 coro->prio = 0;
2978
2979 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2980 api_trace (aTHX_ coro_current, 0);
2981
2982 av_push (av_async_pool, newSVsv (coro_current));
2983} 3115}
2984 3116
2985SV * 3117SV *
2986rouse_cb () 3118rouse_cb ()
2987 PROTOTYPE: 3119 PROTOTYPE:
… …
2989 RETVAL = coro_new_rouse_cb (aTHX); 3121 RETVAL = coro_new_rouse_cb (aTHX);
2990 OUTPUT: 3122 OUTPUT:
2991 RETVAL 3123 RETVAL
2992 3124
2993void 3125void
2994rouse_wait (SV *cb = 0) 3126rouse_wait (...)
2995 PROTOTYPE: ;$ 3127 PROTOTYPE: ;$
2996 PPCODE: 3128 PPCODE:
2997 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3129 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2998 3130
2999 3131
… …
3036 adjust = 1 3168 adjust = 1
3037 CODE: 3169 CODE:
3038 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3170 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039 3171
3040void 3172void
3041down (SV *self) 3173down (...)
3042 CODE: 3174 CODE:
3043 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3175 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044 3176
3045void 3177void
3046wait (SV *self) 3178wait (...)
3047 CODE: 3179 CODE:
3048 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3180 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049 3181
3050void 3182void
3051try (SV *self) 3183try (SV *self)
… …
3094 ); 3226 );
3095 OUTPUT: 3227 OUTPUT:
3096 RETVAL 3228 RETVAL
3097 3229
3098void 3230void
3099wait (SV *self) 3231wait (...)
3100 CODE: 3232 CODE:
3101 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3233 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102 3234
3103void 3235void
3104broadcast (SV *self) 3236broadcast (SV *self)
… …
3161 3293
3162void 3294void
3163_register (char *target, char *proto, SV *req) 3295_register (char *target, char *proto, SV *req)
3164 CODE: 3296 CODE:
3165{ 3297{
3166 HV *st; 3298 CV *req_cv = coro_sv_2cv (aTHX_ req);
3167 GV *gvp;
3168 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3169 /* newXSproto doesn't return the CV on 5.8 */ 3299 /* newXSproto doesn't return the CV on 5.8 */
3170 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3300 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171 sv_setpv ((SV *)slf_cv, proto); 3301 sv_setpv ((SV *)slf_cv, proto);
3172 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3302 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173} 3303}

Diff Legend

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