[ViewVC] Diff of: cvs/IO-AIO/AIO.xs

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.4 by root, Sun Jul 10 20:57:00 2005 UTC vs.
Revision 1.17 by root, Sun Jul 31 18:45:48 2005 UTC

…		…
1	#define PERL_NO_GET_CONTEXT
2
3	#include "EXTERN.h"	1	#include "EXTERN.h"
4	#include "perl.h"	2	#include "perl.h"
5	#include "XSUB.h"	3	#include "XSUB.h"
6		4
		5	#include "autoconf/config.h"
		6
7	#include <sys/types.h>	7	#include <sys/types.h>
8	#include <sys/stat.h>	8	#include <sys/stat.h>
		9
9	#include <unistd.h>	10	#include <unistd.h>
10	#include <fcntl.h>	11	#include <fcntl.h>
11	#include <signal.h>	12	#include <signal.h>
12	#include <sched.h>	13	#include <sched.h>
13	#include <endian.h>
14		14
15	#include <pthread.h>	15	#include <pthread.h>
16	#include <sys/syscall.h>
17		16
18	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */	17	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */
19	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */	18	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */
20	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */	19	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */
21		20
42	off_t offset;	41	off_t offset;
43	size_t length;	42	size_t length;
44	ssize_t result;	43	ssize_t result;
45	mode_t mode; /* open */	44	mode_t mode; /* open */
46	int errorno;	45	int errorno;
47	SV data, callback;	46	SV data, callback, *fh;
48	void *dataptr;	47	void *dataptr;
49	STRLEN dataoffset;	48	STRLEN dataoffset;
50		49
51	Stat_t *statdata;	50	Stat_t *statdata;
52	} aio_cb;	51	} aio_cb;
53		52
54	typedef aio_cb *aio_req;	53	typedef aio_cb *aio_req;
55		54
56	static int started;	55	static int started;
57	static int nreqs;	56	static volatile int nreqs;
58	static int max_outstanding = 1<<30;	57	static int max_outstanding = 1<<30;
59	static int respipe [2];	58	static int respipe [2];
60		59
61	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	60	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
62	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	61	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
…		…
66	static volatile aio_req ress, rese; /* queue start, queue end */	65	static volatile aio_req ress, rese; /* queue start, queue end */
67		66
68	static void	67	static void
69	poll_wait ()	68	poll_wait ()
70	{	69	{
71	if (!nreqs)	70	if (nreqs && !ress)
72	return;	71	{
73
74	fd_set rfd;	72	fd_set rfd;
75	FD_ZERO(&rfd);	73	FD_ZERO(&rfd);
76	FD_SET(respipe [0], &rfd);	74	FD_SET(respipe [0], &rfd);
77		75
78	select (respipe [0] + 1, &rfd, 0, 0, 0);	76	select (respipe [0] + 1, &rfd, 0, 0, 0);
		77	}
79	}	78	}
80		79
81	static int	80	static int
82	poll_cb (pTHX)	81	poll_cb ()
83	{	82	{
84	dSP;	83	dSP;
85	int count = 0;	84	int count = 0;
86	aio_req req;	85	aio_req req, prv;
87		86
		87	pthread_mutex_lock (&reslock);
		88
88	{	89	{
89	/* read and signals sent by the worker threads */	90	/* read any signals sent by the worker threads */
90	char buf [32];	91	char buf [32];
91	while (read (respipe [0], buf, 32) > 0)	92	while (read (respipe [0], buf, 32) > 0)
92	;	93	;
93	}	94	}
94		95
95	for (;;)	96	req = ress;
		97	ress = rese = 0;
		98
		99	pthread_mutex_unlock (&reslock);
		100
		101	while (req)
96	{	102	{
97	pthread_mutex_lock (&reslock);
98
99	req = ress;
100
101	if (ress)
102	{
103	ress = ress->next;
104	if (!ress) rese = 0;
105	}
106
107	pthread_mutex_unlock (&reslock);
108
109	if (!req)
110	break;
111
112	nreqs--;	103	nreqs--;
113		104
114	if (req->type == REQ_QUIT)	105	if (req->type == REQ_QUIT)
115	started--;	106	started--;
116	else	107	else
…		…
123	+ req->result > 0 ? req->result : 0);	114	+ req->result > 0 ? req->result : 0);
124		115
125	if (req->data)	116	if (req->data)
126	SvREFCNT_dec (req->data);	117	SvREFCNT_dec (req->data);
127		118
		119	if (req->fh)
		120	SvREFCNT_dec (req->fh);
		121
128	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)	122	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)
129	{	123	{
130	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;	124	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
131	PL_laststatval = req->result;	125	PL_laststatval = req->result;
132	PL_statcache = *(req->statdata);	126	PL_statcache = *(req->statdata);
133		127
134	Safefree (req->statdata);	128	Safefree (req->statdata);
135	}	129	}
136		130
		131	ENTER;
137	PUSHMARK (SP);	132	PUSHMARK (SP);
138	XPUSHs (sv_2mortal (newSViv (req->result)));	133	XPUSHs (sv_2mortal (newSViv (req->result)));
139		134
140	if (req->type == REQ_OPEN)	135	if (req->type == REQ_OPEN)
141	{	136	{
…		…
144		139
145	PUTBACK;	140	PUTBACK;
146	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	141	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
147	SPAGAIN;	142	SPAGAIN;
148		143
149	fh = POPs;	144	fh = SvREFCNT_inc (POPs);
150		145
151	PUSHMARK (SP);	146	PUSHMARK (SP);
152	XPUSHs (fh);	147	XPUSHs (sv_2mortal (fh));
153	}	148	}
154		149
		150	if (SvOK (req->callback))
		151	{
155	PUTBACK;	152	PUTBACK;
156	call_sv (req->callback, G_VOID \| G_EVAL);	153	call_sv (req->callback, G_VOID \| G_EVAL);
157	SPAGAIN;	154	SPAGAIN;
		155	}
		156
		157	LEAVE;
158		158
159	if (req->callback)	159	if (req->callback)
160	SvREFCNT_dec (req->callback);	160	SvREFCNT_dec (req->callback);
161		161
162	errno = errorno;	162	errno = errorno;
163	count++;	163	count++;
164	}	164	}
165		165
		166	prv = req;
		167	req = req->next;
166	Safefree (req);	168	Safefree (prv);
		169
		170	/* TODO: croak on errors? */
167	}	171	}
168		172
169	return count;	173	return count;
170	}	174	}
171		175
…		…
226	req->type = REQ_QUIT;	230	req->type = REQ_QUIT;
227		231
228	send_req (req);	232	send_req (req);
229	}	233	}
230		234
231	static void	235	/* work around various missing functions */
232	read_write (pTHX_
233	int dowrite, int fd, off_t offset, size_t length,
234	SV data, STRLEN dataoffset, SV callback)
235	{
236	aio_req req;
237	STRLEN svlen;
238	char *svptr = SvPV (data, svlen);
239		236
240	SvUPGRADE (data, SVt_PV);	237	#if !HAVE_PREADWRITE
241	SvPOK_on (data);	238	# define pread aio_pread
		239	# define pwrite aio_pwrite
242		240
243	if (dataoffset < 0)	241	/*
244	dataoffset += svlen;	242	* make our pread/pwrite safe against themselves, but not against
		243	* normal read/write by using a mutex. slows down execution a lot,
		244	* but that's your problem, not mine.
		245	*/
		246	static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
245		247
246	if (dataoffset < 0 \|\| dataoffset > svlen)	248	static ssize_t
247	croak ("data offset outside of string");	249	pread (int fd, void *buf, size_t count, off_t offset)
		250	{
		251	ssize_t res;
		252	off_t ooffset;
248		253
249	if (dowrite)	254	pthread_mutex_lock (&iolock);
		255	ooffset = lseek (fd, 0, SEEK_CUR);
		256	lseek (fd, offset, SEEK_SET);
		257	res = read (fd, buf, count);
		258	lseek (fd, ooffset, SEEK_SET);
		259	pthread_mutex_unlock (&iolock);
		260
		261	return res;
		262	}
		263
		264	static ssize_t
		265	pwrite (int fd, void *buf, size_t count, off_t offset)
		266	{
		267	ssize_t res;
		268	off_t ooffset;
		269
		270	pthread_mutex_lock (&iolock);
		271	ooffset = lseek (fd, 0, SEEK_CUR);
		272	lseek (fd, offset, SEEK_SET);
		273	res = write (fd, buf, count);
		274	lseek (fd, offset, SEEK_SET);
		275	pthread_mutex_unlock (&iolock);
		276
		277	return res;
		278	}
		279	#endif
		280
		281	#if !HAVE_FDATASYNC
		282	# define fdatasync fsync
		283	#endif
		284
		285	#if !HAVE_READAHEAD
		286	# define readahead aio_readahead
		287
		288	static char readahead_buf[4096];
		289
		290	static ssize_t
		291	readahead (int fd, off_t offset, size_t count)
		292	{
		293	while (count > 0)
250	{	294	{
251	/* write: check length and adjust. */	295	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
252	if (length < 0 \|\| length + dataoffset > svlen)	296
253	length = svlen - dataoffset;	297	pread (fd, readahead_buf, len, offset);
		298	offset += len;
		299	count -= len;
254	}	300	}
255	else
256	{
257	/* read: grow scalar as necessary */
258	svptr = SvGROW (data, length + dataoffset);
259	}
260		301
261	if (length < 0)	302	errno = 0;
262	croak ("length must not be negative");
263
264	Newz (0, req, 1, aio_cb);
265
266	if (!req)
267	croak ("out of memory during aio_req allocation");
268
269	req->type = dowrite ? REQ_WRITE : REQ_READ;
270	req->fd = fd;
271	req->offset = offset;
272	req->length = length;
273	req->data = SvREFCNT_inc (data);
274	req->dataptr = (char *)svptr + dataoffset;
275	req->callback = SvREFCNT_inc (callback);
276
277	send_req (req);
278	}	303	}
		304	#endif
279		305
280	static void *	306	static void *
281	aio_proc (void *thr_arg)	307	aio_proc (void *thr_arg)
282	{	308	{
283	aio_req req;	309	aio_req req;
…		…
309		335
310	type = req->type;	336	type = req->type;
311		337
312	switch (type)	338	switch (type)
313	{	339	{
314	case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break;	340	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
315	case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, req->offset); break;	341	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
316	#if SYS_readahead	342
317	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	343	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
318	#else
319	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
320	#endif
321		344
322	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	345	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
323	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	346	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
324	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	347	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
325		348
326	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;	349	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
327	case REQ_CLOSE: req->result = close (req->fd); break;	350	case REQ_CLOSE: req->result = close (req->fd); break;
328	case REQ_UNLINK: req->result = unlink (req->dataptr); break;	351	case REQ_UNLINK: req->result = unlink (req->dataptr); break;
329		352
		353	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
330	case REQ_FSYNC: req->result = fsync (req->fd); break;	354	case REQ_FSYNC: req->result = fsync (req->fd); break;
331	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
332		355
333	case REQ_QUIT:	356	case REQ_QUIT:
334	break;	357	break;
335		358
336	default:	359	default:
…		…
364	return 0;	387	return 0;
365	}	388	}
366		389
367	MODULE = IO::AIO PACKAGE = IO::AIO	390	MODULE = IO::AIO PACKAGE = IO::AIO
368		391
		392	PROTOTYPES: ENABLE
		393
369	BOOT:	394	BOOT:
370	{	395	{
371	if (pipe (respipe))	396	if (pipe (respipe))
372	croak ("unable to initialize result pipe");	397	croak ("unable to initialize result pipe");
373		398
…		…
400	}	425	}
401		426
402	while (started > nthreads)	427	while (started > nthreads)
403	{	428	{
404	poll_wait ();	429	poll_wait ();
405	poll_cb (aTHX);	430	poll_cb ();
406	}	431	}
407	}	432	}
408		433
409	int	434	int
410	max_outstanding(nreqs)	435	max_outstanding(nreqs)
…		…
413	CODE:	438	CODE:
414	RETVAL = max_outstanding;	439	RETVAL = max_outstanding;
415	max_outstanding = nreqs;	440	max_outstanding = nreqs;
416		441
417	void	442	void
418	aio_open(pathname,flags,mode,callback)	443	aio_open(pathname,flags,mode,callback=&PL_sv_undef)
419	SV * pathname	444	SV * pathname
420	int flags	445	int flags
421	int mode	446	int mode
422	SV * callback	447	SV * callback
423	PROTOTYPE: $$$$	448	PROTOTYPE: $$$;$
424	CODE:	449	CODE:
425	{	450	{
426	aio_req req;	451	aio_req req;
427		452
428	Newz (0, req, 1, aio_cb);	453	Newz (0, req, 1, aio_cb);
…		…
439		464
440	send_req (req);	465	send_req (req);
441	}	466	}
442		467
443	void	468	void
444	aio_close(fh,callback)	469	aio_close(fh,callback=&PL_sv_undef)
445	InputStream fh	470	SV * fh
446	SV * callback	471	SV * callback
447	PROTOTYPE: $$	472	PROTOTYPE: $;$
448	ALIAS:	473	ALIAS:
449	aio_close = REQ_CLOSE	474	aio_close = REQ_CLOSE
450	aio_fsync = REQ_FSYNC	475	aio_fsync = REQ_FSYNC
451	aio_fdatasync = REQ_FDATASYNC	476	aio_fdatasync = REQ_FDATASYNC
452	CODE:	477	CODE:
…		…
457		482
458	if (!req)	483	if (!req)
459	croak ("out of memory during aio_req allocation");	484	croak ("out of memory during aio_req allocation");
460		485
461	req->type = ix;	486	req->type = ix;
		487	req->fh = newSVsv (fh);
462	req->fd = PerlIO_fileno (fh);	488	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
463	req->callback = SvREFCNT_inc (callback);	489	req->callback = SvREFCNT_inc (callback);
464		490
465	send_req (req);	491	send_req (req);
466	}	492	}
467		493
468	void	494	void
469	aio_read(fh,offset,length,data,dataoffset,callback)	495	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
470	InputStream fh	496	SV * fh
471	UV offset	497	UV offset
472	IV length	498	IV length
473	SV * data	499	SV * data
474	IV dataoffset	500	IV dataoffset
475	SV * callback	501	SV * callback
		502	ALIAS:
		503	aio_read = REQ_READ
		504	aio_write = REQ_WRITE
476	PROTOTYPE: $$$$$$	505	PROTOTYPE: $$$$$;$
477	CODE:	506	CODE:
478	read_write (aTHX_ 0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
479
480	void
481	aio_write(fh,offset,length,data,dataoffset,callback)
482	OutputStream fh
483	UV offset
484	IV length
485	SV * data
486	IV dataoffset
487	SV * callback
488	PROTOTYPE: $$$$$$
489	CODE:
490	read_write (aTHX_ 1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
491
492	void
493	aio_readahead(fh,offset,length,callback)
494	InputStream fh
495	UV offset
496	IV length
497	SV * callback
498	PROTOTYPE: $$$$
499	CODE:
500	{	507	{
501	aio_req req;	508	aio_req req;
		509	STRLEN svlen;
		510	char *svptr = SvPV (data, svlen);
		511
		512	SvUPGRADE (data, SVt_PV);
		513	SvPOK_on (data);
		514
		515	if (dataoffset < 0)
		516	dataoffset += svlen;
		517
		518	if (dataoffset < 0 \|\| dataoffset > svlen)
		519	croak ("data offset outside of string");
		520
		521	if (ix == REQ_WRITE)
		522	{
		523	/* write: check length and adjust. */
		524	if (length < 0 \|\| length + dataoffset > svlen)
		525	length = svlen - dataoffset;
		526	}
		527	else
		528	{
		529	/* read: grow scalar as necessary */
		530	svptr = SvGROW (data, length + dataoffset);
		531	}
502		532
503	if (length < 0)	533	if (length < 0)
504	croak ("length must not be negative");	534	croak ("length must not be negative");
505		535
506	Newz (0, req, 1, aio_cb);	536	Newz (0, req, 1, aio_cb);
507		537
508	if (!req)	538	if (!req)
509	croak ("out of memory during aio_req allocation");	539	croak ("out of memory during aio_req allocation");
510		540
		541	req->type = ix;
		542	req->fh = newSVsv (fh);
		543	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
		544	: IoOFP (sv_2io (fh)));
		545	req->offset = offset;
		546	req->length = length;
		547	req->data = SvREFCNT_inc (data);
		548	req->dataptr = (char *)svptr + dataoffset;
		549	req->callback = SvREFCNT_inc (callback);
		550
		551	send_req (req);
		552	}
		553
		554	void
		555	aio_readahead(fh,offset,length,callback=&PL_sv_undef)
		556	SV * fh
		557	UV offset
		558	IV length
		559	SV * callback
		560	PROTOTYPE: $$$;$
		561	CODE:
		562	{
		563	aio_req req;
		564
		565	if (length < 0)
		566	croak ("length must not be negative");
		567
		568	Newz (0, req, 1, aio_cb);
		569
		570	if (!req)
		571	croak ("out of memory during aio_req allocation");
		572
511	req->type = REQ_READAHEAD;	573	req->type = REQ_READAHEAD;
		574	req->fh = newSVsv (fh);
512	req->fd = PerlIO_fileno (fh);	575	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
513	req->offset = offset;	576	req->offset = offset;
514	req->length = length;	577	req->length = length;
515	req->callback = SvREFCNT_inc (callback);	578	req->callback = SvREFCNT_inc (callback);
516		579
517	send_req (req);	580	send_req (req);
518	}	581	}
519		582
520	void	583	void
521	aio_stat(fh_or_path,callback)	584	aio_stat(fh_or_path,callback=&PL_sv_undef)
522	SV * fh_or_path	585	SV * fh_or_path
523	SV * callback	586	SV * callback
524	PROTOTYPE: $$
525	ALIAS:	587	ALIAS:
		588	aio_stat = REQ_STAT
526	aio_lstat = 1	589	aio_lstat = REQ_LSTAT
527	CODE:	590	CODE:
528	{	591	{
529	aio_req req;	592	aio_req req;
530		593
531	Newz (0, req, 1, aio_cb);	594	Newz (0, req, 1, aio_cb);
…		…
538	if (!req->statdata)	601	if (!req->statdata)
539	croak ("out of memory during aio_req->statdata allocation");	602	croak ("out of memory during aio_req->statdata allocation");
540		603
541	if (SvPOK (fh_or_path))	604	if (SvPOK (fh_or_path))
542	{	605	{
543	req->type = ix ? REQ_LSTAT : REQ_STAT;	606	req->type = ix;
544	req->data = newSVsv (fh_or_path);	607	req->data = newSVsv (fh_or_path);
545	req->dataptr = SvPV_nolen (req->data);	608	req->dataptr = SvPV_nolen (req->data);
546	}	609	}
547	else	610	else
548	{	611	{
549	req->type = REQ_FSTAT;	612	req->type = REQ_FSTAT;
		613	req->fh = newSVsv (fh_or_path);
550	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	614	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
551	}	615	}
552		616
553	req->callback = SvREFCNT_inc (callback);	617	req->callback = SvREFCNT_inc (callback);
554		618
555	send_req (req);	619	send_req (req);
556	}	620	}
557		621
558	void	622	void
559	aio_unlink(pathname,callback)	623	aio_unlink(pathname,callback=&PL_sv_undef)
560	SV * pathname	624	SV * pathname
561	SV * callback	625	SV * callback
562	PROTOTYPE: $$
563	CODE:	626	CODE:
564	{	627	{
565	aio_req req;	628	aio_req req;
566		629
567	Newz (0, req, 1, aio_cb);	630	Newz (0, req, 1, aio_cb);
…		…
575	req->callback = SvREFCNT_inc (callback);	638	req->callback = SvREFCNT_inc (callback);
576		639
577	send_req (req);	640	send_req (req);
578	}	641	}
579		642
		643	void
		644	flush()
		645	PROTOTYPE:
		646	CODE:
		647	while (nreqs)
		648	{
		649	poll_wait ();
		650	poll_cb ();
		651	}
		652
		653	void
		654	poll()
		655	PROTOTYPE:
		656	CODE:
		657	if (nreqs)
		658	{
		659	poll_wait ();
		660	poll_cb ();
		661	}
		662
580	int	663	int
581	poll_fileno()	664	poll_fileno()
582	PROTOTYPE:	665	PROTOTYPE:
583	CODE:	666	CODE:
584	RETVAL = respipe [0];	667	RETVAL = respipe [0];
…		…
587		670
588	int	671	int
589	poll_cb(...)	672	poll_cb(...)
590	PROTOTYPE:	673	PROTOTYPE:
591	CODE:	674	CODE:
592	RETVAL = poll_cb (aTHX);	675	RETVAL = poll_cb ();
593	OUTPUT:	676	OUTPUT:
594	RETVAL	677	RETVAL
595		678
596	void	679	void
597	poll_wait()	680	poll_wait()

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.4 by root, Sun Jul 10 20:57:00 2005 UTC vs. Revision 1.17 by root, Sun Jul 31 18:45:48 2005 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.4 by root, Sun Jul 10 20:57:00 2005 UTC vs.
Revision 1.17 by root, Sun Jul 31 18:45:48 2005 UTC