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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.307 by root, Wed Nov 19 14:34:46 2008 UTC vs.
Revision 1.320 by root, Fri Nov 21 07:29:04 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
…		…
167	static AV main_mainstack; / used to differentiate between $main and others */	170	static AV main_mainstack; / used to differentiate between $main and others */
168	static JMPENV *main_top_env;	171	static JMPENV *main_top_env;
169	static HV coro_state_stash, coro_stash;	172	static HV coro_state_stash, coro_stash;
170	static volatile SV coro_mortal; / will be freed/thrown after next transfer */	173	static volatile SV coro_mortal; / will be freed/thrown after next transfer */
171		174
		175	static AV av_destroy; / destruction queue */
		176	static SV sv_manager; / the manager coro */
		177
172	static GV irsgv; / $/ */	178	static GV irsgv; / $/ */
173	static GV stdoutgv; / STDOUT /	179	static GV stdoutgv; / STDOUT /
174	static SV *rv_diehook;	180	static SV *rv_diehook;
175	static SV *rv_warnhook;	181	static SV *rv_warnhook;
176	static HV hv_sig; / %SIG */	182	static HV hv_sig; / %SIG */
177		183
178	/* async_pool helper stuff */	184	/* async_pool helper stuff */
179	static SV *sv_pool_rss;	185	static SV *sv_pool_rss;
180	static SV *sv_pool_size;	186	static SV *sv_pool_size;
		187	static SV sv_async_pool_idle; / description string */
181	static AV *av_async_pool;	188	static AV av_async_pool; / idle pool */
		189	static SV sv_Coro; / class string */
		190	static CV *cv_pool_handler;
		191	static CV *cv_coro_state_new;
182		192
183	/* Coro::AnyEvent */	193	/* Coro::AnyEvent */
184	static SV *sv_activity;	194	static SV *sv_activity;
185		195
186	static struct coro_cctx *cctx_first;	196	static struct coro_cctx *cctx_first;
…		…
263	SV except; / exception to be thrown */	273	SV except; / exception to be thrown */
264	SV *rouse_cb;	274	SV *rouse_cb;
265		275
266	/* async_pool */	276	/* async_pool */
267	SV *saved_deffh;	277	SV *saved_deffh;
		278	SV *invoke_cb;
		279	AV *invoke_av;
268		280
269	/* linked list */	281	/* linked list */
270	struct coro next, prev;	282	struct coro next, prev;
271	};	283	};
272		284
…		…
289		301
290	/* for Coro.pm */	302	/* for Coro.pm */
291	static SV *coro_current;	303	static SV *coro_current;
292	static SV *coro_readyhook;	304	static SV *coro_readyhook;
293	static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];	305	static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
		306	static CV cv_coro_run, cv_coro_terminate;
294	static struct coro *coro_first;	307	static struct coro *coro_first;
295	#define coro_nready coroapi.nready	308	#define coro_nready coroapi.nready
296		309
297	/ lowlevel stuff ********************************************************/	310	/ lowlevel stuff ********************************************************/
298		311
…		…
326	return get_hv (name, create);	339	return get_hv (name, create);
327	}	340	}
328		341
329	/* may croak */	342	/* may croak */
330	INLINE CV *	343	INLINE CV *
331	coro_sv_2cv (SV *sv)	344	coro_sv_2cv (pTHX_ SV *sv)
332	{	345	{
333	HV *st;	346	HV *st;
334	GV *gvp;	347	GV *gvp;
335	return sv_2cv (sv, &st, &gvp, 0);	348	return sv_2cv (sv, &st, &gvp, 0);
336	}	349	}
…		…
686	#if !PERL_VERSION_ATLEAST (5,10,0)	699	#if !PERL_VERSION_ATLEAST (5,10,0)
687	Safefree (PL_retstack);	700	Safefree (PL_retstack);
688	#endif	701	#endif
689	}	702	}
690		703
		704	#define CORO_RSS \
		705	rss += sizeof (SYM (curstackinfo)); \
		706	rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
		707	rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
		708	rss += SYM (tmps_max) * sizeof (SV *); \
		709	rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
		710	rss += SYM (scopestack_max) * sizeof (I32); \
		711	rss += SYM (savestack_max) * sizeof (ANY);
		712
691	static size_t	713	static size_t
692	coro_rss (pTHX_ struct coro *coro)	714	coro_rss (pTHX_ struct coro *coro)
693	{	715	{
694	size_t rss = sizeof (*coro);	716	size_t rss = sizeof (*coro);
695		717
696	if (coro->mainstack)	718	if (coro->mainstack)
697	{	719	{
698	perl_slots tmp_slot;
699	perl_slots *slot;
700
701	if (coro->flags & CF_RUNNING)	720	if (coro->flags & CF_RUNNING)
702	{	721	{
703	slot = &tmp_slot;	722	#define SYM(sym) PL_ ## sym
704		723	CORO_RSS;
705	#define VAR(name,type) slot->name = PL_ ## name;
706	# include "state.h"
707	#undef VAR	724	#undef SYM
708	}	725	}
709	else	726	else
710	slot = coro->slot;
711
712	if (slot)
713	{	727	{
714	rss += sizeof (slot->curstackinfo);	728	#define SYM(sym) coro->slot->sym
715	rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);	729	CORO_RSS;
716	rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);	730	#undef SYM
717	rss += slot->tmps_max * sizeof (SV *);
718	rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719	rss += slot->scopestack_max * sizeof (I32);
720	rss += slot->savestack_max * sizeof (ANY);
721
722	#if !PERL_VERSION_ATLEAST (5,10,0)
723	rss += slot->retstack_max * sizeof (OP *);
724	#endif
725	}	731	}
726	}	732	}
727		733
728	return rss;	734	return rss;
729	}	735	}
…		…
829		835
830	static int	836	static int
831	slf_check_nop (pTHX_ struct CoroSLF *frame)	837	slf_check_nop (pTHX_ struct CoroSLF *frame)
832	{	838	{
833	return 0;	839	return 0;
		840	}
		841
		842	static int
		843	slf_check_repeat (pTHX_ struct CoroSLF *frame)
		844	{
		845	return 1;
834	}	846	}
835		847
836	static UNOP coro_setup_op;	848	static UNOP coro_setup_op;
837		849
838	static void NOINLINE /* noinline to keep it out of the transfer fast path */	850	static void NOINLINE /* noinline to keep it out of the transfer fast path */
…		…
871	dSP;	883	dSP;
872	UNOP myop;	884	UNOP myop;
873		885
874	Zero (&myop, 1, UNOP);	886	Zero (&myop, 1, UNOP);
875	myop.op_next = Nullop;	887	myop.op_next = Nullop;
		888	myop.op_type = OP_ENTERSUB;
876	myop.op_flags = OPf_WANT_VOID;	889	myop.op_flags = OPf_WANT_VOID;
877		890
878	PUSHMARK (SP);	891	PUSHMARK (SP);
879	XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));	892	PUSHs ((SV *)coro->startcv);
880	PUTBACK;	893	PUTBACK;
881	PL_op = (OP *)&myop;	894	PL_op = (OP *)&myop;
882	PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);	895	PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883	SPAGAIN;
884	}	896	}
885		897
886	/* this newly created coroutine might be run on an existing cctx which most	898	/* this newly created coroutine might be run on an existing cctx which most
887	* likely was suspended in pp_slf, so we have to emulate entering pp_slf here.	899	* likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888	*/	900	*/
889	slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */	901	slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890	slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */	902	slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891		903
892	/* and we have to provide the pp_slf op in any case, so pp_slf can skip it */	904	/* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893	coro_setup_op.op_next = PL_op;	905	coro_setup_op.op_next = PL_op;
894	coro_setup_op.op_type = OP_CUSTOM;	906	coro_setup_op.op_type = OP_ENTERSUB;
895	coro_setup_op.op_ppaddr = pp_slf;	907	coro_setup_op.op_ppaddr = pp_slf;
896	/* no flags required, as an init function won't be called */	908	/* no flags etc. required, as an init function won't be called */
897		909
898	PL_op = (OP *)&coro_setup_op;	910	PL_op = (OP *)&coro_setup_op;
899		911
900	/* copy throw, in case it was set before coro_setup */	912	/* copy throw, in case it was set before coro_setup */
901	CORO_THROW = coro->except;	913	CORO_THROW = coro->except;
…		…
929	SvREFCNT_dec (GvSV (irsgv));	941	SvREFCNT_dec (GvSV (irsgv));
930		942
931	SvREFCNT_dec (PL_diehook);	943	SvREFCNT_dec (PL_diehook);
932	SvREFCNT_dec (PL_warnhook);	944	SvREFCNT_dec (PL_warnhook);
933		945
934	SvREFCNT_dec (CORO_THROW);
935	SvREFCNT_dec (coro->saved_deffh);	946	SvREFCNT_dec (coro->saved_deffh);
936	SvREFCNT_dec (coro->rouse_cb);	947	SvREFCNT_dec (coro->rouse_cb);
		948	SvREFCNT_dec (coro->invoke_cb);
		949	SvREFCNT_dec (coro->invoke_av);
937		950
938	coro_destruct_stacks (aTHX);	951	coro_destruct_stacks (aTHX);
939	}	952	}
940		953
941	INLINE void	954	INLINE void
…		…
1013	{	1026	{
1014	PERL_CONTEXT *cx = &cxstack[cxstack_ix];	1027	PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015		1028
1016	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)	1029	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017	{	1030	{
1018	runops_proc_t old_runops = PL_runops;
1019	dSP;	1031	dSP;
1020	GV *gv = CvGV (cx->blk_sub.cv);	1032	GV *gv = CvGV (cx->blk_sub.cv);
1021	SV *fullname = sv_2mortal (newSV (0));	1033	SV *fullname = sv_2mortal (newSV (0));
1022		1034
1023	if (isGV (gv))	1035	if (isGV (gv))
…		…
1144	transfer_tail (aTHX);	1156	transfer_tail (aTHX);
1145		1157
1146	/* somebody or something will hit me for both perl_run and PL_restartop */	1158	/* somebody or something will hit me for both perl_run and PL_restartop */
1147	PL_restartop = PL_op;	1159	PL_restartop = PL_op;
1148	perl_run (PL_curinterp);	1160	perl_run (PL_curinterp);
		1161	/*
		1162	* Unfortunately, there is no way to get at the return values of the
		1163	* coro body here, as perl_run destroys these
		1164	*/
1149		1165
1150	/*	1166	/*
1151	* If perl-run returns we assume exit() was being called or the coro	1167	* If perl-run returns we assume exit() was being called or the coro
1152	* fell off the end, which seems to be the only valid (non-bug)	1168	* fell off the end, which seems to be the only valid (non-bug)
1153	* reason for perl_run to return. We try to exit by jumping to the	1169	* reason for perl_run to return. We try to exit by jumping to the
…		…
1447	}	1463	}
1448		1464
1449	cctx_destroy (coro->cctx);	1465	cctx_destroy (coro->cctx);
1450	SvREFCNT_dec (coro->startcv);	1466	SvREFCNT_dec (coro->startcv);
1451	SvREFCNT_dec (coro->args);	1467	SvREFCNT_dec (coro->args);
		1468	SvREFCNT_dec (CORO_THROW);
1452		1469
1453	if (coro->next) coro->next->prev = coro->prev;	1470	if (coro->next) coro->next->prev = coro->prev;
1454	if (coro->prev) coro->prev->next = coro->next;	1471	if (coro->prev) coro->prev->next = coro->next;
1455	if (coro == coro_first) coro_first = coro->next;	1472	if (coro == coro_first) coro_first = coro->next;
1456		1473
…		…
1603	api_is_ready (pTHX_ SV *coro_sv)	1620	api_is_ready (pTHX_ SV *coro_sv)
1604	{	1621	{
1605	return !!(SvSTATE (coro_sv)->flags & CF_READY);	1622	return !!(SvSTATE (coro_sv)->flags & CF_READY);
1606	}	1623	}
1607		1624
		1625	/* expects to own a reference to next->hv */
1608	INLINE void	1626	INLINE void
		1627	prepare_schedule_to (pTHX_ struct coro_transfer_args ta, struct coro next)
		1628	{
		1629	SV *prev_sv = SvRV (coro_current);
		1630
		1631	ta->prev = SvSTATE_hv (prev_sv);
		1632	ta->next = next;
		1633
		1634	TRANSFER_CHECK (*ta);
		1635
		1636	SvRV_set (coro_current, (SV *)next->hv);
		1637
		1638	free_coro_mortal (aTHX);
		1639	coro_mortal = prev_sv;
		1640	}
		1641
		1642	static void
1609	prepare_schedule (pTHX_ struct coro_transfer_args *ta)	1643	prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1610	{	1644	{
1611	SV prev_sv, next_sv;
1612
1613	for (;;)	1645	for (;;)
1614	{	1646	{
1615	next_sv = coro_deq (aTHX);	1647	SV *next_sv = coro_deq (aTHX);
1616		1648
1617	/* nothing to schedule: call the idle handler */
1618	if (expect_false (!next_sv))	1649	if (expect_true (next_sv))
1619	{	1650	{
		1651	struct coro *next = SvSTATE_hv (next_sv);
		1652
		1653	/* cannot transfer to destroyed coros, skip and look for next */
		1654	if (expect_false (next->flags & CF_DESTROYED))
		1655	SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
		1656	else
		1657	{
		1658	next->flags &= ~CF_READY;
		1659	--coro_nready;
		1660
		1661	prepare_schedule_to (aTHX_ ta, next);
		1662	break;
		1663	}
		1664	}
		1665	else
		1666	{
		1667	/* nothing to schedule: call the idle handler */
1620	dSP;	1668	dSP;
1621		1669
1622	ENTER;	1670	ENTER;
1623	SAVETMPS;	1671	SAVETMPS;
1624		1672
…		…
1626	PUTBACK;	1674	PUTBACK;
1627	call_sv (get_sv ("Coro::idle", FALSE), G_VOID \| G_DISCARD);	1675	call_sv (get_sv ("Coro::idle", FALSE), G_VOID \| G_DISCARD);
1628		1676
1629	FREETMPS;	1677	FREETMPS;
1630	LEAVE;	1678	LEAVE;
1631	continue;
1632	}	1679	}
1633
1634	ta->next = SvSTATE_hv (next_sv);
1635
1636	/* cannot transfer to destroyed coros, skip and look for next */
1637	if (expect_false (ta->next->flags & CF_DESTROYED))
1638	{
1639	SvREFCNT_dec (next_sv);
1640	/* coro_nready has already been taken care of by destroy */
1641	continue;
1642	}
1643
1644	--coro_nready;
1645	break;
1646	}	1680	}
1647
1648	/* free this only after the transfer */
1649	prev_sv = SvRV (coro_current);
1650	ta->prev = SvSTATE_hv (prev_sv);
1651	TRANSFER_CHECK (*ta);
1652	assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1653	ta->next->flags &= ~CF_READY;
1654	SvRV_set (coro_current, next_sv);
1655
1656	free_coro_mortal (aTHX);
1657	coro_mortal = prev_sv;
1658	}	1681	}
1659		1682
1660	INLINE void	1683	INLINE void
1661	prepare_cede (pTHX_ struct coro_transfer_args *ta)	1684	prepare_cede (pTHX_ struct coro_transfer_args *ta)
1662	{	1685	{
…		…
1683	{	1706	{
1684	struct coro_transfer_args ta;	1707	struct coro_transfer_args ta;
1685		1708
1686	prepare_schedule (aTHX_ &ta);	1709	prepare_schedule (aTHX_ &ta);
1687	TRANSFER (ta, 1);	1710	TRANSFER (ta, 1);
		1711	}
		1712
		1713	static void
		1714	api_schedule_to (pTHX_ SV *coro_sv)
		1715	{
		1716	struct coro_transfer_args ta;
		1717	struct coro *next = SvSTATE (coro_sv);
		1718
		1719	SvREFCNT_inc_NN (coro_sv);
		1720	prepare_schedule_to (aTHX_ &ta, next);
1688	}	1721	}
1689		1722
1690	static int	1723	static int
1691	api_cede (pTHX)	1724	api_cede (pTHX)
1692	{	1725	{
…		…
1741	else	1774	else
1742	coro->slot->runops = RUNOPS_DEFAULT;	1775	coro->slot->runops = RUNOPS_DEFAULT;
1743	}	1776	}
1744	}	1777	}
1745		1778
		1779	static void
		1780	coro_call_on_destroy (pTHX_ struct coro *coro)
		1781	{
		1782	SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
		1783	SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
		1784
		1785	if (on_destroyp)
		1786	{
		1787	AV on_destroy = (AV )SvRV (*on_destroyp);
		1788
		1789	while (AvFILLp (on_destroy) >= 0)
		1790	{
		1791	dSP; /* don't disturb outer sp */
		1792	SV *cb = av_pop (on_destroy);
		1793
		1794	PUSHMARK (SP);
		1795
		1796	if (statusp)
		1797	{
		1798	int i;
		1799	AV status = (AV )SvRV (*statusp);
		1800	EXTEND (SP, AvFILLp (status) + 1);
		1801
		1802	for (i = 0; i <= AvFILLp (status); ++i)
		1803	PUSHs (AvARRAY (status)[i]);
		1804	}
		1805
		1806	PUTBACK;
		1807	call_sv (sv_2mortal (cb), G_VOID \| G_DISCARD);
		1808	}
		1809	}
		1810	}
		1811
		1812	static void
		1813	slf_init_terminate (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
		1814	{
		1815	int i;
		1816	HV hv = (HV )SvRV (coro_current);
		1817	AV *av = newAV ();
		1818
		1819	av_extend (av, items - 1);
		1820	for (i = 0; i < items; ++i)
		1821	av_push (av, SvREFCNT_inc_NN (arg [i]));
		1822
		1823	hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
		1824
		1825	av_push (av_destroy, (SV )newRV_inc ((SV )hv)); /* RVinc for perl */
		1826	api_ready (aTHX_ sv_manager);
		1827
		1828	frame->prepare = prepare_schedule;
		1829	frame->check = slf_check_repeat;
		1830	}
		1831
		1832	/*****************************************************************************/
		1833	/* async pool handler */
		1834
		1835	static int
		1836	slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
		1837	{
		1838	HV hv = (HV )SvRV (coro_current);
		1839	struct coro coro = (struct coro )frame->data;
		1840
		1841	if (!coro->invoke_cb)
		1842	return 1; /* loop till we have invoke */
		1843	else
		1844	{
		1845	hv_store (hv, "desc", sizeof ("desc") - 1,
		1846	newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
		1847
		1848	coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
		1849
		1850	{
		1851	dSP;
		1852	XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
		1853	PUTBACK;
		1854	}
		1855
		1856	SvREFCNT_dec (GvAV (PL_defgv));
		1857	GvAV (PL_defgv) = coro->invoke_av;
		1858	coro->invoke_av = 0;
		1859
		1860	return 0;
		1861	}
		1862	}
		1863
		1864	static void
		1865	slf_init_pool_handler (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
		1866	{
		1867	HV hv = (HV )SvRV (coro_current);
		1868	struct coro coro = SvSTATE_hv ((SV )hv);
		1869
		1870	if (expect_true (coro->saved_deffh))
		1871	{
		1872	/* subsequent iteration */
		1873	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;
		1874	coro->saved_deffh = 0;
		1875
		1876	if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
		1877	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
		1878	{
		1879	coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
		1880	coro->invoke_av = newAV ();
		1881
		1882	frame->prepare = prepare_nop;
		1883	}
		1884	else
		1885	{
		1886	av_clear (GvAV (PL_defgv));
		1887	hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
		1888
		1889	coro->prio = 0;
		1890
		1891	if (coro->cctx && (coro->cctx->flags & CC_TRACE))
		1892	api_trace (aTHX_ coro_current, 0);
		1893
		1894	frame->prepare = prepare_schedule;
		1895	av_push (av_async_pool, SvREFCNT_inc (hv));
		1896	}
		1897	}
		1898	else
		1899	{
		1900	/* first iteration, simply fall through */
		1901	frame->prepare = prepare_nop;
		1902	}
		1903
		1904	frame->check = slf_check_pool_handler;
		1905	frame->data = (void *)coro;
		1906	}
		1907
1746	/*****************************************************************************/	1908	/*****************************************************************************/
1747	/* rouse callback */	1909	/* rouse callback */
1748		1910
1749	#define CORO_MAGIC_type_rouse PERL_MAGIC_ext	1911	#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1750		1912
…		…
1755	SV data = (SV )GENSUB_ARG;	1917	SV data = (SV )GENSUB_ARG;
1756		1918
1757	if (SvTYPE (SvRV (data)) != SVt_PVAV)	1919	if (SvTYPE (SvRV (data)) != SVt_PVAV)
1758	{	1920	{
1759	/* first call, set args */	1921	/* first call, set args */
1760	int i;
1761	AV *av = newAV ();	1922	AV *av = newAV ();
1762	SV *coro = SvRV (data);	1923	SV *coro = SvRV (data);
1763		1924
1764	SvRV_set (data, (SV *)av);	1925	SvRV_set (data, (SV *)av);
1765	api_ready (aTHX_ coro);	1926	api_ready (aTHX_ coro);
…		…
1906	static void	2067	static void
1907	slf_init_schedule (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)	2068	slf_init_schedule (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
1908	{	2069	{
1909	frame->prepare = prepare_schedule;	2070	frame->prepare = prepare_schedule;
1910	frame->check = slf_check_nop;	2071	frame->check = slf_check_nop;
		2072	}
		2073
		2074	static void
		2075	slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
		2076	{
		2077	struct coro next = (struct coro )slf_frame.data;
		2078
		2079	SvREFCNT_inc_NN (next->hv);
		2080	prepare_schedule_to (aTHX_ ta, next);
		2081	}
		2082
		2083	static void
		2084	slf_init_schedule_to (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
		2085	{
		2086	if (!items)
		2087	croak ("Coro::schedule_to expects a coroutine argument, caught");
		2088
		2089	frame->data = (void *)SvSTATE (arg [0]);
		2090	frame->prepare = slf_prepare_schedule_to;
		2091	frame->check = slf_check_nop;
		2092	}
		2093
		2094	static void
		2095	slf_init_cede_to (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
		2096	{
		2097	api_ready (aTHX_ SvRV (coro_current));
		2098
		2099	slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1911	}	2100	}
1912		2101
1913	static void	2102	static void
1914	slf_init_cede (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)	2103	slf_init_cede (pTHX_ struct CoroSLF frame, CV cv, SV **arg, int items)
1915	{	2104	{
…		…
2061	}	2250	}
2062	else	2251	else
2063	slf_argc = 0;	2252	slf_argc = 0;
2064		2253
2065	PL_op->op_ppaddr = pp_slf;	2254	PL_op->op_ppaddr = pp_slf;
2066	PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */	2255	/PL_op->op_type = OP_CUSTOM; / we do behave like entersub still */
2067		2256
2068	PL_op = (OP *)&slf_restore;	2257	PL_op = (OP *)&slf_restore;
2069	}	2258	}
2070		2259
2071	/*****************************************************************************/	2260	/*****************************************************************************/
…		…
2294	{	2483	{
2295	if (items >= 2)	2484	if (items >= 2)
2296	{	2485	{
2297	/* callback form */	2486	/* callback form */
2298	AV av = (AV )SvRV (arg [0]);	2487	AV av = (AV )SvRV (arg [0]);
2299	CV *cb_cv = coro_sv_2cv (arg [1]);	2488	CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2300		2489
2301	av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));	2490	av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2302		2491
2303	if (SvIVX (AvARRAY (av)[0]) > 0)	2492	if (SvIVX (AvARRAY (av)[0]) > 0)
2304	coro_semaphore_adjust (aTHX_ av, 0);	2493	coro_semaphore_adjust (aTHX_ av, 0);
…		…
2390	dXSARGS;	2579	dXSARGS;
2391	AV state = (AV )GENSUB_ARG;	2580	AV state = (AV )GENSUB_ARG;
2392	SV *coro = av_pop (state);	2581	SV *coro = av_pop (state);
2393	SV *data_sv = newSV (sizeof (struct io_state));	2582	SV *data_sv = newSV (sizeof (struct io_state));
2394		2583
2395	av_extend (state, items);	2584	av_extend (state, items - 1);
2396		2585
2397	sv_upgrade (data_sv, SVt_PV);	2586	sv_upgrade (data_sv, SVt_PV);
2398	SvCUR_set (data_sv, sizeof (struct io_state));	2587	SvCUR_set (data_sv, sizeof (struct io_state));
2399	SvPOK_only (data_sv);	2588	SvPOK_only (data_sv);
2400		2589
…		…
2576		2765
2577	{	2766	{
2578	SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));	2767	SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2579		2768
2580	if (!PL_custom_op_names) PL_custom_op_names = newHV ();	2769	if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2581	hv_store_ent (PL_custom_op_names, slf,	2770	hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2582	newSVpv ("coro_slf", 0), 0);
2583		2771
2584	if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();	2772	if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2585	hv_store_ent (PL_custom_op_descs, slf,	2773	hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2586	newSVpv ("coro schedule like function", 0), 0);
2587	}	2774	}
2588		2775
2589	coroapi.ver = CORO_API_VERSION;	2776	coroapi.ver = CORO_API_VERSION;
2590	coroapi.rev = CORO_API_REVISION;	2777	coroapi.rev = CORO_API_REVISION;
2591		2778
…		…
2610	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));	2797	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2611	}	2798	}
2612		2799
2613	SV *	2800	SV *
2614	new (char *klass, ...)	2801	new (char *klass, ...)
		2802	ALIAS:
		2803	Coro::new = 1
2615	CODE:	2804	CODE:
2616	{	2805	{
2617	struct coro *coro;	2806	struct coro *coro;
2618	MAGIC *mg;	2807	MAGIC *mg;
2619	HV *hv;	2808	HV *hv;
2620	CV *cb;	2809	CV *cb;
2621	int i;	2810	int i;
2622		2811
2623	if (items > 1)	2812	if (items > 1)
2624	{	2813	{
2625	cb = coro_sv_2cv (ST (1));	2814	cb = coro_sv_2cv (aTHX_ ST (1));
2626		2815
		2816	if (!ix)
		2817	{
2627	if (CvISXSUB (cb))	2818	if (CvISXSUB (cb))
2628	croak ("Coro::State doesn't support XS functions as coroutine start, caught");	2819	croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2629		2820
2630	if (!CvROOT (cb))	2821	if (!CvROOT (cb))
2631	croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");	2822	croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
		2823	}
2632	}	2824	}
2633		2825
2634	Newz (0, coro, 1, struct coro);	2826	Newz (0, coro, 1, struct coro);
2635	coro->args = newAV ();	2827	coro->args = newAV ();
2636	coro->flags = CF_NEW;	2828	coro->flags = CF_NEW;
…		…
2644	mg->mg_flags \|= MGf_DUP;	2836	mg->mg_flags \|= MGf_DUP;
2645	RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	2837	RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2646		2838
2647	if (items > 1)	2839	if (items > 1)
2648	{	2840	{
2649	coro->startcv = SvREFCNT_inc_NN (cb);
2650
2651	av_extend (coro->args, items - 1);	2841	av_extend (coro->args, items - 1 + ix - 1);
		2842
		2843	if (ix)
		2844	{
2652	av_push (coro->args, SvREFCNT_inc (cb));	2845	av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
		2846	cb = cv_coro_run;
		2847	}
		2848
		2849	coro->startcv = (CV )SvREFCNT_inc_NN ((SV )cb);
		2850
2653	for (i = 2; i < items; i++)	2851	for (i = 2; i < items; i++)
2654	av_push (coro->args, newSVsv (ST (i)));	2852	av_push (coro->args, newSVsv (ST (i)));
2655	}	2853	}
2656	}	2854	}
2657	OUTPUT:	2855	OUTPUT:
…		…
2858		3056
2859	BOOT:	3057	BOOT:
2860	{	3058	{
2861	int i;	3059	int i;
2862		3060
2863	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2864	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	3061	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2865	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	3062	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2866		3063	cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
		3064	cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2867	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);	3065	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2868	SvREADONLY_on (coro_current);	3066	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
		3067	av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
		3068	sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
		3069
		3070	sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
		3071	sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
		3072	cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
		3073	cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2869		3074
2870	coro_stash = gv_stashpv ("Coro", TRUE);	3075	coro_stash = gv_stashpv ("Coro", TRUE);
2871		3076
2872	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));	3077	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2873	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));	3078	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
…		…
2881		3086
2882	{	3087	{
2883	SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);	3088	SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2884		3089
2885	coroapi.schedule = api_schedule;	3090	coroapi.schedule = api_schedule;
		3091	coroapi.schedule_to = api_schedule_to;
2886	coroapi.cede = api_cede;	3092	coroapi.cede = api_cede;
2887	coroapi.cede_notself = api_cede_notself;	3093	coroapi.cede_notself = api_cede_notself;
2888	coroapi.ready = api_ready;	3094	coroapi.ready = api_ready;
2889	coroapi.is_ready = api_is_ready;	3095	coroapi.is_ready = api_is_ready;
2890	coroapi.nready = coro_nready;	3096	coroapi.nready = coro_nready;
…		…
2895	SvREADONLY_on (sv);	3101	SvREADONLY_on (sv);
2896	}	3102	}
2897	}	3103	}
2898		3104
2899	void	3105	void
		3106	terminate (...)
		3107	CODE:
		3108	CORO_EXECUTE_SLF_XS (slf_init_terminate);
		3109
		3110	void
2900	schedule (...)	3111	schedule (...)
2901	CODE:	3112	CODE:
2902	CORO_EXECUTE_SLF_XS (slf_init_schedule);	3113	CORO_EXECUTE_SLF_XS (slf_init_schedule);
		3114
		3115	void
		3116	schedule_to (...)
		3117	CODE:
		3118	CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
		3119
		3120	void
		3121	cede_to (...)
		3122	CODE:
		3123	CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2903		3124
2904	void	3125	void
2905	cede (...)	3126	cede (...)
2906	CODE:	3127	CODE:
2907	CORO_EXECUTE_SLF_XS (slf_init_cede);	3128	CORO_EXECUTE_SLF_XS (slf_init_cede);
2908		3129
2909	void	3130	void
2910	cede_notself (...)	3131	cede_notself (...)
2911	CODE:	3132	CODE:
2912	CORO_EXECUTE_SLF_XS (slf_init_cede_notself);	3133	CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
		3134
		3135	void
		3136	_cancel (Coro::State self)
		3137	CODE:
		3138	coro_state_destroy (aTHX_ self);
		3139	coro_call_on_destroy (aTHX_ self);
2913		3140
2914	void	3141	void
2915	_set_current (SV *current)	3142	_set_current (SV *current)
2916	PROTOTYPE: $	3143	PROTOTYPE: $
2917	CODE:	3144	CODE:
…		…
2962	CODE:	3189	CODE:
2963	RETVAL = coro_nready;	3190	RETVAL = coro_nready;
2964	OUTPUT:	3191	OUTPUT:
2965	RETVAL	3192	RETVAL
2966		3193
2967	# for async_pool speedup
2968	void	3194	void
2969	_pool_1 (SV *cb)	3195	_pool_handler (...)
2970	CODE:	3196	CODE:
2971	{	3197	CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2972	HV hv = (HV )SvRV (coro_current);
2973	struct coro coro = SvSTATE_hv ((SV )hv);
2974	AV *defav = GvAV (PL_defgv);
2975	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2976	AV *invoke_av;
2977	int i, len;
2978		3198
2979	if (!invoke)	3199	void
		3200	async_pool (SV *cv, ...)
		3201	PROTOTYPE: &@
		3202	PPCODE:
		3203	{
		3204	HV hv = (HV )av_pop (av_async_pool);
		3205	AV *av = newAV ();
		3206	SV *cb = ST (0);
		3207	int i;
		3208
		3209	av_extend (av, items - 2);
		3210	for (i = 1; i < items; ++i)
		3211	av_push (av, SvREFCNT_inc_NN (ST (i)));
		3212
		3213	if ((SV *)hv == &PL_sv_undef)
2980	{	3214	{
2981	SV *old = PL_diehook;	3215	PUSHMARK (SP);
2982	PL_diehook = 0;	3216	EXTEND (SP, 2);
2983	SvREFCNT_dec (old);	3217	PUSHs (sv_Coro);
2984	croak ("\3async_pool terminate\2\n");	3218	PUSHs ((SV *)cv_pool_handler);
		3219	PUTBACK;
		3220	call_sv ((SV *)cv_coro_state_new, G_SCALAR);
		3221	SPAGAIN;
		3222
		3223	hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2985	}	3224	}
2986		3225
2987	SvREFCNT_dec (coro->saved_deffh);
2988	coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2989
2990	hv_store (hv, "desc", sizeof ("desc") - 1,
2991	newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2992
2993	invoke_av = (AV *)SvRV (invoke);
2994	len = av_len (invoke_av);
2995
2996	sv_setsv (cb, AvARRAY (invoke_av)[0]);
2997
2998	if (len > 0)
2999	{	3226	{
3000	av_fill (defav, len - 1);	3227	struct coro *coro = SvSTATE_hv (hv);
3001	for (i = 0; i < len; ++i)	3228
3002	av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));	3229	assert (!coro->invoke_cb);
		3230	assert (!coro->invoke_av);
		3231	coro->invoke_cb = SvREFCNT_inc (cb);
		3232	coro->invoke_av = av;
3003	}	3233	}
3004	}
3005		3234
3006	void	3235	api_ready (aTHX_ (SV *)hv);
3007	_pool_2 (SV *cb)
3008	CODE:
3009	{
3010	HV hv = (HV )SvRV (coro_current);
3011	struct coro coro = SvSTATE_hv ((SV )hv);
3012		3236
3013	sv_setsv (cb, &PL_sv_undef);	3237	if (GIMME_V != G_VOID)
3014		3238	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3015	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;	3239	else
3016	coro->saved_deffh = 0;
3017
3018	if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3019	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3020	{
3021	SV *old = PL_diehook;
3022	PL_diehook = 0;
3023	SvREFCNT_dec (old);	3240	SvREFCNT_dec (hv);
3024	croak ("\3async_pool terminate\2\n");
3025	}
3026
3027	av_clear (GvAV (PL_defgv));
3028	hv_store (hv, "desc", sizeof ("desc") - 1,
3029	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3030
3031	coro->prio = 0;
3032
3033	if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3034	api_trace (aTHX_ coro_current, 0);
3035
3036	av_push (av_async_pool, newSVsv (coro_current));
3037	}	3241	}
3038		3242
3039	SV *	3243	SV *
3040	rouse_cb ()	3244	rouse_cb ()
3041	PROTOTYPE:	3245	PROTOTYPE:
…		…
3215		3419
3216	void	3420	void
3217	_register (char target, char proto, SV *req)	3421	_register (char target, char proto, SV *req)
3218	CODE:	3422	CODE:
3219	{	3423	{
3220	CV *req_cv = coro_sv_2cv (req);	3424	CV *req_cv = coro_sv_2cv (aTHX_ req);
3221	/* newXSproto doesn't return the CV on 5.8 */	3425	/* newXSproto doesn't return the CV on 5.8 */
3222	CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);	3426	CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3223	sv_setpv ((SV *)slf_cv, proto);	3427	sv_setpv ((SV *)slf_cv, proto);
3224	sv_magicext ((SV )slf_cv, (SV )req_cv, CORO_MAGIC_type_aio, 0, 0, 0);	3428	sv_magicext ((SV )slf_cv, (SV )req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3225	}	3429	}

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.307 by root, Wed Nov 19 14:34:46 2008 UTC vs. Revision 1.320 by root, Fri Nov 21 07:29:04 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.307 by root, Wed Nov 19 14:34:46 2008 UTC vs.
Revision 1.320 by root, Fri Nov 21 07:29:04 2008 UTC