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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.446 by root, Wed Sep 3 14:26:34 2014 UTC vs.
Revision 1.450 by root, Sun Jun 28 22:31:03 2015 UTC

…		…
42	# define PadlistNAMES(pl) (*PadlistARRAY (pl))	42	# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43	# define PadARRAY AvARRAY	43	# define PadARRAY AvARRAY
44	# define PadMAX AvFILLp	44	# define PadMAX AvFILLp
45	# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))	45	# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46	#endif	46	#endif
		47	#ifndef PadnamelistREFCNT
		48	# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
		49	#endif
		50	#ifndef PadnamelistREFCNT_dec
		51	# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
		52	#endif
47		53
48	/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */	54	/* 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 */	55	/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50	#if PERL_VERSION_ATLEAST(5,19,0)	56	#if PERL_VERSION_ATLEAST(5,19,0)
51	# define SVt_BIND SVt_IV	57	# define SVt_BIND SVt_IV
…		…
242	SV *saved_deffh;	248	SV *saved_deffh;
243	SV *invoke_cb;	249	SV *invoke_cb;
244	AV *invoke_av;	250	AV *invoke_av;
245		251
246	/* on_enter/on_leave */	252	/* on_enter/on_leave */
247	AV *on_enter;	253	AV on_enter; AV on_enter_xs;
248	AV *on_leave;	254	AV on_leave; AV on_leave_xs;
249		255
250	/* swap_sv */	256	/* swap_sv */
251	AV *swap_sv;	257	AV *swap_sv;
252		258
253	/* times */	259	/* times */
…		…
489		495
490	return 0;	496	return 0;
491	}	497	}
492		498
493	ecb_inline struct coro *	499	ecb_inline struct coro *
494	SvSTATE_ (pTHX_ SV *coro)	500	SvSTATE_ (pTHX_ SV *coro_sv)
495	{	501	{
496	MAGIC *mg;	502	MAGIC *mg;
497		503
498	if (SvROK (coro))	504	if (SvROK (coro_sv))
499	coro = SvRV (coro);	505	coro_sv = SvRV (coro_sv);
500		506
501	mg = SvSTATEhv_p (aTHX_ coro);	507	mg = SvSTATEhv_p (aTHX_ coro_sv);
502	if (!mg)	508	if (!mg)
503	croak ("Coro::State object required");	509	croak ("Coro::State object required");
504		510
505	return (struct coro *)mg->mg_ptr;	511	return (struct coro *)mg->mg_ptr;
506	}	512	}
…		…
517	ecb_inline PADLIST *	523	ecb_inline PADLIST *
518	coro_derive_padlist (pTHX_ CV *cv)	524	coro_derive_padlist (pTHX_ CV *cv)
519	{	525	{
520	PADLIST *padlist = CvPADLIST (cv);	526	PADLIST *padlist = CvPADLIST (cv);
521	PADLIST *newpadlist;	527	PADLIST *newpadlist;
		528	PADNAMELIST *padnames;
522	PAD *newpad;	529	PAD *newpad;
523	PADOFFSET off = PadlistMAX (padlist) + 1;	530	PADOFFSET off = PadlistMAX (padlist) + 1;
524		531
525	#if NEWPADAPI	532	#if NEWPADAPI
526		533
…		…
553	AvREAL_off (newpadlist);	560	AvREAL_off (newpadlist);
554	#endif	561	#endif
555		562
556	/* Already extended to 2 elements by newPADLIST. */	563	/* Already extended to 2 elements by newPADLIST. */
557	PadlistMAX (newpadlist) = 1;	564	PadlistMAX (newpadlist) = 1;
558	PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));	565
		566	padnames = PadlistNAMES (padlist);
		567	++PadnamelistREFCNT (padnames);
		568	PadlistNAMES (newpadlist) = padnames;
		569
559	PadlistARRAY (newpadlist)[1] = newpad;	570	PadlistARRAY (newpadlist)[1] = newpad;
560		571
561	return newpadlist;	572	return newpadlist;
562	}	573	}
563		574
…		…
584	PadMAX (pad) = -1;	595	PadMAX (pad) = -1;
585	SvREFCNT_dec (pad);	596	SvREFCNT_dec (pad);
586	}	597	}
587	}	598	}
588		599
589	SvREFCNT_dec (PadlistNAMES (padlist));	600	PadnamelistREFCNT_dec (PadlistNAMES (padlist));
590		601
591	#if NEWPADAPI	602	#if NEWPADAPI
592	Safefree (PadlistARRAY (padlist));	603	Safefree (PadlistARRAY (padlist));
593	Safefree (padlist);	604	Safefree (padlist);
594	#else	605	#else
…		…
769		780
770	for (i = 0; i <= AvFILLp (c->on_enter); ++i)	781	for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771	on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);	782	on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772	}	783	}
773		784
		785	if (ecb_expect_false (c->on_enter_xs))
		786	{
		787	int i;
		788
		789	for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
		790	((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
		791	}
		792
774	SWAP_SVS (c);	793	SWAP_SVS (c);
775	}	794	}
776		795
777	static void	796	static void
778	save_perl (pTHX_ Coro__State c)	797	save_perl (pTHX_ Coro__State c)
779	{	798	{
780	SWAP_SVS (c);	799	SWAP_SVS (c);
		800
		801	if (ecb_expect_false (c->on_leave_xs))
		802	{
		803	int i;
		804
		805	for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
		806	((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
		807	}
781		808
782	if (ecb_expect_false (c->on_leave))	809	if (ecb_expect_false (c->on_leave))
783	{	810	{
784	int i;	811	int i;
785		812
…		…
1261		1288
1262	SvREFCNT_dec (coro->saved_deffh);	1289	SvREFCNT_dec (coro->saved_deffh);
1263	SvREFCNT_dec (coro->rouse_cb);	1290	SvREFCNT_dec (coro->rouse_cb);
1264	SvREFCNT_dec (coro->invoke_cb);	1291	SvREFCNT_dec (coro->invoke_cb);
1265	SvREFCNT_dec (coro->invoke_av);	1292	SvREFCNT_dec (coro->invoke_av);
		1293	SvREFCNT_dec (coro->on_enter_xs);
		1294	SvREFCNT_dec (coro->on_leave_xs);
1266	}	1295	}
1267	}	1296	}
1268		1297
1269	ecb_inline void	1298	ecb_inline void
1270	free_coro_mortal (pTHX)	1299	free_coro_mortal (pTHX)
…		…
1333		1362
1334	if (PL_curcop != &PL_compiling)	1363	if (PL_curcop != &PL_compiling)
1335	{	1364	{
1336	SV **cb;	1365	SV **cb;
1337		1366
1338	if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)	1367	if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1339	{	1368	{
1340	PERL_CONTEXT *cx = &cxstack[cxstack_ix];	1369	PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1341		1370
1342	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)	1371	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1343	{	1372	{
…		…
1930		1959
1931	ENTER;	1960	ENTER;
1932	SAVETMPS;	1961	SAVETMPS;
1933		1962
1934	PUSHMARK (SP);	1963	PUSHMARK (SP);
1935	XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));	1964	XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936	PUTBACK;	1965	PUTBACK;
1937	call_pv ("Carp::confess", G_VOID \| G_DISCARD);	1966	call_pv ("Carp::confess", G_VOID \| G_DISCARD);
1938		1967
1939	FREETMPS;	1968	FREETMPS;
1940	LEAVE;	1969	LEAVE;
…		…
2810	static void	2839	static void
2811	coro_pop_on_leave (pTHX_ void *coro)	2840	coro_pop_on_leave (pTHX_ void *coro)
2812	{	2841	{
2813	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);	2842	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);
2814	on_enterleave_call (aTHX_ sv_2mortal (cb));	2843	on_enterleave_call (aTHX_ sv_2mortal (cb));
		2844	}
		2845
		2846	static void
		2847	enterleave_hook_xs (pTHX_ struct coro coro, AV avp, coro_enterleave_hook hook, void arg)
		2848	{
		2849	if (!hook)
		2850	return;
		2851
		2852	if (!*avp)
		2853	{
		2854	*avp = newAV ();
		2855	AvREAL_off (*avp);
		2856	}
		2857
		2858	av_push (avp, (SV )hook);
		2859	av_push (avp, (SV )arg);
		2860	}
		2861
		2862	static void
		2863	enterleave_unhook_xs (pTHX_ struct coro coro, AV *avp, coro_enterleave_hook hook, int execute)
		2864	{
		2865	AV av = avp;
		2866	int i;
		2867
		2868	if (!av)
		2869	return;
		2870
		2871	for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
		2872	if (AvARRAY (av)[i] == (SV *)hook)
		2873	{
		2874	if (execute)
		2875	hook ((void *)AvARRAY (av)[i + 1]);
		2876
		2877	memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
		2878	av_pop (av);
		2879	av_pop (av);
		2880	break;
		2881	}
		2882
		2883	if (AvFILLp (av) >= 0)
		2884	{
		2885	*avp = 0;
		2886	SvREFCNT_dec_NN (av);
		2887	}
		2888	}
		2889
		2890	static void
		2891	api_enterleave_hook (pTHX_ SV coro_sv, coro_enterleave_hook enter, void enter_arg, coro_enterleave_hook leave, void *leave_arg)
		2892	{
		2893	struct coro *coro = SvSTATE (coro_sv);
		2894
		2895	if (SvSTATE_current == coro)
		2896	if (enter)
		2897	enter (aTHX enter_arg);
		2898
		2899	enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
		2900	enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
		2901	}
		2902
		2903	static void
		2904	api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
		2905	{
		2906	struct coro *coro = SvSTATE (coro_sv);
		2907
		2908	enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
		2909	enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
		2910	}
		2911
		2912	static void
		2913	savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
		2914	{
		2915	struct coro *coro = SvSTATE_current;
		2916
		2917	enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
		2918	}
		2919
		2920	static void
		2921	savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
		2922	{
		2923	struct coro *coro = SvSTATE_current;
		2924
		2925	enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
		2926	}
		2927
		2928	static void
		2929	api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void enter_arg, coro_enterleave_hook leave, void leave_arg)
		2930	{
		2931	api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
		2932
		2933	/* this ought to be much cheaper than malloc + a single destructor call */
		2934	if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
		2935	if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2815	}	2936	}
2816		2937
2817	/*****************************************************************************/	2938	/*****************************************************************************/
2818	/* PerlIO::cede */	2939	/* PerlIO::cede */
2819		2940
…		…
2949	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));	3070	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2950	PUTBACK;	3071	PUTBACK;
2951	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);	3072	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);
2952	}	3073	}
2953		3074
2954	SvREFCNT_dec (cb);	3075	SvREFCNT_dec_NN (cb);
2955	}	3076	}
2956	}	3077	}
2957		3078
2958	static void	3079	static void
2959	coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)	3080	coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
…		…
3099	{	3220	{
3100	api_ready (aTHX_ cb);	3221	api_ready (aTHX_ cb);
3101	sv_setiv (cb, 0); /* signal waiter */	3222	sv_setiv (cb, 0); /* signal waiter */
3102	}	3223	}
3103		3224
3104	SvREFCNT_dec (cb);	3225	SvREFCNT_dec_NN (cb);
3105		3226
3106	--count;	3227	--count;
3107	}	3228	}
3108	}	3229	}
3109		3230
…		…
3194	}	3315	}
3195		3316
3196	av_push (state, data_sv);	3317	av_push (state, data_sv);
3197		3318
3198	api_ready (aTHX_ coro);	3319	api_ready (aTHX_ coro);
3199	SvREFCNT_dec (coro);	3320	SvREFCNT_dec_NN (coro);
3200	SvREFCNT_dec ((AV *)state);	3321	SvREFCNT_dec_NN ((AV *)state);
3201	}	3322	}
3202		3323
3203	static int	3324	static int
3204	slf_check_aio_req (pTHX_ struct CoroSLF *frame)	3325	slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3205	{	3326	{
…		…
3223	errno = data->errorno;	3344	errno = data->errorno;
3224	PL_laststype = data->laststype;	3345	PL_laststype = data->laststype;
3225	PL_laststatval = data->laststatval;	3346	PL_laststatval = data->laststatval;
3226	PL_statcache = data->statcache;	3347	PL_statcache = data->statcache;
3227		3348
3228	SvREFCNT_dec (data_sv);	3349	SvREFCNT_dec_NN (data_sv);
3229	}	3350	}
3230		3351
3231	/* push result values */	3352	/* push result values */
3232	{	3353	{
3233	dSP;	3354	dSP;
…		…
3845	coroapi.ready = api_ready;	3966	coroapi.ready = api_ready;
3846	coroapi.is_ready = api_is_ready;	3967	coroapi.is_ready = api_is_ready;
3847	coroapi.nready = coro_nready;	3968	coroapi.nready = coro_nready;
3848	coroapi.current = coro_current;	3969	coroapi.current = coro_current;
3849		3970
		3971	coroapi.enterleave_hook = api_enterleave_hook;
		3972	coroapi.enterleave_unhook = api_enterleave_unhook;
		3973	coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
		3974
3850	/GCoroAPI = &coroapi;/	3975	/GCoroAPI = &coroapi;/
3851	sv_setiv (sv, (IV)&coroapi);	3976	sv_setiv (sv, (IV)&coroapi);
3852	SvREADONLY_on (sv);	3977	SvREADONLY_on (sv);
3853	}	3978	}
3854	}	3979	}
…		…
3919		4044
3920	void	4045	void
3921	_set_current (SV *current)	4046	_set_current (SV *current)
3922	PROTOTYPE: $	4047	PROTOTYPE: $
3923	CODE:	4048	CODE:
3924	SvREFCNT_dec (SvRV (coro_current));	4049	SvREFCNT_dec_NN (SvRV (coro_current));
3925	SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));	4050	SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3926		4051
3927	void	4052	void
3928	_set_readyhook (SV *hook)	4053	_set_readyhook (SV *hook)
3929	PROTOTYPE: $	4054	PROTOTYPE: $
…		…
4013		4138
4014	if ((SV *)hv == &PL_sv_undef)	4139	if ((SV *)hv == &PL_sv_undef)
4015	{	4140	{
4016	SV sv = coro_new (aTHX_ coro_stash, (SV *)&cv_pool_handler, 1, 1);	4141	SV sv = coro_new (aTHX_ coro_stash, (SV *)&cv_pool_handler, 1, 1);
4017	hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));	4142	hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4018	SvREFCNT_dec (sv);	4143	SvREFCNT_dec_NN (sv);
4019	}	4144	}
4020		4145
4021	{	4146	{
4022	struct coro *coro = SvSTATE_hv (hv);	4147	struct coro *coro = SvSTATE_hv (hv);
4023		4148
…		…
4030	api_ready (aTHX_ (SV *)hv);	4155	api_ready (aTHX_ (SV *)hv);
4031		4156
4032	if (GIMME_V != G_VOID)	4157	if (GIMME_V != G_VOID)
4033	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	4158	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4034	else	4159	else
4035	SvREFCNT_dec (hv);	4160	SvREFCNT_dec_NN (hv);
4036	}	4161	}
4037		4162
4038	SV *	4163	SV *
4039	rouse_cb ()	4164	rouse_cb ()
4040	PROTOTYPE:	4165	PROTOTYPE:

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.446 by root, Wed Sep 3 14:26:34 2014 UTC vs. Revision 1.450 by root, Sun Jun 28 22:31:03 2015 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.446 by root, Wed Sep 3 14:26:34 2014 UTC vs.
Revision 1.450 by root, Sun Jun 28 22:31:03 2015 UTC