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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.237 by root, Fri May 23 00:27:06 2008 UTC vs.
Revision 1.245 by root, Mon Sep 22 05:40:21 2008 UTC

…		…
361		361
362	/* casting is fun. */	362	/* casting is fun. */
363	while (&PL_sv_undef != (SV )(padlist = (AV )av_pop (av)))	363	while (&PL_sv_undef != (SV )(padlist = (AV )av_pop (av)))
364	free_padlist (aTHX_ padlist);	364	free_padlist (aTHX_ padlist);
365		365
		366	SvREFCNT_dec (av); /* sv_magicext increased the refcount */
		367
366	return 0;	368	return 0;
367	}	369	}
368		370
369	#define CORO_MAGIC_type_cv PERL_MAGIC_ext	371	#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370	#define CORO_MAGIC_type_state PERL_MAGIC_ext	372	#define CORO_MAGIC_type_state PERL_MAGIC_ext
…		…
420	if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))	422	if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
421	CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];	423	CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
422	else	424	else
423	{	425	{
424	#if CORO_PREFER_PERL_FUNCTIONS	426	#if CORO_PREFER_PERL_FUNCTIONS
425	/* this is probably cleaner, but also slower? */	427	/* this is probably cleaner? but also slower! */
		428	/* in practise, it seems to be less stable */
426	CV *cp = Perl_cv_clone (cv);	429	CV *cp = Perl_cv_clone (cv);
427	CvPADLIST (cv) = CvPADLIST (cp);	430	CvPADLIST (cv) = CvPADLIST (cp);
428	CvPADLIST (cp) = 0;	431	CvPADLIST (cp) = 0;
429	SvREFCNT_dec (cp);	432	SvREFCNT_dec (cp);
430	#else	433	#else
…		…
663	#undef VAR	666	#undef VAR
664	}	667	}
665	else	668	else
666	slot = coro->slot;	669	slot = coro->slot;
667		670
		671	if (slot)
		672	{
668	rss += sizeof (slot->curstackinfo);	673	rss += sizeof (slot->curstackinfo);
669	rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);	674	rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
670	rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);	675	rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
671	rss += slot->tmps_max * sizeof (SV *);	676	rss += slot->tmps_max * sizeof (SV *);
672	rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);	677	rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
673	rss += slot->scopestack_max * sizeof (I32);	678	rss += slot->scopestack_max * sizeof (I32);
674	rss += slot->savestack_max * sizeof (ANY);	679	rss += slot->savestack_max * sizeof (ANY);
675		680
676	#if !PERL_VERSION_ATLEAST (5,10,0)	681	#if !PERL_VERSION_ATLEAST (5,10,0)
677	rss += slot->retstack_max * sizeof (OP *);	682	rss += slot->retstack_max * sizeof (OP *);
678	#endif	683	#endif
		684	}
679	}	685	}
680		686
681	return rss;	687	return rss;
682	}	688	}
683		689
684	/ coroutine stack handling **********************************************/	690	/ coroutine stack handling **********************************************/
685		691
686	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);	692	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);
687	static int (orig_sigelem_set) (pTHX_ SV sv, MAGIC *mg);	693	static int (orig_sigelem_set) (pTHX_ SV sv, MAGIC *mg);
		694	static int (orig_sigelem_clr) (pTHX_ SV sv, MAGIC *mg);
		695
		696	/* apparently < 5.8.8 */
		697	#ifndef MgPV_nolen_const
		698	#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
		699	SvPV_nolen((SV*)((mg)->mg_ptr)) : \
		700	(const char*)(mg)->mg_ptr)
		701	#endif
688		702
689	/*	703	/*
690	* This overrides the default magic get method of %SIG elements.	704	* This overrides the default magic get method of %SIG elements.
691	* The original one doesn't provide for reading back of PL_diehook/PL_warnhook	705	* The original one doesn't provide for reading back of PL_diehook/PL_warnhook
692	* and instead of tryign to save and restore the hash elements, we just provide	706	* and instead of tryign to save and restore the hash elements, we just provide
…		…
700	{	714	{
701	const char *s = MgPV_nolen_const (mg);	715	const char *s = MgPV_nolen_const (mg);
702		716
703	if (*s == '_')	717	if (*s == '_')
704	{	718	{
705	if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;	719	SV **svp = 0;
706	if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;	720
		721	if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
		722	if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
		723
		724	if (svp)
		725	{
		726	sv_setsv (sv, svp ? svp : &PL_sv_undef);
		727	return 0;
		728	}
707	}	729	}
708		730
709	return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;	731	return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
		732	}
		733
		734	static int
		735	coro_sigelem_clr (pTHX_ SV sv, MAGIC mg)
		736	{
		737	const char *s = MgPV_nolen_const (mg);
		738
		739	if (*s == '_')
		740	{
		741	SV **svp = 0;
		742
		743	if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
		744	if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
		745
		746	if (svp)
		747	{
		748	SV old = svp;
		749	*svp = 0;
		750	SvREFCNT_dec (old);
		751	return 0;
		752	}
		753	}
		754
		755	return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
710	}	756	}
711		757
712	static int	758	static int
713	coro_sigelem_set (pTHX_ SV sv, MAGIC mg)	759	coro_sigelem_set (pTHX_ SV sv, MAGIC mg)
714	{	760	{
…		…
1583	else	1629	else
1584	coro->slot->runops = RUNOPS_DEFAULT;	1630	coro->slot->runops = RUNOPS_DEFAULT;
1585	}	1631	}
1586	}	1632	}
1587		1633
		1634	static int
		1635	coro_gensub_free (pTHX_ SV sv, MAGIC mg)
		1636	{
		1637	AV *padlist;
		1638	AV av = (AV )mg->mg_obj;
		1639
		1640	abort ();
		1641
		1642	return 0;
		1643	}
		1644
		1645	static MGVTBL coro_gensub_vtbl = {
		1646	0, 0, 0, 0,
		1647	coro_gensub_free
		1648	};
		1649
1588	MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_	1650	MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1589		1651
1590	PROTOTYPES: DISABLE	1652	PROTOTYPES: DISABLE
1591		1653
1592	BOOT:	1654	BOOT:
…		…
1597	BOOT_PAGESIZE;	1659	BOOT_PAGESIZE;
1598		1660
1599	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);	1661	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);
1600	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);	1662	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);
1601		1663
1602	orig_sigelem_get = PL_vtbl_sigelem.svt_get;	1664	orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1603	PL_vtbl_sigelem.svt_get = coro_sigelem_get;	1665	orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1604	orig_sigelem_set = PL_vtbl_sigelem.svt_set;	1666	orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1605	PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1606		1667
1607	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);	1668	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1608	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));	1669	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1609	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));	1670	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1610		1671
…		…
1759	call (Coro::State coro, SV *coderef)	1820	call (Coro::State coro, SV *coderef)
1760	ALIAS:	1821	ALIAS:
1761	eval = 1	1822	eval = 1
1762	CODE:	1823	CODE:
1763	{	1824	{
1764	if (coro->mainstack)	1825	if (coro->mainstack && ((coro->flags & CF_RUNNING) \|\| coro->slot))
1765	{	1826	{
1766	struct coro temp;	1827	struct coro temp;
1767		1828
1768	if (!(coro->flags & CF_RUNNING))	1829	if (!(coro->flags & CF_RUNNING))
1769	{	1830	{
…		…
1851	force_cctx ()	1912	force_cctx ()
1852	CODE:	1913	CODE:
1853	struct coro *coro = SvSTATE (coro_current);	1914	struct coro *coro = SvSTATE (coro_current);
1854	coro->cctx->idle_sp = 0;	1915	coro->cctx->idle_sp = 0;
1855		1916
1856	MODULE = Coro::State PACKAGE = Coro
1857
1858	BOOT:
1859	{
1860	int i;
1861
1862	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1863	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1864	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1865
1866	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1867	SvREADONLY_on (coro_current);
1868
1869	coro_stash = gv_stashpv ("Coro", TRUE);
1870
1871	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1872	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1873	newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1874	newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1875	newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1876	newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1877
1878	for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1879	coro_ready[i] = newAV ();
1880
1881	{
1882	SV *sv = perl_get_sv ("Coro::API", TRUE);
1883	perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1884
1885	coroapi.schedule = api_schedule;
1886	coroapi.cede = api_cede;
1887	coroapi.cede_notself = api_cede_notself;
1888	coroapi.ready = api_ready;
1889	coroapi.is_ready = api_is_ready;
1890	coroapi.nready = &coro_nready;
1891	coroapi.current = coro_current;
1892
1893	GCoroAPI = &coroapi;
1894	sv_setiv (sv, (IV)&coroapi);
1895	SvREADONLY_on (sv);
1896	}
1897	}
1898
1899	void
1900	_set_current (SV *current)
1901	PROTOTYPE: $
1902	CODE:
1903	SvREFCNT_dec (SvRV (coro_current));
1904	SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1905
1906	void
1907	_set_readyhook (SV *hook)
1908	PROTOTYPE: $
1909	CODE:
1910	LOCK;
1911	SvREFCNT_dec (coro_readyhook);
1912	coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1913	UNLOCK;
1914
1915	int
1916	prio (Coro::State coro, int newprio = 0)
1917	ALIAS:
1918	nice = 1
1919	CODE:
1920	{
1921	RETVAL = coro->prio;
1922
1923	if (items > 1)
1924	{
1925	if (ix)
1926	newprio = coro->prio - newprio;
1927
1928	if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1929	if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1930
1931	coro->prio = newprio;
1932	}
1933	}
1934	OUTPUT:
1935	RETVAL
1936
1937	SV *
1938	ready (SV *self)
1939	PROTOTYPE: $
1940	CODE:
1941	RETVAL = boolSV (api_ready (self));
1942	OUTPUT:
1943	RETVAL
1944
1945	int
1946	nready (...)
1947	PROTOTYPE:
1948	CODE:
1949	RETVAL = coro_nready;
1950	OUTPUT:
1951	RETVAL
1952
1953	void	1917	void
1954	throw (Coro::State self, SV *throw = &PL_sv_undef)	1918	throw (Coro::State self, SV *throw = &PL_sv_undef)
1955	PROTOTYPE: $;$	1919	PROTOTYPE: $;$
1956	CODE:	1920	CODE:
1957	SvREFCNT_dec (self->throw);	1921	SvREFCNT_dec (self->throw);
…		…
1971	SV dst = ix ? (SV )&self->slot->defav : (SV **)&self->slot->defsv;	1935	SV dst = ix ? (SV )&self->slot->defav : (SV **)&self->slot->defsv;
1972		1936
1973	SV tmp = src; src = dst; *dst = tmp;	1937	SV tmp = src; src = dst; *dst = tmp;
1974	}	1938	}
1975		1939
		1940	MODULE = Coro::State PACKAGE = Coro
		1941
		1942	BOOT:
		1943	{
		1944	int i;
		1945
		1946	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
		1947	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
		1948	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
		1949
		1950	coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
		1951	SvREADONLY_on (coro_current);
		1952
		1953	coro_stash = gv_stashpv ("Coro", TRUE);
		1954
		1955	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
		1956	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
		1957	newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
		1958	newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
		1959	newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
		1960	newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
		1961
		1962	for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
		1963	coro_ready[i] = newAV ();
		1964
		1965	{
		1966	SV *sv = perl_get_sv ("Coro::API", TRUE);
		1967	perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
		1968
		1969	coroapi.schedule = api_schedule;
		1970	coroapi.cede = api_cede;
		1971	coroapi.cede_notself = api_cede_notself;
		1972	coroapi.ready = api_ready;
		1973	coroapi.is_ready = api_is_ready;
		1974	coroapi.nready = &coro_nready;
		1975	coroapi.current = coro_current;
		1976
		1977	GCoroAPI = &coroapi;
		1978	sv_setiv (sv, (IV)&coroapi);
		1979	SvREADONLY_on (sv);
		1980	}
		1981	}
		1982
		1983	void
		1984	_set_current (SV *current)
		1985	PROTOTYPE: $
		1986	CODE:
		1987	SvREFCNT_dec (SvRV (coro_current));
		1988	SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
		1989
		1990	void
		1991	_set_readyhook (SV *hook)
		1992	PROTOTYPE: $
		1993	CODE:
		1994	LOCK;
		1995	SvREFCNT_dec (coro_readyhook);
		1996	coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
		1997	UNLOCK;
		1998
		1999	int
		2000	prio (Coro::State coro, int newprio = 0)
		2001	ALIAS:
		2002	nice = 1
		2003	CODE:
		2004	{
		2005	RETVAL = coro->prio;
		2006
		2007	if (items > 1)
		2008	{
		2009	if (ix)
		2010	newprio = coro->prio - newprio;
		2011
		2012	if (newprio < PRIO_MIN) newprio = PRIO_MIN;
		2013	if (newprio > PRIO_MAX) newprio = PRIO_MAX;
		2014
		2015	coro->prio = newprio;
		2016	}
		2017	}
		2018	OUTPUT:
		2019	RETVAL
		2020
		2021	SV *
		2022	ready (SV *self)
		2023	PROTOTYPE: $
		2024	CODE:
		2025	RETVAL = boolSV (api_ready (self));
		2026	OUTPUT:
		2027	RETVAL
		2028
		2029	int
		2030	nready (...)
		2031	PROTOTYPE:
		2032	CODE:
		2033	RETVAL = coro_nready;
		2034	OUTPUT:
		2035	RETVAL
		2036
1976	# for async_pool speedup	2037	# for async_pool speedup
1977	void	2038	void
1978	_pool_1 (SV *cb)	2039	_pool_1 (SV *cb)
1979	CODE:	2040	CODE:
1980	{	2041	{
…		…
1985	AV *invoke_av;	2046	AV *invoke_av;
1986	int i, len;	2047	int i, len;
1987		2048
1988	if (!invoke)	2049	if (!invoke)
1989	{	2050	{
1990	SvREFCNT_dec (PL_diehook); PL_diehook = 0;	2051	SV *old = PL_diehook;
		2052	PL_diehook = 0;
		2053	SvREFCNT_dec (old);
1991	croak ("\3async_pool terminate\2\n");	2054	croak ("\3async_pool terminate\2\n");
1992	}	2055	}
1993		2056
1994	SvREFCNT_dec (coro->saved_deffh);	2057	SvREFCNT_dec (coro->saved_deffh);
1995	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);	2058	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
…		…
2024	coro->saved_deffh = 0;	2087	coro->saved_deffh = 0;
2025		2088
2026	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)	2089	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
2027	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))	2090	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2028	{	2091	{
2029	SvREFCNT_dec (PL_diehook); PL_diehook = 0;	2092	SV *old = PL_diehook;
		2093	PL_diehook = 0;
		2094	SvREFCNT_dec (old);
2030	croak ("\3async_pool terminate\2\n");	2095	croak ("\3async_pool terminate\2\n");
2031	}	2096	}
2032		2097
2033	av_clear (GvAV (PL_defgv));	2098	av_clear (GvAV (PL_defgv));
2034	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,	2099	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
…		…
2039	if (coro->cctx && (coro->cctx->flags & CC_TRACE))	2104	if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2040	api_trace (coro_current, 0);	2105	api_trace (coro_current, 0);
2041		2106
2042	av_push (av_async_pool, newSVsv (coro_current));	2107	av_push (av_async_pool, newSVsv (coro_current));
2043	}	2108	}
		2109
		2110	#if 0
		2111
		2112	void
		2113	_generator_call (...)
		2114	PROTOTYPE: @
		2115	PPCODE:
		2116	fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
		2117	xxxx
		2118	abort ();
		2119
		2120	SV *
		2121	gensub (SV *sub, ...)
		2122	PROTOTYPE: &;@
		2123	CODE:
		2124	{
		2125	struct coro *coro;
		2126	MAGIC *mg;
		2127	CV *xcv;
		2128	CV ncv = (CV )newSV_type (SVt_PVCV);
		2129	int i;
		2130
		2131	CvGV (ncv) = CvGV (cv);
		2132	CvFILE (ncv) = CvFILE (cv);
		2133
		2134	Newz (0, coro, 1, struct coro);
		2135	coro->args = newAV ();
		2136	coro->flags = CF_NEW;
		2137
		2138	av_extend (coro->args, items - 1);
		2139	for (i = 1; i < items; i++)
		2140	av_push (coro->args, newSVsv (ST (i)));
		2141
		2142	CvISXSUB_on (ncv);
		2143	CvXSUBANY (ncv).any_ptr = (void *)coro;
		2144
		2145	xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
		2146
		2147	CvXSUB (ncv) = CvXSUB (xcv);
		2148	CvANON_on (ncv);
		2149
		2150	mg = sv_magicext ((SV )ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char )coro, 0);
		2151	RETVAL = newRV_noinc ((SV *)ncv);
		2152	}
		2153	OUTPUT:
		2154	RETVAL
		2155
		2156	#endif
2044		2157
2045		2158
2046	MODULE = Coro::State PACKAGE = Coro::AIO	2159	MODULE = Coro::State PACKAGE = Coro::AIO
2047		2160
2048	SV *	2161	SV *

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.237 by root, Fri May 23 00:27:06 2008 UTC vs. Revision 1.245 by root, Mon Sep 22 05:40:21 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.237 by root, Fri May 23 00:27:06 2008 UTC vs.
Revision 1.245 by root, Mon Sep 22 05:40:21 2008 UTC