[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.222 by root, Sun Jan 20 10:22:07 2008 UTC

…		…
145	static size_t coro_stacksize = CORO_STACKSIZE;	145	static size_t coro_stacksize = CORO_STACKSIZE;
146	static struct CoroAPI coroapi;	146	static struct CoroAPI coroapi;
147	static AV main_mainstack; / used to differentiate between $main and others */	147	static AV main_mainstack; / used to differentiate between $main and others */
148	static JMPENV *main_top_env;	148	static JMPENV *main_top_env;
149	static HV coro_state_stash, coro_stash;	149	static HV coro_state_stash, coro_stash;
150	static SV coro_mortal; / will be freed after next transfer */	150	static volatile SV coro_mortal; / will be freed after next transfer */
151		151
152	static GV irsgv; / $/ */	152	static GV irsgv; / $/ */
153	static GV stdoutgv; / STDOUT /	153	static GV stdoutgv; / STDOUT /
154	static SV *rv_diehook;	154	static SV *rv_diehook;
155	static SV *rv_warnhook;	155	static SV *rv_warnhook;
…		…
664	return rss;	664	return rss;
665	}	665	}
666		666
667	/ coroutine stack handling **********************************************/	667	/ coroutine stack handling **********************************************/
668		668
669	#if 0
670	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);	669	static int (orig_sigelem_get) (pTHX_ SV sv, MAGIC *mg);
		670	static int (orig_sigelem_set) (pTHX_ SV sv, MAGIC *mg);
671		671
672	/*	672	/*
673	* This overrides the default magic get method of %SIG elements.	673	* 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	674	* 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	675	* and instead of tryign to save and restore the hash elements, we just provide
…		…
679	* when a schedule happens then, but we ignore this.	679	* when a schedule happens then, but we ignore this.
680	*/	680	*/
681	static int	681	static int
682	coro_sigelem_get (pTHX_ SV sv, MAGIC mg)	682	coro_sigelem_get (pTHX_ SV sv, MAGIC mg)
683	{	683	{
684	return orig_sigelem_get (aTHX_ sv, mg);
685	const char *s = MgPV_nolen_const (mg);	684	const char *s = MgPV_nolen_const (mg);
686		685
687	if (*s == '_')	686	if (*s == '_')
688	{	687	{
689	if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;	688	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;	689	if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691	}	690	}
692		691
693	return orig_sigelem_get (aTHX_ sv, mg);	692	return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
694	}	693	}
695	#endif	694
		695	static int
		696	coro_sigelem_set (pTHX_ SV sv, MAGIC mg)
		697	{
		698	const char *s = MgPV_nolen_const (mg);
		699
		700	if (*s == '_')
		701	{
		702	SV **svp = 0;
		703
		704	if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
		705	if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
		706
		707	if (svp)
		708	{
		709	SV old = svp;
		710	*svp = newSVsv (sv);
		711	SvREFCNT_dec (old);
		712	return;
		713	}
		714	}
		715
		716	return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
		717	}
696		718
697	static void	719	static void
698	coro_setup (pTHX_ struct coro *coro)	720	coro_setup (pTHX_ struct coro *coro)
699	{	721	{
700	/*	722	/*
…		…
711	PL_localizing = 0;	733	PL_localizing = 0;
712	PL_dirty = 0;	734	PL_dirty = 0;
713	PL_restartop = 0;	735	PL_restartop = 0;
714		736
715	/* recreate the die/warn hooks */	737	/* recreate the die/warn hooks */
716	PL_diehook = 0;	738	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);	739	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		740
724	GvSV (PL_defgv) = newSV (0);	741	GvSV (PL_defgv) = newSV (0);
725	GvAV (PL_defgv) = coro->args; coro->args = 0;	742	GvAV (PL_defgv) = coro->args; coro->args = 0;
726	GvSV (PL_errgv) = newSV (0);	743	GvSV (PL_errgv) = newSV (0);
727	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);	744	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
…		…
1106	if (expect_false (next->flags & CF_DESTROYED))	1123	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");	1124	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1108		1125
1109	if (	1126	if (
1110	#if PERL_VERSION_ATLEAST (5,9,0)	1127	#if PERL_VERSION_ATLEAST (5,9,0)
1111	expect_false (PL_parser)	1128	expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1112	#else	1129	#else
1113	expect_false (PL_lex_state != LEX_NOTPARSING)	1130	expect_false (PL_lex_state != LEX_NOTPARSING)
1114	#endif	1131	#endif
1115	)	1132	)
1116	croak ("Coro::State::transfer called while parsing, but this is not supported");	1133	croak ("Coro::State::transfer called while parsing, but this is not supported");
…		…
1120	/* always use the TRANSFER macro */	1137	/* always use the TRANSFER macro */
1121	static void NOINLINE	1138	static void NOINLINE
1122	transfer (pTHX_ struct coro prev, struct coro next)	1139	transfer (pTHX_ struct coro prev, struct coro next)
1123	{	1140	{
1124	dSTACKLEVEL;	1141	dSTACKLEVEL;
		1142	static volatile int has_throw;
1125		1143
1126	/* sometimes transfer is only called to set idle_sp */	1144	/* sometimes transfer is only called to set idle_sp */
1127	if (expect_false (!next))	1145	if (expect_false (!next))
1128	{	1146	{
1129	((coro_cctx *)prev)->idle_sp = STACKLEVEL;	1147	((coro_cctx *)prev)->idle_sp = STACKLEVEL;
…		…
1181	++next->usecount;	1199	++next->usecount;
1182		1200
1183	if (expect_true (!next->cctx))	1201	if (expect_true (!next->cctx))
1184	next->cctx = cctx_get (aTHX);	1202	next->cctx = cctx_get (aTHX);
1185		1203
		1204	has_throw = !!next->throw;
		1205
1186	if (expect_false (prev__cctx != next->cctx))	1206	if (expect_false (prev__cctx != next->cctx))
1187	{	1207	{
1188	prev__cctx->top_env = PL_top_env;	1208	prev__cctx->top_env = PL_top_env;
1189	PL_top_env = next->cctx->top_env;	1209	PL_top_env = next->cctx->top_env;
1190	coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);	1210	coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1191	}	1211	}
1192		1212
1193	free_coro_mortal (aTHX);	1213	free_coro_mortal (aTHX);
1194	UNLOCK;	1214	UNLOCK;
1195		1215
1196	if (expect_false (prev->throw \|\| next->throw))	1216	if (expect_false (has_throw))
1197	{	1217	{
1198	struct coro *coro = SvSTATE (coro_current);	1218	struct coro *coro = SvSTATE (coro_current);
1199		1219
1200	if (coro->throw)	1220	if (coro->throw)
1201	{	1221	{
…		…
1327	{	1347	{
1328	av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);	1348	av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1329	}	1349	}
1330		1350
1331	static SV *	1351	static SV *
1332	coro_deq (pTHX_ int min_prio)	1352	coro_deq (pTHX)
1333	{	1353	{
1334	int prio = PRIO_MAX - PRIO_MIN;	1354	int prio;
1335		1355
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; )	1356	for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1341	if (AvFILLp (coro_ready [prio]) >= 0)	1357	if (AvFILLp (coro_ready [prio]) >= 0)
1342	return av_shift (coro_ready [prio]);	1358	return av_shift (coro_ready [prio]);
1343		1359
1344	return 0;	1360	return 0;
1345	}	1361	}
…		…
1381	SV prev_sv, next_sv;	1397	SV prev_sv, next_sv;
1382		1398
1383	for (;;)	1399	for (;;)
1384	{	1400	{
1385	LOCK;	1401	LOCK;
1386	next_sv = coro_deq (aTHX_ PRIO_MIN);	1402	next_sv = coro_deq (aTHX);
1387		1403
1388	/* nothing to schedule: call the idle handler */	1404	/* nothing to schedule: call the idle handler */
1389	if (expect_false (!next_sv))	1405	if (expect_false (!next_sv))
1390	{	1406	{
1391	dSP;	1407	dSP;
…		…
1395	SAVETMPS;	1411	SAVETMPS;
1396		1412
1397	PUSHMARK (SP);	1413	PUSHMARK (SP);
1398	PUTBACK;	1414	PUTBACK;
1399	call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);	1415	call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
		1416	SPAGAIN;
1400		1417
1401	FREETMPS;	1418	FREETMPS;
1402	LEAVE;	1419	LEAVE;
1403	continue;	1420	continue;
1404	}	1421	}
…		…
1533	#endif	1550	#endif
1534	BOOT_PAGESIZE;	1551	BOOT_PAGESIZE;
1535		1552
1536	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);	1553	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);
1537	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);	1554	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);
1538	#if 0	1555
1539	orig_sigelem_get = PL_vtbl_sigelem.svt_get;	1556	orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1540	PL_vtbl_sigelem.svt_get = coro_sigelem_get;	1557	PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1541	#endif	1558	orig_sigelem_set = PL_vtbl_sigelem.svt_set;
		1559	PL_vtbl_sigelem.svt_set = coro_sigelem_set;
		1560
1542	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);	1561	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1543	rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));	1562	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));	1563	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1545		1564
1546	coro_state_stash = gv_stashpv ("Coro::State", TRUE);	1565	coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1547		1566
1548	newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));	1567	newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1549	newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));	1568	newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
…		…
1604	Coro::cede_notself = 4	1623	Coro::cede_notself = 4
1605	CODE:	1624	CODE:
1606	{	1625	{
1607	struct transfer_args ta;	1626	struct transfer_args ta;
1608		1627
		1628	PUTBACK;
1609	switch (ix)	1629	switch (ix)
1610	{	1630	{
1611	case 0:	1631	case 0:
1612	ta.prev = (struct coro )INT2PTR (coro_cctx , SvIV (ST (0)));	1632	ta.prev = (struct coro )INT2PTR (coro_cctx , SvIV (ST (0)));
1613	ta.next = 0;	1633	ta.next = 0;
…		…
1632	if (!prepare_cede_notself (aTHX_ &ta))	1652	if (!prepare_cede_notself (aTHX_ &ta))
1633	XSRETURN_EMPTY;	1653	XSRETURN_EMPTY;
1634		1654
1635	break;	1655	break;
1636	}	1656	}
		1657	SPAGAIN;
1637		1658
1638	BARRIER;	1659	BARRIER;
1639	PUTBACK;	1660	PUTBACK;
1640	TRANSFER (ta);	1661	TRANSFER (ta);
1641	SPAGAIN; /* might be the sp of a different coroutine now */	1662	SPAGAIN; /* might be the sp of a different coroutine now */
…		…
1699	{	1720	{
1700	struct coro temp;	1721	struct coro temp;
1701		1722
1702	if (!(coro->flags & CF_RUNNING))	1723	if (!(coro->flags & CF_RUNNING))
1703	{	1724	{
		1725	PUTBACK;
1704	save_perl (aTHX_ &temp);	1726	save_perl (aTHX_ &temp);
1705	load_perl (aTHX_ coro);	1727	load_perl (aTHX_ coro);
1706	}	1728	}
1707		1729
1708	{	1730	{
…		…
1727		1749
1728	if (!(coro->flags & CF_RUNNING))	1750	if (!(coro->flags & CF_RUNNING))
1729	{	1751	{
1730	save_perl (aTHX_ coro);	1752	save_perl (aTHX_ coro);
1731	load_perl (aTHX_ &temp);	1753	load_perl (aTHX_ &temp);
		1754	SPAGAIN;
1732	}	1755	}
1733	}	1756	}
1734	}	1757	}
1735		1758
1736	SV *	1759	SV *
…		…
1886	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);	1909	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1887	AV *invoke_av;	1910	AV *invoke_av;
1888	int i, len;	1911	int i, len;
1889		1912
1890	if (!invoke)	1913	if (!invoke)
		1914	{
		1915	SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1891	croak ("\3async_pool terminate\2\n");	1916	croak ("\3async_pool terminate\2\n");
		1917	}
1892		1918
1893	SvREFCNT_dec (coro->saved_deffh);	1919	SvREFCNT_dec (coro->saved_deffh);
1894	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);	1920	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1895		1921
1896	hv_store (hv, "desc", sizeof ("desc") - 1,	1922	hv_store (hv, "desc", sizeof ("desc") - 1,
…		…
1922	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;	1948	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;
1923	coro->saved_deffh = 0;	1949	coro->saved_deffh = 0;
1924		1950
1925	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)	1951	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1926	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))	1952	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
		1953	{
		1954	SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1927	croak ("\3async_pool terminate\2\n");	1955	croak ("\3async_pool terminate\2\n");
		1956	}
1928		1957
1929	av_clear (GvAV (PL_defgv));	1958	av_clear (GvAV (PL_defgv));
1930	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,	1959	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1931	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);	1960	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1932		1961

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.222 by root, Sun Jan 20 10:22:07 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.222 by root, Sun Jan 20 10:22:07 2008 UTC