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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.215 by root, Sun Oct 14 19:34:09 2007 UTC vs.
Revision 1.223 by root, Wed Feb 13 15:46:00 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
…		…
145	static size_t coro_stacksize = CORO_STACKSIZE;	150	static size_t coro_stacksize = CORO_STACKSIZE;
146	static struct CoroAPI coroapi;	151	static struct CoroAPI coroapi;
147	static AV main_mainstack; / used to differentiate between $main and others */	152	static AV main_mainstack; / used to differentiate between $main and others */
148	static JMPENV *main_top_env;	153	static JMPENV *main_top_env;
149	static HV coro_state_stash, coro_stash;	154	static HV coro_state_stash, coro_stash;
150	static SV coro_mortal; / will be freed after next transfer */	155	static volatile SV coro_mortal; / will be freed after next transfer */
151		156
152	static GV irsgv; / $/ */	157	static GV irsgv; / $/ */
153	static GV stdoutgv; / STDOUT /	158	static GV stdoutgv; / STDOUT /
154	static SV *rv_diehook;	159	static SV *rv_diehook;
155	static SV *rv_warnhook;	160	static SV *rv_warnhook;
…		…
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");
…		…
1120	/* always use the TRANSFER macro */	1142	/* always use the TRANSFER macro */
1121	static void NOINLINE	1143	static void NOINLINE
1122	transfer (pTHX_ struct coro prev, struct coro next)	1144	transfer (pTHX_ struct coro prev, struct coro next)
1123	{	1145	{
1124	dSTACKLEVEL;	1146	dSTACKLEVEL;
		1147	static volatile int has_throw;
1125		1148
1126	/* sometimes transfer is only called to set idle_sp */	1149	/* sometimes transfer is only called to set idle_sp */
1127	if (expect_false (!next))	1150	if (expect_false (!next))
1128	{	1151	{
1129	((coro_cctx *)prev)->idle_sp = STACKLEVEL;	1152	((coro_cctx *)prev)->idle_sp = STACKLEVEL;
…		…
1181	++next->usecount;	1204	++next->usecount;
1182		1205
1183	if (expect_true (!next->cctx))	1206	if (expect_true (!next->cctx))
1184	next->cctx = cctx_get (aTHX);	1207	next->cctx = cctx_get (aTHX);
1185		1208
		1209	has_throw = !!next->throw;
		1210
1186	if (expect_false (prev__cctx != next->cctx))	1211	if (expect_false (prev__cctx != next->cctx))
1187	{	1212	{
1188	prev__cctx->top_env = PL_top_env;	1213	prev__cctx->top_env = PL_top_env;
1189	PL_top_env = next->cctx->top_env;	1214	PL_top_env = next->cctx->top_env;
1190	coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);	1215	coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1191	}	1216	}
1192		1217
1193	free_coro_mortal (aTHX);	1218	free_coro_mortal (aTHX);
1194	UNLOCK;	1219	UNLOCK;
1195		1220
1196	if (expect_false (prev->throw \|\| next->throw))	1221	if (expect_false (has_throw))
1197	{	1222	{
1198	struct coro *coro = SvSTATE (coro_current);	1223	struct coro *coro = SvSTATE (coro_current);
1199		1224
1200	if (coro->throw)	1225	if (coro->throw)
1201	{	1226	{
…		…
1327	{	1352	{
1328	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);
1329	}	1354	}
1330		1355
1331	static SV *	1356	static SV *
1332	coro_deq (pTHX_ int min_prio)	1357	coro_deq (pTHX)
1333	{	1358	{
1334	int prio = PRIO_MAX - PRIO_MIN;	1359	int prio;
1335		1360
1336	min_prio -= PRIO_MIN;
1337	if (min_prio < 0)
1338	min_prio = 0;
1339
1340	for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )	1361	for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1341	if (AvFILLp (coro_ready [prio]) >= 0)	1362	if (AvFILLp (coro_ready [prio]) >= 0)
1342	return av_shift (coro_ready [prio]);	1363	return av_shift (coro_ready [prio]);
1343		1364
1344	return 0;	1365	return 0;
1345	}	1366	}
…		…
1381	SV prev_sv, next_sv;	1402	SV prev_sv, next_sv;
1382		1403
1383	for (;;)	1404	for (;;)
1384	{	1405	{
1385	LOCK;	1406	LOCK;
1386	next_sv = coro_deq (aTHX_ PRIO_MIN);	1407	next_sv = coro_deq (aTHX);
1387		1408
1388	/* nothing to schedule: call the idle handler */	1409	/* nothing to schedule: call the idle handler */
1389	if (expect_false (!next_sv))	1410	if (expect_false (!next_sv))
1390	{	1411	{
1391	dSP;	1412	dSP;
…		…
1395	SAVETMPS;	1416	SAVETMPS;
1396		1417
1397	PUSHMARK (SP);	1418	PUSHMARK (SP);
1398	PUTBACK;	1419	PUTBACK;
1399	call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);	1420	call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
		1421	SPAGAIN;
1400		1422
1401	FREETMPS;	1423	FREETMPS;
1402	LEAVE;	1424	LEAVE;
1403	continue;	1425	continue;
1404	}	1426	}
…		…
1533	#endif	1555	#endif
1534	BOOT_PAGESIZE;	1556	BOOT_PAGESIZE;
1535		1557
1536	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);	1558	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);
1537	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);	1559	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);
1538	#if 0	1560
1539	orig_sigelem_get = PL_vtbl_sigelem.svt_get;	1561	orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1540	PL_vtbl_sigelem.svt_get = coro_sigelem_get;	1562	PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1541	#endif	1563	orig_sigelem_set = PL_vtbl_sigelem.svt_set;
		1564	PL_vtbl_sigelem.svt_set = coro_sigelem_set;
		1565
1542	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);	1566	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1543	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));
1544	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));
1545		1569
1546	coro_state_stash = gv_stashpv ("Coro::State", TRUE);	1570	coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1547		1571
1548	newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));	1572	newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1549	newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));	1573	newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
…		…
1604	Coro::cede_notself = 4	1628	Coro::cede_notself = 4
1605	CODE:	1629	CODE:
1606	{	1630	{
1607	struct transfer_args ta;	1631	struct transfer_args ta;
1608		1632
		1633	PUTBACK;
1609	switch (ix)	1634	switch (ix)
1610	{	1635	{
1611	case 0:	1636	case 0:
1612	ta.prev = (struct coro )INT2PTR (coro_cctx , SvIV (ST (0)));	1637	ta.prev = (struct coro )INT2PTR (coro_cctx , SvIV (ST (0)));
1613	ta.next = 0;	1638	ta.next = 0;
…		…
1632	if (!prepare_cede_notself (aTHX_ &ta))	1657	if (!prepare_cede_notself (aTHX_ &ta))
1633	XSRETURN_EMPTY;	1658	XSRETURN_EMPTY;
1634		1659
1635	break;	1660	break;
1636	}	1661	}
		1662	SPAGAIN;
1637		1663
1638	BARRIER;	1664	BARRIER;
1639	PUTBACK;	1665	PUTBACK;
1640	TRANSFER (ta);	1666	TRANSFER (ta);
1641	SPAGAIN; /* might be the sp of a different coroutine now */	1667	SPAGAIN; /* might be the sp of a different coroutine now */
…		…
1699	{	1725	{
1700	struct coro temp;	1726	struct coro temp;
1701		1727
1702	if (!(coro->flags & CF_RUNNING))	1728	if (!(coro->flags & CF_RUNNING))
1703	{	1729	{
		1730	PUTBACK;
1704	save_perl (aTHX_ &temp);	1731	save_perl (aTHX_ &temp);
1705	load_perl (aTHX_ coro);	1732	load_perl (aTHX_ coro);
1706	}	1733	}
1707		1734
1708	{	1735	{
…		…
1727		1754
1728	if (!(coro->flags & CF_RUNNING))	1755	if (!(coro->flags & CF_RUNNING))
1729	{	1756	{
1730	save_perl (aTHX_ coro);	1757	save_perl (aTHX_ coro);
1731	load_perl (aTHX_ &temp);	1758	load_perl (aTHX_ &temp);
		1759	SPAGAIN;
1732	}	1760	}
1733	}	1761	}
1734	}	1762	}
1735		1763
1736	SV *	1764	SV *
…		…
1886	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);	1914	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1887	AV *invoke_av;	1915	AV *invoke_av;
1888	int i, len;	1916	int i, len;
1889		1917
1890	if (!invoke)	1918	if (!invoke)
		1919	{
		1920	SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1891	croak ("\3async_pool terminate\2\n");	1921	croak ("\3async_pool terminate\2\n");
		1922	}
1892		1923
1893	SvREFCNT_dec (coro->saved_deffh);	1924	SvREFCNT_dec (coro->saved_deffh);
1894	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);	1925	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1895		1926
1896	hv_store (hv, "desc", sizeof ("desc") - 1,	1927	hv_store (hv, "desc", sizeof ("desc") - 1,
…		…
1922	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;	1953	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;
1923	coro->saved_deffh = 0;	1954	coro->saved_deffh = 0;
1924		1955
1925	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)	1956	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1926	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))	1957	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
		1958	{
		1959	SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1927	croak ("\3async_pool terminate\2\n");	1960	croak ("\3async_pool terminate\2\n");
		1961	}
1928		1962
1929	av_clear (GvAV (PL_defgv));	1963	av_clear (GvAV (PL_defgv));
1930	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,	1964	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1931	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);	1965	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1932		1966

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.215 by root, Sun Oct 14 19:34:09 2007 UTC vs. Revision 1.223 by root, Wed Feb 13 15:46:00 2008 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.215 by root, Sun Oct 14 19:34:09 2007 UTC vs.
Revision 1.223 by root, Wed Feb 13 15:46:00 2008 UTC