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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.101 by root, Mon Nov 27 00:08:18 2006 UTC vs.
Revision 1.141 by root, Mon Jan 22 18:45:17 2007 UTC

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

Diff Legend

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

Comparing Coro/Coro/State.xs (file contents): Revision 1.101 by root, Mon Nov 27 00:08:18 2006 UTC vs. Revision 1.141 by root, Mon Jan 22 18:45:17 2007 UTC

Diff Legend

Comparing Coro/Coro/State.xs (file contents):
Revision 1.101 by root, Mon Nov 27 00:08:18 2006 UTC vs.
Revision 1.141 by root, Mon Jan 22 18:45:17 2007 UTC