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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.431 by root, Fri Feb 8 22:29:18 2013 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 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
…		…
883	#endif	963	#endif
884		964
885	New(54,PL_savestack,24,ANY);	965	New(54,PL_savestack,24,ANY);
886	PL_savestack_ix = 0;	966	PL_savestack_ix = 0;
887	PL_savestack_max = 24;	967	PL_savestack_max = 24;
		968	#if !PERL_VERSION_ATLEAST (5,24,0)
		969	/* perl 5.24 moves SS_MAXPUSH optimisation from */
		970	/* the header macros to PL_savestack_max */
		971	PL_savestack_max -= SS_MAXPUSH;
		972	#endif
888		973
889	#if !PERL_VERSION_ATLEAST (5,10,0)	974	#if !PERL_VERSION_ATLEAST (5,10,0)
890	New(54,PL_retstack,4,OP*);	975	New(54,PL_retstack,4,OP*);
891	PL_retstack_ix = 0;	976	PL_retstack_ix = 0;
892	PL_retstack_max = 4;	977	PL_retstack_max = 4;
…		…
1109		1194
1110	GvSV (PL_defgv) = newSV (0);	1195	GvSV (PL_defgv) = newSV (0);
1111	GvAV (PL_defgv) = coro->args; coro->args = 0;	1196	GvAV (PL_defgv) = coro->args; coro->args = 0;
1112	GvSV (PL_errgv) = newSV (0);	1197	GvSV (PL_errgv) = newSV (0);
1113	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);	1198	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1114	GvHV (PL_hintgv) = 0;	1199	GvHV (PL_hintgv) = newHV ();
		1200	#if PERL_VERSION_ATLEAST (5,10,0)
		1201	hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
		1202	#endif
1115	PL_rs = newSVsv (GvSV (irsgv));	1203	PL_rs = newSVsv (GvSV (irsgv));
1116	PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);	1204	PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1117		1205
1118	{	1206	{
1119	dSP;	1207	dSP;
…		…
1147	PL_op = (OP *)&init_perl_op;	1235	PL_op = (OP *)&init_perl_op;
1148		1236
1149	/* copy throw, in case it was set before init_perl */	1237	/* copy throw, in case it was set before init_perl */
1150	CORO_THROW = coro->except;	1238	CORO_THROW = coro->except;
1151		1239
1152	SWAP_SVS (coro);	1240	SWAP_SVS_ENTER (coro);
1153		1241
1154	if (ecb_expect_false (enable_times))	1242	if (ecb_expect_false (enable_times))
1155	{	1243	{
1156	coro_times_update ();	1244	coro_times_update ();
1157	coro_times_sub (coro);	1245	coro_times_sub (coro);
…		…
1195	/* this will cause transfer_check to croak on block*/	1283	/* this will cause transfer_check to croak on block*/
1196	SvRV_set (coro_current, (SV *)coro->hv);	1284	SvRV_set (coro_current, (SV *)coro->hv);
1197		1285
1198	load_perl (aTHX_ coro);	1286	load_perl (aTHX_ coro);
1199		1287
		1288	/* restore swapped sv's */
		1289	SWAP_SVS_LEAVE (coro);
		1290
1200	coro_unwind_stacks (aTHX);	1291	coro_unwind_stacks (aTHX);
1201
1202	/* restore swapped sv's */
1203	SWAP_SVS (coro);
1204		1292
1205	coro_destruct_stacks (aTHX);	1293	coro_destruct_stacks (aTHX);
1206		1294
1207	/* now save some sv's to be free'd later */	1295	/* now save some sv's to be free'd later */
1208	svf [0] = GvSV (PL_defgv);	1296	svf [0] = GvSV (PL_defgv);
…		…
1229		1317
1230	SvREFCNT_dec (coro->saved_deffh);	1318	SvREFCNT_dec (coro->saved_deffh);
1231	SvREFCNT_dec (coro->rouse_cb);	1319	SvREFCNT_dec (coro->rouse_cb);
1232	SvREFCNT_dec (coro->invoke_cb);	1320	SvREFCNT_dec (coro->invoke_cb);
1233	SvREFCNT_dec (coro->invoke_av);	1321	SvREFCNT_dec (coro->invoke_av);
		1322	SvREFCNT_dec (coro->on_enter_xs);
		1323	SvREFCNT_dec (coro->on_leave_xs);
1234	}	1324	}
1235	}	1325	}
1236		1326
1237	ecb_inline void	1327	ecb_inline void
1238	free_coro_mortal (pTHX)	1328	free_coro_mortal (pTHX)
…		…
1301		1391
1302	if (PL_curcop != &PL_compiling)	1392	if (PL_curcop != &PL_compiling)
1303	{	1393	{
1304	SV **cb;	1394	SV **cb;
1305		1395
1306	if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)	1396	if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1307	{	1397	{
1308	PERL_CONTEXT *cx = &cxstack[cxstack_ix];	1398	PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1309		1399
1310	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)	1400	if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1311	{	1401	{
…		…
1453	* coro body here, as perl_run destroys these. Likewise, we cannot catch	1543	* coro body here, as perl_run destroys these. Likewise, we cannot catch
1454	* runtime errors here, as this is just a random interpreter, not a thread.	1544	* runtime errors here, as this is just a random interpreter, not a thread.
1455	*/	1545	*/
1456		1546
1457	/*	1547	/*
		1548	* pp_entersub in 5.24 no longer ENTERs, but perl_destruct
		1549	* requires PL_scopestack_ix, so do it here if required.
		1550	*/
		1551	if (!PL_scopestack_ix)
		1552	ENTER;
		1553
		1554	/*
1458	* If perl-run returns we assume exit() was being called or the coro	1555	* If perl-run returns we assume exit() was being called or the coro
1459	* fell off the end, which seems to be the only valid (non-bug)	1556	* fell off the end, which seems to be the only valid (non-bug)
1460	* reason for perl_run to return. We try to mimic whatever perl is normally	1557	* reason for perl_run to return. We try to mimic whatever perl is normally
1461	* doing in that case. YMMV.	1558	* doing in that case. YMMV.
1462	*/	1559	*/
…		…
1888	/* nothing to schedule: call the idle handler */	1985	/* nothing to schedule: call the idle handler */
1889	if (SvROK (sv_idle)	1986	if (SvROK (sv_idle)
1890	&& SvOBJECT (SvRV (sv_idle)))	1987	&& SvOBJECT (SvRV (sv_idle)))
1891	{	1988	{
1892	if (SvRV (sv_idle) == SvRV (coro_current))	1989	if (SvRV (sv_idle) == SvRV (coro_current))
		1990	{
		1991	require_pv ("Carp");
		1992
		1993	{
		1994	dSP;
		1995
		1996	ENTER;
		1997	SAVETMPS;
		1998
		1999	PUSHMARK (SP);
1893	croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");	2000	XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
		2001	PUTBACK;
		2002	call_pv ("Carp::confess", G_VOID \| G_DISCARD);
		2003
		2004	FREETMPS;
		2005	LEAVE;
		2006	}
		2007	}
1894		2008
1895	++coro_nready; /* hack so that api_ready doesn't invoke ready hook */	2009	++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1896	api_ready (aTHX_ SvRV (sv_idle));	2010	api_ready (aTHX_ SvRV (sv_idle));
1897	--coro_nready;	2011	--coro_nready;
1898	}	2012	}
…		…
2096	AV *od = coro->on_destroy;	2210	AV *od = coro->on_destroy;
2097		2211
2098	if (!od)	2212	if (!od)
2099	return;	2213	return;
2100		2214
		2215	coro->on_destroy = 0;
		2216	sv_2mortal ((SV *)od);
		2217
2101	while (AvFILLp (od) >= 0)	2218	while (AvFILLp (od) >= 0)
2102	{	2219	{
2103	SV *cb = sv_2mortal (av_pop (od));	2220	SV *cb = sv_2mortal (av_pop (od));
2104		2221
2105	/* coro hv's (and only hv's at the moment) are supported as well */	2222	/* coro hv's (and only hv's at the moment) are supported as well */
…		…
2199	slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);	2316	slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200	}	2317	}
2201	else	2318	else
2202	{	2319	{
2203	struct coro *self = SvSTATE_current;	2320	struct coro *self = SvSTATE_current;
		2321
		2322	if (!self)
		2323	croak ("Coro::cancel called outside of thread content,");
2204		2324
2205	/* otherwise we cancel directly, purely for speed reasons	2325	/* otherwise we cancel directly, purely for speed reasons
2206	* unfortunately, this requires some magic trickery, as	2326	* unfortunately, this requires some magic trickery, as
2207	* somebody else could cancel us, so we have to fight the cancellation.	2327	* somebody else could cancel us, so we have to fight the cancellation.
2208	* this is ugly, and hopefully fully worth the extra speed.	2328	* this is ugly, and hopefully fully worth the extra speed.
…		…
2318	else	2438	else
2319	{	2439	{
2320	av_clear (GvAV (PL_defgv));	2440	av_clear (GvAV (PL_defgv));
2321	hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);	2441	hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2322		2442
		2443	if (ecb_expect_false (coro->swap_sv))
		2444	{
		2445	swap_svs_leave (coro);
		2446	SvREFCNT_dec_NN (coro->swap_sv);
		2447	coro->swap_sv = 0;
		2448	}
		2449
2323	coro->prio = 0;	2450	coro->prio = 0;
2324		2451
2325	if (coro->cctx && (coro->cctx->flags & CC_TRACE))	2452	if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2326	api_trace (aTHX_ coro_current, 0);	2453	api_trace (aTHX_ coro_current, 0);
2327		2454
2328	frame->prepare = prepare_schedule;	2455	frame->prepare = prepare_schedule;
2329	av_push (av_async_pool, SvREFCNT_inc (hv));	2456	av_push (av_async_pool, SvREFCNT_inc (hv));
2330	}	2457	}
…		…
2550		2677
2551	/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */	2678	/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552	static void	2679	static void
2553	slf_destroy (pTHX_ struct coro *coro)	2680	slf_destroy (pTHX_ struct coro *coro)
2554	{	2681	{
2555	/* this callback is reserved for slf functions needing to do cleanup */	2682	struct CoroSLF frame = coro->slf_frame;
2556	if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557	coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558		2683
2559	/*	2684	/*
2560	* The on_destroy above most likely is from an SLF call.	2685	* The on_destroy below most likely is from an SLF call.
2561	* Since by definition the SLF call will not finish when we destroy	2686	* Since by definition the SLF call will not finish when we destroy
2562	* the coro, we will have to force-finish it here, otherwise	2687	* the coro, we will have to force-finish it here, otherwise
2563	* cleanup functions cannot call SLF functions.	2688	* cleanup functions cannot call SLF functions.
2564	*/	2689	*/
2565	coro->slf_frame.prepare = 0;	2690	coro->slf_frame.prepare = 0;
		2691
		2692	/* this callback is reserved for slf functions needing to do cleanup */
		2693	if (frame.destroy && frame.prepare && !PL_dirty)
		2694	frame.destroy (aTHX_ &frame);
2566	}	2695	}
2567		2696
2568	/*	2697	/*
2569	* these not obviously related functions are all rolled into one	2698	* these not obviously related functions are all rolled into one
2570	* function to increase chances that they all will call transfer with the same	2699	* function to increase chances that they all will call transfer with the same
…		…
2753	static void	2882	static void
2754	coro_pop_on_leave (pTHX_ void *coro)	2883	coro_pop_on_leave (pTHX_ void *coro)
2755	{	2884	{
2756	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);	2885	SV cb = coro_avp_pop_and_free (aTHX_ &((struct coro )coro)->on_leave);
2757	on_enterleave_call (aTHX_ sv_2mortal (cb));	2886	on_enterleave_call (aTHX_ sv_2mortal (cb));
		2887	}
		2888
		2889	static void
		2890	enterleave_hook_xs (pTHX_ struct coro coro, AV avp, coro_enterleave_hook hook, void arg)
		2891	{
		2892	if (!hook)
		2893	return;
		2894
		2895	if (!*avp)
		2896	{
		2897	*avp = newAV ();
		2898	AvREAL_off (*avp);
		2899	}
		2900
		2901	av_push (avp, (SV )hook);
		2902	av_push (avp, (SV )arg);
		2903	}
		2904
		2905	static void
		2906	enterleave_unhook_xs (pTHX_ struct coro coro, AV *avp, coro_enterleave_hook hook, int execute)
		2907	{
		2908	AV av = avp;
		2909	int i;
		2910
		2911	if (!av)
		2912	return;
		2913
		2914	for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
		2915	if (AvARRAY (av)[i] == (SV *)hook)
		2916	{
		2917	if (execute)
		2918	hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
		2919
		2920	memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
		2921	av_pop (av);
		2922	av_pop (av);
		2923	break;
		2924	}
		2925
		2926	if (AvFILLp (av) >= 0)
		2927	{
		2928	*avp = 0;
		2929	SvREFCNT_dec_NN (av);
		2930	}
		2931	}
		2932
		2933	static void
		2934	api_enterleave_hook (pTHX_ SV coro_sv, coro_enterleave_hook enter, void enter_arg, coro_enterleave_hook leave, void *leave_arg)
		2935	{
		2936	struct coro *coro = SvSTATE (coro_sv);
		2937
		2938	if (SvSTATE_current == coro)
		2939	if (enter)
		2940	enter (aTHX_ enter_arg);
		2941
		2942	enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
		2943	enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
		2944	}
		2945
		2946	static void
		2947	api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
		2948	{
		2949	struct coro *coro = SvSTATE (coro_sv);
		2950
		2951	enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
		2952	enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
		2953	}
		2954
		2955	static void
		2956	savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
		2957	{
		2958	struct coro *coro = SvSTATE_current;
		2959
		2960	enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
		2961	}
		2962
		2963	static void
		2964	savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
		2965	{
		2966	struct coro *coro = SvSTATE_current;
		2967
		2968	enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
		2969	}
		2970
		2971	static void
		2972	api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void enter_arg, coro_enterleave_hook leave, void leave_arg)
		2973	{
		2974	api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
		2975
		2976	/* this ought to be much cheaper than malloc + a single destructor call */
		2977	if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
		2978	if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2758	}	2979	}
2759		2980
2760	/*****************************************************************************/	2981	/*****************************************************************************/
2761	/* PerlIO::cede */	2982	/* PerlIO::cede */
2762		2983
…		…
2892	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));	3113	XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2893	PUTBACK;	3114	PUTBACK;
2894	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);	3115	call_sv (cb, G_VOID \| G_DISCARD \| G_EVAL \| G_KEEPERR);
2895	}	3116	}
2896		3117
2897	SvREFCNT_dec (cb);	3118	SvREFCNT_dec_NN (cb);
2898	}	3119	}
2899	}	3120	}
2900		3121
2901	static void	3122	static void
2902	coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)	3123	coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
…		…
2910	{	3131	{
2911	AV av = (AV )frame->data;	3132	AV av = (AV )frame->data;
2912	SV *count_sv = AvARRAY (av)[0];	3133	SV *count_sv = AvARRAY (av)[0];
2913	SV *coro_hv = SvRV (coro_current);	3134	SV *coro_hv = SvRV (coro_current);
2914		3135
		3136	frame->destroy = 0;
		3137
2915	/* if we are about to throw, don't actually acquire the lock, just throw */	3138	/* if we are about to throw, don't actually acquire the lock, just throw */
2916	if (CORO_THROW)	3139	if (ecb_expect_false (CORO_THROW))
		3140	{
		3141	/* we still might be responsible for the semaphore, so wake up others */
		3142	coro_semaphore_adjust (aTHX_ av, 0);
		3143
2917	return 0;	3144	return 0;
		3145	}
2918	else if (SvIVX (count_sv) > 0)	3146	else if (SvIVX (count_sv) > 0)
2919	{	3147	{
2920	frame->destroy = 0;
2921
2922	if (acquire)	3148	if (acquire)
2923	SvIVX (count_sv) = SvIVX (count_sv) - 1;	3149	SvIVX (count_sv) = SvIVX (count_sv) - 1;
2924	else	3150	else
2925	coro_semaphore_adjust (aTHX_ av, 0);	3151	coro_semaphore_adjust (aTHX_ av, 0);
2926		3152
…		…
3037	{	3263	{
3038	api_ready (aTHX_ cb);	3264	api_ready (aTHX_ cb);
3039	sv_setiv (cb, 0); /* signal waiter */	3265	sv_setiv (cb, 0); /* signal waiter */
3040	}	3266	}
3041		3267
3042	SvREFCNT_dec (cb);	3268	SvREFCNT_dec_NN (cb);
3043		3269
3044	--count;	3270	--count;
3045	}	3271	}
3046	}	3272	}
3047		3273
…		…
3132	}	3358	}
3133		3359
3134	av_push (state, data_sv);	3360	av_push (state, data_sv);
3135		3361
3136	api_ready (aTHX_ coro);	3362	api_ready (aTHX_ coro);
3137	SvREFCNT_dec (coro);	3363	SvREFCNT_dec_NN (coro);
3138	SvREFCNT_dec ((AV *)state);	3364	SvREFCNT_dec_NN ((AV *)state);
3139	}	3365	}
3140		3366
3141	static int	3367	static int
3142	slf_check_aio_req (pTHX_ struct CoroSLF *frame)	3368	slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3143	{	3369	{
…		…
3148	/* it quickly returns */	3374	/* it quickly returns */
3149	if (CORO_THROW)	3375	if (CORO_THROW)
3150	return 0;	3376	return 0;
3151		3377
3152	/* one element that is an RV? repeat! */	3378	/* one element that is an RV? repeat! */
3153	if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))	3379	if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3154	return 1;	3380	return 1;
3155		3381
3156	/* restore status */	3382	/* restore status */
3157	{	3383	{
3158	SV *data_sv = av_pop (state);	3384	SV *data_sv = av_pop (state);
…		…
3161	errno = data->errorno;	3387	errno = data->errorno;
3162	PL_laststype = data->laststype;	3388	PL_laststype = data->laststype;
3163	PL_laststatval = data->laststatval;	3389	PL_laststatval = data->laststatval;
3164	PL_statcache = data->statcache;	3390	PL_statcache = data->statcache;
3165		3391
3166	SvREFCNT_dec (data_sv);	3392	SvREFCNT_dec_NN (data_sv);
3167	}	3393	}
3168		3394
3169	/* push result values */	3395	/* push result values */
3170	{	3396	{
3171	dSP;	3397	dSP;
…		…
3386		3612
3387	PROTOTYPES: DISABLE	3613	PROTOTYPES: DISABLE
3388		3614
3389	BOOT:	3615	BOOT:
3390	{	3616	{
		3617	#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
		3618	#include "state.h"
3391	#ifdef USE_ITHREADS	3619	#ifdef USE_ITHREADS
3392	# if CORO_PTHREAD	3620	# if CORO_PTHREAD
3393	coro_thx = PERL_GET_CONTEXT;	3621	coro_thx = PERL_GET_CONTEXT;
3394	# endif	3622	# endif
3395	#endif	3623	#endif
…		…
3407		3635
3408	orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;	3636	orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3409	orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;	3637	orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3410	orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;	3638	orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3411		3639
3412	hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3413	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));	3640	rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3414	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));	3641	rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3415		3642
3416	coro_state_stash = gv_stashpv ("Coro::State", TRUE);	3643	coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3417		3644
…		…
3723	if (ecb_expect_false (current == self))	3950	if (ecb_expect_false (current == self))
3724	coro_times_sub (SvSTATE (coro_current));	3951	coro_times_sub (SvSTATE (coro_current));
3725	}	3952	}
3726		3953
3727	void	3954	void
3728	swap_sv (Coro::State coro, SV sv, SV swapsv)	3955	swap_sv (Coro::State coro, SV sva, SV svb)
3729	CODE:	3956	CODE:
3730	{	3957	{
3731	struct coro *current = SvSTATE_current;	3958	struct coro *current = SvSTATE_current;
		3959	AV *swap_sv;
		3960	int i;
		3961
		3962	sva = SvRV (sva);
		3963	svb = SvRV (svb);
3732		3964
3733	if (current == coro)	3965	if (current == coro)
3734	SWAP_SVS (current);	3966	SWAP_SVS_LEAVE (current);
3735		3967
3736	if (!coro->swap_sv)	3968	if (!coro->swap_sv)
3737	coro->swap_sv = newAV ();	3969	coro->swap_sv = newAV ();
3738		3970
		3971	swap_sv = coro->swap_sv;
		3972
		3973	for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
		3974	{
		3975	SV *a = AvARRAY (swap_sv)[i ];
		3976	SV *b = AvARRAY (swap_sv)[i + 1];
		3977
		3978	if (a == sva && b == svb)
		3979	{
		3980	SvREFCNT_dec_NN (a);
		3981	SvREFCNT_dec_NN (b);
		3982
		3983	for (; i <= AvFILLp (swap_sv) - 2; i++)
		3984	AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
		3985
		3986	AvFILLp (swap_sv) -= 2;
		3987
		3988	goto removed;
		3989	}
		3990	}
		3991
3739	av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));	3992	av_push (swap_sv, SvREFCNT_inc_NN (sva));
3740	av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));	3993	av_push (swap_sv, SvREFCNT_inc_NN (svb));
		3994
		3995	removed:
3741		3996
3742	if (current == coro)	3997	if (current == coro)
3743	SWAP_SVS (current);	3998	SWAP_SVS_ENTER (current);
3744	}	3999	}
3745		4000
3746		4001
3747	MODULE = Coro::State PACKAGE = Coro	4002	MODULE = Coro::State PACKAGE = Coro
3748		4003
3749	BOOT:	4004	BOOT:
3750	{	4005	{
		4006	if (SVt_LAST > 32)
		4007	croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
		4008
3751	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);	4009	sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3752	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);	4010	sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3753	cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);	4011	cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3754	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);	4012	coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3755	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);	4013	av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
…		…
3781	coroapi.ready = api_ready;	4039	coroapi.ready = api_ready;
3782	coroapi.is_ready = api_is_ready;	4040	coroapi.is_ready = api_is_ready;
3783	coroapi.nready = coro_nready;	4041	coroapi.nready = coro_nready;
3784	coroapi.current = coro_current;	4042	coroapi.current = coro_current;
3785		4043
		4044	coroapi.enterleave_hook = api_enterleave_hook;
		4045	coroapi.enterleave_unhook = api_enterleave_unhook;
		4046	coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
		4047
3786	/GCoroAPI = &coroapi;/	4048	/GCoroAPI = &coroapi;/
3787	sv_setiv (sv, (IV)&coroapi);	4049	sv_setiv (sv, (IV)&coroapi);
3788	SvREADONLY_on (sv);	4050	SvREADONLY_on (sv);
3789	}	4051	}
3790	}	4052	}
…		…
3855		4117
3856	void	4118	void
3857	_set_current (SV *current)	4119	_set_current (SV *current)
3858	PROTOTYPE: $	4120	PROTOTYPE: $
3859	CODE:	4121	CODE:
3860	SvREFCNT_dec (SvRV (coro_current));	4122	SvREFCNT_dec_NN (SvRV (coro_current));
3861	SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));	4123	SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3862		4124
3863	void	4125	void
3864	_set_readyhook (SV *hook)	4126	_set_readyhook (SV *hook)
3865	PROTOTYPE: $	4127	PROTOTYPE: $
…		…
3949		4211
3950	if ((SV *)hv == &PL_sv_undef)	4212	if ((SV *)hv == &PL_sv_undef)
3951	{	4213	{
3952	SV sv = coro_new (aTHX_ coro_stash, (SV *)&cv_pool_handler, 1, 1);	4214	SV sv = coro_new (aTHX_ coro_stash, (SV *)&cv_pool_handler, 1, 1);
3953	hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));	4215	hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3954	SvREFCNT_dec (sv);	4216	SvREFCNT_dec_NN (sv);
3955	}	4217	}
3956		4218
3957	{	4219	{
3958	struct coro *coro = SvSTATE_hv (hv);	4220	struct coro *coro = SvSTATE_hv (hv);
3959		4221
…		…
3966	api_ready (aTHX_ (SV *)hv);	4228	api_ready (aTHX_ (SV *)hv);
3967		4229
3968	if (GIMME_V != G_VOID)	4230	if (GIMME_V != G_VOID)
3969	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	4231	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3970	else	4232	else
3971	SvREFCNT_dec (hv);	4233	SvREFCNT_dec_NN (hv);
3972	}	4234	}
3973		4235
3974	SV *	4236	SV *
3975	rouse_cb ()	4237	rouse_cb ()
3976	PROTOTYPE:	4238	PROTOTYPE:
…		…
4055	RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);	4317	RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4056	OUTPUT:	4318	OUTPUT:
4057	RETVAL	4319	RETVAL
4058		4320
4059	void	4321	void
4060	up (SV *self, int adjust = 1)	4322	up (SV *self)
4061	ALIAS:
4062	adjust = 1
4063	CODE:	4323	CODE:
		4324	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
		4325
		4326	void
		4327	adjust (SV *self, int adjust)
		4328	CODE:
4064	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);	4329	coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4065		4330
4066	void	4331	void
4067	down (...)	4332	down (...)
4068	CODE:	4333	CODE:
4069	CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);	4334	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.431 by root, Fri Feb 8 22:29:18 2013 UTC vs. Revision 1.463 by root, Wed Jun 22 20:37:27 2016 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.431 by root, Fri Feb 8 22:29:18 2013 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 2016 UTC