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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.217 by root, Wed Nov 14 11:32:56 2007 UTC vs.
Revision 1.226 by root, Fri Apr 4 20:07:35 2008 UTC

…		…
72	# ifndef IS_PADCONST	72	# ifndef IS_PADCONST
73	# define IS_PADCONST(v) 0	73	# define IS_PADCONST(v) 0
74	# endif	74	# endif
75	#endif	75	#endif
76		76
		77	/* 5.8.8 */
		78	#ifndef GV_NOTQUAL
		79	# define GV_NOTQUAL 0
		80	#endif
		81	#ifndef newSV
		82	# define newSV(l) NEWSV(0,l)
		83	#endif
		84
		85	/* 5.11 */
		86	#ifndef CxHASARGS
		87	# define CxHASARGS(cx) (cx)->blk_sub.hasargs
		88	#endif
		89
77	/* 5.8.7 */	90	/* 5.8.7 */
78	#ifndef SvRV_set	91	#ifndef SvRV_set
79	# define SvRV_set(s,v) SvRV(s) = (v)	92	# define SvRV_set(s,v) SvRV(s) = (v)
80	#endif
81
82	/* 5.8.8 */
83	#ifndef GV_NOTQUAL
84	# define GV_NOTQUAL 0
85	#endif
86	#ifndef newSV
87	# define newSV(l) NEWSV(0,l)
88	#endif	93	#endif
89		94
90	#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64	95	#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91	# undef CORO_STACKGUARD	96	# undef CORO_STACKGUARD
92	#endif	97	#endif
…		…
664	return rss;	669	return rss;
665	}	670	}
666		671
667	/ coroutine stack handling **********************************************/	672	/ coroutine stack handling **********************************************/
668		673
669	#if 0
670	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);	674	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);
		675	static int (orig_sigelem_set) (pTHX_ SV sv, MAGIC *mg);
671		676
672	/*	677	/*
673	* This overrides the default magic get method of %SIG elements.	678	* This overrides the default magic get method of %SIG elements.
674	* The original one doesn't provide for reading back of PL_diehook/PL_warnhook	679	* The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675	* and instead of tryign to save and restore the hash elements, we just provide	680	* and instead of tryign to save and restore the hash elements, we just provide
…		…
679	* when a schedule happens then, but we ignore this.	684	* when a schedule happens then, but we ignore this.
680	*/	685	*/
681	static int	686	static int
682	coro_sigelem_get (pTHX_ SV sv, MAGIC mg)	687	coro_sigelem_get (pTHX_ SV sv, MAGIC mg)
683	{	688	{
684	return orig_sigelem_get (aTHX_ sv, mg);
685	const char *s = MgPV_nolen_const (mg);	689	const char *s = MgPV_nolen_const (mg);
686		690
687	if (*s == '_')	691	if (*s == '_')
688	{	692	{
689	if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;	693	if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
690	if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;	694	if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691	}	695	}
692		696
693	return orig_sigelem_get (aTHX_ sv, mg);	697	return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
694	}	698	}
695	#endif	699
		700	static int
		701	coro_sigelem_set (pTHX_ SV sv, MAGIC mg)
		702	{
		703	const char *s = MgPV_nolen_const (mg);
		704
		705	if (*s == '_')
		706	{
		707	SV **svp = 0;
		708
		709	if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
		710	if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
		711
		712	if (svp)
		713	{
		714	SV old = svp;
		715	*svp = newSVsv (sv);
		716	SvREFCNT_dec (old);
		717	return;
		718	}
		719	}
		720
		721	return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
		722	}
696		723
697	static void	724	static void
698	coro_setup (pTHX_ struct coro *coro)	725	coro_setup (pTHX_ struct coro *coro)
699	{	726	{
700	/*	727	/*
…		…
711	PL_localizing = 0;	738	PL_localizing = 0;
712	PL_dirty = 0;	739	PL_dirty = 0;
713	PL_restartop = 0;	740	PL_restartop = 0;
714		741
715	/* recreate the die/warn hooks */	742	/* recreate the die/warn hooks */
716	PL_diehook = 0;	743	PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
717	hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0);	744	PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
718	PL_diehook = SvREFCNT_inc (rv_diehook);
719
720	PL_warnhook = 0;
721	hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
722	PL_warnhook = SvREFCNT_inc (rv_warnhook);
723		745
724	GvSV (PL_defgv) = newSV (0);	746	GvSV (PL_defgv) = newSV (0);
725	GvAV (PL_defgv) = coro->args; coro->args = 0;	747	GvAV (PL_defgv) = coro->args; coro->args = 0;
726	GvSV (PL_errgv) = newSV (0);	748	GvSV (PL_errgv) = newSV (0);
727	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);	749	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
…		…
878	SAVETMPS;	900	SAVETMPS;
879	EXTEND (SP, 3);	901	EXTEND (SP, 3);
880	PUSHMARK (SP);	902	PUSHMARK (SP);
881	PUSHs (&PL_sv_yes);	903	PUSHs (&PL_sv_yes);
882	PUSHs (fullname);	904	PUSHs (fullname);
883	PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);	905	PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
884	PUTBACK;	906	PUTBACK;
885	cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);	907	cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
886	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);	908	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);
887	SPAGAIN;	909	SPAGAIN;
888	FREETMPS;	910	FREETMPS;
…		…
1106	if (expect_false (next->flags & CF_DESTROYED))	1128	if (expect_false (next->flags & CF_DESTROYED))
1107	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");	1129	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1108		1130
1109	if (	1131	if (
1110	#if PERL_VERSION_ATLEAST (5,9,0)	1132	#if PERL_VERSION_ATLEAST (5,9,0)
1111	expect_false (PL_parser)	1133	expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1112	#else	1134	#else
1113	expect_false (PL_lex_state != LEX_NOTPARSING)	1135	expect_false (PL_lex_state != LEX_NOTPARSING)
1114	#endif	1136	#endif
1115	)	1137	)
1116	croak ("Coro::State::transfer called while parsing, but this is not supported");	1138	croak ("Coro::State::transfer called while parsing, but this is not supported");
…		…
1330	{	1352	{
1331	av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);	1353	av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1332	}	1354	}
1333		1355
1334	static SV *	1356	static SV *
1335	coro_deq (pTHX_ int min_prio)	1357	coro_deq (pTHX)
1336	{	1358	{
1337	int prio = PRIO_MAX - PRIO_MIN;	1359	int prio;
1338		1360
1339	min_prio -= PRIO_MIN;
1340	if (min_prio < 0)
1341	min_prio = 0;
1342
1343	for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )	1361	for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1344	if (AvFILLp (coro_ready [prio]) >= 0)	1362	if (AvFILLp (coro_ready [prio]) >= 0)
1345	return av_shift (coro_ready [prio]);	1363	return av_shift (coro_ready [prio]);
1346		1364
1347	return 0;	1365	return 0;
1348	}	1366	}
…		…
1384	SV prev_sv, next_sv;	1402	SV prev_sv, next_sv;
1385		1403
1386	for (;;)	1404	for (;;)
1387	{	1405	{
1388	LOCK;	1406	LOCK;
1389	next_sv = coro_deq (aTHX_ PRIO_MIN);	1407	next_sv = coro_deq (aTHX);
1390		1408
1391	/* nothing to schedule: call the idle handler */	1409	/* nothing to schedule: call the idle handler */
1392	if (expect_false (!next_sv))	1410	if (expect_false (!next_sv))
1393	{	1411	{
1394	dSP;	1412	dSP;
…		…
1398	SAVETMPS;	1416	SAVETMPS;
1399		1417
1400	PUSHMARK (SP);	1418	PUSHMARK (SP);
1401	PUTBACK;	1419	PUTBACK;
1402	call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);	1420	call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
		1421	SPAGAIN;
1403		1422
1404	FREETMPS;	1423	FREETMPS;
1405	LEAVE;	1424	LEAVE;
1406	continue;	1425	continue;
1407	}	1426	}
…		…
1536	#endif	1555	#endif
1537	BOOT_PAGESIZE;	1556	BOOT_PAGESIZE;
1538		1557
1539	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);	1558	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);
1540	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);	1559	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);
1541	#if 0	1560
1542	orig_sigelem_get = PL_vtbl_sigelem.svt_get;	1561	orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1543	PL_vtbl_sigelem.svt_get = coro_sigelem_get;	1562	PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1544	#endif	1563	orig_sigelem_set = PL_vtbl_sigelem.svt_set;
		1564	PL_vtbl_sigelem.svt_set = coro_sigelem_set;
		1565
1545	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);	1566	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1546	rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));	1567	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1547	rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));	1568	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1548		1569
1549	coro_state_stash = gv_stashpv ("Coro::State", TRUE);	1570	coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1550		1571
1551	newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));	1572	newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1552	newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));	1573	newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
…		…
1607	Coro::cede_notself = 4	1628	Coro::cede_notself = 4
1608	CODE:	1629	CODE:
1609	{	1630	{
1610	struct transfer_args ta;	1631	struct transfer_args ta;
1611		1632
		1633	PUTBACK;
1612	switch (ix)	1634	switch (ix)
1613	{	1635	{
1614	case 0:	1636	case 0:
1615	ta.prev = (struct coro )INT2PTR (coro_cctx , SvIV (ST (0)));	1637	ta.prev = (struct coro )INT2PTR (coro_cctx , SvIV (ST (0)));
1616	ta.next = 0;	1638	ta.next = 0;
…		…
1635	if (!prepare_cede_notself (aTHX_ &ta))	1657	if (!prepare_cede_notself (aTHX_ &ta))
1636	XSRETURN_EMPTY;	1658	XSRETURN_EMPTY;
1637		1659
1638	break;	1660	break;
1639	}	1661	}
		1662	SPAGAIN;
1640		1663
1641	BARRIER;	1664	BARRIER;
1642	PUTBACK;	1665	PUTBACK;
1643	TRANSFER (ta);	1666	TRANSFER (ta);
1644	SPAGAIN; /* might be the sp of a different coroutine now */	1667	SPAGAIN; /* might be the sp of a different coroutine now */
…		…
1702	{	1725	{
1703	struct coro temp;	1726	struct coro temp;
1704		1727
1705	if (!(coro->flags & CF_RUNNING))	1728	if (!(coro->flags & CF_RUNNING))
1706	{	1729	{
		1730	PUTBACK;
1707	save_perl (aTHX_ &temp);	1731	save_perl (aTHX_ &temp);
1708	load_perl (aTHX_ coro);	1732	load_perl (aTHX_ coro);
1709	}	1733	}
1710		1734
1711	{	1735	{
…		…
1730		1754
1731	if (!(coro->flags & CF_RUNNING))	1755	if (!(coro->flags & CF_RUNNING))
1732	{	1756	{
1733	save_perl (aTHX_ coro);	1757	save_perl (aTHX_ coro);
1734	load_perl (aTHX_ &temp);	1758	load_perl (aTHX_ &temp);
		1759	SPAGAIN;
1735	}	1760	}
1736	}	1761	}
1737	}	1762	}
1738		1763
1739	SV *	1764	SV *
…		…
1780	case 1: RETVAL = coro->usecount; break;	1805	case 1: RETVAL = coro->usecount; break;
1781	}	1806	}
1782	OUTPUT:	1807	OUTPUT:
1783	RETVAL	1808	RETVAL
1784		1809
		1810	void
		1811	force_cctx ()
		1812	CODE:
		1813	struct coro *coro = SvSTATE (coro_current);
		1814	coro->cctx->idle_sp = 0;
1785		1815
1786	MODULE = Coro::State PACKAGE = Coro	1816	MODULE = Coro::State PACKAGE = Coro
1787		1817
1788	BOOT:	1818	BOOT:
1789	{	1819	{
…		…
1876	PROTOTYPE: $;$	1906	PROTOTYPE: $;$
1877	CODE:	1907	CODE:
1878	SvREFCNT_dec (self->throw);	1908	SvREFCNT_dec (self->throw);
1879	self->throw = SvOK (throw) ? newSVsv (throw) : 0;	1909	self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1880		1910
		1911	void
		1912	swap_defsv (Coro::State self)
		1913	PROTOTYPE: $
		1914	ALIAS:
		1915	swap_defav = 1
		1916	CODE:
		1917	if (!self->slot)
		1918	croak ("cannot swap state with coroutine that has no saved state");
		1919	else
		1920	{
		1921	SV src = ix ? (SV )&GvAV (PL_defgv) : &GvSV (PL_defgv);
		1922	SV dst = ix ? (SV )&self->slot->defav : (SV **)&self->slot->defsv;
		1923
		1924	SV tmp = src; src = dst; *dst = tmp;
		1925	}
		1926
1881	# for async_pool speedup	1927	# for async_pool speedup
1882	void	1928	void
1883	_pool_1 (SV *cb)	1929	_pool_1 (SV *cb)
1884	CODE:	1930	CODE:
1885	{	1931	{
…		…
1889	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);	1935	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1890	AV *invoke_av;	1936	AV *invoke_av;
1891	int i, len;	1937	int i, len;
1892		1938
1893	if (!invoke)	1939	if (!invoke)
		1940	{
		1941	SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1894	croak ("\3async_pool terminate\2\n");	1942	croak ("\3async_pool terminate\2\n");
		1943	}
1895		1944
1896	SvREFCNT_dec (coro->saved_deffh);	1945	SvREFCNT_dec (coro->saved_deffh);
1897	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);	1946	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1898		1947
1899	hv_store (hv, "desc", sizeof ("desc") - 1,	1948	hv_store (hv, "desc", sizeof ("desc") - 1,
…		…
1925	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;	1974	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;
1926	coro->saved_deffh = 0;	1975	coro->saved_deffh = 0;
1927		1976
1928	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)	1977	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1929	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))	1978	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
		1979	{
		1980	SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1930	croak ("\3async_pool terminate\2\n");	1981	croak ("\3async_pool terminate\2\n");
		1982	}
1931		1983
1932	av_clear (GvAV (PL_defgv));	1984	av_clear (GvAV (PL_defgv));
1933	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,	1985	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1934	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);	1986	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1935		1987

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.217 by root, Wed Nov 14 11:32:56 2007 UTC vs. Revision 1.226 by root, Fri Apr 4 20:07:35 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.217 by root, Wed Nov 14 11:32:56 2007 UTC vs.
Revision 1.226 by root, Fri Apr 4 20:07:35 2008 UTC