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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.232 by root, Thu Apr 24 12:40:38 2008 UTC vs.
Revision 1.240 by root, Sun Jun 29 00:28:17 2008 UTC

…		…
171	/* async_pool helper stuff */	171	/* async_pool helper stuff */
172	static SV *sv_pool_rss;	172	static SV *sv_pool_rss;
173	static SV *sv_pool_size;	173	static SV *sv_pool_size;
174	static AV *av_async_pool;	174	static AV *av_async_pool;
175		175
		176	/* Coro::AnyEvent */
		177	static SV *sv_activity;
		178
176	static struct coro_cctx *cctx_first;	179	static struct coro_cctx *cctx_first;
177	static int cctx_count, cctx_idle;	180	static int cctx_count, cctx_idle;
178		181
179	enum {	182	enum {
180	CC_MAPPED = 0x01,	183	CC_MAPPED = 0x01,
…		…
265	#define PRIO_IDLE -3	268	#define PRIO_IDLE -3
266	#define PRIO_MIN -4	269	#define PRIO_MIN -4
267		270
268	/* for Coro.pm */	271	/* for Coro.pm */
269	static SV *coro_current;	272	static SV *coro_current;
		273	static SV *coro_readyhook;
270	static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];	274	static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
271	static int coro_nready;	275	static int coro_nready;
272	static struct coro *coro_first;	276	static struct coro *coro_first;
273		277
274	/ lowlevel stuff ********************************************************/	278	/ lowlevel stuff ********************************************************/
…		…
510		514
511	if (expect_true (CvDEPTH (cv)))	515	if (expect_true (CvDEPTH (cv)))
512	{	516	{
513	EXTEND (SP, 3);	517	EXTEND (SP, 3);
514	PUSHs ((SV *)CvPADLIST (cv));	518	PUSHs ((SV *)CvPADLIST (cv));
515	PUSHs (INT2PTR (SV *, CvDEPTH (cv)));	519	PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
516	PUSHs ((SV *)cv);	520	PUSHs ((SV *)cv);
517		521
518	CvDEPTH (cv) = 0;	522	CvDEPTH (cv) = 0;
519	get_padlist (aTHX_ cv);	523	get_padlist (aTHX_ cv);
520	}	524	}
…		…
679		683
680	/ coroutine stack handling **********************************************/	684	/ coroutine stack handling **********************************************/
681		685
682	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);	686	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);
683	static int (orig_sigelem_set) (pTHX_ SV sv, MAGIC *mg);	687	static int (orig_sigelem_set) (pTHX_ SV sv, MAGIC *mg);
		688	static int (orig_sigelem_clr) (pTHX_ SV sv, MAGIC *mg);
		689
		690	/* apparently < 5.8.8 */
		691	#undef MgPV_nolen_const
		692	#ifndef MgPV_nolen_const
		693	#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
		694	SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \
		695	(const char*)(mg)->mg_ptr)
		696	#endif
684		697
685	/*	698	/*
686	* This overrides the default magic get method of %SIG elements.	699	* This overrides the default magic get method of %SIG elements.
687	* The original one doesn't provide for reading back of PL_diehook/PL_warnhook	700	* The original one doesn't provide for reading back of PL_diehook/PL_warnhook
688	* and instead of tryign to save and restore the hash elements, we just provide	701	* and instead of tryign to save and restore the hash elements, we just provide
…		…
696	{	709	{
697	const char *s = MgPV_nolen_const (mg);	710	const char *s = MgPV_nolen_const (mg);
698		711
699	if (*s == '_')	712	if (*s == '_')
700	{	713	{
701	if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;	714	SV **svp = 0;
702	if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;	715
		716	if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
		717	if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
		718
		719	if (svp)
		720	{
		721	sv_setsv (sv, svp ? svp : &PL_sv_undef);
		722	return 0;
		723	}
703	}	724	}
704		725
705	return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;	726	return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
		727	}
		728
		729	static int
		730	coro_sigelem_clr (pTHX_ SV sv, MAGIC mg)
		731	{
		732	const char *s = MgPV_nolen_const (mg);
		733
		734	if (*s == '_')
		735	{
		736	SV **svp = 0;
		737
		738	if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
		739	if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
		740
		741	if (svp)
		742	{
		743	SV old = svp;
		744	*svp = 0;
		745	SvREFCNT_dec (old);
		746	return 0;
		747	}
		748	}
		749
		750	return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
706	}	751	}
707		752
708	static int	753	static int
709	coro_sigelem_set (pTHX_ SV sv, MAGIC mg)	754	coro_sigelem_set (pTHX_ SV sv, MAGIC mg)
710	{	755	{
…		…
1379	static int	1424	static int
1380	api_ready (SV *coro_sv)	1425	api_ready (SV *coro_sv)
1381	{	1426	{
1382	dTHX;	1427	dTHX;
1383	struct coro *coro;	1428	struct coro *coro;
		1429	SV *sv_hook;
		1430	void (*xs_hook)(void);
1384		1431
1385	if (SvROK (coro_sv))	1432	if (SvROK (coro_sv))
1386	coro_sv = SvRV (coro_sv);	1433	coro_sv = SvRV (coro_sv);
1387		1434
1388	coro = SvSTATE (coro_sv);	1435	coro = SvSTATE (coro_sv);
…		…
1391	return 0;	1438	return 0;
1392		1439
1393	coro->flags \|= CF_READY;	1440	coro->flags \|= CF_READY;
1394		1441
1395	LOCK;	1442	LOCK;
		1443
		1444	sv_hook = coro_nready ? 0 : coro_readyhook;
		1445	xs_hook = coro_nready ? 0 : coroapi.readyhook;
		1446
1396	coro_enq (aTHX_ SvREFCNT_inc (coro_sv));	1447	coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1397	++coro_nready;	1448	++coro_nready;
		1449
1398	UNLOCK;	1450	UNLOCK;
		1451
		1452	if (sv_hook)
		1453	{
		1454	dSP;
		1455
		1456	ENTER;
		1457	SAVETMPS;
		1458
		1459	PUSHMARK (SP);
		1460	PUTBACK;
		1461	call_sv (sv_hook, G_DISCARD);
		1462	SPAGAIN;
		1463
		1464	FREETMPS;
		1465	LEAVE;
		1466	}
		1467
		1468	if (xs_hook)
		1469	xs_hook ();
1399		1470
1400	return 1;	1471	return 1;
1401	}	1472	}
1402		1473
1403	static int	1474	static int
…		…
1567	BOOT_PAGESIZE;	1638	BOOT_PAGESIZE;
1568		1639
1569	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);	1640	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);
1570	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);	1641	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);
1571		1642
1572	orig_sigelem_get = PL_vtbl_sigelem.svt_get;	1643	orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1573	PL_vtbl_sigelem.svt_get = coro_sigelem_get;	1644	orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1574	orig_sigelem_set = PL_vtbl_sigelem.svt_set;	1645	orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1575	PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1576		1646
1577	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);	1647	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1578	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));	1648	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1579	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));	1649	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1580		1650
…		…
1589	main_top_env = PL_top_env;	1659	main_top_env = PL_top_env;
1590		1660
1591	while (main_top_env->je_prev)	1661	while (main_top_env->je_prev)
1592	main_top_env = main_top_env->je_prev;	1662	main_top_env = main_top_env->je_prev;
1593		1663
1594	coroapi.ver = CORO_API_VERSION;	1664	coroapi.ver = CORO_API_VERSION;
1595	coroapi.rev = CORO_API_REVISION;	1665	coroapi.rev = CORO_API_REVISION;
1596	coroapi.transfer = api_transfer;	1666	coroapi.transfer = api_transfer;
1597		1667
1598	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));	1668	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1599	}	1669	}
1600		1670
1601	SV *	1671	SV *
…		…
1685	RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));	1755	RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1686	OUTPUT:	1756	OUTPUT:
1687	RETVAL	1757	RETVAL
1688		1758
1689	void	1759	void
1690	_exit (code)	1760	_exit (int code)
1691	int code
1692	PROTOTYPE: $	1761	PROTOTYPE: $
1693	CODE:	1762	CODE:
1694	_exit (code);	1763	_exit (code);
1695		1764
1696	int	1765	int
…		…
1787		1856
1788	void	1857	void
1789	api_trace (SV *coro, int flags = CC_TRACE \| CC_TRACE_SUB)	1858	api_trace (SV *coro, int flags = CC_TRACE \| CC_TRACE_SUB)
1790		1859
1791	SV *	1860	SV *
1792	has_stack (Coro::State coro)	1861	has_cctx (Coro::State coro)
1793	PROTOTYPE: $	1862	PROTOTYPE: $
1794	CODE:	1863	CODE:
1795	RETVAL = boolSV (!!coro->cctx);	1864	RETVAL = boolSV (!!coro->cctx);
1796	OUTPUT:	1865	OUTPUT:
1797	RETVAL	1866	RETVAL
…		…
1828		1897
1829	BOOT:	1898	BOOT:
1830	{	1899	{
1831	int i;	1900	int i;
1832		1901
		1902	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1833	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	1903	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1834	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	1904	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1835	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1836		1905
1837	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);	1906	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1838	SvREADONLY_on (coro_current);	1907	SvREADONLY_on (coro_current);
1839		1908
1840	coro_stash = gv_stashpv ("Coro", TRUE);	1909	coro_stash = gv_stashpv ("Coro", TRUE);
…		…
1871	_set_current (SV *current)	1940	_set_current (SV *current)
1872	PROTOTYPE: $	1941	PROTOTYPE: $
1873	CODE:	1942	CODE:
1874	SvREFCNT_dec (SvRV (coro_current));	1943	SvREFCNT_dec (SvRV (coro_current));
1875	SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));	1944	SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
		1945
		1946	void
		1947	_set_readyhook (SV *hook)
		1948	PROTOTYPE: $
		1949	CODE:
		1950	LOCK;
		1951	SvREFCNT_dec (coro_readyhook);
		1952	coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
		1953	UNLOCK;
1876		1954
1877	int	1955	int
1878	prio (Coro::State coro, int newprio = 0)	1956	prio (Coro::State coro, int newprio = 0)
1879	ALIAS:	1957	ALIAS:
1880	nice = 1	1958	nice = 1
…		…
1947	AV *invoke_av;	2025	AV *invoke_av;
1948	int i, len;	2026	int i, len;
1949		2027
1950	if (!invoke)	2028	if (!invoke)
1951	{	2029	{
1952	SvREFCNT_dec (PL_diehook); PL_diehook = 0;	2030	SV *old = PL_diehook;
		2031	PL_diehook = 0;
		2032	SvREFCNT_dec (old);
1953	croak ("\3async_pool terminate\2\n");	2033	croak ("\3async_pool terminate\2\n");
1954	}	2034	}
1955		2035
1956	SvREFCNT_dec (coro->saved_deffh);	2036	SvREFCNT_dec (coro->saved_deffh);
1957	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);	2037	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
…		…
1986	coro->saved_deffh = 0;	2066	coro->saved_deffh = 0;
1987		2067
1988	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)	2068	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1989	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))	2069	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1990	{	2070	{
1991	SvREFCNT_dec (PL_diehook); PL_diehook = 0;	2071	SV *old = PL_diehook;
		2072	PL_diehook = 0;
		2073	SvREFCNT_dec (old);
1992	croak ("\3async_pool terminate\2\n");	2074	croak ("\3async_pool terminate\2\n");
1993	}	2075	}
1994		2076
1995	av_clear (GvAV (PL_defgv));	2077	av_clear (GvAV (PL_defgv));
1996	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,	2078	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
…		…
2037	PL_laststype = data->laststype;	2119	PL_laststype = data->laststype;
2038	PL_laststatval = data->laststatval;	2120	PL_laststatval = data->laststatval;
2039	PL_statcache = data->statcache;	2121	PL_statcache = data->statcache;
2040	}	2122	}
2041		2123
		2124
		2125	MODULE = Coro::State PACKAGE = Coro::AnyEvent
		2126
		2127	BOOT:
		2128	sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
		2129
		2130	SV *
		2131	_schedule (...)
		2132	PROTOTYPE: @
		2133	CODE:
		2134	{
		2135	static int incede;
		2136
		2137	api_cede_notself ();
		2138
		2139	++incede;
		2140	while (coro_nready >= incede && api_cede ())
		2141	;
		2142
		2143	sv_setsv (sv_activity, &PL_sv_undef);
		2144	if (coro_nready >= incede)
		2145	{
		2146	PUSHMARK (SP);
		2147	PUTBACK;
		2148	call_pv ("Coro::AnyEvent::_activity", G_DISCARD \| G_EVAL);
		2149	SPAGAIN;
		2150	}
		2151
		2152	--incede;
		2153	}
		2154

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.232 by root, Thu Apr 24 12:40:38 2008 UTC vs. Revision 1.240 by root, Sun Jun 29 00:28:17 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.232 by root, Thu Apr 24 12:40:38 2008 UTC vs.
Revision 1.240 by root, Sun Jun 29 00:28:17 2008 UTC