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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.228 by root, Sun Apr 6 17:51:15 2008 UTC vs.
Revision 1.240 by root, Sun Jun 29 00:28:17 2008 UTC

…		…
10	#include "patchlevel.h"	10	#include "patchlevel.h"
11		11
12	#include <stdio.h>	12	#include <stdio.h>
13	#include <errno.h>	13	#include <errno.h>
14	#include <assert.h>	14	#include <assert.h>
		15
		16	#ifdef WIN32
		17	# undef setjmp
		18	# undef longjmp
		19	# undef _exit
		20	# define setjmp _setjmp // deep magic, don't ask
		21	#else
15	#include <inttypes.h> /* portable stdint.h */	22	# include <inttypes.h> /* most portable stdint.h */
		23	#endif
16		24
17	#ifdef HAVE_MMAP	25	#ifdef HAVE_MMAP
18	# include <unistd.h>	26	# include <unistd.h>
19	# include <sys/mman.h>	27	# include <sys/mman.h>
20	# ifndef MAP_ANONYMOUS	28	# ifndef MAP_ANONYMOUS
…		…
163	/* async_pool helper stuff */	171	/* async_pool helper stuff */
164	static SV *sv_pool_rss;	172	static SV *sv_pool_rss;
165	static SV *sv_pool_size;	173	static SV *sv_pool_size;
166	static AV *av_async_pool;	174	static AV *av_async_pool;
167		175
		176	/* Coro::AnyEvent */
		177	static SV *sv_activity;
		178
168	static struct coro_cctx *cctx_first;	179	static struct coro_cctx *cctx_first;
169	static int cctx_count, cctx_idle;	180	static int cctx_count, cctx_idle;
170		181
171	enum {	182	enum {
172	CC_MAPPED = 0x01,	183	CC_MAPPED = 0x01,
…		…
257	#define PRIO_IDLE -3	268	#define PRIO_IDLE -3
258	#define PRIO_MIN -4	269	#define PRIO_MIN -4
259		270
260	/* for Coro.pm */	271	/* for Coro.pm */
261	static SV *coro_current;	272	static SV *coro_current;
		273	static SV *coro_readyhook;
262	static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];	274	static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
263	static int coro_nready;	275	static int coro_nready;
264	static struct coro *coro_first;	276	static struct coro *coro_first;
265		277
266	/ lowlevel stuff ********************************************************/	278	/ lowlevel stuff ********************************************************/
…		…
502		514
503	if (expect_true (CvDEPTH (cv)))	515	if (expect_true (CvDEPTH (cv)))
504	{	516	{
505	EXTEND (SP, 3);	517	EXTEND (SP, 3);
506	PUSHs ((SV *)CvPADLIST (cv));	518	PUSHs ((SV *)CvPADLIST (cv));
507	PUSHs (INT2PTR (SV *, CvDEPTH (cv)));	519	PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
508	PUSHs ((SV *)cv);	520	PUSHs ((SV *)cv);
509		521
510	CvDEPTH (cv) = 0;	522	CvDEPTH (cv) = 0;
511	get_padlist (aTHX_ cv);	523	get_padlist (aTHX_ cv);
512	}	524	}
…		…
671		683
672	/ coroutine stack handling **********************************************/	684	/ coroutine stack handling **********************************************/
673		685
674	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);	686	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);
675	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
676		697
677	/*	698	/*
678	* This overrides the default magic get method of %SIG elements.	699	* This overrides the default magic get method of %SIG elements.
679	* 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
680	* 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
…		…
688	{	709	{
689	const char *s = MgPV_nolen_const (mg);	710	const char *s = MgPV_nolen_const (mg);
690		711
691	if (*s == '_')	712	if (*s == '_')
692	{	713	{
693	if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;	714	SV **svp = 0;
694	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	}
695	}	724	}
696		725
697	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;
698	}	751	}
699		752
700	static int	753	static int
701	coro_sigelem_set (pTHX_ SV sv, MAGIC mg)	754	coro_sigelem_set (pTHX_ SV sv, MAGIC mg)
702	{	755	{
…		…
712	if (svp)	765	if (svp)
713	{	766	{
714	SV old = svp;	767	SV old = svp;
715	*svp = newSVsv (sv);	768	*svp = newSVsv (sv);
716	SvREFCNT_dec (old);	769	SvREFCNT_dec (old);
717	return;	770	return 0;
718	}	771	}
719	}	772	}
720		773
721	return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;	774	return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
722	}	775	}
…		…
736	PL_curpm = 0;	789	PL_curpm = 0;
737	PL_curpad = 0;	790	PL_curpad = 0;
738	PL_localizing = 0;	791	PL_localizing = 0;
739	PL_dirty = 0;	792	PL_dirty = 0;
740	PL_restartop = 0;	793	PL_restartop = 0;
741	#if !PERL_VERSION_ATLEAST (5,10,0)	794	#if PERL_VERSION_ATLEAST (5,10,0)
742	PL_parser = 0;	795	PL_parser = 0;
743	#endif	796	#endif
744		797
745	/* recreate the die/warn hooks */	798	/* recreate the die/warn hooks */
746	PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );	799	PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
…		…
1130		1183
1131	if (expect_false (next->flags & CF_DESTROYED))	1184	if (expect_false (next->flags & CF_DESTROYED))
1132	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");	1185	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1133		1186
1134	#if !PERL_VERSION_ATLEAST (5,10,0)	1187	#if !PERL_VERSION_ATLEAST (5,10,0)
1135	if (expect_false (PL_lex_state != LEX_NOTPARSING)	1188	if (expect_false (PL_lex_state != LEX_NOTPARSING))
1136	croak ("Coro::State::transfer called while parsing, but this is not supported");	1189	croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1137	#endif	1190	#endif
1138	}	1191	}
1139	}	1192	}
1140		1193
1141	/* always use the TRANSFER macro */	1194	/* always use the TRANSFER macro */
…		…
1371	static int	1424	static int
1372	api_ready (SV *coro_sv)	1425	api_ready (SV *coro_sv)
1373	{	1426	{
1374	dTHX;	1427	dTHX;
1375	struct coro *coro;	1428	struct coro *coro;
		1429	SV *sv_hook;
		1430	void (*xs_hook)(void);
1376		1431
1377	if (SvROK (coro_sv))	1432	if (SvROK (coro_sv))
1378	coro_sv = SvRV (coro_sv);	1433	coro_sv = SvRV (coro_sv);
1379		1434
1380	coro = SvSTATE (coro_sv);	1435	coro = SvSTATE (coro_sv);
…		…
1383	return 0;	1438	return 0;
1384		1439
1385	coro->flags \|= CF_READY;	1440	coro->flags \|= CF_READY;
1386		1441
1387	LOCK;	1442	LOCK;
		1443
		1444	sv_hook = coro_nready ? 0 : coro_readyhook;
		1445	xs_hook = coro_nready ? 0 : coroapi.readyhook;
		1446
1388	coro_enq (aTHX_ SvREFCNT_inc (coro_sv));	1447	coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1389	++coro_nready;	1448	++coro_nready;
		1449
1390	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 ();
1391		1470
1392	return 1;	1471	return 1;
1393	}	1472	}
1394		1473
1395	static int	1474	static int
…		…
1559	BOOT_PAGESIZE;	1638	BOOT_PAGESIZE;
1560		1639
1561	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);	1640	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);
1562	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);	1641	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);
1563		1642
1564	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;
1565	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;
1566	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;
1567	PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1568		1646
1569	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);	1647	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1570	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));
1571	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));
1572		1650
…		…
1581	main_top_env = PL_top_env;	1659	main_top_env = PL_top_env;
1582		1660
1583	while (main_top_env->je_prev)	1661	while (main_top_env->je_prev)
1584	main_top_env = main_top_env->je_prev;	1662	main_top_env = main_top_env->je_prev;
1585		1663
1586	coroapi.ver = CORO_API_VERSION;	1664	coroapi.ver = CORO_API_VERSION;
1587	coroapi.rev = CORO_API_REVISION;	1665	coroapi.rev = CORO_API_REVISION;
1588	coroapi.transfer = api_transfer;	1666	coroapi.transfer = api_transfer;
1589		1667
1590	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));	1668	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1591	}	1669	}
1592		1670
1593	SV *	1671	SV *
…		…
1677	RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));	1755	RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1678	OUTPUT:	1756	OUTPUT:
1679	RETVAL	1757	RETVAL
1680		1758
1681	void	1759	void
1682	_exit (code)	1760	_exit (int code)
1683	int code
1684	PROTOTYPE: $	1761	PROTOTYPE: $
1685	CODE:	1762	CODE:
1686	_exit (code);	1763	_exit (code);
1687		1764
1688	int	1765	int
…		…
1779		1856
1780	void	1857	void
1781	api_trace (SV *coro, int flags = CC_TRACE \| CC_TRACE_SUB)	1858	api_trace (SV *coro, int flags = CC_TRACE \| CC_TRACE_SUB)
1782		1859
1783	SV *	1860	SV *
1784	has_stack (Coro::State coro)	1861	has_cctx (Coro::State coro)
1785	PROTOTYPE: $	1862	PROTOTYPE: $
1786	CODE:	1863	CODE:
1787	RETVAL = boolSV (!!coro->cctx);	1864	RETVAL = boolSV (!!coro->cctx);
1788	OUTPUT:	1865	OUTPUT:
1789	RETVAL	1866	RETVAL
…		…
1820		1897
1821	BOOT:	1898	BOOT:
1822	{	1899	{
1823	int i;	1900	int i;
1824		1901
		1902	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1825	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	1903	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1826	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	1904	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1827	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1828		1905
1829	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);	1906	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1830	SvREADONLY_on (coro_current);	1907	SvREADONLY_on (coro_current);
1831		1908
1832	coro_stash = gv_stashpv ("Coro", TRUE);	1909	coro_stash = gv_stashpv ("Coro", TRUE);
…		…
1863	_set_current (SV *current)	1940	_set_current (SV *current)
1864	PROTOTYPE: $	1941	PROTOTYPE: $
1865	CODE:	1942	CODE:
1866	SvREFCNT_dec (SvRV (coro_current));	1943	SvREFCNT_dec (SvRV (coro_current));
1867	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;
1868		1954
1869	int	1955	int
1870	prio (Coro::State coro, int newprio = 0)	1956	prio (Coro::State coro, int newprio = 0)
1871	ALIAS:	1957	ALIAS:
1872	nice = 1	1958	nice = 1
…		…
1939	AV *invoke_av;	2025	AV *invoke_av;
1940	int i, len;	2026	int i, len;
1941		2027
1942	if (!invoke)	2028	if (!invoke)
1943	{	2029	{
1944	SvREFCNT_dec (PL_diehook); PL_diehook = 0;	2030	SV *old = PL_diehook;
		2031	PL_diehook = 0;
		2032	SvREFCNT_dec (old);
1945	croak ("\3async_pool terminate\2\n");	2033	croak ("\3async_pool terminate\2\n");
1946	}	2034	}
1947		2035
1948	SvREFCNT_dec (coro->saved_deffh);	2036	SvREFCNT_dec (coro->saved_deffh);
1949	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);	2037	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
…		…
1978	coro->saved_deffh = 0;	2066	coro->saved_deffh = 0;
1979		2067
1980	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)	2068	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1981	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))	2069	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1982	{	2070	{
1983	SvREFCNT_dec (PL_diehook); PL_diehook = 0;	2071	SV *old = PL_diehook;
		2072	PL_diehook = 0;
		2073	SvREFCNT_dec (old);
1984	croak ("\3async_pool terminate\2\n");	2074	croak ("\3async_pool terminate\2\n");
1985	}	2075	}
1986		2076
1987	av_clear (GvAV (PL_defgv));	2077	av_clear (GvAV (PL_defgv));
1988	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,	2078	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
…		…
2029	PL_laststype = data->laststype;	2119	PL_laststype = data->laststype;
2030	PL_laststatval = data->laststatval;	2120	PL_laststatval = data->laststatval;
2031	PL_statcache = data->statcache;	2121	PL_statcache = data->statcache;
2032	}	2122	}
2033		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.228 by root, Sun Apr 6 17:51:15 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.228 by root, Sun Apr 6 17:51:15 2008 UTC vs.
Revision 1.240 by root, Sun Jun 29 00:28:17 2008 UTC