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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.124 by root, Tue Dec 5 12:50:04 2006 UTC vs.
Revision 1.154 by root, Fri Sep 21 01:08:06 2007 UTC

…		…
1	#include "libcoro/coro.c"	1	#include "libcoro/coro.c"
		2
		3	#define PERL_NO_GET_CONTEXT
2		4
3	#include "EXTERN.h"	5	#include "EXTERN.h"
4	#include "perl.h"	6	#include "perl.h"
5	#include "XSUB.h"	7	#include "XSUB.h"
6		8
7	#include "patchlevel.h"	9	#include "patchlevel.h"
8		10
9	#if USE_VALGRIND
10	# include <valgrind/valgrind.h>
11	#endif
12
13	/* the maximum number of idle cctx that will be pooled */
14	#define MAX_IDLE_CCTX 8
15
16	#define PERL_VERSION_ATLEAST(a,b,c) \
17	(PERL_REVISION > (a) \
18	\|\| (PERL_REVISION == (a) \
19	&& (PERL_VERSION > (b) \
20	\|\| (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
21
22	#if !PERL_VERSION_ATLEAST (5,6,0)
23	# ifndef PL_ppaddr
24	# define PL_ppaddr ppaddr
25	# endif
26	# ifndef call_sv
27	# define call_sv perl_call_sv
28	# endif
29	# ifndef get_sv
30	# define get_sv perl_get_sv
31	# endif
32	# ifndef get_cv
33	# define get_cv perl_get_cv
34	# endif
35	# ifndef IS_PADGV
36	# define IS_PADGV(v) 0
37	# endif
38	# ifndef IS_PADCONST
39	# define IS_PADCONST(v) 0
40	# endif
41	#endif
42
43	#include <stdio.h>	11	#include <stdio.h>
44	#include <errno.h>	12	#include <errno.h>
45	#include <assert.h>	13	#include <assert.h>
46
47	#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
48	# undef STACKGUARD
49	#endif
50
51	#ifndef STACKGUARD
52	# define STACKGUARD 0
53	#endif
54		14
55	#ifdef HAVE_MMAP	15	#ifdef HAVE_MMAP
56	# include <unistd.h>	16	# include <unistd.h>
57	# include <sys/mman.h>	17	# include <sys/mman.h>
58	# ifndef MAP_ANONYMOUS	18	# ifndef MAP_ANONYMOUS
73	#else	33	#else
74	# define PAGESIZE 0	34	# define PAGESIZE 0
75	# define BOOT_PAGESIZE (void)0	35	# define BOOT_PAGESIZE (void)0
76	#endif	36	#endif
77		37
		38	#if CORO_USE_VALGRIND
		39	# include <valgrind/valgrind.h>
		40	# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
		41	#else
		42	# define REGISTER_STACK(cctx,start,end)
		43	#endif
		44
		45	/* the maximum number of idle cctx that will be pooled */
		46	#define MAX_IDLE_CCTX 8
		47
		48	#define PERL_VERSION_ATLEAST(a,b,c) \
		49	(PERL_REVISION > (a) \
		50	\|\| (PERL_REVISION == (a) \
		51	&& (PERL_VERSION > (b) \
		52	\|\| (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
		53
		54	#if !PERL_VERSION_ATLEAST (5,6,0)
		55	# ifndef PL_ppaddr
		56	# define PL_ppaddr ppaddr
		57	# endif
		58	# ifndef call_sv
		59	# define call_sv perl_call_sv
		60	# endif
		61	# ifndef get_sv
		62	# define get_sv perl_get_sv
		63	# endif
		64	# ifndef get_cv
		65	# define get_cv perl_get_cv
		66	# endif
		67	# ifndef IS_PADGV
		68	# define IS_PADGV(v) 0
		69	# endif
		70	# ifndef IS_PADCONST
		71	# define IS_PADCONST(v) 0
		72	# endif
		73	#endif
		74
		75	/* 5.8.7 */
		76	#ifndef SvRV_set
		77	# define SvRV_set(s,v) SvRV(s) = (v)
		78	#endif
		79
		80	#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
		81	# undef CORO_STACKGUARD
		82	#endif
		83
		84	#ifndef CORO_STACKGUARD
		85	# define CORO_STACKGUARD 0
		86	#endif
		87
		88	/* prefer perl internal functions over our own? */
		89	#ifndef CORO_PREFER_PERL_FUNCTIONS
		90	# define CORO_PREFER_PERL_FUNCTIONS 0
		91	#endif
		92
78	/* The next macro should declare a variable stacklevel that contains and approximation	93	/* The next macro should declare a variable stacklevel that contains and approximation
79	* to the current C stack pointer. Its property is that it changes with each call	94	* to the current C stack pointer. Its property is that it changes with each call
80	* and should be unique. */	95	* and should be unique. */
81	#define dSTACKLEVEL int stacklevel	96	#define dSTACKLEVEL int stacklevel
82	#define STACKLEVEL ((void *)&stacklevel)	97	#define STACKLEVEL ((void *)&stacklevel)
83		98
84	#define IN_DESTRUCT (PL_main_cv == Nullcv)	99	#define IN_DESTRUCT (PL_main_cv == Nullcv)
85		100
86	#if __GNUC__ >= 3	101	#if __GNUC__ >= 3
87	# define attribute(x) __attribute__(x)	102	# define attribute(x) __attribute__(x)
		103	# define BARRIER __asm__ __volatile__ ("" : : : "memory")
88	#else	104	#else
89	# define attribute(x)	105	# define attribute(x)
		106	# define BARRIER
90	#endif	107	#endif
91		108
92	#define NOINLINE attribute ((noinline))	109	#define NOINLINE attribute ((noinline))
93		110
94	#include "CoroAPI.h"	111	#include "CoroAPI.h"
…		…
100	#else	117	#else
101	# define LOCK (void)0	118	# define LOCK (void)0
102	# define UNLOCK (void)0	119	# define UNLOCK (void)0
103	#endif	120	#endif
104		121
		122	/* helper storage struct for Coro::AIO */
105	struct io_state	123	struct io_state
106	{	124	{
107	int errorno;	125	int errorno;
108	I32 laststype;	126	I32 laststype;
109	int laststatval;	127	int laststatval;
110	Stat_t statcache;	128	Stat_t statcache;
111	};	129	};
112		130
		131	static size_t coro_stacksize = CORO_STACKSIZE;
113	static struct CoroAPI coroapi;	132	static struct CoroAPI coroapi;
114	static AV main_mainstack; / used to differentiate between $main and others */	133	static AV main_mainstack; / used to differentiate between $main and others */
		134	static JMPENV *main_top_env;
115	static HV coro_state_stash, coro_stash;	135	static HV coro_state_stash, coro_stash;
116	static SV coro_mortal; / will be freed after next transfer */	136	static SV coro_mortal; / will be freed after next transfer */
117		137
118	static struct coro_cctx *cctx_first;	138	static struct coro_cctx *cctx_first;
119	static int cctx_count, cctx_idle;	139	static int cctx_count, cctx_idle;
…		…
122	typedef struct coro_cctx {	142	typedef struct coro_cctx {
123	struct coro_cctx *next;	143	struct coro_cctx *next;
124		144
125	/* the stack */	145	/* the stack */
126	void *sptr;	146	void *sptr;
127	long ssize; /* positive == mmap, otherwise malloc */	147	size_t ssize;
128		148
129	/* cpu state */	149	/* cpu state */
130	void idle_sp; / sp of top-level transfer/schedule/cede call */	150	void idle_sp; / sp of top-level transfer/schedule/cede call */
		151	JMPENV idle_te; / same as idle_sp, but for top_env, TODO: remove once stable */
131	JMPENV *top_env;	152	JMPENV *top_env;
132	coro_context cctx;	153	coro_context cctx;
133		154
134	int inuse;
135
136	#if USE_VALGRIND	155	#if CORO_USE_VALGRIND
137	int valgrind_id;	156	int valgrind_id;
138	#endif	157	#endif
		158	char inuse, mapped;
139	} coro_cctx;	159	} coro_cctx;
140		160
141	enum {	161	enum {
142	CF_RUNNING = 0x0001, /* coroutine is running */	162	CF_RUNNING = 0x0001, /* coroutine is running */
143	CF_READY = 0x0002, /* coroutine is ready */	163	CF_READY = 0x0002, /* coroutine is ready */
144	CF_NEW = 0x0004, /* ahs never been switched to */	164	CF_NEW = 0x0004, /* has never been switched to */
		165	CF_DESTROYED = 0x0008, /* coroutine data has been freed */
145	};	166	};
146		167
147	/* this is a structure representing a perl-level coroutine */	168	/* this is a structure representing a perl-level coroutine */
148	struct coro {	169	struct coro {
149	/* the c coroutine allocated to this perl coroutine, if any */	170	/* the c coroutine allocated to this perl coroutine, if any */
…		…
157		178
158	/* optionally saved, might be zero */	179	/* optionally saved, might be zero */
159	AV defav; / @_ */	180	AV defav; / @_ */
160	SV defsv; / $_ */	181	SV defsv; / $_ */
161	SV errsv; / $@ */	182	SV errsv; / $@ */
		183	GV deffh; / default filehandle */
162	SV irssv; / $/ */	184	SV irssv; / $/ */
163	SV irssv_sv; / real $/ cache */	185	SV irssv_sv; / real $/ cache */
164		186
165	#define VAR(name,type) type name;	187	#define VAR(name,type) type name;
166	# include "state.h"	188	# include "state.h"
167	#undef VAR	189	#undef VAR
168		190
169	/* coro process data */	191	/* coro process data */
170	int prio;	192	int prio;
		193
		194	/* linked list */
		195	struct coro next, prev;
		196	HV hv; / the perl hash associated with this coro, if any */
171	};	197	};
172		198
173	typedef struct coro *Coro__State;	199	typedef struct coro *Coro__State;
174	typedef struct coro *Coro__State_or_hashref;	200	typedef struct coro *Coro__State_or_hashref;
175		201
		202	/ Coro ******************************************************************/
		203
		204	#define PRIO_MAX 3
		205	#define PRIO_HIGH 1
		206	#define PRIO_NORMAL 0
		207	#define PRIO_LOW -1
		208	#define PRIO_IDLE -3
		209	#define PRIO_MIN -4
		210
		211	/* for Coro.pm */
		212	static SV *coro_current;
		213	static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
		214	static int coro_nready;
		215	static struct coro *coro_first;
		216
		217	/ lowlevel stuff ********************************************************/
		218
176	static AV *	219	static AV *
177	coro_clone_padlist (CV *cv)	220	coro_clone_padlist (pTHX_ CV *cv)
178	{	221	{
179	AV *padlist = CvPADLIST (cv);	222	AV *padlist = CvPADLIST (cv);
180	AV newpadlist, newpad;	223	AV newpadlist, newpad;
181		224
182	newpadlist = newAV ();	225	newpadlist = newAV ();
…		…
194		237
195	return newpadlist;	238	return newpadlist;
196	}	239	}
197		240
198	static void	241	static void
199	free_padlist (AV *padlist)	242	free_padlist (pTHX_ AV *padlist)
200	{	243	{
201	/* may be during global destruction */	244	/* may be during global destruction */
202	if (SvREFCNT (padlist))	245	if (SvREFCNT (padlist))
203	{	246	{
204	I32 i = AvFILLp (padlist);	247	I32 i = AvFILLp (padlist);
…		…
225	AV *padlist;	268	AV *padlist;
226	AV av = (AV )mg->mg_obj;	269	AV av = (AV )mg->mg_obj;
227		270
228	/* casting is fun. */	271	/* casting is fun. */
229	while (&PL_sv_undef != (SV )(padlist = (AV )av_pop (av)))	272	while (&PL_sv_undef != (SV )(padlist = (AV )av_pop (av)))
230	free_padlist (padlist);	273	free_padlist (aTHX_ padlist);
231		274
232	SvREFCNT_dec (av);	275	SvREFCNT_dec (av);
233		276
234	return 0;	277	return 0;
235	}	278	}
…		…
245	: mg_find ((SV *)cv, PERL_MAGIC_coro) \	288	: mg_find ((SV *)cv, PERL_MAGIC_coro) \
246	: 0	289	: 0
247		290
248	/* the next two functions merely cache the padlists */	291	/* the next two functions merely cache the padlists */
249	static void	292	static void
250	get_padlist (CV *cv)	293	get_padlist (pTHX_ CV *cv)
251	{	294	{
252	MAGIC *mg = CORO_MAGIC (cv);	295	MAGIC *mg = CORO_MAGIC (cv);
253	AV *av;	296	AV *av;
254		297
255	if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)	298	if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
256	CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];	299	CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
257	else	300	else
258	{	301	{
259	#if 0	302	#if CORO_PREFER_PERL_FUNCTIONS
260	/* this is probably cleaner, but also slower? */	303	/* this is probably cleaner, but also slower? */
261	CV *cp = Perl_cv_clone (cv);	304	CV *cp = Perl_cv_clone (cv);
262	CvPADLIST (cv) = CvPADLIST (cp);	305	CvPADLIST (cv) = CvPADLIST (cp);
263	CvPADLIST (cp) = 0;	306	CvPADLIST (cp) = 0;
264	SvREFCNT_dec (cp);	307	SvREFCNT_dec (cp);
265	#else	308	#else
266	CvPADLIST (cv) = coro_clone_padlist (cv);	309	CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
267	#endif	310	#endif
268	}	311	}
269	}	312	}
270		313
271	static void	314	static void
272	put_padlist (CV *cv)	315	put_padlist (pTHX_ CV *cv)
273	{	316	{
274	MAGIC *mg = CORO_MAGIC (cv);	317	MAGIC *mg = CORO_MAGIC (cv);
275	AV *av;	318	AV *av;
276		319
277	if (!mg)	320	if (!mg)
…		…
288	av_extend (av, AvMAX (av) + 1);	331	av_extend (av, AvMAX (av) + 1);
289		332
290	AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);	333	AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
291	}	334	}
292		335
		336	/ load & save, init *****************************************************/
		337
293	#define SB do {	338	#define SB do {
294	#define SE } while (0)	339	#define SE } while (0)
295		340
296	#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE	341	#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
297		342
298	static void	343	static void
299	load_perl (Coro__State c)	344	load_perl (pTHX_ Coro__State c)
300	{	345	{
301	#define VAR(name,type) PL_ ## name = c->name;	346	#define VAR(name,type) PL_ ## name = c->name;
302	# include "state.h"	347	# include "state.h"
303	#undef VAR	348	#undef VAR
304		349
305	if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);	350	if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
306	if (c->defsv) REPLACE_SV (DEFSV , c->defsv);	351	if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
307	if (c->errsv) REPLACE_SV (ERRSV , c->errsv);	352	if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
		353	if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
		354
308	if (c->irssv)	355	if (c->irssv)
309	{	356	{
310	if (c->irssv == PL_rs \|\| sv_eq (PL_rs, c->irssv))	357	if (c->irssv == PL_rs \|\| sv_eq (PL_rs, c->irssv))
		358	{
311	SvREFCNT_dec (c->irssv);	359	SvREFCNT_dec (c->irssv);
		360	c->irssv = 0;
		361	}
312	else	362	else
313	{	363	{
314	REPLACE_SV (PL_rs, c->irssv);	364	REPLACE_SV (PL_rs, c->irssv);
315	if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);	365	if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
316	sv_setsv (c->irssv_sv, PL_rs);	366	sv_setsv (c->irssv_sv, PL_rs);
…		…
322	CV *cv;	372	CV *cv;
323		373
324	/* now do the ugly restore mess */	374	/* now do the ugly restore mess */
325	while ((cv = (CV *)POPs))	375	while ((cv = (CV *)POPs))
326	{	376	{
327	put_padlist (cv); /* mark this padlist as available */	377	put_padlist (aTHX_ cv); /* mark this padlist as available */
328	CvDEPTH (cv) = PTR2IV (POPs);	378	CvDEPTH (cv) = PTR2IV (POPs);
329	CvPADLIST (cv) = (AV *)POPs;	379	CvPADLIST (cv) = (AV *)POPs;
330	}	380	}
331		381
332	PUTBACK;	382	PUTBACK;
333	}	383	}
334	}	384	}
335		385
336	static void	386	static void
337	save_perl (Coro__State c)	387	save_perl (pTHX_ Coro__State c)
338	{	388	{
339	{	389	{
340	dSP;	390	dSP;
341	I32 cxix = cxstack_ix;	391	I32 cxix = cxstack_ix;
342	PERL_CONTEXT *ccstk = cxstack;	392	PERL_CONTEXT *ccstk = cxstack;
…		…
345	/*	395	/*
346	* the worst thing you can imagine happens first - we have to save	396	* the worst thing you can imagine happens first - we have to save
347	* (and reinitialize) all cv's in the whole callchain :(	397	* (and reinitialize) all cv's in the whole callchain :(
348	*/	398	*/
349		399
		400	EXTEND (SP, 3 + 1);
350	PUSHs (Nullsv);	401	PUSHs (Nullsv);
351	/* this loop was inspired by pp_caller */	402	/* this loop was inspired by pp_caller */
352	for (;;)	403	for (;;)
353	{	404	{
354	while (cxix >= 0)	405	while (cxix >= 0)
355	{	406	{
356	PERL_CONTEXT *cx = &ccstk[cxix--];	407	PERL_CONTEXT *cx = &ccstk[cxix--];
357		408
358	if (CxTYPE (cx) == CXt_SUB)	409	if (CxTYPE (cx) == CXt_SUB \|\| CxTYPE (cx) == CXt_FORMAT)
359	{	410	{
360	CV *cv = cx->blk_sub.cv;	411	CV *cv = cx->blk_sub.cv;
361		412
362	if (CvDEPTH (cv))	413	if (CvDEPTH (cv))
363	{	414	{
364	EXTEND (SP, 3);	415	EXTEND (SP, 3);
365
366	PUSHs ((SV *)CvPADLIST (cv));	416	PUSHs ((SV *)CvPADLIST (cv));
367	PUSHs (INT2PTR (SV *, CvDEPTH (cv)));	417	PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
368	PUSHs ((SV *)cv);	418	PUSHs ((SV *)cv);
369		419
370	CvDEPTH (cv) = 0;	420	CvDEPTH (cv) = 0;
371	get_padlist (cv);	421	get_padlist (aTHX_ cv);
372	}	422	}
373	}	423	}
374	#ifdef CXt_FORMAT
375	else if (CxTYPE (cx) == CXt_FORMAT)
376	{
377	/* I never used formats, so how should I know how these are implemented? */
378	/* my bold guess is as a simple, plain sub... */
379	croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
380	}
381	#endif
382	}	424	}
383		425
384	if (top_si->si_type == PERLSI_MAIN)	426	if (top_si->si_type == PERLSI_MAIN)
385	break;	427	break;
386		428
…		…
393	}	435	}
394		436
395	c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;	437	c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
396	c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;	438	c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
397	c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;	439	c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
		440	c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0;
398	c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;	441	c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
399		442
400	#define VAR(name,type)c->name = PL_ ## name;	443	#define VAR(name,type)c->name = PL_ ## name;
401	# include "state.h"	444	# include "state.h"
402	#undef VAR	445	#undef VAR
…		…
406	* allocate various perl stacks. This is an exact copy	449	* allocate various perl stacks. This is an exact copy
407	* of perl.c:init_stacks, except that it uses less memory	450	* of perl.c:init_stacks, except that it uses less memory
408	* on the (sometimes correct) assumption that coroutines do	451	* on the (sometimes correct) assumption that coroutines do
409	* not usually need a lot of stackspace.	452	* not usually need a lot of stackspace.
410	*/	453	*/
		454	#if CORO_PREFER_PERL_FUNCTIONS
		455	# define coro_init_stacks init_stacks
		456	#else
411	static void	457	static void
412	coro_init_stacks ()	458	coro_init_stacks (pTHX)
413	{	459	{
414	PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));	460	PL_curstackinfo = new_stackinfo(64, 4);
415	PL_curstackinfo->si_type = PERLSI_MAIN;	461	PL_curstackinfo->si_type = PERLSI_MAIN;
416	PL_curstack = PL_curstackinfo->si_stack;	462	PL_curstack = PL_curstackinfo->si_stack;
417	PL_mainstack = PL_curstack; /* remember in case we switch stacks */	463	PL_mainstack = PL_curstack; /* remember in case we switch stacks */
418		464
419	PL_stack_base = AvARRAY(PL_curstack);	465	PL_stack_base = AvARRAY(PL_curstack);
420	PL_stack_sp = PL_stack_base;	466	PL_stack_sp = PL_stack_base;
421	PL_stack_max = PL_stack_base + AvMAX(PL_curstack);	467	PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
422		468
423	New(50,PL_tmps_stack,128,SV*);	469	New(50,PL_tmps_stack,64,SV*);
424	PL_tmps_floor = -1;	470	PL_tmps_floor = -1;
425	PL_tmps_ix = -1;	471	PL_tmps_ix = -1;
426	PL_tmps_max = 128;	472	PL_tmps_max = 64;
427		473
428	New(54,PL_markstack,32,I32);	474	New(54,PL_markstack,16,I32);
429	PL_markstack_ptr = PL_markstack;	475	PL_markstack_ptr = PL_markstack;
430	PL_markstack_max = PL_markstack + 32;	476	PL_markstack_max = PL_markstack + 16;
431		477
432	#ifdef SET_MARK_OFFSET	478	#ifdef SET_MARK_OFFSET
433	SET_MARK_OFFSET;	479	SET_MARK_OFFSET;
434	#endif	480	#endif
435		481
436	New(54,PL_scopestack,32,I32);	482	New(54,PL_scopestack,16,I32);
437	PL_scopestack_ix = 0;	483	PL_scopestack_ix = 0;
438	PL_scopestack_max = 32;	484	PL_scopestack_max = 16;
439		485
440	New(54,PL_savestack,64,ANY);	486	New(54,PL_savestack,32,ANY);
441	PL_savestack_ix = 0;	487	PL_savestack_ix = 0;
442	PL_savestack_max = 64;	488	PL_savestack_max = 32;
443		489
444	#if !PERL_VERSION_ATLEAST (5,9,0)	490	#if !PERL_VERSION_ATLEAST (5,9,0)
445	New(54,PL_retstack,16,OP*);	491	New(54,PL_retstack,8,OP*);
446	PL_retstack_ix = 0;	492	PL_retstack_ix = 0;
447	PL_retstack_max = 16;	493	PL_retstack_max = 8;
448	#endif	494	#endif
449	}	495	}
		496	#endif
450		497
451	/*	498	/*
452	* destroy the stacks, the callchain etc...	499	* destroy the stacks, the callchain etc...
453	*/	500	*/
454	static void	501	static void
455	coro_destroy_stacks ()	502	coro_destroy_stacks (pTHX)
456	{	503	{
457	if (!IN_DESTRUCT)	504	if (!IN_DESTRUCT)
458	{	505	{
459	/* is this ugly, I ask? */	506	/* restore all saved variables and stuff */
460	LEAVE_SCOPE (0);	507	LEAVE_SCOPE (0);
		508	assert (PL_tmps_floor == -1);
461		509
462	/* sure it is, but more important: is it correct?? :/ */	510	/* free all temporaries */
463	FREETMPS;	511	FREETMPS;
		512	assert (PL_tmps_ix == -1);
464		513
		514	/* unwind all extra stacks */
465	/POPSTACK_TO (PL_mainstack);//D//use/	515	POPSTACK_TO (PL_mainstack);
		516
		517	/* unwind main stack */
		518	dounwind (-1);
466	}	519	}
467		520
468	while (PL_curstackinfo->si_next)	521	while (PL_curstackinfo->si_next)
469	PL_curstackinfo = PL_curstackinfo->si_next;	522	PL_curstackinfo = PL_curstackinfo->si_next;
470		523
471	while (PL_curstackinfo)	524	while (PL_curstackinfo)
472	{	525	{
473	PERL_SI *p = PL_curstackinfo->si_prev;	526	PERL_SI *p = PL_curstackinfo->si_prev;
474		527
475	{ /D//remove/
476	dSP;
477	SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
478	PUTBACK; /* possibly superfluous */
479	}
480
481	if (!IN_DESTRUCT)	528	if (!IN_DESTRUCT)
482	{
483	dounwind (-1);/D//remove/
484	SvREFCNT_dec (PL_curstackinfo->si_stack);	529	SvREFCNT_dec (PL_curstackinfo->si_stack);
485	}
486		530
487	Safefree (PL_curstackinfo->si_cxstack);	531	Safefree (PL_curstackinfo->si_cxstack);
488	Safefree (PL_curstackinfo);	532	Safefree (PL_curstackinfo);
489	PL_curstackinfo = p;	533	PL_curstackinfo = p;
490	}	534	}
…		…
496	#if !PERL_VERSION_ATLEAST (5,9,0)	540	#if !PERL_VERSION_ATLEAST (5,9,0)
497	Safefree (PL_retstack);	541	Safefree (PL_retstack);
498	#endif	542	#endif
499	}	543	}
500		544
		545	static size_t
		546	coro_rss (struct coro *coro)
		547	{
		548	size_t rss = sizeof (coro);
		549
		550	if (coro->mainstack)
		551	{
		552	if (coro->flags & CF_RUNNING)
		553	{
		554	#define VAR(name,type)coro->name = PL_ ## name;
		555	# include "state.h"
		556	#undef VAR
		557	}
		558
		559	rss += sizeof (coro->curstackinfo);
		560	rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
		561	rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
		562	rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
		563	rss += coro->tmps_max * sizeof (SV *);
		564	rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
		565	rss += coro->scopestack_max * sizeof (I32);
		566	rss += coro->savestack_max * sizeof (ANY);
		567
		568	#if !PERL_VERSION_ATLEAST (5,9,0)
		569	rss += coro->retstack_max * sizeof (OP *);
		570	#endif
		571	}
		572
		573	return rss;
		574	}
		575
		576	/ coroutine stack handling **********************************************/
		577
501	static void	578	static void
502	setup_coro (struct coro *coro)	579	setup_coro (pTHX_ struct coro *coro)
503	{	580	{
504	/*	581	/*
505	* emulate part of the perl startup here.	582	* emulate part of the perl startup here.
506	*/	583	*/
507
508	coro_init_stacks ();	584	coro_init_stacks (aTHX);
509		585
510	PL_curcop = &PL_compiling;	586	PL_curcop = &PL_compiling;
511	PL_in_eval = EVAL_NULL;	587	PL_in_eval = EVAL_NULL;
		588	PL_comppad = 0;
512	PL_curpm = 0;	589	PL_curpm = 0;
513	PL_localizing = 0;	590	PL_localizing = 0;
514	PL_dirty = 0;	591	PL_dirty = 0;
515	PL_restartop = 0;	592	PL_restartop = 0;
516		593
…		…
524	Zero (&myop, 1, LOGOP);	601	Zero (&myop, 1, LOGOP);
525	myop.op_next = Nullop;	602	myop.op_next = Nullop;
526	myop.op_flags = OPf_WANT_VOID;	603	myop.op_flags = OPf_WANT_VOID;
527		604
528	PUSHMARK (SP);	605	PUSHMARK (SP);
529	XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));	606	XPUSHs (av_shift (GvAV (PL_defgv)));
530	PUTBACK;	607	PUTBACK;
531	PL_op = (OP *)&myop;	608	PL_op = (OP *)&myop;
532	PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);	609	PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
533	SPAGAIN;	610	SPAGAIN;
534	}	611	}
535		612
536	ENTER; /* necessary e.g. for dounwind */	613	ENTER; /* necessary e.g. for dounwind */
537	}	614	}
538		615
539	static void	616	static void
540	free_coro_mortal ()	617	free_coro_mortal (pTHX)
541	{	618	{
542	if (coro_mortal)	619	if (coro_mortal)
543	{	620	{
544	SvREFCNT_dec (coro_mortal);	621	SvREFCNT_dec (coro_mortal);
545	coro_mortal = 0;	622	coro_mortal = 0;
546	}	623	}
547	}	624	}
548		625
549	/* inject a fake call to Coro::State::_cctx_init into the execution */	626	/* inject a fake call to Coro::State::_cctx_init into the execution */
		627	/* _cctx_init should be careful, as it could be called at almost any time */
		628	/* during execution of a perl program */
550	static void NOINLINE	629	static void NOINLINE
551	prepare_cctx (coro_cctx *cctx)	630	prepare_cctx (pTHX_ coro_cctx *cctx)
552	{	631	{
553	dSP;	632	dSP;
554	LOGOP myop;	633	LOGOP myop;
555		634
556	Zero (&myop, 1, LOGOP);	635	Zero (&myop, 1, LOGOP);
…		…
565	PL_op = (OP *)&myop;	644	PL_op = (OP *)&myop;
566	PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);	645	PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
567	SPAGAIN;	646	SPAGAIN;
568	}	647	}
569		648
		649	/*
		650	* this is a _very_ stripped down perl interpreter ;)
		651	*/
570	static void	652	static void
571	coro_run (void *arg)	653	coro_run (void *arg)
572	{	654	{
		655	dTHX;
		656
573	/* coro_run is the alternative tail of transfer(), so unlock here. */	657	/* coro_run is the alternative tail of transfer(), so unlock here. */
574	UNLOCK;	658	UNLOCK;
575		659
576	/*
577	* this is a _very_ stripped down perl interpreter ;)
578	*/
579	PL_top_env = &PL_start_env;	660	PL_top_env = &PL_start_env;
580		661
581	/* inject call to cctx_init */	662	/* inject a fake subroutine call to cctx_init */
582	prepare_cctx ((coro_cctx *)arg);	663	prepare_cctx (aTHX_ (coro_cctx *)arg);
583		664
584	/* somebody will hit me for both perl_run and PL_restartop */	665	/* somebody or something will hit me for both perl_run and PL_restartop */
585	PL_restartop = PL_op;	666	PL_restartop = PL_op;
586	perl_run (PL_curinterp);	667	perl_run (PL_curinterp);
587		668
588	fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);	669	/*
589	abort ();	670	* If perl-run returns we assume exit() was being called or the coro
		671	* fell off the end, which seems to be the only valid (non-bug)
		672	* reason for perl_run to return. We try to exit by jumping to the
		673	* bootstrap-time "top" top_env, as we cannot restore the "main"
		674	* coroutine as Coro has no such concept
		675	*/
		676	PL_top_env = main_top_env;
		677	JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
590	}	678	}
591		679
592	static coro_cctx *	680	static coro_cctx *
593	cctx_new ()	681	cctx_new ()
594	{	682	{
595	coro_cctx *cctx;	683	coro_cctx *cctx;
		684	void *stack_start;
		685	size_t stack_size;
596		686
597	++cctx_count;	687	++cctx_count;
598		688
599	Newz (0, cctx, 1, coro_cctx);	689	Newz (0, cctx, 1, coro_cctx);
600		690
601	#if HAVE_MMAP	691	#if HAVE_MMAP
602		692
603	cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;	693	cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
604	/* mmap supposedly does allocate-on-write for us */	694	/* mmap supposedly does allocate-on-write for us */
605	cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC\|PROT_READ\|PROT_WRITE, MAP_PRIVATE\|MAP_ANONYMOUS, 0, 0);	695	cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC\|PROT_READ\|PROT_WRITE, MAP_PRIVATE\|MAP_ANONYMOUS, 0, 0);
606		696
607	if (cctx->sptr == (void *)-1)	697	if (cctx->sptr != (void *)-1)
608	{
609	perror ("FATAL: unable to mmap stack for coroutine");
610	_exit (EXIT_FAILURE);
611	}	698	{
612
613	# if STACKGUARD	699	# if CORO_STACKGUARD
614	mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE);	700	mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
615	# endif	701	# endif
		702	stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
		703	stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
		704	cctx->mapped = 1;
		705	}
		706	else
		707	#endif
		708	{
		709	cctx->ssize = coro_stacksize * (long)sizeof (long);
		710	New (0, cctx->sptr, coro_stacksize, long);
616		711
617	#else
618
619	cctx->ssize = STACKSIZE * (long)sizeof (long);
620	New (0, cctx->sptr, STACKSIZE, long);
621
622	if (!cctx->sptr)	712	if (!cctx->sptr)
623	{	713	{
624	perror ("FATAL: unable to malloc stack for coroutine");	714	perror ("FATAL: unable to allocate stack for coroutine");
625	_exit (EXIT_FAILURE);	715	_exit (EXIT_FAILURE);
626	}	716	}
627		717
628	#endif	718	stack_start = cctx->sptr;
		719	stack_size = cctx->ssize;
		720	}
629		721
630	#if USE_VALGRIND	722	REGISTER_STACK (cctx, (char )stack_start, (char )stack_start + stack_size);
631	cctx->valgrind_id = VALGRIND_STACK_REGISTER (
632	STACKGUARD * PAGESIZE + (char *)cctx->sptr,
633	cctx->ssize + (char *)cctx->sptr
634	);
635	#endif
636
637	coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize);	723	coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
638		724
639	return cctx;	725	return cctx;
640	}	726	}
641		727
642	static void	728	static void
…		…
645	if (!cctx)	731	if (!cctx)
646	return;	732	return;
647		733
648	--cctx_count;	734	--cctx_count;
649		735
650	#if USE_VALGRIND	736	#if CORO_USE_VALGRIND
651	VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);	737	VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
652	#endif	738	#endif
653		739
654	#if HAVE_MMAP	740	#if HAVE_MMAP
		741	if (cctx->mapped)
655	munmap (cctx->sptr, cctx->ssize);	742	munmap (cctx->sptr, cctx->ssize);
656	#else	743	else
		744	#endif
657	Safefree (cctx->sptr);	745	Safefree (cctx->sptr);
658	#endif
659		746
660	Safefree (cctx);	747	Safefree (cctx);
661	}	748	}
662		749
663	static coro_cctx *	750	static coro_cctx *
664	cctx_get ()	751	cctx_get (pTHX)
665	{	752	{
666	coro_cctx *cctx;
667
668	if (cctx_first)	753	while (cctx_first)
669	{	754	{
670	cctx = cctx_first;	755	coro_cctx *cctx = cctx_first;
671	cctx_first = cctx->next;	756	cctx_first = cctx->next;
672	--cctx_idle;	757	--cctx_idle;
		758
		759	if (cctx->ssize >= coro_stacksize)
		760	return cctx;
		761
		762	cctx_destroy (cctx);
673	}	763	}
674	else	764
675	{
676	cctx = cctx_new ();
677	PL_op = PL_op->op_next;	765	PL_op = PL_op->op_next;
678	}
679
680	return cctx;	766	return cctx_new ();
681	}	767	}
682		768
683	static void	769	static void
684	cctx_put (coro_cctx *cctx)	770	cctx_put (coro_cctx *cctx)
685	{	771	{
…		…
697	++cctx_idle;	783	++cctx_idle;
698	cctx->next = cctx_first;	784	cctx->next = cctx_first;
699	cctx_first = cctx;	785	cctx_first = cctx;
700	}	786	}
701		787
		788	/ coroutine switching ***************************************************/
		789
702	/* never call directly, always through the coro_state_transfer global variable */	790	/* never call directly, always through the coro_state_transfer global variable */
703	static void NOINLINE	791	static void NOINLINE
704	transfer (struct coro prev, struct coro next)	792	transfer (pTHX_ struct coro prev, struct coro next)
705	{	793	{
706	dSTACKLEVEL;	794	dSTACKLEVEL;
707		795
708	/* sometimes transfer is only called to set idle_sp */	796	/* sometimes transfer is only called to set idle_sp */
709	if (!next)	797	if (!next)
710	{	798	{
711	((coro_cctx *)prev)->idle_sp = STACKLEVEL;	799	((coro_cctx *)prev)->idle_sp = STACKLEVEL;
712	assert (((coro_cctx )prev)->top_env = PL_top_env); / just for the side effetc when assert is enabled */	800	assert (((coro_cctx )prev)->idle_te = PL_top_env); / just for the side-effect when asserts are enabled */
713	}	801	}
714	else if (prev != next)	802	else if (prev != next)
715	{	803	{
716	coro_cctx *prev__cctx;	804	coro_cctx *prev__cctx;
717		805
…		…
729	croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");	817	croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
730		818
731	if (next->flags & CF_RUNNING)	819	if (next->flags & CF_RUNNING)
732	croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");	820	croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
733		821
		822	if (next->flags & CF_DESTROYED)
		823	croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
		824
734	prev->flags &= ~CF_RUNNING;	825	prev->flags &= ~CF_RUNNING;
735	next->flags \|= CF_RUNNING;	826	next->flags \|= CF_RUNNING;
736		827
737	LOCK;	828	LOCK;
738		829
739	if (next->flags & CF_NEW)	830	if (next->flags & CF_NEW)
740	{	831	{
741	/* need to start coroutine */	832	/* need to start coroutine */
742	next->flags &= ~CF_NEW;	833	next->flags &= ~CF_NEW;
743	/* first get rid of the old state */	834	/* first get rid of the old state */
744	save_perl (prev);	835	save_perl (aTHX_ prev);
745	/* setup coroutine call */	836	/* setup coroutine call */
746	setup_coro (next);	837	setup_coro (aTHX_ next);
747	/* need a new stack */	838	/* need a new stack */
748	assert (!next->cctx);	839	assert (!next->cctx);
749	}	840	}
750	else	841	else
751	{	842	{
752	/* coroutine already started */	843	/* coroutine already started */
753	save_perl (prev);	844	save_perl (aTHX_ prev);
754	load_perl (next);	845	load_perl (aTHX_ next);
755	}	846	}
756		847
757	prev__cctx = prev->cctx;	848	prev__cctx = prev->cctx;
758		849
759	/* possibly "free" the cctx */	850	/* possibly "free" the cctx */
760	if (prev__cctx->idle_sp == STACKLEVEL)	851	if (prev__cctx->idle_sp == STACKLEVEL)
761	{	852	{
762	/* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */	853	/* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
763	assert (PL_top_env == prev__cctx->top_env);	854	assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
764		855
765	prev->cctx = 0;	856	prev->cctx = 0;
766		857
767	cctx_put (prev__cctx);	858	cctx_put (prev__cctx);
768	prev__cctx->inuse = 0;	859	prev__cctx->inuse = 0;
769	}	860	}
770		861
771	if (!next->cctx)	862	if (!next->cctx)
772	{	863	{
773	next->cctx = cctx_get ();	864	next->cctx = cctx_get (aTHX);
774	assert (!next->cctx->inuse);	865	assert (!next->cctx->inuse);
775	next->cctx->inuse = 1;	866	next->cctx->inuse = 1;
776	}	867	}
777		868
778	if (prev__cctx != next->cctx)	869	if (prev__cctx != next->cctx)
…		…
780	prev__cctx->top_env = PL_top_env;	871	prev__cctx->top_env = PL_top_env;
781	PL_top_env = next->cctx->top_env;	872	PL_top_env = next->cctx->top_env;
782	coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);	873	coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
783	}	874	}
784		875
785	free_coro_mortal ();	876	free_coro_mortal (aTHX);
786
787	UNLOCK;	877	UNLOCK;
788	}	878	}
789	}	879	}
790		880
791	struct transfer_args	881	struct transfer_args
792	{	882	{
793	struct coro prev, next;	883	struct coro prev, next;
794	};	884	};
795		885
796	#define TRANSFER(ta) transfer ((ta).prev, (ta).next)	886	#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
797		887
		888	/ high level stuff ******************************************************/
		889
798	static void	890	static int
799	coro_state_destroy (struct coro *coro)	891	coro_state_destroy (pTHX_ struct coro *coro)
800	{	892	{
801	if (coro->refcnt--)	893	if (coro->flags & CF_DESTROYED)
802	return;	894	return 0;
		895
		896	coro->flags \|= CF_DESTROYED;
		897
		898	if (coro->flags & CF_READY)
		899	{
		900	/* reduce nready, as destroying a ready coro effectively unreadies it */
		901	/* alternative: look through all ready queues and remove the coro */
		902	LOCK;
		903	--coro_nready;
		904	UNLOCK;
		905	}
		906	else
		907	coro->flags \|= CF_READY; /* make sure it is NOT put into the readyqueue */
803		908
804	if (coro->mainstack && coro->mainstack != main_mainstack)	909	if (coro->mainstack && coro->mainstack != main_mainstack)
805	{	910	{
806	struct coro temp;	911	struct coro temp;
		912
		913	assert (!(coro->flags & CF_RUNNING));
		914
807	Zero (&temp, 1, struct coro);	915	Zero (&temp, 1, struct coro);
808	temp.save = CORO_SAVE_ALL;	916	temp.save = CORO_SAVE_ALL;
809		917
810	if (coro->flags & CF_RUNNING)	918	if (coro->flags & CF_RUNNING)
811	croak ("FATAL: tried to destroy currently running coroutine");	919	croak ("FATAL: tried to destroy currently running coroutine");
812		920
813	save_perl (&temp);	921	save_perl (aTHX_ &temp);
814	load_perl (coro);	922	load_perl (aTHX_ coro);
815		923
816	coro_destroy_stacks ();	924	coro_destroy_stacks (aTHX);
817		925
818	load_perl (&temp); /* this will get rid of defsv etc.. */	926	load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
819		927
820	coro->mainstack = 0;	928	coro->mainstack = 0;
821	}	929	}
822		930
823	cctx_destroy (coro->cctx);	931	cctx_destroy (coro->cctx);
824	SvREFCNT_dec (coro->args);	932	SvREFCNT_dec (coro->args);
825	Safefree (coro);	933
		934	if (coro->next) coro->next->prev = coro->prev;
		935	if (coro->prev) coro->prev->next = coro->next;
		936	if (coro == coro_first) coro_first = coro->next;
		937
		938	return 1;
826	}	939	}
827		940
828	static int	941	static int
829	coro_state_clear (pTHX_ SV sv, MAGIC mg)	942	coro_state_free (pTHX_ SV sv, MAGIC mg)
830	{	943	{
831	struct coro coro = (struct coro )mg->mg_ptr;	944	struct coro coro = (struct coro )mg->mg_ptr;
832	mg->mg_ptr = 0;	945	mg->mg_ptr = 0;
833		946
		947	coro->hv = 0;
		948
		949	if (--coro->refcnt < 0)
		950	{
834	coro_state_destroy (coro);	951	coro_state_destroy (aTHX_ coro);
		952	Safefree (coro);
		953	}
835		954
836	return 0;	955	return 0;
837	}	956	}
838		957
839	static int	958	static int
…		…
846	return 0;	965	return 0;
847	}	966	}
848		967
849	static MGVTBL coro_state_vtbl = {	968	static MGVTBL coro_state_vtbl = {
850	0, 0, 0, 0,	969	0, 0, 0, 0,
851	coro_state_clear,	970	coro_state_free,
852	0,	971	0,
853	#ifdef MGf_DUP	972	#ifdef MGf_DUP
854	coro_state_dup,	973	coro_state_dup,
855	#else	974	#else
856	# define MGf_DUP 0	975	# define MGf_DUP 0
857	#endif	976	#endif
858	};	977	};
859		978
860	static struct coro *	979	static struct coro *
861	SvSTATE (SV *coro)	980	SvSTATE_ (pTHX_ SV *coro)
862	{	981	{
863	HV *stash;	982	HV *stash;
864	MAGIC *mg;	983	MAGIC *mg;
865		984
866	if (SvROK (coro))	985	if (SvROK (coro))
…		…
872	/* very slow, but rare, check */	991	/* very slow, but rare, check */
873	if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))	992	if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
874	croak ("Coro::State object required");	993	croak ("Coro::State object required");
875	}	994	}
876		995
877	mg = SvMAGIC (coro);	996	mg = CORO_MAGIC (coro);
878	assert (mg->mg_type == PERL_MAGIC_ext);
879	return (struct coro *)mg->mg_ptr;	997	return (struct coro *)mg->mg_ptr;
880	}	998	}
881		999
		1000	#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
		1001
882	static void	1002	static void
883	prepare_transfer (struct transfer_args ta, SV prev_sv, SV *next_sv)	1003	prepare_transfer (pTHX_ struct transfer_args ta, SV prev_sv, SV *next_sv)
884	{	1004	{
885	ta->prev = SvSTATE (prev_sv);	1005	ta->prev = SvSTATE (prev_sv);
886	ta->next = SvSTATE (next_sv);	1006	ta->next = SvSTATE (next_sv);
887	}	1007	}
888		1008
889	static void	1009	static void
890	api_transfer (SV prev_sv, SV next_sv)	1010	api_transfer (SV prev_sv, SV next_sv)
891	{	1011	{
		1012	dTHX;
892	struct transfer_args ta;	1013	struct transfer_args ta;
893		1014
894	prepare_transfer (&ta, prev_sv, next_sv);	1015	prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
895	TRANSFER (ta);	1016	TRANSFER (ta);
896	}	1017	}
897		1018
898	static int	1019	static int
899	api_save (SV *coro_sv, int new_save)	1020	api_save (SV *coro_sv, int new_save)
900	{	1021	{
		1022	dTHX;
901	struct coro *coro = SvSTATE (coro_sv);	1023	struct coro *coro = SvSTATE (coro_sv);
902	int old_save = coro->save;	1024	int old_save = coro->save;
903		1025
904	if (new_save >= 0)	1026	if (new_save >= 0)
905	coro->save = new_save;	1027	coro->save = new_save;
…		…
907	return old_save;	1029	return old_save;
908	}	1030	}
909		1031
910	/ Coro ******************************************************************/	1032	/ Coro ******************************************************************/
911		1033
912	#define PRIO_MAX 3
913	#define PRIO_HIGH 1
914	#define PRIO_NORMAL 0
915	#define PRIO_LOW -1
916	#define PRIO_IDLE -3
917	#define PRIO_MIN -4
918
919	/* for Coro.pm */
920	static SV *coro_current;
921	static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
922	static int coro_nready;
923
924	static void	1034	static void
925	coro_enq (SV *coro_sv)	1035	coro_enq (pTHX_ SV *coro_sv)
926	{	1036	{
927	av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);	1037	av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
928	coro_nready++;
929	}	1038	}
930		1039
931	static SV *	1040	static SV *
932	coro_deq (int min_prio)	1041	coro_deq (pTHX_ int min_prio)
933	{	1042	{
934	int prio = PRIO_MAX - PRIO_MIN;	1043	int prio = PRIO_MAX - PRIO_MIN;
935		1044
936	min_prio -= PRIO_MIN;	1045	min_prio -= PRIO_MIN;
937	if (min_prio < 0)	1046	if (min_prio < 0)
938	min_prio = 0;	1047	min_prio = 0;
939		1048
940	for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )	1049	for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
941	if (AvFILLp (coro_ready [prio]) >= 0)	1050	if (AvFILLp (coro_ready [prio]) >= 0)
942	{
943	coro_nready--;
944	return av_shift (coro_ready [prio]);	1051	return av_shift (coro_ready [prio]);
945	}
946		1052
947	return 0;	1053	return 0;
948	}	1054	}
949		1055
950	static int	1056	static int
951	api_ready (SV *coro_sv)	1057	api_ready (SV *coro_sv)
952	{	1058	{
		1059	dTHX;
953	struct coro *coro;	1060	struct coro *coro;
954		1061
955	if (SvROK (coro_sv))	1062	if (SvROK (coro_sv))
956	coro_sv = SvRV (coro_sv);	1063	coro_sv = SvRV (coro_sv);
957		1064
958	coro = SvSTATE (coro_sv);	1065	coro = SvSTATE (coro_sv);
959		1066
960	if (coro->flags & CF_READY)	1067	if (coro->flags & CF_READY)
961	return 0;	1068	return 0;
962		1069
963	#if 0 /* this is actually harmless */
964	if (coro->flags & CF_RUNNING)
965	croak ("Coro::ready called on currently running coroutine");
966	#endif
967
968	coro->flags \|= CF_READY;	1070	coro->flags \|= CF_READY;
969		1071
970	LOCK;	1072	LOCK;
971	coro_enq (SvREFCNT_inc (coro_sv));	1073	coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
		1074	++coro_nready;
972	UNLOCK;	1075	UNLOCK;
973		1076
974	return 1;	1077	return 1;
975	}	1078	}
976		1079
977	static int	1080	static int
978	api_is_ready (SV *coro_sv)	1081	api_is_ready (SV *coro_sv)
979	{	1082	{
		1083	dTHX;
980	return !!SvSTATE (coro_sv)->flags & CF_READY;	1084	return !!(SvSTATE (coro_sv)->flags & CF_READY);
981	}	1085	}
982		1086
983	static void	1087	static void
984	prepare_schedule (struct transfer_args *ta)	1088	prepare_schedule (pTHX_ struct transfer_args *ta)
985	{	1089	{
986	SV prev, next;	1090	SV prev_sv, next_sv;
987		1091
988	for (;;)	1092	for (;;)
989	{	1093	{
990	LOCK;	1094	LOCK;
991	next = coro_deq (PRIO_MIN);	1095	next_sv = coro_deq (aTHX_ PRIO_MIN);
		1096
		1097	/* nothing to schedule: call the idle handler */
		1098	if (!next_sv)
		1099	{
		1100	dSP;
		1101	UNLOCK;
		1102
		1103	ENTER;
		1104	SAVETMPS;
		1105
		1106	PUSHMARK (SP);
		1107	PUTBACK;
		1108	call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
		1109
		1110	FREETMPS;
		1111	LEAVE;
		1112	continue;
		1113	}
		1114
		1115	ta->next = SvSTATE (next_sv);
		1116
		1117	/* cannot transfer to destroyed coros, skip and look for next */
		1118	if (ta->next->flags & CF_DESTROYED)
		1119	{
		1120	UNLOCK;
		1121	SvREFCNT_dec (next_sv);
		1122	/* coro_nready is already taken care of by destroy */
		1123	continue;
		1124	}
		1125
		1126	--coro_nready;
992	UNLOCK;	1127	UNLOCK;
993
994	if (next)
995	break;	1128	break;
996
997	{
998	dSP;
999
1000	ENTER;
1001	SAVETMPS;
1002
1003	PUSHMARK (SP);
1004	PUTBACK;
1005	call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1006
1007	FREETMPS;
1008	LEAVE;
1009	}	1129	}
1010	}
1011
1012	prev = SvRV (coro_current);
1013	SvRV_set (coro_current, next);
1014		1130
1015	/* free this only after the transfer */	1131	/* free this only after the transfer */
1016	LOCK;	1132	prev_sv = SvRV (coro_current);
1017	free_coro_mortal ();	1133	SvRV_set (coro_current, next_sv);
1018	UNLOCK;
1019	coro_mortal = prev;
1020
1021	assert (!SvROK(prev));//D
1022	assert (!SvROK(next));//D
1023
1024	ta->prev = SvSTATE (prev);	1134	ta->prev = SvSTATE (prev_sv);
1025	ta->next = SvSTATE (next);
1026		1135
1027	assert (ta->next->flags & CF_READY);	1136	assert (ta->next->flags & CF_READY);
1028	ta->next->flags &= ~CF_READY;	1137	ta->next->flags &= ~CF_READY;
1029	}
1030		1138
		1139	LOCK;
		1140	free_coro_mortal (aTHX);
		1141	coro_mortal = prev_sv;
		1142	UNLOCK;
		1143	}
		1144
1031	static void	1145	static void
1032	prepare_cede (struct transfer_args *ta)	1146	prepare_cede (pTHX_ struct transfer_args *ta)
1033	{	1147	{
1034	api_ready (coro_current);	1148	api_ready (coro_current);
1035
1036	prepare_schedule (ta);	1149	prepare_schedule (aTHX_ ta);
		1150	}
		1151
		1152	static int
		1153	prepare_cede_notself (pTHX_ struct transfer_args *ta)
		1154	{
		1155	if (coro_nready)
		1156	{
		1157	SV *prev = SvRV (coro_current);
		1158	prepare_schedule (aTHX_ ta);
		1159	api_ready (prev);
		1160	return 1;
		1161	}
		1162	else
		1163	return 0;
1037	}	1164	}
1038		1165
1039	static void	1166	static void
1040	api_schedule (void)	1167	api_schedule (void)
1041	{	1168	{
		1169	dTHX;
1042	struct transfer_args ta;	1170	struct transfer_args ta;
1043		1171
1044	prepare_schedule (&ta);	1172	prepare_schedule (aTHX_ &ta);
1045	TRANSFER (ta);	1173	TRANSFER (ta);
1046	}	1174	}
1047		1175
1048	static void	1176	static int
1049	api_cede (void)	1177	api_cede (void)
1050	{	1178	{
		1179	dTHX;
1051	struct transfer_args ta;	1180	struct transfer_args ta;
1052		1181
1053	prepare_cede (&ta);	1182	prepare_cede (aTHX_ &ta);
		1183
		1184	if (ta.prev != ta.next)
		1185	{
1054	TRANSFER (ta);	1186	TRANSFER (ta);
		1187	return 1;
		1188	}
		1189	else
		1190	return 0;
		1191	}
		1192
		1193	static int
		1194	api_cede_notself (void)
		1195	{
		1196	dTHX;
		1197	struct transfer_args ta;
		1198
		1199	if (prepare_cede_notself (aTHX_ &ta))
		1200	{
		1201	TRANSFER (ta);
		1202	return 1;
		1203	}
		1204	else
		1205	return 0;
1055	}	1206	}
1056		1207
1057	MODULE = Coro::State PACKAGE = Coro::State	1208	MODULE = Coro::State PACKAGE = Coro::State
1058		1209
1059	PROTOTYPES: DISABLE	1210	PROTOTYPES: DISABLE
…		…
1069		1220
1070	newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));	1221	newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1071	newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));	1222	newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1072	newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));	1223	newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1073	newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));	1224	newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
		1225	newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
		1226	newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1074	newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));	1227	newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1075		1228
1076	main_mainstack = PL_mainstack;	1229	main_mainstack = PL_mainstack;
		1230	main_top_env = PL_top_env;
		1231
		1232	while (main_top_env->je_prev)
		1233	main_top_env = main_top_env->je_prev;
1077		1234
1078	coroapi.ver = CORO_API_VERSION;	1235	coroapi.ver = CORO_API_VERSION;
1079	coroapi.transfer = api_transfer;	1236	coroapi.transfer = api_transfer;
1080		1237
1081	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));	1238	assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
…		…
1089	HV *hv;	1246	HV *hv;
1090	int i;	1247	int i;
1091		1248
1092	Newz (0, coro, 1, struct coro);	1249	Newz (0, coro, 1, struct coro);
1093	coro->args = newAV ();	1250	coro->args = newAV ();
1094	coro->save = CORO_SAVE_ALL;	1251	coro->save = CORO_SAVE_DEF;
1095	coro->flags = CF_NEW;	1252	coro->flags = CF_NEW;
1096		1253
		1254	if (coro_first) coro_first->prev = coro;
		1255	coro->next = coro_first;
		1256	coro_first = coro;
		1257
1097	hv = newHV ();	1258	coro->hv = hv = newHV ();
1098	sv_magicext ((SV )hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char )coro, 0)->mg_flags \|= MGf_DUP;	1259	sv_magicext ((SV )hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char )coro, 0)->mg_flags \|= MGf_DUP;
1099	RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	1260	RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1100		1261
1101	for (i = 1; i < items; i++)	1262	for (i = 1; i < items; i++)
1102	av_push (coro->args, newSVsv (ST (i)));	1263	av_push (coro->args, newSVsv (ST (i)));
…		…
1109	CODE:	1270	CODE:
1110	RETVAL = api_save (coro, new_save);	1271	RETVAL = api_save (coro, new_save);
1111	OUTPUT:	1272	OUTPUT:
1112	RETVAL	1273	RETVAL
1113		1274
		1275	int
		1276	save_also (SV *coro_sv, int save_also)
		1277	CODE:
		1278	{
		1279	struct coro *coro = SvSTATE (coro_sv);
		1280	RETVAL = coro->save;
		1281	coro->save \|= save_also;
		1282	}
		1283	OUTPUT:
		1284	RETVAL
		1285
1114	void	1286	void
1115	_set_stacklevel (...)	1287	_set_stacklevel (...)
1116	ALIAS:	1288	ALIAS:
1117	Coro::State::transfer = 1	1289	Coro::State::transfer = 1
1118	Coro::schedule = 2	1290	Coro::schedule = 2
1119	Coro::cede = 3	1291	Coro::cede = 3
		1292	Coro::cede_notself = 4
1120	CODE:	1293	CODE:
1121	{	1294	{
1122	struct transfer_args ta;	1295	struct transfer_args ta;
1123		1296
1124	switch (ix)	1297	switch (ix)
…		…
1130		1303
1131	case 1:	1304	case 1:
1132	if (items != 2)	1305	if (items != 2)
1133	croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);	1306	croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1134		1307
1135	prepare_transfer (&ta, ST (0), ST (1));	1308	prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1136	break;	1309	break;
1137		1310
1138	case 2:	1311	case 2:
1139	prepare_schedule (&ta);	1312	prepare_schedule (aTHX_ &ta);
1140	break;	1313	break;
1141		1314
1142	case 3:	1315	case 3:
1143	prepare_cede (&ta);	1316	prepare_cede (aTHX_ &ta);
		1317	break;
		1318
		1319	case 4:
		1320	if (!prepare_cede_notself (aTHX_ &ta))
		1321	XSRETURN_EMPTY;
		1322
1144	break;	1323	break;
1145	}	1324	}
1146		1325
		1326	BARRIER;
1147	TRANSFER (ta);	1327	TRANSFER (ta);
1148	}
1149		1328
1150	void	1329	if (GIMME_V != G_VOID && ta.next != ta.prev)
1151	_clone_state_from (SV dst, SV src)	1330	XSRETURN_YES;
		1331	}
		1332
		1333	bool
		1334	_destroy (SV *coro_sv)
1152	CODE:	1335	CODE:
1153	{	1336	RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1154	struct coro *coro_src = SvSTATE (src);	1337	OUTPUT:
1155		1338	RETVAL
1156	sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1157
1158	++coro_src->refcnt;
1159	sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags \|= MGf_DUP;
1160	}
1161		1339
1162	void	1340	void
1163	_exit (code)	1341	_exit (code)
1164	int code	1342	int code
1165	PROTOTYPE: $	1343	PROTOTYPE: $
1166	CODE:	1344	CODE:
1167	_exit (code);	1345	_exit (code);
1168		1346
1169	int	1347	int
		1348	cctx_stacksize (int new_stacksize = 0)
		1349	CODE:
		1350	RETVAL = coro_stacksize;
		1351	if (new_stacksize)
		1352	coro_stacksize = new_stacksize;
		1353	OUTPUT:
		1354	RETVAL
		1355
		1356	int
1170	cctx_count ()	1357	cctx_count ()
1171	CODE:	1358	CODE:
1172	RETVAL = cctx_count;	1359	RETVAL = cctx_count;
1173	OUTPUT:	1360	OUTPUT:
1174	RETVAL	1361	RETVAL
…		…
1178	CODE:	1365	CODE:
1179	RETVAL = cctx_idle;	1366	RETVAL = cctx_idle;
1180	OUTPUT:	1367	OUTPUT:
1181	RETVAL	1368	RETVAL
1182		1369
		1370	void
		1371	list ()
		1372	PPCODE:
		1373	{
		1374	struct coro *coro;
		1375	for (coro = coro_first; coro; coro = coro->next)
		1376	if (coro->hv)
		1377	XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
		1378	}
		1379
		1380	void
		1381	_eval (Coro::State coro, SV *coderef)
		1382	CODE:
		1383	{
		1384	if (coro->mainstack)
		1385	{
		1386	struct coro temp;
		1387	Zero (&temp, 1, struct coro);
		1388	temp.save = CORO_SAVE_ALL;
		1389
		1390	if (!(coro->flags & CF_RUNNING))
		1391	{
		1392	save_perl (aTHX_ &temp);
		1393	load_perl (aTHX_ coro);
		1394	}
		1395
		1396	{
		1397	dSP;
		1398	ENTER;
		1399	SAVETMPS;
		1400	PUSHMARK (SP);
		1401	PUTBACK;
		1402	call_sv (coderef, G_KEEPERR \| G_EVAL \| G_VOID \| G_DISCARD);
		1403	SPAGAIN;
		1404	FREETMPS;
		1405	LEAVE;
		1406	PUTBACK;
		1407	}
		1408
		1409	if (!(coro->flags & CF_RUNNING))
		1410	{
		1411	save_perl (aTHX_ coro);
		1412	load_perl (aTHX_ &temp);
		1413	}
		1414	}
		1415	}
		1416
		1417	SV *
		1418	is_ready (Coro::State coro)
		1419	PROTOTYPE: $
		1420	ALIAS:
		1421	is_ready = CF_READY
		1422	is_running = CF_RUNNING
		1423	is_new = CF_NEW
		1424	is_destroyed = CF_DESTROYED
		1425	CODE:
		1426	RETVAL = boolSV (coro->flags & ix);
		1427	OUTPUT:
		1428	RETVAL
		1429
		1430	IV
		1431	rss (Coro::State coro)
		1432	PROTOTYPE: $
		1433	CODE:
		1434	RETVAL = coro_rss (coro);
		1435	OUTPUT:
		1436	RETVAL
		1437
		1438
1183	MODULE = Coro::State PACKAGE = Coro	1439	MODULE = Coro::State PACKAGE = Coro
1184		1440
1185	BOOT:	1441	BOOT:
1186	{	1442	{
1187	int i;	1443	int i;
…		…
1202	coro_ready[i] = newAV ();	1458	coro_ready[i] = newAV ();
1203		1459
1204	{	1460	{
1205	SV *sv = perl_get_sv("Coro::API", 1);	1461	SV *sv = perl_get_sv("Coro::API", 1);
1206		1462
1207	coroapi.schedule = api_schedule;	1463	coroapi.schedule = api_schedule;
1208	coroapi.save = api_save;	1464	coroapi.save = api_save;
1209	coroapi.cede = api_cede;	1465	coroapi.cede = api_cede;
		1466	coroapi.cede_notself = api_cede_notself;
1210	coroapi.ready = api_ready;	1467	coroapi.ready = api_ready;
1211	coroapi.is_ready = api_is_ready;	1468	coroapi.is_ready = api_is_ready;
1212	coroapi.nready = &coro_nready;	1469	coroapi.nready = &coro_nready;
1213	coroapi.current = coro_current;	1470	coroapi.current = coro_current;
1214		1471
1215	GCoroAPI = &coroapi;	1472	GCoroAPI = &coroapi;
1216	sv_setiv (sv, (IV)&coroapi);	1473	sv_setiv (sv, (IV)&coroapi);
1217	SvREADONLY_on (sv);	1474	SvREADONLY_on (sv);
1218	}	1475	}
…		…
1234	RETVAL = coro->prio;	1491	RETVAL = coro->prio;
1235		1492
1236	if (items > 1)	1493	if (items > 1)
1237	{	1494	{
1238	if (ix)	1495	if (ix)
1239	newprio += coro->prio;	1496	newprio = coro->prio - newprio;
1240		1497
1241	if (newprio < PRIO_MIN) newprio = PRIO_MIN;	1498	if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1242	if (newprio > PRIO_MAX) newprio = PRIO_MAX;	1499	if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1243		1500
1244	coro->prio = newprio;	1501	coro->prio = newprio;
1245	}	1502	}
1246	}	1503	}
		1504	OUTPUT:
		1505	RETVAL
1247		1506
1248	SV *	1507	SV *
1249	ready (SV *self)	1508	ready (SV *self)
1250	PROTOTYPE: $	1509	PROTOTYPE: $
1251	CODE:	1510	CODE:
1252	RETVAL = boolSV (api_ready (self));	1511	RETVAL = boolSV (api_ready (self));
1253	OUTPUT:	1512	OUTPUT:
1254	RETVAL	1513	RETVAL
1255		1514
1256	SV *
1257	is_ready (SV *self)
1258	PROTOTYPE: $
1259	CODE:
1260	RETVAL = boolSV (api_is_ready (self));
1261	OUTPUT:
1262	RETVAL
1263
1264	int	1515	int
1265	nready (...)	1516	nready (...)
1266	PROTOTYPE:	1517	PROTOTYPE:
1267	CODE:	1518	CODE:
1268	RETVAL = coro_nready;	1519	RETVAL = coro_nready;

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.124 by root, Tue Dec 5 12:50:04 2006 UTC vs. Revision 1.154 by root, Fri Sep 21 01:08:06 2007 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.124 by root, Tue Dec 5 12:50:04 2006 UTC vs.
Revision 1.154 by root, Fri Sep 21 01:08:06 2007 UTC