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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.432 by root, Wed May 8 00:44:44 2013 UTC vs.
Revision 1.461 by root, Fri Jun 17 16:29:50 2016 UTC

…		…
14	#include "perliol.h"	14	#include "perliol.h"
15		15
16	#include "schmorp.h"	16	#include "schmorp.h"
17		17
18	#define ECB_NO_THREADS 1	18	#define ECB_NO_THREADS 1
		19	#define ECB_NO_LIBM 1
19	#include "ecb.h"	20	#include "ecb.h"
20		21
21	#include <stddef.h>	22	#include <stddef.h>
22	#include <stdio.h>	23	#include <stdio.h>
23	#include <errno.h>	24	#include <errno.h>
24	#include <assert.h>	25	#include <assert.h>
25		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
		34
26	#ifndef SVs_PADSTALE	35	#ifndef SVs_PADSTALE
27	# define SVs_PADSTALE 0	36	# define SVs_PADSTALE 0
28	#endif	37	#endif
29		38
30	#ifdef PadARRAY	39	#ifdef PadARRAY
31	# define NEWPADAPI	40	# define NEWPADAPI 1
32	# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))	41	# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33	#else	42	#else
34	typedef AV PADNAMELIST;	43	typedef AV PADNAMELIST;
35	# if !PERL_VERSION_ATLEAST(5,8,0)	44	# if !PERL_VERSION_ATLEAST(5,8,0)
36	typedef AV PADLIST;	45	typedef AV PADLIST;
…		…
41	# define PadlistNAMES(pl) (*PadlistARRAY (pl))	50	# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42	# define PadARRAY AvARRAY	51	# define PadARRAY AvARRAY
43	# define PadMAX AvFILLp	52	# define PadMAX AvFILLp
44	# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))	53	# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45	#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
		61
		62	/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
		63	/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
		64	#if PERL_VERSION_ATLEAST(5,19,0)
		65	# define SVt_BIND SVt_IV
		66	#endif
46		67
47	#if defined(_WIN32)	68	#if defined(_WIN32)
48	# undef HAS_GETTIMEOFDAY	69	# undef HAS_GETTIMEOFDAY
49	# undef setjmp	70	# undef setjmp
50	# undef longjmp	71	# undef longjmp
…		…
119		140
120	static GV irsgv; / $/ */	141	static GV irsgv; / $/ */
121	static GV stdoutgv; / STDOUT /	142	static GV stdoutgv; / STDOUT /
122	static SV *rv_diehook;	143	static SV *rv_diehook;
123	static SV *rv_warnhook;	144	static SV *rv_warnhook;
124	static HV hv_sig; / %SIG */
125		145
126	/* async_pool helper stuff */	146	/* async_pool helper stuff */
127	static SV *sv_pool_rss;	147	static SV *sv_pool_rss;
128	static SV *sv_pool_size;	148	static SV *sv_pool_size;
129	static SV sv_async_pool_idle; / description string */	149	static SV sv_async_pool_idle; / description string */
…		…
235	SV *saved_deffh;	255	SV *saved_deffh;
236	SV *invoke_cb;	256	SV *invoke_cb;
237	AV *invoke_av;	257	AV *invoke_av;
238		258
239	/* on_enter/on_leave */	259	/* on_enter/on_leave */
240	AV *on_enter;	260	AV on_enter; AV on_enter_xs;
241	AV *on_leave;	261	AV on_leave; AV on_leave_xs;
242		262
243	/* swap_sv */	263	/* swap_sv */
244	AV *swap_sv;	264	AV *swap_sv;
245		265
246	/* times */	266	/* times */
…		…
482		502
483	return 0;	503	return 0;
484	}	504	}
485		505
486	ecb_inline struct coro *	506	ecb_inline struct coro *
487	SvSTATE_ (pTHX_ SV *coro)	507	SvSTATE_ (pTHX_ SV *coro_sv)
488	{	508	{
489	MAGIC *mg;	509	MAGIC *mg;
490		510
491	if (SvROK (coro))	511	if (SvROK (coro_sv))
492	coro = SvRV (coro);	512	coro_sv = SvRV (coro_sv);
493		513
494	mg = SvSTATEhv_p (aTHX_ coro);	514	mg = SvSTATEhv_p (aTHX_ coro_sv);
495	if (!mg)	515	if (!mg)
496	croak ("Coro::State object required");	516	croak ("Coro::State object required");
497		517
498	return (struct coro *)mg->mg_ptr;	518	return (struct coro *)mg->mg_ptr;
499	}	519	}
…		…
510	ecb_inline PADLIST *	530	ecb_inline PADLIST *
511	coro_derive_padlist (pTHX_ CV *cv)	531	coro_derive_padlist (pTHX_ CV *cv)
512	{	532	{
513	PADLIST *padlist = CvPADLIST (cv);	533	PADLIST *padlist = CvPADLIST (cv);
514	PADLIST *newpadlist;	534	PADLIST *newpadlist;
		535	PADNAMELIST *padnames;
515	PAD *newpad;	536	PAD *newpad;
516	PADOFFSET const off = PadlistMAX (padlist) + 1;	537	PADOFFSET off = PadlistMAX (padlist) + 1;
517		538
518	newPADLIST(newpadlist);	539	#if NEWPADAPI
519	#if !PERL_VERSION_ATLEAST(5,15,3)	540
520	/* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */	541	/* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521	AvREAL_off (newpadlist);	542	/* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522	#endif	543	while (!PadlistARRAY (padlist)[off - 1])
		544	--off;
		545
		546	Perl_pad_push (aTHX_ padlist, off);
		547
		548	newpad = PadlistARRAY (padlist)[off];
		549	PadlistARRAY (padlist)[off] = 0;
		550
		551	#else
		552
523	#if PERL_VERSION_ATLEAST (5,10,0)	553	#if PERL_VERSION_ATLEAST (5,10,0)
524	Perl_pad_push (aTHX_ padlist, off);	554	Perl_pad_push (aTHX_ padlist, off);
525	#else	555	#else
526	Perl_pad_push (aTHX_ padlist, off, 1);	556	Perl_pad_push (aTHX_ padlist, off, 1);
527	#endif	557	#endif
		558
528	newpad = PadlistARRAY (padlist)[off];	559	newpad = PadlistARRAY (padlist)[off];
529	PadlistMAX (padlist) = off - 1;	560	PadlistMAX (padlist) = off - 1;
530		561
		562	#endif
		563
		564	newPADLIST (newpadlist);
		565	#if !PERL_VERSION_ATLEAST(5,15,3)
		566	/* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
		567	AvREAL_off (newpadlist);
		568	#endif
		569
531	/* Already extended to 2 elements by newPADLIST. */	570	/* Already extended to 2 elements by newPADLIST. */
532	PadlistMAX (newpadlist) = 1;	571	PadlistMAX (newpadlist) = 1;
533	PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));	572
		573	padnames = PadlistNAMES (padlist);
		574	++PadnamelistREFCNT (padnames);
		575	PadlistNAMES (newpadlist) = padnames;
		576
534	PadlistARRAY (newpadlist)[1] = newpad;	577	PadlistARRAY (newpadlist)[1] = newpad;
535		578
536	return newpadlist;	579	return newpadlist;
537	}	580	}
538		581
…		…
546		589
547	while (i > 0) /* special-case index 0 */	590	while (i > 0) /* special-case index 0 */
548	{	591	{
549	/* we try to be extra-careful here */	592	/* we try to be extra-careful here */
550	PAD *pad = PadlistARRAY (padlist)[i--];	593	PAD *pad = PadlistARRAY (padlist)[i--];
		594
		595	if (pad)
		596	{
551	I32 j = PadMAX (pad);	597	I32 j = PadMAX (pad);
552		598
553	while (j >= 0)	599	while (j >= 0)
554	SvREFCNT_dec (PadARRAY (pad)[j--]);	600	SvREFCNT_dec (PadARRAY (pad)[j--]);
555		601
556	PadMAX (pad) = -1;	602	PadMAX (pad) = -1;
557	SvREFCNT_dec (pad);	603	SvREFCNT_dec (pad);
		604	}
558	}	605	}
559		606
560	SvREFCNT_dec (PadlistNAMES (padlist));	607	PadnamelistREFCNT_dec (PadlistNAMES (padlist));
561		608
562	#ifdef NEWPADAPI	609	#if NEWPADAPI
563	Safefree (PadlistARRAY (padlist));	610	Safefree (PadlistARRAY (padlist));
564	Safefree (padlist);	611	Safefree (padlist);
565	#else	612	#else
566	AvFILLp (padlist) = -1;	613	AvFILLp (padlist) = -1;
567	AvREAL_off (padlist);	614	AvREAL_off (padlist);
…		…
661	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;
662		709
663	/* 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,
664	* 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.
665	*/	712	*/
666	#define svany_in_head(type) \	713	U32 svany_in_head_set = (1 << SVt_NULL) \| (1 << SVt_BIND) \| (1 << SVt_IV) \| (1 << SVt_RV);
667	(((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)))
668		719
669	if (svany_in_head (SvTYPE (a)))	720	if (svany_in_head (SvTYPE (a)))
670	SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);	721	SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671		722
672	if (svany_in_head (SvTYPE (b)))	723	if (svany_in_head (SvTYPE (b)))
…		…
675	#endif	726	#endif
676	}	727	}
677		728
678	/* swap sv heads, at least logically */	729	/* swap sv heads, at least logically */
679	static void	730	static void
680	swap_svs (pTHX_ Coro__State c)	731	swap_svs_enter (pTHX_ Coro__State c)
681	{	732	{
682	int i;	733	int i;
683		734
684	for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)	735	for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
685	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]);
686	}	737	}
687		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
688	#define SWAP_SVS(coro) \	748	#define SWAP_SVS_ENTER(coro) \
689	if (ecb_expect_false ((coro)->swap_sv)) \	749	if (ecb_expect_false ((coro)->swap_sv)) \
690	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))
691		755
692	static void	756	static void
693	on_enterleave_call (pTHX_ SV *cb);	757	on_enterleave_call (pTHX_ SV *cb);
694		758
695	static void	759	static void
…		…
740		804
741	for (i = 0; i <= AvFILLp (c->on_enter); ++i)	805	for (i = 0; i <= AvFILLp (c->on_enter); ++i)
742	on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);	806	on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
743	}	807	}
744		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
745	SWAP_SVS (c);	817	SWAP_SVS_ENTER (c);
746	}	818	}
747		819
748	static void	820	static void
749	save_perl (pTHX_ Coro__State c)	821	save_perl (pTHX_ Coro__State c)
750	{	822	{
751	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	}
752		832
753	if (ecb_expect_false (c->on_leave))	833	if (ecb_expect_false (c->on_leave))
754	{	834	{
755	int i;	835	int i;
756		836
…		…
1109		1189
1110	GvSV (PL_defgv) = newSV (0);	1190	GvSV (PL_defgv) = newSV (0);
1111	GvAV (PL_defgv) = coro->args; coro->args = 0;	1191	GvAV (PL_defgv) = coro->args; coro->args = 0;
1112	GvSV (PL_errgv) = newSV (0);	1192	GvSV (PL_errgv) = newSV (0);
1113	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);
1114	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
1115	PL_rs = newSVsv (GvSV (irsgv));	1198	PL_rs = newSVsv (GvSV (irsgv));
1116	PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);	1199	PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1117		1200
1118	{	1201	{
1119	dSP;	1202	dSP;
…		…
1147	PL_op = (OP *)&init_perl_op;	1230	PL_op = (OP *)&init_perl_op;
1148		1231
1149	/* copy throw, in case it was set before init_perl */	1232	/* copy throw, in case it was set before init_perl */
1150	CORO_THROW = coro->except;	1233	CORO_THROW = coro->except;
1151		1234
1152	SWAP_SVS (coro);	1235	SWAP_SVS_ENTER (coro);
1153		1236
1154	if (ecb_expect_false (enable_times))	1237	if (ecb_expect_false (enable_times))
1155	{	1238	{
1156	coro_times_update ();	1239	coro_times_update ();
1157	coro_times_sub (coro);	1240	coro_times_sub (coro);
…		…
1195	/* this will cause transfer_check to croak on block*/	1278	/* this will cause transfer_check to croak on block*/
1196	SvRV_set (coro_current, (SV *)coro->hv);	1279	SvRV_set (coro_current, (SV *)coro->hv);
1197		1280
1198	load_perl (aTHX_ coro);	1281	load_perl (aTHX_ coro);
1199		1282
		1283	/* restore swapped sv's */
		1284	SWAP_SVS_LEAVE (coro);
		1285
1200	coro_unwind_stacks (aTHX);	1286	coro_unwind_stacks (aTHX);
1201
1202	/* restore swapped sv's */
1203	SWAP_SVS (coro);
1204		1287
1205	coro_destruct_stacks (aTHX);	1288	coro_destruct_stacks (aTHX);
1206		1289
1207	/* now save some sv's to be free'd later */	1290	/* now save some sv's to be free'd later */
1208	svf [0] = GvSV (PL_defgv);	1291	svf [0] = GvSV (PL_defgv);
…		…
1229		1312
1230	SvREFCNT_dec (coro->saved_deffh);	1313	SvREFCNT_dec (coro->saved_deffh);
1231	SvREFCNT_dec (coro->rouse_cb);	1314	SvREFCNT_dec (coro->rouse_cb);
1232	SvREFCNT_dec (coro->invoke_cb);	1315	SvREFCNT_dec (coro->invoke_cb);
1233	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);
1234	}	1319	}
1235	}	1320	}
1236		1321
1237	ecb_inline void	1322	ecb_inline void
1238	free_coro_mortal (pTHX)	1323	free_coro_mortal (pTHX)
…		…
1301		1386
1302	if (PL_curcop != &PL_compiling)	1387	if (PL_curcop != &PL_compiling)
1303	{	1388	{
1304	SV **cb;	1389	SV **cb;
1305		1390
1306	if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)	1391	if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1307	{	1392	{
1308	PERL_CONTEXT *cx = &cxstack[cxstack_ix];	1393	PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1309		1394
1310	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)	1395	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1311	{	1396	{
…		…
1888	/* nothing to schedule: call the idle handler */	1973	/* nothing to schedule: call the idle handler */
1889	if (SvROK (sv_idle)	1974	if (SvROK (sv_idle)
1890	&& SvOBJECT (SvRV (sv_idle)))	1975	&& SvOBJECT (SvRV (sv_idle)))
1891	{	1976	{
1892	if (SvRV (sv_idle) == SvRV (coro_current))	1977	if (SvRV (sv_idle) == SvRV (coro_current))
		1978	{
		1979	require_pv ("Carp");
		1980
		1981	{
		1982	dSP;
		1983
		1984	ENTER;
		1985	SAVETMPS;
		1986
		1987	PUSHMARK (SP);
1893	croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");	1988	XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
		1989	PUTBACK;
		1990	call_pv ("Carp::confess", G_VOID \| G_DISCARD);
		1991
		1992	FREETMPS;
		1993	LEAVE;
		1994	}
		1995	}
1894		1996
1895	++coro_nready; /* hack so that api_ready doesn't invoke ready hook */	1997	++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1896	api_ready (aTHX_ SvRV (sv_idle));	1998	api_ready (aTHX_ SvRV (sv_idle));
1897	--coro_nready;	1999	--coro_nready;
1898	}	2000	}
…		…
2202	slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);	2304	slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2203	}	2305	}
2204	else	2306	else
2205	{	2307	{
2206	struct coro *self = SvSTATE_current;	2308	struct coro *self = SvSTATE_current;
		2309
		2310	if (!self)
		2311	croak ("Coro::cancel called outside of thread content,");
2207		2312
2208	/* otherwise we cancel directly, purely for speed reasons	2313	/* otherwise we cancel directly, purely for speed reasons
2209	* unfortunately, this requires some magic trickery, as	2314	* unfortunately, this requires some magic trickery, as
2210	* 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.
2211	* this is ugly, and hopefully fully worth the extra speed.	2316	* this is ugly, and hopefully fully worth the extra speed.
…		…
2321	else	2426	else
2322	{	2427	{
2323	av_clear (GvAV (PL_defgv));	2428	av_clear (GvAV (PL_defgv));
2324	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);
2325		2430
		2431	if (ecb_expect_false (coro->swap_sv))
		2432	{
		2433	swap_svs_leave (coro);
		2434	SvREFCNT_dec_NN (coro->swap_sv);
		2435	coro->swap_sv = 0;
		2436	}
		2437
2326	coro->prio = 0;	2438	coro->prio = 0;
2327		2439
2328	if (coro->cctx && (coro->cctx->flags & CC_TRACE))	2440	if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2329	api_trace (aTHX_ coro_current, 0);	2441	api_trace (aTHX_ coro_current, 0);
2330		2442
2331	frame->prepare = prepare_schedule;	2443	frame->prepare = prepare_schedule;
2332	av_push (av_async_pool, SvREFCNT_inc (hv));	2444	av_push (av_async_pool, SvREFCNT_inc (hv));
2333	}	2445	}
…		…
2553		2665
2554	/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */	2666	/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2555	static void	2667	static void
2556	slf_destroy (pTHX_ struct coro *coro)	2668	slf_destroy (pTHX_ struct coro *coro)
2557	{	2669	{
2558	/* this callback is reserved for slf functions needing to do cleanup */	2670	struct CoroSLF frame = coro->slf_frame;
2559	if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2560	coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2561		2671
2562	/*	2672	/*
2563	* The on_destroy above most likely is from an SLF call.	2673	* The on_destroy below most likely is from an SLF call.
2564	* Since by definition the SLF call will not finish when we destroy	2674	* Since by definition the SLF call will not finish when we destroy
2565	* the coro, we will have to force-finish it here, otherwise	2675	* the coro, we will have to force-finish it here, otherwise
2566	* cleanup functions cannot call SLF functions.	2676	* cleanup functions cannot call SLF functions.
2567	*/	2677	*/
2568	coro->slf_frame.prepare = 0;	2678	coro->slf_frame.prepare = 0;
		2679
		2680	/* this callback is reserved for slf functions needing to do cleanup */
		2681	if (frame.destroy && frame.prepare && !PL_dirty)
		2682	frame.destroy (aTHX_ &frame);
2569	}	2683	}
2570		2684
2571	/*	2685	/*
2572	* these not obviously related functions are all rolled into one	2686	* these not obviously related functions are all rolled into one
2573	* function to increase chances that they all will call transfer with the same	2687	* function to increase chances that they all will call transfer with the same
…		…
2756	static void	2870	static void
2757	coro_pop_on_leave (pTHX_ void *coro)	2871	coro_pop_on_leave (pTHX_ void *coro)
2758	{	2872	{
2759	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);	2873	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);
2760	on_enterleave_call (aTHX_ sv_2mortal (cb));	2874	on_enterleave_call (aTHX_ sv_2mortal (cb));
		2875	}
		2876
		2877	static void
		2878	enterleave_hook_xs (pTHX_ struct coro coro, AV avp, coro_enterleave_hook hook, void arg)
		2879	{
		2880	if (!hook)
		2881	return;
		2882
		2883	if (!*avp)
		2884	{
		2885	*avp = newAV ();
		2886	AvREAL_off (*avp);
		2887	}
		2888
		2889	av_push (avp, (SV )hook);
		2890	av_push (avp, (SV )arg);
		2891	}
		2892
		2893	static void
		2894	enterleave_unhook_xs (pTHX_ struct coro coro, AV *avp, coro_enterleave_hook hook, int execute)
		2895	{
		2896	AV av = avp;
		2897	int i;
		2898
		2899	if (!av)
		2900	return;
		2901
		2902	for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
		2903	if (AvARRAY (av)[i] == (SV *)hook)
		2904	{
		2905	if (execute)
		2906	hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
		2907
		2908	memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
		2909	av_pop (av);
		2910	av_pop (av);
		2911	break;
		2912	}
		2913
		2914	if (AvFILLp (av) >= 0)
		2915	{
		2916	*avp = 0;
		2917	SvREFCNT_dec_NN (av);
		2918	}
		2919	}
		2920
		2921	static void
		2922	api_enterleave_hook (pTHX_ SV coro_sv, coro_enterleave_hook enter, void enter_arg, coro_enterleave_hook leave, void *leave_arg)
		2923	{
		2924	struct coro *coro = SvSTATE (coro_sv);
		2925
		2926	if (SvSTATE_current == coro)
		2927	if (enter)
		2928	enter (aTHX_ enter_arg);
		2929
		2930	enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
		2931	enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
		2932	}
		2933
		2934	static void
		2935	api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
		2936	{
		2937	struct coro *coro = SvSTATE (coro_sv);
		2938
		2939	enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
		2940	enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
		2941	}
		2942
		2943	static void
		2944	savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
		2945	{
		2946	struct coro *coro = SvSTATE_current;
		2947
		2948	enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
		2949	}
		2950
		2951	static void
		2952	savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
		2953	{
		2954	struct coro *coro = SvSTATE_current;
		2955
		2956	enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
		2957	}
		2958
		2959	static void
		2960	api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void enter_arg, coro_enterleave_hook leave, void leave_arg)
		2961	{
		2962	api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
		2963
		2964	/* this ought to be much cheaper than malloc + a single destructor call */
		2965	if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
		2966	if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2761	}	2967	}
2762		2968
2763	/*****************************************************************************/	2969	/*****************************************************************************/
2764	/* PerlIO::cede */	2970	/* PerlIO::cede */
2765		2971
…		…
2895	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));	3101	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2896	PUTBACK;	3102	PUTBACK;
2897	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);	3103	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);
2898	}	3104	}
2899		3105
2900	SvREFCNT_dec (cb);	3106	SvREFCNT_dec_NN (cb);
2901	}	3107	}
2902	}	3108	}
2903		3109
2904	static void	3110	static void
2905	coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)	3111	coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
…		…
2913	{	3119	{
2914	AV av = (AV )frame->data;	3120	AV av = (AV )frame->data;
2915	SV *count_sv = AvARRAY (av)[0];	3121	SV *count_sv = AvARRAY (av)[0];
2916	SV *coro_hv = SvRV (coro_current);	3122	SV *coro_hv = SvRV (coro_current);
2917		3123
		3124	frame->destroy = 0;
		3125
2918	/* if we are about to throw, don't actually acquire the lock, just throw */	3126	/* if we are about to throw, don't actually acquire the lock, just throw */
2919	if (CORO_THROW)	3127	if (ecb_expect_false (CORO_THROW))
		3128	{
		3129	/* we still might be responsible for the semaphore, so wake up others */
		3130	coro_semaphore_adjust (aTHX_ av, 0);
		3131
2920	return 0;	3132	return 0;
		3133	}
2921	else if (SvIVX (count_sv) > 0)	3134	else if (SvIVX (count_sv) > 0)
2922	{	3135	{
2923	frame->destroy = 0;
2924
2925	if (acquire)	3136	if (acquire)
2926	SvIVX (count_sv) = SvIVX (count_sv) - 1;	3137	SvIVX (count_sv) = SvIVX (count_sv) - 1;
2927	else	3138	else
2928	coro_semaphore_adjust (aTHX_ av, 0);	3139	coro_semaphore_adjust (aTHX_ av, 0);
2929		3140
…		…
3040	{	3251	{
3041	api_ready (aTHX_ cb);	3252	api_ready (aTHX_ cb);
3042	sv_setiv (cb, 0); /* signal waiter */	3253	sv_setiv (cb, 0); /* signal waiter */
3043	}	3254	}
3044		3255
3045	SvREFCNT_dec (cb);	3256	SvREFCNT_dec_NN (cb);
3046		3257
3047	--count;	3258	--count;
3048	}	3259	}
3049	}	3260	}
3050		3261
…		…
3135	}	3346	}
3136		3347
3137	av_push (state, data_sv);	3348	av_push (state, data_sv);
3138		3349
3139	api_ready (aTHX_ coro);	3350	api_ready (aTHX_ coro);
3140	SvREFCNT_dec (coro);	3351	SvREFCNT_dec_NN (coro);
3141	SvREFCNT_dec ((AV *)state);	3352	SvREFCNT_dec_NN ((AV *)state);
3142	}	3353	}
3143		3354
3144	static int	3355	static int
3145	slf_check_aio_req (pTHX_ struct CoroSLF *frame)	3356	slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3146	{	3357	{
…		…
3151	/* it quickly returns */	3362	/* it quickly returns */
3152	if (CORO_THROW)	3363	if (CORO_THROW)
3153	return 0;	3364	return 0;
3154		3365
3155	/* one element that is an RV? repeat! */	3366	/* one element that is an RV? repeat! */
3156	if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))	3367	if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3157	return 1;	3368	return 1;
3158		3369
3159	/* restore status */	3370	/* restore status */
3160	{	3371	{
3161	SV *data_sv = av_pop (state);	3372	SV *data_sv = av_pop (state);
…		…
3164	errno = data->errorno;	3375	errno = data->errorno;
3165	PL_laststype = data->laststype;	3376	PL_laststype = data->laststype;
3166	PL_laststatval = data->laststatval;	3377	PL_laststatval = data->laststatval;
3167	PL_statcache = data->statcache;	3378	PL_statcache = data->statcache;
3168		3379
3169	SvREFCNT_dec (data_sv);	3380	SvREFCNT_dec_NN (data_sv);
3170	}	3381	}
3171		3382
3172	/* push result values */	3383	/* push result values */
3173	{	3384	{
3174	dSP;	3385	dSP;
…		…
3389		3600
3390	PROTOTYPES: DISABLE	3601	PROTOTYPES: DISABLE
3391		3602
3392	BOOT:	3603	BOOT:
3393	{	3604	{
		3605	#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
		3606	#include "state.h"
3394	#ifdef USE_ITHREADS	3607	#ifdef USE_ITHREADS
3395	# if CORO_PTHREAD	3608	# if CORO_PTHREAD
3396	coro_thx = PERL_GET_CONTEXT;	3609	coro_thx = PERL_GET_CONTEXT;
3397	# endif	3610	# endif
3398	#endif	3611	#endif
…		…
3410		3623
3411	orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;	3624	orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3412	orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;	3625	orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3413	orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;	3626	orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3414		3627
3415	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3416	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));	3628	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3417	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));	3629	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3418		3630
3419	coro_state_stash = gv_stashpv ("Coro::State", TRUE);	3631	coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3420		3632
…		…
3726	if (ecb_expect_false (current == self))	3938	if (ecb_expect_false (current == self))
3727	coro_times_sub (SvSTATE (coro_current));	3939	coro_times_sub (SvSTATE (coro_current));
3728	}	3940	}
3729		3941
3730	void	3942	void
3731	swap_sv (Coro::State coro, SV sv, SV swapsv)	3943	swap_sv (Coro::State coro, SV sva, SV svb)
3732	CODE:	3944	CODE:
3733	{	3945	{
3734	struct coro *current = SvSTATE_current;	3946	struct coro *current = SvSTATE_current;
		3947	AV *swap_sv;
		3948	int i;
		3949
		3950	sva = SvRV (sva);
		3951	svb = SvRV (svb);
3735		3952
3736	if (current == coro)	3953	if (current == coro)
3737	SWAP_SVS (current);	3954	SWAP_SVS_LEAVE (current);
3738		3955
3739	if (!coro->swap_sv)	3956	if (!coro->swap_sv)
3740	coro->swap_sv = newAV ();	3957	coro->swap_sv = newAV ();
3741		3958
		3959	swap_sv = coro->swap_sv;
		3960
		3961	for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
		3962	{
		3963	SV *a = AvARRAY (swap_sv)[i ];
		3964	SV *b = AvARRAY (swap_sv)[i + 1];
		3965
		3966	if (a == sva && b == svb)
		3967	{
		3968	SvREFCNT_dec_NN (a);
		3969	SvREFCNT_dec_NN (b);
		3970
		3971	for (; i <= AvFILLp (swap_sv) - 2; i++)
		3972	AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
		3973
		3974	AvFILLp (swap_sv) -= 2;
		3975
		3976	goto removed;
		3977	}
		3978	}
		3979
3742	av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));	3980	av_push (swap_sv, SvREFCNT_inc_NN (sva));
3743	av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));	3981	av_push (swap_sv, SvREFCNT_inc_NN (svb));
		3982
		3983	removed:
3744		3984
3745	if (current == coro)	3985	if (current == coro)
3746	SWAP_SVS (current);	3986	SWAP_SVS_ENTER (current);
3747	}	3987	}
3748		3988
3749		3989
3750	MODULE = Coro::State PACKAGE = Coro	3990	MODULE = Coro::State PACKAGE = Coro
3751		3991
3752	BOOT:	3992	BOOT:
3753	{	3993	{
		3994	if (SVt_LAST > 32)
		3995	croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
		3996
3754	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	3997	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3755	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	3998	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3756	cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);	3999	cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3757	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);	4000	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3758	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);	4001	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
…		…
3784	coroapi.ready = api_ready;	4027	coroapi.ready = api_ready;
3785	coroapi.is_ready = api_is_ready;	4028	coroapi.is_ready = api_is_ready;
3786	coroapi.nready = coro_nready;	4029	coroapi.nready = coro_nready;
3787	coroapi.current = coro_current;	4030	coroapi.current = coro_current;
3788		4031
		4032	coroapi.enterleave_hook = api_enterleave_hook;
		4033	coroapi.enterleave_unhook = api_enterleave_unhook;
		4034	coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
		4035
3789	/GCoroAPI = &coroapi;/	4036	/GCoroAPI = &coroapi;/
3790	sv_setiv (sv, (IV)&coroapi);	4037	sv_setiv (sv, (IV)&coroapi);
3791	SvREADONLY_on (sv);	4038	SvREADONLY_on (sv);
3792	}	4039	}
3793	}	4040	}
…		…
3858		4105
3859	void	4106	void
3860	_set_current (SV *current)	4107	_set_current (SV *current)
3861	PROTOTYPE: $	4108	PROTOTYPE: $
3862	CODE:	4109	CODE:
3863	SvREFCNT_dec (SvRV (coro_current));	4110	SvREFCNT_dec_NN (SvRV (coro_current));
3864	SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));	4111	SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3865		4112
3866	void	4113	void
3867	_set_readyhook (SV *hook)	4114	_set_readyhook (SV *hook)
3868	PROTOTYPE: $	4115	PROTOTYPE: $
…		…
3952		4199
3953	if ((SV *)hv == &PL_sv_undef)	4200	if ((SV *)hv == &PL_sv_undef)
3954	{	4201	{
3955	SV sv = coro_new (aTHX_ coro_stash, (SV *)&cv_pool_handler, 1, 1);	4202	SV sv = coro_new (aTHX_ coro_stash, (SV *)&cv_pool_handler, 1, 1);
3956	hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));	4203	hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3957	SvREFCNT_dec (sv);	4204	SvREFCNT_dec_NN (sv);
3958	}	4205	}
3959		4206
3960	{	4207	{
3961	struct coro *coro = SvSTATE_hv (hv);	4208	struct coro *coro = SvSTATE_hv (hv);
3962		4209
…		…
3969	api_ready (aTHX_ (SV *)hv);	4216	api_ready (aTHX_ (SV *)hv);
3970		4217
3971	if (GIMME_V != G_VOID)	4218	if (GIMME_V != G_VOID)
3972	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	4219	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3973	else	4220	else
3974	SvREFCNT_dec (hv);	4221	SvREFCNT_dec_NN (hv);
3975	}	4222	}
3976		4223
3977	SV *	4224	SV *
3978	rouse_cb ()	4225	rouse_cb ()
3979	PROTOTYPE:	4226	PROTOTYPE:
…		…
4058	RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);	4305	RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4059	OUTPUT:	4306	OUTPUT:
4060	RETVAL	4307	RETVAL
4061		4308
4062	void	4309	void
4063	up (SV *self, int adjust = 1)	4310	up (SV *self)
4064	ALIAS:
4065	adjust = 1
4066	CODE:	4311	CODE:
		4312	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
		4313
		4314	void
		4315	adjust (SV *self, int adjust)
		4316	CODE:
4067	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);	4317	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4068		4318
4069	void	4319	void
4070	down (...)	4320	down (...)
4071	CODE:	4321	CODE:
4072	CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);	4322	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.432 by root, Wed May 8 00:44:44 2013 UTC vs. Revision 1.461 by root, Fri Jun 17 16:29:50 2016 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.432 by root, Wed May 8 00:44:44 2013 UTC vs.
Revision 1.461 by root, Fri Jun 17 16:29:50 2016 UTC