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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.304 by root, Wed Nov 19 08:22:48 2008 UTC vs.
Revision 1.317 by root, Thu Nov 20 06:28:52 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	{
…		…
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
610	static void	630	static void
611	coro_init_stacks (pTHX)	631	coro_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
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
…		…
1592	api_is_ready (pTHX_ SV *coro_sv)	1612	api_is_ready (pTHX_ SV *coro_sv)
1593	{	1613	{
1594	return !!(SvSTATE (coro_sv)->flags & CF_READY);	1614	return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595	}	1615	}
1596		1616
		1617	/* expects to own a reference to next->hv */
1597	INLINE void	1618	INLINE void
		1619	prepare_schedule_to (pTHX_ struct coro_transfer_args ta, struct coro next)
		1620	{
		1621	SV *prev_sv = SvRV (coro_current);
		1622
		1623	ta->prev = SvSTATE_hv (prev_sv);
		1624	ta->next = next;
		1625
		1626	TRANSFER_CHECK (*ta);
		1627
		1628	SvRV_set (coro_current, (SV *)next->hv);
		1629
		1630	free_coro_mortal (aTHX);
		1631	coro_mortal = prev_sv;
		1632	}
		1633
		1634	static void
1598	prepare_schedule (pTHX_ struct coro_transfer_args *ta)	1635	prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1599	{	1636	{
1600	SV prev_sv, next_sv;
1601
1602	for (;;)	1637	for (;;)
1603	{	1638	{
1604	next_sv = coro_deq (aTHX);	1639	SV *next_sv = coro_deq (aTHX);
1605		1640
1606	/* nothing to schedule: call the idle handler */
1607	if (expect_false (!next_sv))	1641	if (expect_true (next_sv))
1608	{	1642	{
		1643	struct coro *next = SvSTATE_hv (next_sv);
		1644
		1645	/* cannot transfer to destroyed coros, skip and look for next */
		1646	if (expect_false (next->flags & CF_DESTROYED))
		1647	SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
		1648	else
		1649	{
		1650	next->flags &= ~CF_READY;
		1651	--coro_nready;
		1652
		1653	return prepare_schedule_to (aTHX_ ta, next);
		1654	}
		1655	}
		1656	else
		1657	{
		1658	/* nothing to schedule: call the idle handler */
1609	dSP;	1659	dSP;
1610		1660
1611	ENTER;	1661	ENTER;
1612	SAVETMPS;	1662	SAVETMPS;
1613		1663
…		…
1615	PUTBACK;	1665	PUTBACK;
1616	call_sv (get_sv ("Coro::idle", FALSE), G_VOID \| G_DISCARD);	1666	call_sv (get_sv ("Coro::idle", FALSE), G_VOID \| G_DISCARD);
1617		1667
1618	FREETMPS;	1668	FREETMPS;
1619	LEAVE;	1669	LEAVE;
1620	continue;
1621	}	1670	}
1622
1623	ta->next = SvSTATE_hv (next_sv);
1624
1625	/* cannot transfer to destroyed coros, skip and look for next */
1626	if (expect_false (ta->next->flags & CF_DESTROYED))
1627	{
1628	SvREFCNT_dec (next_sv);
1629	/* coro_nready has already been taken care of by destroy */
1630	continue;
1631	}
1632
1633	--coro_nready;
1634	break;
1635	}	1671	}
1636
1637	/* free this only after the transfer */
1638	prev_sv = SvRV (coro_current);
1639	ta->prev = SvSTATE_hv (prev_sv);
1640	TRANSFER_CHECK (*ta);
1641	assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1642	ta->next->flags &= ~CF_READY;
1643	SvRV_set (coro_current, next_sv);
1644
1645	free_coro_mortal (aTHX);
1646	coro_mortal = prev_sv;
1647	}	1672	}
1648		1673
1649	INLINE void	1674	INLINE void
1650	prepare_cede (pTHX_ struct coro_transfer_args *ta)	1675	prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651	{	1676	{
…		…
1672	{	1697	{
1673	struct coro_transfer_args ta;	1698	struct coro_transfer_args ta;
1674		1699
1675	prepare_schedule (aTHX_ &ta);	1700	prepare_schedule (aTHX_ &ta);
1676	TRANSFER (ta, 1);	1701	TRANSFER (ta, 1);
		1702	}
		1703
		1704	static void
		1705	api_schedule_to (pTHX_ SV *coro_sv)
		1706	{
		1707	struct coro_transfer_args ta;
		1708	struct coro *next = SvSTATE (coro_sv);
		1709
		1710	SvREFCNT_inc_NN (coro_sv);
		1711	prepare_schedule_to (aTHX_ &ta, next);
1677	}	1712	}
1678		1713
1679	static int	1714	static int
1680	api_cede (pTHX)	1715	api_cede (pTHX)
1681	{	1716	{
…		…
1731	coro->slot->runops = RUNOPS_DEFAULT;	1766	coro->slot->runops = RUNOPS_DEFAULT;
1732	}	1767	}
1733	}	1768	}
1734		1769
1735	/*****************************************************************************/	1770	/*****************************************************************************/
		1771	/* async pool handler */
		1772
		1773	static int
		1774	slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
		1775	{
		1776	HV hv = (HV )SvRV (coro_current);
		1777	struct coro coro = (struct coro )frame->data;
		1778
		1779	if (!coro->invoke_cb)
		1780	return 1; /* loop till we have invoke */
		1781	else
		1782	{
		1783	hv_store (hv, "desc", sizeof ("desc") - 1,
		1784	newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
		1785
		1786	coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
		1787
		1788	{
		1789	dSP;
		1790	XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
		1791	PUTBACK;
		1792	}
		1793
		1794	SvREFCNT_dec (GvAV (PL_defgv));
		1795	GvAV (PL_defgv) = coro->invoke_av;
		1796	coro->invoke_av = 0;
		1797
		1798	return 0;
		1799	}
		1800	}
		1801
		1802	static void
		1803	slf_init_pool_handler (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
		1804	{
		1805	HV hv = (HV )SvRV (coro_current);
		1806	struct coro coro = SvSTATE_hv ((SV )hv);
		1807
		1808	if (expect_true (coro->saved_deffh))
		1809	{
		1810	/* subsequent iteration */
		1811	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;
		1812	coro->saved_deffh = 0;
		1813
		1814	if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
		1815	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
		1816	{
		1817	coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
		1818	coro->invoke_av = newAV ();
		1819
		1820	frame->prepare = prepare_nop;
		1821	}
		1822	else
		1823	{
		1824	av_clear (GvAV (PL_defgv));
		1825	hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
		1826
		1827	coro->prio = 0;
		1828
		1829	if (coro->cctx && (coro->cctx->flags & CC_TRACE))
		1830	api_trace (aTHX_ coro_current, 0);
		1831
		1832	frame->prepare = prepare_schedule;
		1833	av_push (av_async_pool, SvREFCNT_inc (hv));
		1834	}
		1835	}
		1836	else
		1837	{
		1838	/* first iteration, simply fall through */
		1839	frame->prepare = prepare_nop;
		1840	}
		1841
		1842	frame->check = slf_check_pool_handler;
		1843	frame->data = (void *)coro;
		1844	}
		1845
		1846	/*****************************************************************************/
1736	/* rouse callback */	1847	/* rouse callback */
1737		1848
1738	#define CORO_MAGIC_type_rouse PERL_MAGIC_ext	1849	#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739		1850
1740	static void	1851	static void
…		…
1744	SV data = (SV )GENSUB_ARG;	1855	SV data = (SV )GENSUB_ARG;
1745		1856
1746	if (SvTYPE (SvRV (data)) != SVt_PVAV)	1857	if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747	{	1858	{
1748	/* first call, set args */	1859	/* first call, set args */
1749	int i;
1750	AV *av = newAV ();	1860	AV *av = newAV ();
1751	SV *coro = SvRV (data);	1861	SV *coro = SvRV (data);
1752		1862
1753	SvRV_set (data, (SV *)av);	1863	SvRV_set (data, (SV *)av);
1754	api_ready (aTHX_ coro);	1864	api_ready (aTHX_ coro);
…		…
1895	static void	2005	static void
1896	slf_init_schedule (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)	2006	slf_init_schedule (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
1897	{	2007	{
1898	frame->prepare = prepare_schedule;	2008	frame->prepare = prepare_schedule;
1899	frame->check = slf_check_nop;	2009	frame->check = slf_check_nop;
		2010	}
		2011
		2012	static void
		2013	slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
		2014	{
		2015	struct coro next = (struct coro )slf_frame.data;
		2016
		2017	SvREFCNT_inc_NN (next->hv);
		2018	prepare_schedule_to (aTHX_ ta, next);
		2019	}
		2020
		2021	static void
		2022	slf_init_schedule_to (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
		2023	{
		2024	if (!items)
		2025	croak ("Coro::schedule_to expects a coroutine argument, caught");
		2026
		2027	frame->data = (void *)SvSTATE (arg [0]);
		2028	frame->prepare = slf_prepare_schedule_to;
		2029	frame->check = slf_check_nop;
		2030	}
		2031
		2032	static void
		2033	slf_init_cede_to (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
		2034	{
		2035	api_ready (aTHX_ SvRV (coro_current));
		2036
		2037	slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900	}	2038	}
1901		2039
1902	static void	2040	static void
1903	slf_init_cede (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)	2041	slf_init_cede (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
1904	{	2042	{
…		…
2143	SV **ary;	2281	SV **ary;
2144		2282
2145	/* unfortunately, building manually saves memory */	2283	/* unfortunately, building manually saves memory */
2146	Newx (ary, 2, SV *);	2284	Newx (ary, 2, SV *);
2147	AvALLOC (av) = ary;	2285	AvALLOC (av) = ary;
		2286	/AvARRAY (av) = ary;/
2148	SvPV_set ((SV )av, (char )ary); /* 5.8.8 needs this syntax instead of AvARRAY = ary */	2287	SvPVX ((SV )av) = (char )ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */
2149	AvMAX (av) = 1;	2288	AvMAX (av) = 1;
2150	AvFILLp (av) = 0;	2289	AvFILLp (av) = 0;
2151	ary [0] = newSViv (count);	2290	ary [0] = newSViv (count);
2152		2291
2153	return newRV_noinc ((SV *)av);	2292	return newRV_noinc ((SV *)av);
…		…
2173	AvARRAY (av)[0] = AvARRAY (av)[1];	2312	AvARRAY (av)[0] = AvARRAY (av)[1];
2174	AvARRAY (av)[1] = count_sv;	2313	AvARRAY (av)[1] = count_sv;
2175	cb = av_shift (av);	2314	cb = av_shift (av);
2176		2315
2177	if (SvOBJECT (cb))	2316	if (SvOBJECT (cb))
		2317	{
2178	api_ready (aTHX_ cb);	2318	api_ready (aTHX_ cb);
2179	else	2319	--count;
2180	croak ("callbacks not yet supported");	2320	}
		2321	else if (SvTYPE (cb) == SVt_PVCV)
		2322	{
		2323	dSP;
		2324	PUSHMARK (SP);
		2325	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
		2326	PUTBACK;
		2327	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);
		2328	}
2181		2329
2182	SvREFCNT_dec (cb);	2330	SvREFCNT_dec (cb);
2183
2184	--count;
2185	}	2331	}
2186	}	2332	}
2187		2333
2188	static void	2334	static void
2189	coro_semaphore_on_destroy (pTHX_ struct coro *coro)	2335	coro_semaphore_on_destroy (pTHX_ struct coro *coro)
…		…
2271	}	2417	}
2272		2418
2273	static void	2419	static void
2274	slf_init_semaphore_wait (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)	2420	slf_init_semaphore_wait (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
2275	{	2421	{
		2422	if (items >= 2)
		2423	{
		2424	/* callback form */
		2425	AV av = (AV )SvRV (arg [0]);
		2426	CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
		2427
		2428	av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
		2429
		2430	if (SvIVX (AvARRAY (av)[0]) > 0)
		2431	coro_semaphore_adjust (aTHX_ av, 0);
		2432
		2433	frame->prepare = prepare_nop;
		2434	frame->check = slf_check_nop;
		2435	}
		2436	else
		2437	{
2276	slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);	2438	slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277	frame->check = slf_check_semaphore_wait;	2439	frame->check = slf_check_semaphore_wait;
		2440	}
2278	}	2441	}
2279		2442
2280	/* signal */	2443	/* signal */
2281		2444
2282	static void	2445	static void
…		…
2354	dXSARGS;	2517	dXSARGS;
2355	AV state = (AV )GENSUB_ARG;	2518	AV state = (AV )GENSUB_ARG;
2356	SV *coro = av_pop (state);	2519	SV *coro = av_pop (state);
2357	SV *data_sv = newSV (sizeof (struct io_state));	2520	SV *data_sv = newSV (sizeof (struct io_state));
2358		2521
2359	av_extend (state, items);	2522	av_extend (state, items - 1);
2360		2523
2361	sv_upgrade (data_sv, SVt_PV);	2524	sv_upgrade (data_sv, SVt_PV);
2362	SvCUR_set (data_sv, sizeof (struct io_state));	2525	SvCUR_set (data_sv, sizeof (struct io_state));
2363	SvPOK_only (data_sv);	2526	SvPOK_only (data_sv);
2364		2527
…		…
2574	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));	2737	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2575	}	2738	}
2576		2739
2577	SV *	2740	SV *
2578	new (char *klass, ...)	2741	new (char *klass, ...)
		2742	ALIAS:
		2743	Coro::new = 1
2579	CODE:	2744	CODE:
2580	{	2745	{
2581	struct coro *coro;	2746	struct coro *coro;
2582	MAGIC *mg;	2747	MAGIC *mg;
2583	HV *hv;	2748	HV *hv;
		2749	CV *cb;
2584	int i;	2750	int i;
		2751
		2752	if (items > 1)
		2753	{
		2754	cb = coro_sv_2cv (aTHX_ ST (1));
		2755
		2756	if (!ix)
		2757	{
		2758	if (CvISXSUB (cb))
		2759	croak ("Coro::State doesn't support XS functions as coroutine start, caught");
		2760
		2761	if (!CvROOT (cb))
		2762	croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
		2763	}
		2764	}
2585		2765
2586	Newz (0, coro, 1, struct coro);	2766	Newz (0, coro, 1, struct coro);
2587	coro->args = newAV ();	2767	coro->args = newAV ();
2588	coro->flags = CF_NEW;	2768	coro->flags = CF_NEW;
2589		2769
…		…
2594	coro->hv = hv = newHV ();	2774	coro->hv = hv = newHV ();
2595	mg = sv_magicext ((SV )hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char )coro, 0);	2775	mg = sv_magicext ((SV )hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char )coro, 0);
2596	mg->mg_flags \|= MGf_DUP;	2776	mg->mg_flags \|= MGf_DUP;
2597	RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	2777	RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598		2778
		2779	if (items > 1)
		2780	{
2599	av_extend (coro->args, items - 1);	2781	av_extend (coro->args, items - 1 + ix - 1);
		2782
		2783	if (ix)
		2784	{
		2785	av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
		2786	cb = cv_coro_run;
		2787	}
		2788
		2789	coro->startcv = (CV )SvREFCNT_inc_NN ((SV )cb);
		2790
2600	for (i = 1; i < items; i++)	2791	for (i = 2; i < items; i++)
2601	av_push (coro->args, newSVsv (ST (i)));	2792	av_push (coro->args, newSVsv (ST (i)));
		2793	}
2602	}	2794	}
2603	OUTPUT:	2795	OUTPUT:
2604	RETVAL	2796	RETVAL
2605		2797
2606	void	2798	void
…		…
2804		2996
2805	BOOT:	2997	BOOT:
2806	{	2998	{
2807	int i;	2999	int i;
2808		3000
2809	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);	3001	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	3002	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	3003	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812		3004	cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
		3005	cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2813	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);	3006	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2814	SvREADONLY_on (coro_current);	3007
		3008	sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
		3009	sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
		3010	cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
		3011	cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2815		3012
2816	coro_stash = gv_stashpv ("Coro", TRUE);	3013	coro_stash = gv_stashpv ("Coro", TRUE);
2817		3014
2818	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));	3015	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2819	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));	3016	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
…		…
2827		3024
2828	{	3025	{
2829	SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);	3026	SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2830		3027
2831	coroapi.schedule = api_schedule;	3028	coroapi.schedule = api_schedule;
		3029	coroapi.schedule_to = api_schedule_to;
2832	coroapi.cede = api_cede;	3030	coroapi.cede = api_cede;
2833	coroapi.cede_notself = api_cede_notself;	3031	coroapi.cede_notself = api_cede_notself;
2834	coroapi.ready = api_ready;	3032	coroapi.ready = api_ready;
2835	coroapi.is_ready = api_is_ready;	3033	coroapi.is_ready = api_is_ready;
2836	coroapi.nready = coro_nready;	3034	coroapi.nready = coro_nready;
…		…
2844		3042
2845	void	3043	void
2846	schedule (...)	3044	schedule (...)
2847	CODE:	3045	CODE:
2848	CORO_EXECUTE_SLF_XS (slf_init_schedule);	3046	CORO_EXECUTE_SLF_XS (slf_init_schedule);
		3047
		3048	void
		3049	schedule_to (...)
		3050	CODE:
		3051	CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
		3052
		3053	void
		3054	cede_to (...)
		3055	CODE:
		3056	CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2849		3057
2850	void	3058	void
2851	cede (...)	3059	cede (...)
2852	CODE:	3060	CODE:
2853	CORO_EXECUTE_SLF_XS (slf_init_cede);	3061	CORO_EXECUTE_SLF_XS (slf_init_cede);
…		…
2908	CODE:	3116	CODE:
2909	RETVAL = coro_nready;	3117	RETVAL = coro_nready;
2910	OUTPUT:	3118	OUTPUT:
2911	RETVAL	3119	RETVAL
2912		3120
2913	# for async_pool speedup
2914	void	3121	void
2915	_pool_1 (SV *cb)	3122	_pool_handler (...)
2916	CODE:	3123	CODE:
2917	{	3124	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		3125
2925	if (!invoke)	3126	void
		3127	async_pool (SV *cv, ...)
		3128	PROTOTYPE: &@
		3129	PPCODE:
		3130	{
		3131	HV hv = (HV )av_pop (av_async_pool);
		3132	AV *av = newAV ();
		3133	SV *cb = ST (0);
		3134	int i;
		3135
		3136	av_extend (av, items - 2);
		3137	for (i = 1; i < items; ++i)
		3138	av_push (av, SvREFCNT_inc_NN (ST (i)));
		3139
		3140	if ((SV *)hv == &PL_sv_undef)
2926	{	3141	{
2927	SV *old = PL_diehook;	3142	PUSHMARK (SP);
2928	PL_diehook = 0;	3143	EXTEND (SP, 2);
2929	SvREFCNT_dec (old);	3144	PUSHs (sv_Coro);
2930	croak ("\3async_pool terminate\2\n");	3145	PUSHs ((SV *)cv_pool_handler);
		3146	PUTBACK;
		3147	call_sv ((SV *)cv_coro_state_new, G_SCALAR);
		3148	SPAGAIN;
		3149
		3150	hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2931	}	3151	}
2932		3152
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	{	3153	{
2946	av_fill (defav, len - 1);	3154	struct coro *coro = SvSTATE_hv (hv);
2947	for (i = 0; i < len; ++i)	3155
2948	av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));	3156	assert (!coro->invoke_cb);
		3157	assert (!coro->invoke_av);
		3158	coro->invoke_cb = SvREFCNT_inc (cb);
		3159	coro->invoke_av = av;
2949	}	3160	}
2950	}
2951		3161
2952	void	3162	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		3163
2959	sv_setsv (cb, &PL_sv_undef);	3164	if (GIMME_V != G_VOID)
2960		3165	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;	3166	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);	3167	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	}	3168	}
2984		3169
2985	SV *	3170	SV *
2986	rouse_cb ()	3171	rouse_cb ()
2987	PROTOTYPE:	3172	PROTOTYPE:
…		…
2989	RETVAL = coro_new_rouse_cb (aTHX);	3174	RETVAL = coro_new_rouse_cb (aTHX);
2990	OUTPUT:	3175	OUTPUT:
2991	RETVAL	3176	RETVAL
2992		3177
2993	void	3178	void
2994	rouse_wait (SV *cb = 0)	3179	rouse_wait (...)
2995	PROTOTYPE: ;$	3180	PROTOTYPE: ;$
2996	PPCODE:	3181	PPCODE:
2997	CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);	3182	CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2998		3183
2999		3184
…		…
3036	adjust = 1	3221	adjust = 1
3037	CODE:	3222	CODE:
3038	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);	3223	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039		3224
3040	void	3225	void
3041	down (SV *self)	3226	down (...)
3042	CODE:	3227	CODE:
3043	CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);	3228	CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044		3229
3045	void	3230	void
3046	wait (SV *self)	3231	wait (...)
3047	CODE:	3232	CODE:
3048	CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);	3233	CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049		3234
3050	void	3235	void
3051	try (SV *self)	3236	try (SV *self)
…		…
3094	);	3279	);
3095	OUTPUT:	3280	OUTPUT:
3096	RETVAL	3281	RETVAL
3097		3282
3098	void	3283	void
3099	wait (SV *self)	3284	wait (...)
3100	CODE:	3285	CODE:
3101	CORO_EXECUTE_SLF_XS (slf_init_signal_wait);	3286	CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102		3287
3103	void	3288	void
3104	broadcast (SV *self)	3289	broadcast (SV *self)
…		…
3161		3346
3162	void	3347	void
3163	_register (char target, char proto, SV *req)	3348	_register (char target, char proto, SV *req)
3164	CODE:	3349	CODE:
3165	{	3350	{
3166	HV *st;	3351	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 */	3352	/* newXSproto doesn't return the CV on 5.8 */
3170	CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);	3353	CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171	sv_setpv ((SV *)slf_cv, proto);	3354	sv_setpv ((SV *)slf_cv, proto);
3172	sv_magicext ((SV )slf_cv, (SV )req_cv, CORO_MAGIC_type_aio, 0, 0, 0);	3355	sv_magicext ((SV )slf_cv, (SV )req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173	}	3356	}

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.304 by root, Wed Nov 19 08:22:48 2008 UTC vs. Revision 1.317 by root, Thu Nov 20 06:28:52 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.304 by root, Wed Nov 19 08:22:48 2008 UTC vs.
Revision 1.317 by root, Thu Nov 20 06:28:52 2008 UTC