[ViewVC] Diff of: cvs/Coro/Coro/State.xs

Comparing Coro/Coro/State.xs (file contents):
Revision 1.305 by root, Wed Nov 19 10:44:41 2008 UTC vs.
Revision 1.315 by root, Thu Nov 20 05:25:17 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
…		…
176	static HV hv_sig; / %SIG */	179	static HV hv_sig; / %SIG */
177		180
178	/* async_pool helper stuff */	181	/* async_pool helper stuff */
179	static SV *sv_pool_rss;	182	static SV *sv_pool_rss;
180	static SV *sv_pool_size;	183	static SV *sv_pool_size;
		184	static SV *sv_async_pool_idle;
181	static AV *av_async_pool;	185	static AV *av_async_pool;
		186	static SV *sv_Coro;
		187	static CV *cv_pool_handler;
		188	static CV *cv_coro_state_new;
182		189
183	/* Coro::AnyEvent */	190	/* Coro::AnyEvent */
184	static SV *sv_activity;	191	static SV *sv_activity;
185		192
186	static struct coro_cctx *cctx_first;	193	static 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 */
290	static SV *coro_current;	300	static SV *coro_current;
291	static SV *coro_readyhook;	301	static SV *coro_readyhook;
292	static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];	302	static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
		303	static CV cv_coro_run, cv_coro_terminate;
293	static struct coro *coro_first;	304	static 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 */
		340	INLINE CV *
		341	coro_sv_2cv (pTHX_ SV *sv)
		342	{
		343	HV *st;
		344	GV *gvp;
		345	return sv_2cv (sv, &st, &gvp, 0);
326	}	346	}
327		347
328	static AV *	348	static AV *
329	coro_clone_padlist (pTHX_ CV *cv)	349	coro_clone_padlist (pTHX_ CV *cv)
330	{	350	{
…		…
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
681	static size_t	710	static size_t
682	coro_rss (pTHX_ struct coro *coro)	711	coro_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
931	INLINE void	945	INLINE 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
		1758	static int
		1759	slf_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
		1787	static void
		1788	slf_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
1740	static void	1836	static 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);
…		…
2174	AvARRAY (av)[0] = AvARRAY (av)[1];	2269	AvARRAY (av)[0] = AvARRAY (av)[1];
2175	AvARRAY (av)[1] = count_sv;	2270	AvARRAY (av)[1] = count_sv;
2176	cb = av_shift (av);	2271	cb = av_shift (av);
2177		2272
2178	if (SvOBJECT (cb))	2273	if (SvOBJECT (cb))
		2274	{
2179	api_ready (aTHX_ cb);	2275	api_ready (aTHX_ cb);
2180	else	2276	--count;
2181	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	}
2182		2286
2183	SvREFCNT_dec (cb);	2287	SvREFCNT_dec (cb);
2184
2185	--count;
2186	}	2288	}
2187	}	2289	}
2188		2290
2189	static void	2291	static void
2190	coro_semaphore_on_destroy (pTHX_ struct coro *coro)	2292	coro_semaphore_on_destroy (pTHX_ struct coro *coro)
…		…
2272	}	2374	}
2273		2375
2274	static void	2376	static void
2275	slf_init_semaphore_wait (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)	2377	slf_init_semaphore_wait (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
2276	{	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	{
2277	slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);	2395	slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2278	frame->check = slf_check_semaphore_wait;	2396	frame->check = slf_check_semaphore_wait;
		2397	}
2279	}	2398	}
2280		2399
2281	/* signal */	2400	/* signal */
2282		2401
2283	static void	2402	static void
…		…
2355	dXSARGS;	2474	dXSARGS;
2356	AV state = (AV )GENSUB_ARG;	2475	AV state = (AV )GENSUB_ARG;
2357	SV *coro = av_pop (state);	2476	SV *coro = av_pop (state);
2358	SV *data_sv = newSV (sizeof (struct io_state));	2477	SV *data_sv = newSV (sizeof (struct io_state));
2359		2478
2360	av_extend (state, items);	2479	av_extend (state, items - 1);
2361		2480
2362	sv_upgrade (data_sv, SVt_PV);	2481	sv_upgrade (data_sv, SVt_PV);
2363	SvCUR_set (data_sv, sizeof (struct io_state));	2482	SvCUR_set (data_sv, sizeof (struct io_state));
2364	SvPOK_only (data_sv);	2483	SvPOK_only (data_sv);
2365		2484
…		…
2575	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));	2694	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2576	}	2695	}
2577		2696
2578	SV *	2697	SV *
2579	new (char *klass, ...)	2698	new (char *klass, ...)
		2699	ALIAS:
		2700	Coro::new = 1
2580	CODE:	2701	CODE:
2581	{	2702	{
2582	struct coro *coro;	2703	struct coro *coro;
2583	MAGIC *mg;	2704	MAGIC *mg;
2584	HV *hv;	2705	HV *hv;
		2706	CV *cb;
2585	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	}
2586		2722
2587	Newz (0, coro, 1, struct coro);	2723	Newz (0, coro, 1, struct coro);
2588	coro->args = newAV ();	2724	coro->args = newAV ();
2589	coro->flags = CF_NEW;	2725	coro->flags = CF_NEW;
2590		2726
…		…
2595	coro->hv = hv = newHV ();	2731	coro->hv = hv = newHV ();
2596	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);
2597	mg->mg_flags \|= MGf_DUP;	2733	mg->mg_flags \|= MGf_DUP;
2598	RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	2734	RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2599		2735
		2736	if (items > 1)
		2737	{
2600	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
2601	for (i = 1; i < items; i++)	2748	for (i = 2; i < items; i++)
2602	av_push (coro->args, newSVsv (ST (i)));	2749	av_push (coro->args, newSVsv (ST (i)));
		2750	}
2603	}	2751	}
2604	OUTPUT:	2752	OUTPUT:
2605	RETVAL	2753	RETVAL
2606		2754
2607	void	2755	void
…		…
2805		2953
2806	BOOT:	2954	BOOT:
2807	{	2955	{
2808	int i;	2956	int i;
2809		2957
2810	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);	2958	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2811	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	2959	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2812	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	2960	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2813		2961	cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
		2962	cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2814	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);	2963	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2815	SvREADONLY_on (coro_current);	2964
		2965	sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
		2966	sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
		2967	cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
		2968	cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2816		2969
2817	coro_stash = gv_stashpv ("Coro", TRUE);	2970	coro_stash = gv_stashpv ("Coro", TRUE);
2818		2971
2819	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));	2972	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2820	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));	2973	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
…		…
2909	CODE:	3062	CODE:
2910	RETVAL = coro_nready;	3063	RETVAL = coro_nready;
2911	OUTPUT:	3064	OUTPUT:
2912	RETVAL	3065	RETVAL
2913		3066
2914	# for async_pool speedup
2915	void	3067	void
2916	_pool_1 (SV *cb)	3068	_pool_handler (...)
2917	CODE:	3069	CODE:
2918	{	3070	CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2919	HV hv = (HV )SvRV (coro_current);
2920	struct coro coro = SvSTATE_hv ((SV )hv);
2921	AV *defav = GvAV (PL_defgv);
2922	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2923	AV *invoke_av;
2924	int i, len;
2925		3071
2926	if (!invoke)	3072	void
		3073	async_pool (SV *cv, ...)
		3074	PROTOTYPE: &@
		3075	PPCODE:
		3076	{
		3077	HV hv = (HV )av_pop (av_async_pool);
		3078	AV *av = newAV ();
		3079	SV *cb = ST (0);
		3080	int i;
		3081
		3082	av_extend (av, items - 2);
		3083	for (i = 1; i < items; ++i)
		3084	av_push (av, SvREFCNT_inc_NN (ST (i)));
		3085
		3086	if ((SV *)hv == &PL_sv_undef)
2927	{	3087	{
2928	SV *old = PL_diehook;	3088	PUSHMARK (SP);
2929	PL_diehook = 0;	3089	EXTEND (SP, 2);
2930	SvREFCNT_dec (old);	3090	PUSHs (sv_Coro);
2931	croak ("\3async_pool terminate\2\n");	3091	PUSHs ((SV *)cv_pool_handler);
		3092	PUTBACK;
		3093	call_sv ((SV *)cv_coro_state_new, G_SCALAR);
		3094	SPAGAIN;
		3095
		3096	hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2932	}	3097	}
2933		3098
2934	SvREFCNT_dec (coro->saved_deffh);
2935	coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2936
2937	hv_store (hv, "desc", sizeof ("desc") - 1,
2938	newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2939
2940	invoke_av = (AV *)SvRV (invoke);
2941	len = av_len (invoke_av);
2942
2943	sv_setsv (cb, AvARRAY (invoke_av)[0]);
2944
2945	if (len > 0)
2946	{	3099	{
2947	av_fill (defav, len - 1);	3100	struct coro *coro = SvSTATE_hv (hv);
2948	for (i = 0; i < len; ++i)	3101
2949	av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));	3102	assert (!coro->invoke_cb);
		3103	assert (!coro->invoke_av);
		3104	coro->invoke_cb = SvREFCNT_inc (cb);
		3105	coro->invoke_av = av;
2950	}	3106	}
2951	}
2952		3107
2953	void	3108	api_ready (aTHX_ (SV *)hv);
2954	_pool_2 (SV *cb)
2955	CODE:
2956	{
2957	HV hv = (HV )SvRV (coro_current);
2958	struct coro coro = SvSTATE_hv ((SV )hv);
2959		3109
2960	sv_setsv (cb, &PL_sv_undef);	3110	if (GIMME_V != G_VOID)
2961		3111	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2962	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;	3112	else
2963	coro->saved_deffh = 0;
2964
2965	if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2966	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2967	{
2968	SV *old = PL_diehook;
2969	PL_diehook = 0;
2970	SvREFCNT_dec (old);	3113	SvREFCNT_dec (hv);
2971	croak ("\3async_pool terminate\2\n");
2972	}
2973
2974	av_clear (GvAV (PL_defgv));
2975	hv_store (hv, "desc", sizeof ("desc") - 1,
2976	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2977
2978	coro->prio = 0;
2979
2980	if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2981	api_trace (aTHX_ coro_current, 0);
2982
2983	av_push (av_async_pool, newSVsv (coro_current));
2984	}	3114	}
2985		3115
2986	SV *	3116	SV *
2987	rouse_cb ()	3117	rouse_cb ()
2988	PROTOTYPE:	3118	PROTOTYPE:
…		…
2990	RETVAL = coro_new_rouse_cb (aTHX);	3120	RETVAL = coro_new_rouse_cb (aTHX);
2991	OUTPUT:	3121	OUTPUT:
2992	RETVAL	3122	RETVAL
2993		3123
2994	void	3124	void
2995	rouse_wait (SV *cb = 0)	3125	rouse_wait (...)
2996	PROTOTYPE: ;$	3126	PROTOTYPE: ;$
2997	PPCODE:	3127	PPCODE:
2998	CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);	3128	CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2999		3129
3000		3130
…		…
3037	adjust = 1	3167	adjust = 1
3038	CODE:	3168	CODE:
3039	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);	3169	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3040		3170
3041	void	3171	void
3042	down (SV *self)	3172	down (...)
3043	CODE:	3173	CODE:
3044	CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);	3174	CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3045		3175
3046	void	3176	void
3047	wait (SV *self)	3177	wait (...)
3048	CODE:	3178	CODE:
3049	CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);	3179	CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3050		3180
3051	void	3181	void
3052	try (SV *self)	3182	try (SV *self)
…		…
3095	);	3225	);
3096	OUTPUT:	3226	OUTPUT:
3097	RETVAL	3227	RETVAL
3098		3228
3099	void	3229	void
3100	wait (SV *self)	3230	wait (...)
3101	CODE:	3231	CODE:
3102	CORO_EXECUTE_SLF_XS (slf_init_signal_wait);	3232	CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3103		3233
3104	void	3234	void
3105	broadcast (SV *self)	3235	broadcast (SV *self)
…		…
3162		3292
3163	void	3293	void
3164	_register (char target, char proto, SV *req)	3294	_register (char target, char proto, SV *req)
3165	CODE:	3295	CODE:
3166	{	3296	{
3167	HV *st;	3297	CV *req_cv = coro_sv_2cv (aTHX_ req);
3168	GV *gvp;
3169	CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3170	/* newXSproto doesn't return the CV on 5.8 */	3298	/* newXSproto doesn't return the CV on 5.8 */
3171	CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);	3299	CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3172	sv_setpv ((SV *)slf_cv, proto);	3300	sv_setpv ((SV *)slf_cv, proto);
3173	sv_magicext ((SV )slf_cv, (SV )req_cv, CORO_MAGIC_type_aio, 0, 0, 0);	3301	sv_magicext ((SV )slf_cv, (SV )req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3174	}	3302	}

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.305 by root, Wed Nov 19 10:44:41 2008 UTC vs. Revision 1.315 by root, Thu Nov 20 05:25:17 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.305 by root, Wed Nov 19 10:44:41 2008 UTC vs.
Revision 1.315 by root, Thu Nov 20 05:25:17 2008 UTC