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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.442 by root, Tue Mar 4 06:13:24 2014 UTC vs.
Revision 1.459 by root, Fri Jun 17 05:00:19 2016 UTC

…		…
21		21
22	#include <stddef.h>	22	#include <stddef.h>
23	#include <stdio.h>	23	#include <stdio.h>
24	#include <errno.h>	24	#include <errno.h>
25	#include <assert.h>	25	#include <assert.h>
		26
		27	#ifndef SvREFCNT_dec_NN
		28	#define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		29	#endif
		30
		31	#ifndef SvREFCNT_inc_NN
		32	#define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
		33	#endif
26		34
27	#ifndef SVs_PADSTALE	35	#ifndef SVs_PADSTALE
28	# define SVs_PADSTALE 0	36	# define SVs_PADSTALE 0
29	#endif	37	#endif
30		38
…		…
42	# define PadlistNAMES(pl) (*PadlistARRAY (pl))	50	# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43	# define PadARRAY AvARRAY	51	# define PadARRAY AvARRAY
44	# define PadMAX AvFILLp	52	# define PadMAX AvFILLp
45	# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))	53	# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46	#endif	54	#endif
		55	#ifndef PadnamelistREFCNT
		56	# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
		57	#endif
		58	#ifndef PadnamelistREFCNT_dec
		59	# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
		60	#endif
47		61
48	/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */	62	/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49	/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */	63	/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50	#if PERL_VERSION_ATLEAST(5,19,0)	64	#if PERL_VERSION_ATLEAST(5,19,0)
51	# define SVt_BIND SVt_IV	65	# define SVt_BIND SVt_IV
…		…
126		140
127	static GV irsgv; / $/ */	141	static GV irsgv; / $/ */
128	static GV stdoutgv; / STDOUT /	142	static GV stdoutgv; / STDOUT /
129	static SV *rv_diehook;	143	static SV *rv_diehook;
130	static SV *rv_warnhook;	144	static SV *rv_warnhook;
131	static HV hv_sig; / %SIG */
132		145
133	/* async_pool helper stuff */	146	/* async_pool helper stuff */
134	static SV *sv_pool_rss;	147	static SV *sv_pool_rss;
135	static SV *sv_pool_size;	148	static SV *sv_pool_size;
136	static SV sv_async_pool_idle; / description string */	149	static SV sv_async_pool_idle; / description string */
…		…
242	SV *saved_deffh;	255	SV *saved_deffh;
243	SV *invoke_cb;	256	SV *invoke_cb;
244	AV *invoke_av;	257	AV *invoke_av;
245		258
246	/* on_enter/on_leave */	259	/* on_enter/on_leave */
247	AV *on_enter;	260	AV on_enter; AV on_enter_xs;
248	AV *on_leave;	261	AV on_leave; AV on_leave_xs;
249		262
250	/* swap_sv */	263	/* swap_sv */
251	AV *swap_sv;	264	AV *swap_sv;
252		265
253	/* times */	266	/* times */
…		…
489		502
490	return 0;	503	return 0;
491	}	504	}
492		505
493	ecb_inline struct coro *	506	ecb_inline struct coro *
494	SvSTATE_ (pTHX_ SV *coro)	507	SvSTATE_ (pTHX_ SV *coro_sv)
495	{	508	{
496	MAGIC *mg;	509	MAGIC *mg;
497		510
498	if (SvROK (coro))	511	if (SvROK (coro_sv))
499	coro = SvRV (coro);	512	coro_sv = SvRV (coro_sv);
500		513
501	mg = SvSTATEhv_p (aTHX_ coro);	514	mg = SvSTATEhv_p (aTHX_ coro_sv);
502	if (!mg)	515	if (!mg)
503	croak ("Coro::State object required");	516	croak ("Coro::State object required");
504		517
505	return (struct coro *)mg->mg_ptr;	518	return (struct coro *)mg->mg_ptr;
506	}	519	}
…		…
517	ecb_inline PADLIST *	530	ecb_inline PADLIST *
518	coro_derive_padlist (pTHX_ CV *cv)	531	coro_derive_padlist (pTHX_ CV *cv)
519	{	532	{
520	PADLIST *padlist = CvPADLIST (cv);	533	PADLIST *padlist = CvPADLIST (cv);
521	PADLIST *newpadlist;	534	PADLIST *newpadlist;
		535	PADNAMELIST *padnames;
522	PAD *newpad;	536	PAD *newpad;
523	PADOFFSET off = PadlistMAX (padlist) + 1;	537	PADOFFSET off = PadlistMAX (padlist) + 1;
524		538
525	#if NEWPADAPI	539	#if NEWPADAPI
526		540
…		…
553	AvREAL_off (newpadlist);	567	AvREAL_off (newpadlist);
554	#endif	568	#endif
555		569
556	/* Already extended to 2 elements by newPADLIST. */	570	/* Already extended to 2 elements by newPADLIST. */
557	PadlistMAX (newpadlist) = 1;	571	PadlistMAX (newpadlist) = 1;
558	PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));	572
		573	padnames = PadlistNAMES (padlist);
		574	++PadnamelistREFCNT (padnames);
		575	PadlistNAMES (newpadlist) = padnames;
		576
559	PadlistARRAY (newpadlist)[1] = newpad;	577	PadlistARRAY (newpadlist)[1] = newpad;
560		578
561	return newpadlist;	579	return newpadlist;
562	}	580	}
563		581
…		…
584	PadMAX (pad) = -1;	602	PadMAX (pad) = -1;
585	SvREFCNT_dec (pad);	603	SvREFCNT_dec (pad);
586	}	604	}
587	}	605	}
588		606
589	SvREFCNT_dec (PadlistNAMES (padlist));	607	PadnamelistREFCNT_dec (PadlistNAMES (padlist));
590		608
591	#if NEWPADAPI	609	#if NEWPADAPI
592	Safefree (PadlistARRAY (padlist));	610	Safefree (PadlistARRAY (padlist));
593	Safefree (padlist);	611	Safefree (padlist);
594	#else	612	#else
…		…
690	tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;	708	tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691		709
692	/* if SvANY points to the head, we need to adjust the pointers,	710	/* if SvANY points to the head, we need to adjust the pointers,
693	* as the pointer for a still points to b, and maybe vice versa.	711	* as the pointer for a still points to b, and maybe vice versa.
694	*/	712	*/
695	#define svany_in_head(type) \	713	U32 svany_in_head_set = (1 << SVt_NULL) \| (1 << SVt_BIND) \| (1 << SVt_IV) \| (1 << SVt_RV);
696	(((1 << SVt_NULL) \| (1 << SVt_BIND) \| (1 << SVt_IV) \| (1 << SVt_RV)) & (1 << (type)))	714	#if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
		715	svany_in_head_set \|= 1 << SVt_NV;
		716	#endif
		717
		718	#define svany_in_head(type) (svany_in_head_set & (1 << (type)))
697		719
698	if (svany_in_head (SvTYPE (a)))	720	if (svany_in_head (SvTYPE (a)))
699	SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);	721	SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700		722
701	if (svany_in_head (SvTYPE (b)))	723	if (svany_in_head (SvTYPE (b)))
…		…
704	#endif	726	#endif
705	}	727	}
706		728
707	/* swap sv heads, at least logically */	729	/* swap sv heads, at least logically */
708	static void	730	static void
709	swap_svs (pTHX_ Coro__State c)	731	swap_svs_enter (pTHX_ Coro__State c)
710	{	732	{
711	int i;	733	int i;
712		734
713	for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)	735	for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714	swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);	736	swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715	}	737	}
716		738
		739	static void
		740	swap_svs_leave (pTHX_ Coro__State c)
		741	{
		742	int i;
		743
		744	for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
		745	swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
		746	}
		747
717	#define SWAP_SVS(coro) \	748	#define SWAP_SVS_ENTER(coro) \
718	if (ecb_expect_false ((coro)->swap_sv)) \	749	if (ecb_expect_false ((coro)->swap_sv)) \
719	swap_svs (aTHX_ (coro))	750	swap_svs_enter (aTHX_ (coro))
		751
		752	#define SWAP_SVS_LEAVE(coro) \
		753	if (ecb_expect_false ((coro)->swap_sv)) \
		754	swap_svs_leave (aTHX_ (coro))
720		755
721	static void	756	static void
722	on_enterleave_call (pTHX_ SV *cb);	757	on_enterleave_call (pTHX_ SV *cb);
723		758
724	static void	759	static void
…		…
769		804
770	for (i = 0; i <= AvFILLp (c->on_enter); ++i)	805	for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771	on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);	806	on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772	}	807	}
773		808
		809	if (ecb_expect_false (c->on_enter_xs))
		810	{
		811	int i;
		812
		813	for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
		814	((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
		815	}
		816
774	SWAP_SVS (c);	817	SWAP_SVS_ENTER (c);
775	}	818	}
776		819
777	static void	820	static void
778	save_perl (pTHX_ Coro__State c)	821	save_perl (pTHX_ Coro__State c)
779	{	822	{
780	SWAP_SVS (c);	823	SWAP_SVS_LEAVE (c);
		824
		825	if (ecb_expect_false (c->on_leave_xs))
		826	{
		827	int i;
		828
		829	for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
		830	((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
		831	}
781		832
782	if (ecb_expect_false (c->on_leave))	833	if (ecb_expect_false (c->on_leave))
783	{	834	{
784	int i;	835	int i;
785		836
…		…
1138		1189
1139	GvSV (PL_defgv) = newSV (0);	1190	GvSV (PL_defgv) = newSV (0);
1140	GvAV (PL_defgv) = coro->args; coro->args = 0;	1191	GvAV (PL_defgv) = coro->args; coro->args = 0;
1141	GvSV (PL_errgv) = newSV (0);	1192	GvSV (PL_errgv) = newSV (0);
1142	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);	1193	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1143	GvHV (PL_hintgv) = 0;	1194	GvHV (PL_hintgv) = newHV ();
		1195	#if PERL_VERSION_ATLEAST (5,10,0)
		1196	hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
		1197	#endif
1144	PL_rs = newSVsv (GvSV (irsgv));	1198	PL_rs = newSVsv (GvSV (irsgv));
1145	PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);	1199	PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1146		1200
1147	{	1201	{
1148	dSP;	1202	dSP;
…		…
1176	PL_op = (OP *)&init_perl_op;	1230	PL_op = (OP *)&init_perl_op;
1177		1231
1178	/* copy throw, in case it was set before init_perl */	1232	/* copy throw, in case it was set before init_perl */
1179	CORO_THROW = coro->except;	1233	CORO_THROW = coro->except;
1180		1234
1181	SWAP_SVS (coro);	1235	SWAP_SVS_ENTER (coro);
1182		1236
1183	if (ecb_expect_false (enable_times))	1237	if (ecb_expect_false (enable_times))
1184	{	1238	{
1185	coro_times_update ();	1239	coro_times_update ();
1186	coro_times_sub (coro);	1240	coro_times_sub (coro);
…		…
1224	/* this will cause transfer_check to croak on block*/	1278	/* this will cause transfer_check to croak on block*/
1225	SvRV_set (coro_current, (SV *)coro->hv);	1279	SvRV_set (coro_current, (SV *)coro->hv);
1226		1280
1227	load_perl (aTHX_ coro);	1281	load_perl (aTHX_ coro);
1228		1282
		1283	/* restore swapped sv's */
		1284	SWAP_SVS_LEAVE (coro);
		1285
1229	coro_unwind_stacks (aTHX);	1286	coro_unwind_stacks (aTHX);
1230
1231	/* restore swapped sv's */
1232	SWAP_SVS (coro);
1233		1287
1234	coro_destruct_stacks (aTHX);	1288	coro_destruct_stacks (aTHX);
1235		1289
1236	/* now save some sv's to be free'd later */	1290	/* now save some sv's to be free'd later */
1237	svf [0] = GvSV (PL_defgv);	1291	svf [0] = GvSV (PL_defgv);
…		…
1258		1312
1259	SvREFCNT_dec (coro->saved_deffh);	1313	SvREFCNT_dec (coro->saved_deffh);
1260	SvREFCNT_dec (coro->rouse_cb);	1314	SvREFCNT_dec (coro->rouse_cb);
1261	SvREFCNT_dec (coro->invoke_cb);	1315	SvREFCNT_dec (coro->invoke_cb);
1262	SvREFCNT_dec (coro->invoke_av);	1316	SvREFCNT_dec (coro->invoke_av);
		1317	SvREFCNT_dec (coro->on_enter_xs);
		1318	SvREFCNT_dec (coro->on_leave_xs);
1263	}	1319	}
1264	}	1320	}
1265		1321
1266	ecb_inline void	1322	ecb_inline void
1267	free_coro_mortal (pTHX)	1323	free_coro_mortal (pTHX)
…		…
1330		1386
1331	if (PL_curcop != &PL_compiling)	1387	if (PL_curcop != &PL_compiling)
1332	{	1388	{
1333	SV **cb;	1389	SV **cb;
1334		1390
1335	if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)	1391	if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1336	{	1392	{
1337	PERL_CONTEXT *cx = &cxstack[cxstack_ix];	1393	PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1338		1394
1339	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)	1395	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1340	{	1396	{
…		…
1927		1983
1928	ENTER;	1984	ENTER;
1929	SAVETMPS;	1985	SAVETMPS;
1930		1986
1931	PUSHMARK (SP);	1987	PUSHMARK (SP);
1932	XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));	1988	XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933	PUTBACK;	1989	PUTBACK;
1934	call_pv ("Carp::confess", G_VOID \| G_DISCARD);	1990	call_pv ("Carp::confess", G_VOID \| G_DISCARD);
1935		1991
1936	FREETMPS;	1992	FREETMPS;
1937	LEAVE;	1993	LEAVE;
…		…
2248	slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);	2304	slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249	}	2305	}
2250	else	2306	else
2251	{	2307	{
2252	struct coro *self = SvSTATE_current;	2308	struct coro *self = SvSTATE_current;
		2309
		2310	if (!self)
		2311	croak ("Coro::cancel called outside of thread content,");
2253		2312
2254	/* otherwise we cancel directly, purely for speed reasons	2313	/* otherwise we cancel directly, purely for speed reasons
2255	* unfortunately, this requires some magic trickery, as	2314	* unfortunately, this requires some magic trickery, as
2256	* somebody else could cancel us, so we have to fight the cancellation.	2315	* somebody else could cancel us, so we have to fight the cancellation.
2257	* this is ugly, and hopefully fully worth the extra speed.	2316	* this is ugly, and hopefully fully worth the extra speed.
…		…
2367	else	2426	else
2368	{	2427	{
2369	av_clear (GvAV (PL_defgv));	2428	av_clear (GvAV (PL_defgv));
2370	hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);	2429	hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2371		2430
		2431	if (ecb_expect_false (coro->swap_sv))
		2432	{
		2433	SvREFCNT_dec_NN (coro->swap_sv);
		2434	coro->swap_sv = 0;
		2435	}
		2436
2372	coro->prio = 0;	2437	coro->prio = 0;
2373		2438
2374	if (coro->cctx && (coro->cctx->flags & CC_TRACE))	2439	if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2375	api_trace (aTHX_ coro_current, 0);	2440	api_trace (aTHX_ coro_current, 0);
2376		2441
2377	frame->prepare = prepare_schedule;	2442	frame->prepare = prepare_schedule;
2378	av_push (av_async_pool, SvREFCNT_inc (hv));	2443	av_push (av_async_pool, SvREFCNT_inc (hv));
2379	}	2444	}
…		…
2804	static void	2869	static void
2805	coro_pop_on_leave (pTHX_ void *coro)	2870	coro_pop_on_leave (pTHX_ void *coro)
2806	{	2871	{
2807	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);	2872	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);
2808	on_enterleave_call (aTHX_ sv_2mortal (cb));	2873	on_enterleave_call (aTHX_ sv_2mortal (cb));
		2874	}
		2875
		2876	static void
		2877	enterleave_hook_xs (pTHX_ struct coro coro, AV avp, coro_enterleave_hook hook, void arg)
		2878	{
		2879	if (!hook)
		2880	return;
		2881
		2882	if (!*avp)
		2883	{
		2884	*avp = newAV ();
		2885	AvREAL_off (*avp);
		2886	}
		2887
		2888	av_push (avp, (SV )hook);
		2889	av_push (avp, (SV )arg);
		2890	}
		2891
		2892	static void
		2893	enterleave_unhook_xs (pTHX_ struct coro coro, AV *avp, coro_enterleave_hook hook, int execute)
		2894	{
		2895	AV av = avp;
		2896	int i;
		2897
		2898	if (!av)
		2899	return;
		2900
		2901	for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
		2902	if (AvARRAY (av)[i] == (SV *)hook)
		2903	{
		2904	if (execute)
		2905	hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
		2906
		2907	memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
		2908	av_pop (av);
		2909	av_pop (av);
		2910	break;
		2911	}
		2912
		2913	if (AvFILLp (av) >= 0)
		2914	{
		2915	*avp = 0;
		2916	SvREFCNT_dec_NN (av);
		2917	}
		2918	}
		2919
		2920	static void
		2921	api_enterleave_hook (pTHX_ SV coro_sv, coro_enterleave_hook enter, void enter_arg, coro_enterleave_hook leave, void *leave_arg)
		2922	{
		2923	struct coro *coro = SvSTATE (coro_sv);
		2924
		2925	if (SvSTATE_current == coro)
		2926	if (enter)
		2927	enter (aTHX_ enter_arg);
		2928
		2929	enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
		2930	enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
		2931	}
		2932
		2933	static void
		2934	api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
		2935	{
		2936	struct coro *coro = SvSTATE (coro_sv);
		2937
		2938	enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
		2939	enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
		2940	}
		2941
		2942	static void
		2943	savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
		2944	{
		2945	struct coro *coro = SvSTATE_current;
		2946
		2947	enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
		2948	}
		2949
		2950	static void
		2951	savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
		2952	{
		2953	struct coro *coro = SvSTATE_current;
		2954
		2955	enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
		2956	}
		2957
		2958	static void
		2959	api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void enter_arg, coro_enterleave_hook leave, void leave_arg)
		2960	{
		2961	api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
		2962
		2963	/* this ought to be much cheaper than malloc + a single destructor call */
		2964	if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
		2965	if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2809	}	2966	}
2810		2967
2811	/*****************************************************************************/	2968	/*****************************************************************************/
2812	/* PerlIO::cede */	2969	/* PerlIO::cede */
2813		2970
…		…
2943	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));	3100	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2944	PUTBACK;	3101	PUTBACK;
2945	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);	3102	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);
2946	}	3103	}
2947		3104
2948	SvREFCNT_dec (cb);	3105	SvREFCNT_dec_NN (cb);
2949	}	3106	}
2950	}	3107	}
2951		3108
2952	static void	3109	static void
2953	coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)	3110	coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
…		…
3093	{	3250	{
3094	api_ready (aTHX_ cb);	3251	api_ready (aTHX_ cb);
3095	sv_setiv (cb, 0); /* signal waiter */	3252	sv_setiv (cb, 0); /* signal waiter */
3096	}	3253	}
3097		3254
3098	SvREFCNT_dec (cb);	3255	SvREFCNT_dec_NN (cb);
3099		3256
3100	--count;	3257	--count;
3101	}	3258	}
3102	}	3259	}
3103		3260
…		…
3188	}	3345	}
3189		3346
3190	av_push (state, data_sv);	3347	av_push (state, data_sv);
3191		3348
3192	api_ready (aTHX_ coro);	3349	api_ready (aTHX_ coro);
3193	SvREFCNT_dec (coro);	3350	SvREFCNT_dec_NN (coro);
3194	SvREFCNT_dec ((AV *)state);	3351	SvREFCNT_dec_NN ((AV *)state);
3195	}	3352	}
3196		3353
3197	static int	3354	static int
3198	slf_check_aio_req (pTHX_ struct CoroSLF *frame)	3355	slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3199	{	3356	{
…		…
3217	errno = data->errorno;	3374	errno = data->errorno;
3218	PL_laststype = data->laststype;	3375	PL_laststype = data->laststype;
3219	PL_laststatval = data->laststatval;	3376	PL_laststatval = data->laststatval;
3220	PL_statcache = data->statcache;	3377	PL_statcache = data->statcache;
3221		3378
3222	SvREFCNT_dec (data_sv);	3379	SvREFCNT_dec_NN (data_sv);
3223	}	3380	}
3224		3381
3225	/* push result values */	3382	/* push result values */
3226	{	3383	{
3227	dSP;	3384	dSP;
…		…
3442		3599
3443	PROTOTYPES: DISABLE	3600	PROTOTYPES: DISABLE
3444		3601
3445	BOOT:	3602	BOOT:
3446	{	3603	{
		3604	#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
		3605	#include "state.h"
3447	#ifdef USE_ITHREADS	3606	#ifdef USE_ITHREADS
3448	# if CORO_PTHREAD	3607	# if CORO_PTHREAD
3449	coro_thx = PERL_GET_CONTEXT;	3608	coro_thx = PERL_GET_CONTEXT;
3450	# endif	3609	# endif
3451	#endif	3610	#endif
…		…
3463		3622
3464	orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;	3623	orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3465	orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;	3624	orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3466	orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;	3625	orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3467		3626
3468	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3469	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));	3627	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3470	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));	3628	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3471		3629
3472	coro_state_stash = gv_stashpv ("Coro::State", TRUE);	3630	coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3473		3631
…		…
3779	if (ecb_expect_false (current == self))	3937	if (ecb_expect_false (current == self))
3780	coro_times_sub (SvSTATE (coro_current));	3938	coro_times_sub (SvSTATE (coro_current));
3781	}	3939	}
3782		3940
3783	void	3941	void
3784	swap_sv (Coro::State coro, SV sv, SV swapsv)	3942	swap_sv (Coro::State coro, SV sva, SV svb)
3785	CODE:	3943	CODE:
3786	{	3944	{
3787	struct coro *current = SvSTATE_current;	3945	struct coro *current = SvSTATE_current;
		3946	AV *swap_sv;
		3947	int i;
		3948
		3949	sva = SvRV (sva);
		3950	svb = SvRV (svb);
3788		3951
3789	if (current == coro)	3952	if (current == coro)
3790	SWAP_SVS (current);	3953	SWAP_SVS_LEAVE (current);
3791		3954
3792	if (!coro->swap_sv)	3955	if (!coro->swap_sv)
3793	coro->swap_sv = newAV ();	3956	coro->swap_sv = newAV ();
3794		3957
		3958	swap_sv = coro->swap_sv;
		3959
		3960	for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
		3961	{
		3962	SV *a = AvARRAY (swap_sv)[i ];
		3963	SV *b = AvARRAY (swap_sv)[i + 1];
		3964
		3965	if (a == sva && b == svb)
		3966	{
		3967	SvREFCNT_dec_NN (a);
		3968	SvREFCNT_dec_NN (b);
		3969
		3970	for (; i <= AvFILLp (swap_sv) - 2; i++)
		3971	AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
		3972
		3973	AvFILLp (swap_sv) -= 2;
		3974
		3975	goto removed;
		3976	}
		3977	}
		3978
3795	av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));	3979	av_push (swap_sv, SvREFCNT_inc_NN (sva));
3796	av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));	3980	av_push (swap_sv, SvREFCNT_inc_NN (svb));
		3981
		3982	removed:
3797		3983
3798	if (current == coro)	3984	if (current == coro)
3799	SWAP_SVS (current);	3985	SWAP_SVS_ENTER (current);
3800	}	3986	}
3801		3987
3802		3988
3803	MODULE = Coro::State PACKAGE = Coro	3989	MODULE = Coro::State PACKAGE = Coro
3804		3990
3805	BOOT:	3991	BOOT:
3806	{	3992	{
		3993	if (SVt_LAST > 32)
		3994	croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
		3995
3807	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	3996	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3808	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	3997	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3809	cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);	3998	cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3810	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);	3999	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3811	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);	4000	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
…		…
3837	coroapi.ready = api_ready;	4026	coroapi.ready = api_ready;
3838	coroapi.is_ready = api_is_ready;	4027	coroapi.is_ready = api_is_ready;
3839	coroapi.nready = coro_nready;	4028	coroapi.nready = coro_nready;
3840	coroapi.current = coro_current;	4029	coroapi.current = coro_current;
3841		4030
		4031	coroapi.enterleave_hook = api_enterleave_hook;
		4032	coroapi.enterleave_unhook = api_enterleave_unhook;
		4033	coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
		4034
3842	/GCoroAPI = &coroapi;/	4035	/GCoroAPI = &coroapi;/
3843	sv_setiv (sv, (IV)&coroapi);	4036	sv_setiv (sv, (IV)&coroapi);
3844	SvREADONLY_on (sv);	4037	SvREADONLY_on (sv);
3845	}	4038	}
3846	}	4039	}
…		…
3911		4104
3912	void	4105	void
3913	_set_current (SV *current)	4106	_set_current (SV *current)
3914	PROTOTYPE: $	4107	PROTOTYPE: $
3915	CODE:	4108	CODE:
3916	SvREFCNT_dec (SvRV (coro_current));	4109	SvREFCNT_dec_NN (SvRV (coro_current));
3917	SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));	4110	SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3918		4111
3919	void	4112	void
3920	_set_readyhook (SV *hook)	4113	_set_readyhook (SV *hook)
3921	PROTOTYPE: $	4114	PROTOTYPE: $
…		…
4005		4198
4006	if ((SV *)hv == &PL_sv_undef)	4199	if ((SV *)hv == &PL_sv_undef)
4007	{	4200	{
4008	SV sv = coro_new (aTHX_ coro_stash, (SV *)&cv_pool_handler, 1, 1);	4201	SV sv = coro_new (aTHX_ coro_stash, (SV *)&cv_pool_handler, 1, 1);
4009	hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));	4202	hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4010	SvREFCNT_dec (sv);	4203	SvREFCNT_dec_NN (sv);
4011	}	4204	}
4012		4205
4013	{	4206	{
4014	struct coro *coro = SvSTATE_hv (hv);	4207	struct coro *coro = SvSTATE_hv (hv);
4015		4208
…		…
4022	api_ready (aTHX_ (SV *)hv);	4215	api_ready (aTHX_ (SV *)hv);
4023		4216
4024	if (GIMME_V != G_VOID)	4217	if (GIMME_V != G_VOID)
4025	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	4218	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4026	else	4219	else
4027	SvREFCNT_dec (hv);	4220	SvREFCNT_dec_NN (hv);
4028	}	4221	}
4029		4222
4030	SV *	4223	SV *
4031	rouse_cb ()	4224	rouse_cb ()
4032	PROTOTYPE:	4225	PROTOTYPE:
…		…
4111	RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);	4304	RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4112	OUTPUT:	4305	OUTPUT:
4113	RETVAL	4306	RETVAL
4114		4307
4115	void	4308	void
4116	up (SV *self, int adjust = 1)	4309	up (SV *self)
4117	ALIAS:
4118	adjust = 1
4119	CODE:	4310	CODE:
		4311	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
		4312
		4313	void
		4314	adjust (SV *self, int adjust)
		4315	CODE:
4120	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);	4316	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4121		4317
4122	void	4318	void
4123	down (...)	4319	down (...)
4124	CODE:	4320	CODE:
4125	CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);	4321	CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.442 by root, Tue Mar 4 06:13:24 2014 UTC vs. Revision 1.459 by root, Fri Jun 17 05:00:19 2016 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.442 by root, Tue Mar 4 06:13:24 2014 UTC vs.
Revision 1.459 by root, Fri Jun 17 05:00:19 2016 UTC