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

Diff Legend

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