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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.196 by root, Sat Oct 6 01:11:01 2007 UTC vs.
Revision 1.205 by root, Tue Oct 9 14:07:02 2007 UTC

…		…
1	#include "libcoro/coro.c"	1	#include "libcoro/coro.c"
2		2
3	#define PERL_NO_GET_CONTEXT	3	#define PERL_NO_GET_CONTEXT
		4	#define PERL_EXT
4		5
5	#include "EXTERN.h"	6	#include "EXTERN.h"
6	#include "perl.h"	7	#include "perl.h"
7	#include "XSUB.h"	8	#include "XSUB.h"
8		9
129	#else	130	#else
130	# define LOCK (void)0	131	# define LOCK (void)0
131	# define UNLOCK (void)0	132	# define UNLOCK (void)0
132	#endif	133	#endif
133		134
		135	#define strpair(const) const, sizeof (const) - 1
		136
134	/* helper storage struct for Coro::AIO */	137	/* helper storage struct for Coro::AIO */
135	struct io_state	138	struct io_state
136	{	139	{
137	int errorno;	140	int errorno;
138	I32 laststype;	141	I32 laststype;
…		…
147	static HV coro_state_stash, coro_stash;	150	static HV coro_state_stash, coro_stash;
148	static SV coro_mortal; / will be freed after next transfer */	151	static SV coro_mortal; / will be freed after next transfer */
149		152
150	static GV irsgv; / $/ */	153	static GV irsgv; / $/ */
151	static GV stdoutgv; / STDOUT /	154	static GV stdoutgv; / STDOUT /
		155
		156	static HV hv_sig; / %SIG */
		157	static SV *sv_diehook;
		158	static SV *sv_warnhook;
152		159
153	/* async_pool helper stuff */	160	/* async_pool helper stuff */
154	static SV *sv_pool_rss;	161	static SV *sv_pool_rss;
155	static SV *sv_pool_size;	162	static SV *sv_pool_size;
156	static AV *av_async_pool;	163	static AV *av_async_pool;
…		…
192	CF_READY = 0x0002, /* coroutine is ready */	199	CF_READY = 0x0002, /* coroutine is ready */
193	CF_NEW = 0x0004, /* has never been switched to */	200	CF_NEW = 0x0004, /* has never been switched to */
194	CF_DESTROYED = 0x0008, /* coroutine data has been freed */	201	CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195	};	202	};
196		203
		204	/* the structure where most of the perl state is stored, overlaid on the cxstack */
		205	typedef struct {
		206	SV *defsv;
		207	AV *defav;
		208	SV *errsv;
		209	SV *irsgv;
		210	#define VAR(name,type) type name;
		211	# include "state.h"
		212	#undef VAR
		213	} perl_slots;
		214
		215	#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
		216
197	/* this is a structure representing a perl-level coroutine */	217	/* this is a structure representing a perl-level coroutine */
198	struct coro {	218	struct coro {
199	/* the c coroutine allocated to this perl coroutine, if any */	219	/* the c coroutine allocated to this perl coroutine, if any */
200	coro_cctx *cctx;	220	coro_cctx *cctx;
201		221
		222	/* process data */
		223	AV *mainstack;
		224	perl_slots slot; / basically the saved sp */
		225
202	/* data associated with this coroutine (initial args) */	226	AV args; / data associated with this coroutine (initial args) */
203	AV *args;	227	int refcnt; /* coroutines are refcounted, yes */
204	int refcnt;
205	int flags; /* CF_ flags */	228	int flags; /* CF_ flags */
206		229	HV hv; / the perl hash associated with this coro, if any */
207	/* optionally saved, might be zero */
208	AV defav; / @_ */
209	SV defsv; / $_ */
210	SV errsv; / $@ */
211	SV deffh; / default filehandle */
212	SV irssv; / $/ */
213	SV irssv_sv; / real $/ cache */
214
215	#define VAR(name,type) type name;
216	# include "state.h"
217	#undef VAR
218		230
219	/* statistics */	231	/* statistics */
220	int usecount; /* number of transfers to this coro */	232	int usecount; /* number of transfers to this coro */
221		233
222	/* coro process data */	234	/* coro process data */
223	int prio;	235	int prio;
224	SV *throw;	236	SV throw; / exception to be thrown */
225		237
226	/* async_pool */	238	/* async_pool */
227	SV *saved_deffh;	239	SV *saved_deffh;
228		240
229	/* linked list */	241	/* linked list */
230	struct coro next, prev;	242	struct coro next, prev;
231	HV hv; / the perl hash associated with this coro, if any */
232	};	243	};
233		244
234	typedef struct coro *Coro__State;	245	typedef struct coro *Coro__State;
235	typedef struct coro *Coro__State_or_hashref;	246	typedef struct coro *Coro__State_or_hashref;
236		247
…		…
248	static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];	259	static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
249	static int coro_nready;	260	static int coro_nready;
250	static struct coro *coro_first;	261	static struct coro *coro_first;
251		262
252	/ lowlevel stuff ********************************************************/	263	/ lowlevel stuff ********************************************************/
		264
		265	static SV *
		266	coro_get_sv (const char *name, int create)
		267	{
		268	#if PERL_VERSION_ATLEAST (5,9,0)
		269	/* silence stupid and wrong 5.10 warning that I am unable to switch off */
		270	get_sv (name, create);
		271	#endif
		272	return get_sv (name, create);
		273	}
		274
		275	static AV *
		276	coro_get_av (const char *name, int create)
		277	{
		278	#if PERL_VERSION_ATLEAST (5,9,0)
		279	/* silence stupid and wrong 5.10 warning that I am unable to switch off */
		280	get_av (name, create);
		281	#endif
		282	return get_av (name, create);
		283	}
		284
		285	static HV *
		286	coro_get_hv (const char *name, int create)
		287	{
		288	#if PERL_VERSION_ATLEAST (5,9,0)
		289	/* silence stupid and wrong 5.10 warning that I am unable to switch off */
		290	get_hv (name, create);
		291	#endif
		292	return get_hv (name, create);
		293	}
253		294
254	static AV *	295	static AV *
255	coro_clone_padlist (pTHX_ CV *cv)	296	coro_clone_padlist (pTHX_ CV *cv)
256	{	297	{
257	AV *padlist = CvPADLIST (cv);	298	AV *padlist = CvPADLIST (cv);
…		…
397	/ load & save, init *****************************************************/	438	/ load & save, init *****************************************************/
398		439
399	static void	440	static void
400	load_perl (pTHX_ Coro__State c)	441	load_perl (pTHX_ Coro__State c)
401	{	442	{
		443	perl_slots *slot = c->slot;
		444	c->slot = 0;
		445
		446	PL_mainstack = c->mainstack;
		447
		448	GvSV (PL_defgv) = slot->defsv;
		449	GvAV (PL_defgv) = slot->defav;
		450	GvSV (PL_errgv) = slot->errsv;
		451	GvSV (irsgv) = slot->irsgv;
		452
402	#define VAR(name,type) PL_ ## name = c->name;	453	#define VAR(name,type) PL_ ## name = slot->name;
403	# include "state.h"	454	# include "state.h"
404	#undef VAR	455	#undef VAR
405		456
406	GvSV (PL_defgv) = c->defsv;	457	/hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);/
407	GvAV (PL_defgv) = c->defav;	458	/hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);/
408	GvSV (PL_errgv) = c->errsv;
409	GvSV (irsgv) = c->irssv_sv;
410		459
411	{	460	{
412	dSP;	461	dSP;
		462
413	CV *cv;	463	CV *cv;
414		464
415	/* now do the ugly restore mess */	465	/* now do the ugly restore mess */
416	while (expect_true (cv = (CV *)POPs))	466	while (expect_true (cv = (CV *)POPs))
417	{	467	{
…		…
472	}	522	}
473		523
474	PUTBACK;	524	PUTBACK;
475	}	525	}
476		526
		527	/* allocate some space on the context stack for our purposes */
		528	/* we manually unroll here, as usually 2 slots is enough */
		529	if (SLOT_COUNT >= 1) CXINC;
		530	if (SLOT_COUNT >= 2) CXINC;
		531	if (SLOT_COUNT >= 3) CXINC;
		532	{
		533	int i;
		534	for (i = 3; i < SLOT_COUNT; ++i)
		535	CXINC;
		536	}
		537	cxstack_ix -= SLOT_COUNT; /* undo allocation */
		538
		539	c->mainstack = PL_mainstack;
		540
		541	{
		542	perl_slots slot = c->slot = (perl_slots )(cxstack + cxstack_ix + 1);
		543
477	c->defav = GvAV (PL_defgv);	544	slot->defav = GvAV (PL_defgv);
478	c->defsv = DEFSV;	545	slot->defsv = DEFSV;
479	c->errsv = ERRSV;	546	slot->errsv = ERRSV;
480	c->irssv_sv = GvSV (irsgv);	547	slot->irsgv = GvSV (irsgv);
481		548
482	#define VAR(name,type)c->name = PL_ ## name;	549	#define VAR(name,type) slot->name = PL_ ## name;
483	# include "state.h"	550	# include "state.h"
484	#undef VAR	551	#undef VAR
		552	}
485	}	553	}
486		554
487	/*	555	/*
488	* allocate various perl stacks. This is an exact copy	556	* allocate various perl stacks. This is an exact copy
489	* of perl.c:init_stacks, except that it uses less memory	557	* of perl.c:init_stacks, except that it uses less memory
…		…
494	# define coro_init_stacks init_stacks	562	# define coro_init_stacks init_stacks
495	#else	563	#else
496	static void	564	static void
497	coro_init_stacks (pTHX)	565	coro_init_stacks (pTHX)
498	{	566	{
499	PL_curstackinfo = new_stackinfo(64, 6);	567	PL_curstackinfo = new_stackinfo(32, 8);
500	PL_curstackinfo->si_type = PERLSI_MAIN;	568	PL_curstackinfo->si_type = PERLSI_MAIN;
501	PL_curstack = PL_curstackinfo->si_stack;	569	PL_curstack = PL_curstackinfo->si_stack;
502	PL_mainstack = PL_curstack; /* remember in case we switch stacks */	570	PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503		571
504	PL_stack_base = AvARRAY(PL_curstack);	572	PL_stack_base = AvARRAY(PL_curstack);
505	PL_stack_sp = PL_stack_base;	573	PL_stack_sp = PL_stack_base;
506	PL_stack_max = PL_stack_base + AvMAX(PL_curstack);	574	PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507		575
508	New(50,PL_tmps_stack,64,SV*);	576	New(50,PL_tmps_stack,32,SV*);
509	PL_tmps_floor = -1;	577	PL_tmps_floor = -1;
510	PL_tmps_ix = -1;	578	PL_tmps_ix = -1;
511	PL_tmps_max = 64;	579	PL_tmps_max = 32;
512		580
513	New(54,PL_markstack,16,I32);	581	New(54,PL_markstack,16,I32);
514	PL_markstack_ptr = PL_markstack;	582	PL_markstack_ptr = PL_markstack;
515	PL_markstack_max = PL_markstack + 16;	583	PL_markstack_max = PL_markstack + 16;
516		584
517	#ifdef SET_MARK_OFFSET	585	#ifdef SET_MARK_OFFSET
518	SET_MARK_OFFSET;	586	SET_MARK_OFFSET;
519	#endif	587	#endif
520		588
521	New(54,PL_scopestack,16,I32);	589	New(54,PL_scopestack,8,I32);
522	PL_scopestack_ix = 0;	590	PL_scopestack_ix = 0;
523	PL_scopestack_max = 16;	591	PL_scopestack_max = 8;
524		592
525	New(54,PL_savestack,64,ANY);	593	New(54,PL_savestack,24,ANY);
526	PL_savestack_ix = 0;	594	PL_savestack_ix = 0;
527	PL_savestack_max = 64;	595	PL_savestack_max = 24;
528		596
529	#if !PERL_VERSION_ATLEAST (5,9,0)	597	#if !PERL_VERSION_ATLEAST (5,9,0)
530	New(54,PL_retstack,4,OP*);	598	New(54,PL_retstack,4,OP*);
531	PL_retstack_ix = 0;	599	PL_retstack_ix = 0;
532	PL_retstack_max = 4;	600	PL_retstack_max = 4;
…		…
569	{	637	{
570	size_t rss = sizeof (*coro);	638	size_t rss = sizeof (*coro);
571		639
572	if (coro->mainstack)	640	if (coro->mainstack)
573	{	641	{
		642	perl_slots tmp_slot;
		643	perl_slots *slot;
		644
574	if (coro->flags & CF_RUNNING)	645	if (coro->flags & CF_RUNNING)
575	{	646	{
		647	slot = &tmp_slot;
		648
576	#define VAR(name,type)coro->name = PL_ ## name;	649	#define VAR(name,type) slot->name = PL_ ## name;
577	# include "state.h"	650	# include "state.h"
578	#undef VAR	651	#undef VAR
579	}	652	}
		653	else
		654	slot = coro->slot;
580		655
581	rss += sizeof (coro->curstackinfo);	656	rss += sizeof (slot->curstackinfo);
582	rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
583	rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);	657	rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584	rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);	658	rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585	rss += coro->tmps_max * sizeof (SV *);	659	rss += slot->tmps_max * sizeof (SV *);
586	rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);	660	rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587	rss += coro->scopestack_max * sizeof (I32);	661	rss += slot->scopestack_max * sizeof (I32);
588	rss += coro->savestack_max * sizeof (ANY);	662	rss += slot->savestack_max * sizeof (ANY);
589		663
590	#if !PERL_VERSION_ATLEAST (5,9,0)	664	#if !PERL_VERSION_ATLEAST (5,9,0)
591	rss += coro->retstack_max * sizeof (OP *);	665	rss += slot->retstack_max * sizeof (OP *);
592	#endif	666	#endif
593	}	667	}
594		668
595	return rss;	669	return rss;
596	}	670	}
…		…
612	PL_curpm = 0;	686	PL_curpm = 0;
613	PL_curpad = 0;	687	PL_curpad = 0;
614	PL_localizing = 0;	688	PL_localizing = 0;
615	PL_dirty = 0;	689	PL_dirty = 0;
616	PL_restartop = 0;	690	PL_restartop = 0;
		691	PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
		692	PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
617		693
618	GvSV (PL_defgv) = newSV (0);	694	GvSV (PL_defgv) = newSV (0);
619	GvAV (PL_defgv) = coro->args; coro->args = 0;	695	GvAV (PL_defgv) = coro->args; coro->args = 0;
620	GvSV (PL_errgv) = newSV (0);	696	GvSV (PL_errgv) = newSV (0);
621	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);	697	GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
…		…
666	SvREFCNT_dec (GvSV (PL_errgv));	742	SvREFCNT_dec (GvSV (PL_errgv));
667	SvREFCNT_dec (PL_defoutgv);	743	SvREFCNT_dec (PL_defoutgv);
668	SvREFCNT_dec (PL_rs);	744	SvREFCNT_dec (PL_rs);
669	SvREFCNT_dec (GvSV (irsgv));	745	SvREFCNT_dec (GvSV (irsgv));
670		746
		747	SvREFCNT_dec (PL_diehook);
		748	SvREFCNT_dec (PL_warnhook);
		749
671	SvREFCNT_dec (coro->saved_deffh);	750	SvREFCNT_dec (coro->saved_deffh);
672	SvREFCNT_dec (coro->throw);	751	SvREFCNT_dec (coro->throw);
673		752
674	coro_destroy_stacks (aTHX);	753	coro_destroy_stacks (aTHX);
675	}	754	}
…		…
727	PUSHMARK (SP);	806	PUSHMARK (SP);
728	PUSHs (&PL_sv_no);	807	PUSHs (&PL_sv_no);
729	PUSHs (fullname);	808	PUSHs (fullname);
730	PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	809	PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
731	PUTBACK;	810	PUTBACK;
732	cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);	811	cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
733	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);	812	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);
734	SPAGAIN;	813	SPAGAIN;
735	FREETMPS;	814	FREETMPS;
736	LEAVE;	815	LEAVE;
737	PL_runops = runops_trace;	816	PL_runops = runops_trace;
…		…
766	PUSHMARK (SP);	845	PUSHMARK (SP);
767	PUSHs (&PL_sv_yes);	846	PUSHs (&PL_sv_yes);
768	PUSHs (fullname);	847	PUSHs (fullname);
769	PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);	848	PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
770	PUTBACK;	849	PUTBACK;
771	cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);	850	cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
772	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);	851	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);
773	SPAGAIN;	852	SPAGAIN;
774	FREETMPS;	853	FREETMPS;
775	LEAVE;	854	LEAVE;
776	PL_runops = runops_trace;	855	PL_runops = runops_trace;
…		…
790	PL_runops = RUNOPS_DEFAULT;	869	PL_runops = RUNOPS_DEFAULT;
791	PUSHMARK (SP);	870	PUSHMARK (SP);
792	PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));	871	PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
793	PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));	872	PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
794	PUTBACK;	873	PUTBACK;
795	cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);	874	cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
796	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);	875	if (cb) call_sv (*cb, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);
797	SPAGAIN;	876	SPAGAIN;
798	FREETMPS;	877	FREETMPS;
799	LEAVE;	878	LEAVE;
800	PL_runops = runops_trace;	879	PL_runops = runops_trace;
…		…
810		889
811	/* inject a fake call to Coro::State::_cctx_init into the execution */	890	/* inject a fake call to Coro::State::_cctx_init into the execution */
812	/* _cctx_init should be careful, as it could be called at almost any time */	891	/* _cctx_init should be careful, as it could be called at almost any time */
813	/* during execution of a perl program */	892	/* during execution of a perl program */
814	static void NOINLINE	893	static void NOINLINE
815	prepare_cctx (pTHX_ coro_cctx *cctx)	894	cctx_prepare (pTHX_ coro_cctx *cctx)
816	{	895	{
817	dSP;	896	dSP;
818	LOGOP myop;	897	LOGOP myop;
819		898
820	PL_top_env = &PL_start_env;	899	PL_top_env = &PL_start_env;
…		…
838		917
839	/*	918	/*
840	* this is a _very_ stripped down perl interpreter ;)	919	* this is a _very_ stripped down perl interpreter ;)
841	*/	920	*/
842	static void	921	static void
843	coro_run (void *arg)	922	cctx_run (void *arg)
844	{	923	{
845	dTHX;	924	dTHX;
846		925
847	/* coro_run is the alternative tail of transfer(), so unlock here. */	926	/* cctx_run is the alternative tail of transfer(), so unlock here. */
848	UNLOCK;	927	UNLOCK;
849		928
850	/* we now skip the entersub that lead to transfer() */	929	/* we now skip the entersub that lead to transfer() */
851	PL_op = PL_op->op_next;	930	PL_op = PL_op->op_next;
852		931
853	/* inject a fake subroutine call to cctx_init */	932	/* inject a fake subroutine call to cctx_init */
854	prepare_cctx (aTHX_ (coro_cctx *)arg);	933	cctx_prepare (aTHX_ (coro_cctx *)arg);
855		934
856	/* somebody or something will hit me for both perl_run and PL_restartop */	935	/* somebody or something will hit me for both perl_run and PL_restartop */
857	PL_restartop = PL_op;	936	PL_restartop = PL_op;
858	perl_run (PL_curinterp);	937	perl_run (PL_curinterp);
859		938
…		…
874	coro_cctx *cctx;	953	coro_cctx *cctx;
875	void *stack_start;	954	void *stack_start;
876	size_t stack_size;	955	size_t stack_size;
877		956
878	++cctx_count;	957	++cctx_count;
		958	fprintf (stderr, "bp1\n");//D
879		959
880	Newz (0, cctx, 1, coro_cctx);	960	Newz (0, cctx, 1, coro_cctx);
881		961
882	#if HAVE_MMAP	962	#if HAVE_MMAP
883
884	cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;	963	cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
885	/* mmap supposedly does allocate-on-write for us */	964	/* mmap supposedly does allocate-on-write for us */
886	cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC\|PROT_READ\|PROT_WRITE, MAP_PRIVATE\|MAP_ANONYMOUS, 0, 0);	965	cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC\|PROT_READ\|PROT_WRITE, MAP_PRIVATE\|MAP_ANONYMOUS, 0, 0);
887		966
888	if (cctx->sptr != (void *)-1)	967	if (cctx->sptr != (void *)-1)
…		…
909	stack_start = cctx->sptr;	988	stack_start = cctx->sptr;
910	stack_size = cctx->ssize;	989	stack_size = cctx->ssize;
911	}	990	}
912		991
913	REGISTER_STACK (cctx, (char )stack_start, (char )stack_start + stack_size);	992	REGISTER_STACK (cctx, (char )stack_start, (char )stack_start + stack_size);
914	coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);	993	coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
915		994
916	return cctx;	995	return cctx;
917	}	996	}
918		997
919	static void	998	static void
…		…
991	croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");	1070	croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
992		1071
993	if (expect_false (next->flags & CF_DESTROYED))	1072	if (expect_false (next->flags & CF_DESTROYED))
994	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");	1073	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
995		1074
		1075	if (
		1076	#if PERL_VERSION_ATLEAST (5,9,0)
		1077	expect_false (PL_parser)
		1078	#else
996	if (expect_false (PL_lex_state != LEX_NOTPARSING))	1079	expect_false (PL_lex_state != LEX_NOTPARSING)
		1080	#endif
		1081	)
997	croak ("Coro::State::transfer called while parsing, but this is not supported");	1082	croak ("Coro::State::transfer called while parsing, but this is not supported");
998	}	1083	}
999	}	1084	}
1000		1085
1001	/* always use the TRANSFER macro */	1086	/* always use the TRANSFER macro */
…		…
1054	prev->cctx = 0;	1139	prev->cctx = 0;
1055		1140
1056	/* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */	1141	/* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1057	/* without this the next cctx_get might destroy the prev__cctx while still in use */	1142	/* without this the next cctx_get might destroy the prev__cctx while still in use */
1058	if (expect_false (CCTX_EXPIRED (prev__cctx)))	1143	if (expect_false (CCTX_EXPIRED (prev__cctx)))
		1144	if (!next->cctx)
1059	next->cctx = cctx_get (aTHX);	1145	next->cctx = cctx_get (aTHX);
1060		1146
1061	cctx_put (prev__cctx);	1147	cctx_put (prev__cctx);
1062	}	1148	}
1063		1149
1064	++next->usecount;	1150	++next->usecount;
…		…
1130	save_perl (aTHX_ &temp);	1216	save_perl (aTHX_ &temp);
1131	load_perl (aTHX_ coro);	1217	load_perl (aTHX_ coro);
1132		1218
1133	coro_destroy (aTHX_ coro);	1219	coro_destroy (aTHX_ coro);
1134		1220
1135	load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */	1221	load_perl (aTHX_ &temp);
1136		1222
1137	coro->mainstack = 0;	1223	coro->slot = 0;
1138	}	1224	}
1139		1225
1140	cctx_destroy (coro->cctx);	1226	cctx_destroy (coro->cctx);
1141	SvREFCNT_dec (coro->args);	1227	SvREFCNT_dec (coro->args);
1142		1228
…		…
1399	coro->cctx->flags &= ~(CC_TRACE \| CC_TRACE_ALL);	1485	coro->cctx->flags &= ~(CC_TRACE \| CC_TRACE_ALL);
1400		1486
1401	if (coro->flags & CF_RUNNING)	1487	if (coro->flags & CF_RUNNING)
1402	PL_runops = RUNOPS_DEFAULT;	1488	PL_runops = RUNOPS_DEFAULT;
1403	else	1489	else
1404	coro->runops = RUNOPS_DEFAULT;	1490	coro->slot->runops = RUNOPS_DEFAULT;
1405	}	1491	}
1406	}	1492	}
1407		1493
1408	MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_	1494	MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1409		1495
…		…
1416	#endif	1502	#endif
1417	BOOT_PAGESIZE;	1503	BOOT_PAGESIZE;
1418		1504
1419	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);	1505	irsgv = gv_fetchpv ("/" , GV_ADD\|GV_NOTQUAL, SVt_PV);
1420	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);	1506	stdoutgv = gv_fetchpv ("STDOUT", GV_ADD\|GV_NOTQUAL, SVt_PVIO);
		1507
		1508	hv_sig = coro_get_hv ("SIG", TRUE);
		1509	sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
		1510	sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
		1511
		1512	if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
		1513	if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1421		1514
1422	coro_state_stash = gv_stashpv ("Coro::State", TRUE);	1515	coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1423		1516
1424	newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));	1517	newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1425	newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));	1518	newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
…		…
1569	CODE:	1662	CODE:
1570	{	1663	{
1571	if (coro->mainstack)	1664	if (coro->mainstack)
1572	{	1665	{
1573	struct coro temp;	1666	struct coro temp;
1574	Zero (&temp, 1, struct coro);
1575		1667
1576	if (!(coro->flags & CF_RUNNING))	1668	if (!(coro->flags & CF_RUNNING))
1577	{	1669	{
1578	save_perl (aTHX_ &temp);	1670	save_perl (aTHX_ &temp);
1579	load_perl (aTHX_ coro);	1671	load_perl (aTHX_ coro);
…		…
1583	dSP;	1675	dSP;
1584	ENTER;	1676	ENTER;
1585	SAVETMPS;	1677	SAVETMPS;
1586	PUSHMARK (SP);	1678	PUSHMARK (SP);
1587	PUTBACK;	1679	PUTBACK;
		1680
1588	if (ix)	1681	if (ix)
1589	eval_sv (coderef, 0);	1682	eval_sv (coderef, 0);
1590	else	1683	else
1591	call_sv (coderef, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);	1684	call_sv (coderef, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);
		1685
1592	SPAGAIN;	1686	SPAGAIN;
1593	FREETMPS;	1687	FREETMPS;
1594	LEAVE;	1688	LEAVE;
1595	PUTBACK;	1689	PUTBACK;
1596	}	1690	}
…		…
1654		1748
1655	BOOT:	1749	BOOT:
1656	{	1750	{
1657	int i;	1751	int i;
1658		1752
1659	sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);	1753	sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1660	sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);	1754	sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1661	av_async_pool = get_av ("Coro::async_pool", TRUE);	1755	av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1662		1756
1663	coro_current = get_sv ("Coro::current", FALSE);	1757	coro_current = coro_get_sv ("Coro::current", FALSE);
1664	SvREADONLY_on (coro_current);	1758	SvREADONLY_on (coro_current);
1665		1759
1666	coro_stash = gv_stashpv ("Coro", TRUE);	1760	coro_stash = gv_stashpv ("Coro", TRUE);
1667		1761
1668	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));	1762	newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1669	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));	1763	newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1670	newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));	1764	newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1671	newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));	1765	newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
…		…
1674		1768
1675	for (i = PRIO_MAX - PRIO_MIN + 1; i--; )	1769	for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1676	coro_ready[i] = newAV ();	1770	coro_ready[i] = newAV ();
1677		1771
1678	{	1772	{
1679	SV *sv = perl_get_sv("Coro::API", 1);	1773	SV *sv = perl_get_sv ("Coro::API", TRUE);
		1774	perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1680		1775
1681	coroapi.schedule = api_schedule;	1776	coroapi.schedule = api_schedule;
1682	coroapi.cede = api_cede;	1777	coroapi.cede = api_cede;
1683	coroapi.cede_notself = api_cede_notself;	1778	coroapi.cede_notself = api_cede_notself;
1684	coroapi.ready = api_ready;	1779	coroapi.ready = api_ready;
…		…
1750	CODE:	1845	CODE:
1751	{	1846	{
1752	struct coro *coro = SvSTATE (coro_current);	1847	struct coro *coro = SvSTATE (coro_current);
1753	HV hv = (HV )SvRV (coro_current);	1848	HV hv = (HV )SvRV (coro_current);
1754	AV *defav = GvAV (PL_defgv);	1849	AV *defav = GvAV (PL_defgv);
1755	SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);	1850	SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1756	AV *invoke_av;	1851	AV *invoke_av;
1757	int i, len;	1852	int i, len;
1758		1853
1759	if (!invoke)	1854	if (!invoke)
1760	croak ("\3terminate\2\n");	1855	croak ("\3async_pool terminate\2\n");
1761		1856
1762	SvREFCNT_dec (coro->saved_deffh);	1857	SvREFCNT_dec (coro->saved_deffh);
1763	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);	1858	coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1764		1859
1765	hv_store (hv, "desc", sizeof ("desc") - 1,	1860	hv_store (hv, "desc", sizeof ("desc") - 1,
1766	newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);	1861	newSVpvn (strpair ("[async_pool]")), 0);
1767		1862
1768	invoke_av = (AV *)SvRV (invoke);	1863	invoke_av = (AV *)SvRV (invoke);
1769	len = av_len (invoke_av);	1864	len = av_len (invoke_av);
1770		1865
1771	sv_setsv (cb, AvARRAY (invoke_av)[0]);	1866	sv_setsv (cb, AvARRAY (invoke_av)[0]);
…		…
1791	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;	1886	SvREFCNT_dec ((SV )PL_defoutgv); PL_defoutgv = (GV )coro->saved_deffh;
1792	coro->saved_deffh = 0;	1887	coro->saved_deffh = 0;
1793		1888
1794	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)	1889	if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1795	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))	1890	\|\| av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1796	croak ("\3terminate\2\n");	1891	croak ("\3async_pool terminate\2\n");
1797		1892
1798	av_clear (GvAV (PL_defgv));	1893	av_clear (GvAV (PL_defgv));
1799	hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,	1894	hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1800	newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);	1895	newSVpvn (strpair ("[async_pool idle]")), 0);
1801		1896
1802	coro->prio = 0;	1897	coro->prio = 0;
1803		1898
1804	if (coro->cctx && (coro->cctx->flags & CC_TRACE))	1899	if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1805	api_trace (coro_current, 0);	1900	api_trace (coro_current, 0);

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.196 by root, Sat Oct 6 01:11:01 2007 UTC vs. Revision 1.205 by root, Tue Oct 9 14:07:02 2007 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.196 by root, Sat Oct 6 01:11:01 2007 UTC vs.
Revision 1.205 by root, Tue Oct 9 14:07:02 2007 UTC