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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.48 by root, Sun Oct 22 10:33:19 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC

…		…
		1	/* solaris */
		2	#define _POSIX_PTHREAD_SEMANTICS 1
		3
		4	#if __linux
		5	# define _GNU_SOURCE
		6	#endif
		7
1	#define _REENTRANT 1	8	#define _REENTRANT 1
		9
2	#include <errno.h>	10	#include <errno.h>
3		11
4	#include "EXTERN.h"	12	#include "EXTERN.h"
5	#include "perl.h"	13	#include "perl.h"
6	#include "XSUB.h"	14	#include "XSUB.h"
41	# define NAME_MAX 4096	49	# define NAME_MAX 4096
42	#endif	50	#endif
43		51
44	#if __ia64	52	#if __ia64
45	# define STACKSIZE 65536	53	# define STACKSIZE 65536
		54	#elif __i386 \|\| __x86_64 /* 16k is unreasonably high :( */
		55	# define STACKSIZE PTHREAD_STACK_MIN
46	#else	56	#else
47	# define STACKSIZE 8192	57	# define STACKSIZE 16384
48	#endif	58	#endif
		59
		60	/* buffer size for various temporary buffers */
		61	#define AIO_BUFSIZE 65536
		62
		63	#define dBUF \
		64	char *aio_buf; \
		65	LOCK (wrklock); \
		66	self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
		67	UNLOCK (wrklock); \
		68	if (!aio_buf) \
		69	return -1;
49		70
50	enum {	71	enum {
51	REQ_QUIT,	72	REQ_QUIT,
52	REQ_OPEN, REQ_CLOSE,	73	REQ_OPEN, REQ_CLOSE,
53	REQ_READ, REQ_WRITE, REQ_READAHEAD,	74	REQ_READ, REQ_WRITE, REQ_READAHEAD,
…		…
55	REQ_STAT, REQ_LSTAT, REQ_FSTAT,	76	REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56	REQ_FSYNC, REQ_FDATASYNC,	77	REQ_FSYNC, REQ_FDATASYNC,
57	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	78	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58	REQ_READDIR,	79	REQ_READDIR,
59	REQ_LINK, REQ_SYMLINK,	80	REQ_LINK, REQ_SYMLINK,
60	REQ_SLEEP,	81	REQ_GROUP, REQ_NOP,
61	REQ_GROUP,	82	REQ_BUSY,
62	};	83	};
63		84
64	#define AIO_REQ_KLASS "IO::AIO::REQ"	85	#define AIO_REQ_KLASS "IO::AIO::REQ"
65	#define AIO_GRP_KLASS "IO::AIO::GRP"	86	#define AIO_GRP_KLASS "IO::AIO::GRP"
66		87
67	typedef struct aio_cb	88	typedef struct aio_cb
68	{	89	{
69	struct aio_cb grp, grp_prev, *grp_next;
70
71	struct aio_cb *volatile next;	90	struct aio_cb *volatile next;
72
73	SV self; / the perl counterpart of this request, if any */
74		91
75	SV data, callback;	92	SV data, callback;
76	SV fh, fh2;	93	SV fh, fh2;
77	void dataptr, data2ptr;	94	void dataptr, data2ptr;
78	Stat_t *statdata;	95	Stat_t *statdata;
79	off_t offset;	96	off_t offset;
80	size_t length;	97	size_t length;
81	ssize_t result;	98	ssize_t result;
82		99
		100	STRLEN dataoffset;
83	int type;	101	int type;
84	int fd, fd2;	102	int fd, fd2;
85	int errorno;	103	int errorno;
86	STRLEN dataoffset;
87	mode_t mode; /* open */	104	mode_t mode; /* open */
		105
88	unsigned char cancelled;	106	unsigned char flags;
		107	unsigned char pri;
		108
		109	SV self; / the perl counterpart of this request, if any */
		110	struct aio_cb grp, grp_prev, grp_next, grp_first;
89	} aio_cb;	111	} aio_cb;
		112
		113	enum {
		114	FLAG_CANCELLED = 0x01,
		115	};
90		116
91	typedef aio_cb *aio_req;	117	typedef aio_cb *aio_req;
92	typedef aio_cb *aio_req_ornot;	118	typedef aio_cb *aio_req_ornot;
		119
		120	enum {
		121	PRI_MIN = -4,
		122	PRI_MAX = 4,
		123
		124	DEFAULT_PRI = 0,
		125	PRI_BIAS = -PRI_MIN,
		126	NUM_PRI = PRI_MAX + PRI_BIAS + 1,
		127	};
		128
		129	static int next_pri = DEFAULT_PRI + PRI_BIAS;
93		130
94	static int started, wanted;	131	static int started, wanted;
95	static volatile int nreqs;	132	static volatile int nreqs;
96	static int max_outstanding = 1<<30;	133	static int max_outstanding = 1<<30;
97	static int respipe [2];	134	static int respipe [2];
98		135
		136	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
		137	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
		138	#else
		139	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
		140	#endif
		141
		142	#define LOCK(mutex) pthread_mutex_lock (&(mutex))
		143	#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
		144
		145	/* worker threasd management */
		146	static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
		147
		148	typedef struct worker {
		149	/* locked by wrklock */
		150	struct worker prev, next;
		151
		152	pthread_t tid;
		153
		154	/* locked by reslock, reqlock or wrklock */
		155	aio_req req; /* currently processed request */
		156	void *dbuf;
		157	DIR *dirp;
		158	} worker;
		159
		160	static worker wrk_first = { &wrk_first, &wrk_first, 0 };
		161
		162	static void worker_clear (worker *wrk)
		163	{
		164	if (wrk->dirp)
		165	{
		166	closedir (wrk->dirp);
		167	wrk->dirp = 0;
		168	}
		169
		170	if (wrk->dbuf)
		171	{
		172	free (wrk->dbuf);
		173	wrk->dbuf = 0;
		174	}
		175	}
		176
		177	static void worker_free (worker *wrk)
		178	{
		179	wrk->next->prev = wrk->prev;
		180	wrk->prev->next = wrk->next;
		181
		182	free (wrk);
		183	}
		184
99	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	185	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	186	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	187	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102		188
103	static volatile aio_req reqs, reqe; /* queue start, queue end */	189	/*
104	static volatile aio_req ress, rese; /* queue start, queue end */	190	* a somewhat faster data structure might be nice, but
		191	* with 8 priorities this actually needs <20 insns
		192	* per shift, the most expensive operation.
		193	*/
		194	typedef struct {
		195	aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
		196	int size;
		197	} reqq;
105		198
		199	static reqq req_queue;
		200	static reqq res_queue;
		201
		202	int reqq_push (reqq *q, aio_req req)
		203	{
		204	int pri = req->pri;
		205	req->next = 0;
		206
		207	if (q->qe[pri])
		208	{
		209	q->qe[pri]->next = req;
		210	q->qe[pri] = req;
		211	}
		212	else
		213	q->qe[pri] = q->qs[pri] = req;
		214
		215	return q->size++;
		216	}
		217
		218	aio_req reqq_shift (reqq *q)
		219	{
		220	int pri;
		221
		222	if (!q->size)
		223	return 0;
		224
		225	--q->size;
		226
		227	for (pri = NUM_PRI; pri--; )
		228	{
		229	aio_req req = q->qs[pri];
		230
		231	if (req)
		232	{
		233	if (!(q->qs[pri] = req->next))
		234	q->qe[pri] = 0;
		235
		236	return req;
		237	}
		238	}
		239
		240	abort ();
		241	}
		242
		243	static void req_invoke (aio_req req);
106	static void req_free (aio_req req);	244	static void req_free (aio_req req);
107		245
108	/* must be called at most once */	246	/* must be called at most once */
109	static SV req_sv (aio_req req, const char klass)	247	static SV req_sv (aio_req req, const char klass)
110	{	248	{
		249	if (!req->self)
		250	{
111	req->self = (SV *)newHV ();	251	req->self = (SV *)newHV ();
112	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	252	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		253	}
113		254
114	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));	255	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
115	}	256	}
116		257
117	static aio_req SvAIO_REQ (SV *sv)	258	static aio_req SvAIO_REQ (SV *sv)
118	{	259	{
		260	MAGIC *mg;
		261
119	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	262	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
120	croak ("object of class " AIO_REQ_KLASS " expected");	263	croak ("object of class " AIO_REQ_KLASS " expected");
121		264
122	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	265	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123		266
124	return mg ? (aio_req)mg->mg_ptr : 0;	267	return mg ? (aio_req)mg->mg_ptr : 0;
125	}	268	}
126		269
		270	static void aio_grp_feed (aio_req grp)
		271	{
		272	while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
		273	{
		274	int old_len = grp->length;
		275
		276	if (grp->fh2 && SvOK (grp->fh2))
		277	{
		278	dSP;
		279
		280	ENTER;
		281	SAVETMPS;
		282	PUSHMARK (SP);
		283	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
		284	PUTBACK;
		285	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
		286	SPAGAIN;
		287	FREETMPS;
		288	LEAVE;
		289	}
		290
		291	/* stop if no progress has been made */
		292	if (old_len == grp->length)
		293	{
		294	SvREFCNT_dec (grp->fh2);
		295	grp->fh2 = 0;
		296	break;
		297	}
		298	}
		299	}
		300
		301	static void aio_grp_dec (aio_req grp)
		302	{
		303	--grp->length;
		304
		305	/* call feeder, if applicable */
		306	aio_grp_feed (grp);
		307
		308	/* finish, if done */
		309	if (!grp->length && grp->fd)
		310	{
		311	req_invoke (grp);
		312	req_free (grp);
		313	}
		314	}
		315
127	static void poll_wait ()	316	static void poll_wait ()
128	{	317	{
129	if (nreqs && !ress)
130	{
131	fd_set rfd;	318	fd_set rfd;
		319
		320	while (nreqs)
		321	{
		322	int size;
		323	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		324	LOCK (reslock);
		325	#endif
		326	size = res_queue.size;
		327	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		328	UNLOCK (reslock);
		329	#endif
		330
		331	if (size)
		332	return;
		333
132	FD_ZERO(&rfd);	334	FD_ZERO(&rfd);
133	FD_SET(respipe [0], &rfd);	335	FD_SET(respipe [0], &rfd);
134		336
135	select (respipe [0] + 1, &rfd, 0, 0, 0);	337	select (respipe [0] + 1, &rfd, 0, 0, 0);
136	}	338	}
137	}	339	}
138		340
139	static void req_invoke (aio_req req)	341	static void req_invoke (aio_req req)
140	{	342	{
141	dSP;	343	dSP;
142	int errorno = errno;
143		344
144	if (req->cancelled \|\| !SvOK (req->callback))	345	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
145	return;	346	{
146
147	errno = req->errorno;	347	errno = req->errorno;
148		348
149	ENTER;	349	ENTER;
		350	SAVETMPS;
150	PUSHMARK (SP);	351	PUSHMARK (SP);
151	EXTEND (SP, 1);	352	EXTEND (SP, 1);
152		353
153	switch (req->type)	354	switch (req->type)
154	{
155	case REQ_READDIR:
156	{	355	{
157	SV *rv = &PL_sv_undef;	356	case REQ_READDIR:
158
159	if (req->result >= 0)
160	{	357	{
161	char *buf = req->data2ptr;	358	SV *rv = &PL_sv_undef;
162	AV *av = newAV ();
163		359
164	while (req->result)	360	if (req->result >= 0)
165	{	361	{
		362	int i;
		363	char *buf = req->data2ptr;
		364	AV *av = newAV ();
		365
		366	av_extend (av, req->result - 1);
		367
		368	for (i = 0; i < req->result; ++i)
		369	{
166	SV *sv = newSVpv (buf, 0);	370	SV *sv = newSVpv (buf, 0);
167		371
168	av_push (av, sv);	372	av_store (av, i, sv);
169	buf += SvCUR (sv) + 1;	373	buf += SvCUR (sv) + 1;
170	req->result--;	374	}
		375
		376	rv = sv_2mortal (newRV_noinc ((SV *)av));
171	}	377	}
172		378
173	rv = sv_2mortal (newRV_noinc ((SV *)av));	379	PUSHs (rv);
174	}	380	}
		381	break;
175		382
176	PUSHs (rv);	383	case REQ_OPEN:
		384	{
		385	/* convert fd to fh */
		386	SV *fh;
		387
		388	PUSHs (sv_2mortal (newSViv (req->result)));
		389	PUTBACK;
		390	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
		391	SPAGAIN;
		392
		393	fh = SvREFCNT_inc (POPs);
		394
		395	PUSHMARK (SP);
		396	XPUSHs (sv_2mortal (fh));
		397	}
		398	break;
		399
		400	case REQ_GROUP:
		401	req->fd = 2; /* mark group as finished */
		402
		403	if (req->data)
		404	{
		405	int i;
		406	AV av = (AV )req->data;
		407
		408	EXTEND (SP, AvFILL (av) + 1);
		409	for (i = 0; i <= AvFILL (av); ++i)
		410	PUSHs (*av_fetch (av, i, 0));
		411	}
		412	break;
		413
		414	case REQ_NOP:
		415	case REQ_BUSY:
		416	break;
		417
		418	default:
		419	PUSHs (sv_2mortal (newSViv (req->result)));
		420	break;
177	}	421	}
178	break;
179		422
180	case REQ_OPEN:
181	{
182	/* convert fd to fh */
183	SV *fh;
184		423
185	PUSHs (sv_2mortal (newSViv (req->result)));
186	PUTBACK;	424	PUTBACK;
187	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
188	SPAGAIN;
189
190	fh = SvREFCNT_inc (POPs);
191
192	PUSHMARK (SP);
193	XPUSHs (sv_2mortal (fh));
194	}
195	break;
196
197	case REQ_GROUP:
198	if (req->data)
199	{
200	int i;
201	AV av = (AV )req->data;
202
203	EXTEND (SP, AvFILL (av) + 1);
204	for (i = 0; i <= AvFILL (av); ++i)
205	PUSHs (*av_fetch (av, i, 0));
206	}
207	break;
208
209	case REQ_SLEEP:
210	break;
211
212	default:
213	PUSHs (sv_2mortal (newSViv (req->result)));
214	break;
215	}
216
217
218	PUTBACK;
219	call_sv (req->callback, G_VOID \| G_EVAL);	425	call_sv (req->callback, G_VOID \| G_EVAL);
220	SPAGAIN;	426	SPAGAIN;
		427
		428	FREETMPS;
		429	LEAVE;
		430	}
		431
		432	if (req->grp)
		433	{
		434	aio_req grp = req->grp;
		435
		436	/* unlink request */
		437	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
		438	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
		439
		440	if (grp->grp_first == req)
		441	grp->grp_first = req->grp_next;
		442
		443	aio_grp_dec (grp);
		444	}
221		445
222	if (SvTRUE (ERRSV))	446	if (SvTRUE (ERRSV))
223	{	447	{
224	req_free (req);	448	req_free (req);
225	croak (0);	449	croak (0);
226	}	450	}
227
228	LEAVE;
229
230	errno = errorno;
231	}	451	}
232		452
233	static void req_free (aio_req req)	453	static void req_free (aio_req req)
234	{	454	{
235	if (req->grp)
236	{
237	aio_req grp = req->grp;
238
239	/* unlink request */
240	req->grp_next->grp_prev = req->grp_prev;
241	req->grp_prev->grp_next = req->grp_next;
242
243	if (grp->grp_next == grp && grp->fd)
244	{
245	req_invoke (grp);
246	req_free (grp);
247	}
248	}
249
250	if (req->self)	455	if (req->self)
251	{	456	{
252	sv_unmagic (req->self, PERL_MAGIC_ext);	457	sv_unmagic (req->self, PERL_MAGIC_ext);
253	SvREFCNT_dec (req->self);	458	SvREFCNT_dec (req->self);
254	}	459	}
255		460
256	if (req->data)
257	SvREFCNT_dec (req->data);	461	SvREFCNT_dec (req->data);
258
259	if (req->fh)
260	SvREFCNT_dec (req->fh);	462	SvREFCNT_dec (req->fh);
261
262	if (req->fh2)
263	SvREFCNT_dec (req->fh2);	463	SvREFCNT_dec (req->fh2);
264
265	if (req->statdata)
266	Safefree (req->statdata);
267
268	if (req->callback)
269	SvREFCNT_dec (req->callback);	464	SvREFCNT_dec (req->callback);
		465	Safefree (req->statdata);
270		466
271	if (req->type == REQ_READDIR && req->result >= 0)	467	if (req->type == REQ_READDIR)
272	free (req->data2ptr);	468	free (req->data2ptr);
273		469
274	Safefree (req);	470	Safefree (req);
275	}	471	}
276		472
277	static void req_cancel (aio_req req)	473	static void req_cancel (aio_req req)
278	{	474	{
279	req->cancelled = 1;	475	req->flags \|= FLAG_CANCELLED;
280		476
281	if (req->type == REQ_GROUP)	477	if (req->type == REQ_GROUP)
282	{	478	{
283	aio_req sub;	479	aio_req sub;
284		480
285	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	481	for (sub = req->grp_first; sub; sub = sub->grp_next)
286	req_cancel (sub);	482	req_cancel (sub);
287	}	483	}
288	}	484	}
289		485
290	static int poll_cb ()	486	static int poll_cb ()
…		…
294	int do_croak = 0;	490	int do_croak = 0;
295	aio_req req;	491	aio_req req;
296		492
297	for (;;)	493	for (;;)
298	{	494	{
299	pthread_mutex_lock (&reslock);	495	LOCK (reslock);
300	req = ress;	496	req = reqq_shift (&res_queue);
301		497
302	if (req)	498	if (req)
303	{	499	{
304	ress = req->next;
305
306	if (!ress)	500	if (!res_queue.size)
307	{	501	{
308	/* read any signals sent by the worker threads */	502	/* read any signals sent by the worker threads */
309	char buf [32];	503	char buf [32];
310	while (read (respipe [0], buf, 32) == 32)	504	while (read (respipe [0], buf, 32) == 32)
311	;	505	;
312
313	rese = 0;
314	}	506	}
315	}	507	}
316		508
317	pthread_mutex_unlock (&reslock);	509	UNLOCK (reslock);
318		510
319	if (!req)	511	if (!req)
320	break;	512	break;
321		513
322	nreqs--;	514	--nreqs;
323		515
324	if (req->type == REQ_QUIT)	516	if (req->type == REQ_QUIT)
325	started--;	517	started--;
326	else if (req->type == REQ_GROUP && req->grp_next != req)	518	else if (req->type == REQ_GROUP && req->length)
327	{	519	{
328	req->fd = 1; /* mark request as delayed */	520	req->fd = 1; /* mark request as delayed */
329	continue;	521	continue;
330	}	522	}
331	else	523	else
…		…
356		548
357	static void aio_proc(void arg);	549	static void aio_proc(void arg);
358		550
359	static void start_thread (void)	551	static void start_thread (void)
360	{	552	{
		553	worker *wrk = calloc (1, sizeof (worker));
		554
		555	if (!wrk)
		556	croak ("unable to allocate worker thread data");
		557
361	sigset_t fullsigset, oldsigset;	558	sigset_t fullsigset, oldsigset;
362	pthread_t tid;
363	pthread_attr_t attr;	559	pthread_attr_t attr;
364		560
365	pthread_attr_init (&attr);	561	pthread_attr_init (&attr);
366	pthread_attr_setstacksize (&attr, STACKSIZE);	562	pthread_attr_setstacksize (&attr, STACKSIZE);
367	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	563	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
368		564
369	sigfillset (&fullsigset);	565	sigfillset (&fullsigset);
		566
		567	LOCK (wrklock);
370	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	568	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
371		569
372	if (pthread_create (&tid, &attr, aio_proc, 0) == 0)	570	if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
		571	{
		572	wrk->prev = &wrk_first;
		573	wrk->next = wrk_first.next;
		574	wrk_first.next->prev = wrk;
		575	wrk_first.next = wrk;
373	started++;	576	started++;
		577	}
		578	else
		579	free (wrk);
374		580
375	sigprocmask (SIG_SETMASK, &oldsigset, 0);	581	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		582	UNLOCK (wrklock);
376	}	583	}
377		584
378	static void req_send (aio_req req)	585	static void req_send (aio_req req)
379	{	586	{
380	while (started < wanted && nreqs >= started)	587	while (started < wanted && nreqs >= started)
381	start_thread ();	588	start_thread ();
382		589
383	nreqs++;	590	++nreqs;
384		591
385	pthread_mutex_lock (&reqlock);	592	LOCK (reqlock);
386		593	reqq_push (&req_queue, req);
387	req->next = 0;
388
389	if (reqe)
390	{
391	reqe->next = req;
392	reqe = req;
393	}
394	else
395	reqe = reqs = req;
396
397	pthread_cond_signal (&reqwait);	594	pthread_cond_signal (&reqwait);
398	pthread_mutex_unlock (&reqlock);	595	UNLOCK (reqlock);
399		596
400	if (nreqs > max_outstanding)	597	if (nreqs > max_outstanding)
401	for (;;)	598	for (;;)
402	{	599	{
403	poll_cb ();	600	poll_cb ();
…		…
410	}	607	}
411		608
412	static void end_thread (void)	609	static void end_thread (void)
413	{	610	{
414	aio_req req;	611	aio_req req;
		612
415	Newz (0, req, 1, aio_cb);	613	Newz (0, req, 1, aio_cb);
		614
416	req->type = REQ_QUIT;	615	req->type = REQ_QUIT;
		616	req->pri = PRI_MAX + PRI_BIAS;
417		617
418	req_send (req);	618	req_send (req);
419	}	619	}
420		620
421	static void min_parallel (int nthreads)	621	static void min_parallel (int nthreads)
…		…
473	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)	673	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
474	{	674	{
475	ssize_t res;	675	ssize_t res;
476	off_t ooffset;	676	off_t ooffset;
477		677
478	pthread_mutex_lock (&preadwritelock);	678	LOCK (preadwritelock);
479	ooffset = lseek (fd, 0, SEEK_CUR);	679	ooffset = lseek (fd, 0, SEEK_CUR);
480	lseek (fd, offset, SEEK_SET);	680	lseek (fd, offset, SEEK_SET);
481	res = read (fd, buf, count);	681	res = read (fd, buf, count);
482	lseek (fd, ooffset, SEEK_SET);	682	lseek (fd, ooffset, SEEK_SET);
483	pthread_mutex_unlock (&preadwritelock);	683	UNLOCK (preadwritelock);
484		684
485	return res;	685	return res;
486	}	686	}
487		687
488	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)	688	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
489	{	689	{
490	ssize_t res;	690	ssize_t res;
491	off_t ooffset;	691	off_t ooffset;
492		692
493	pthread_mutex_lock (&preadwritelock);	693	LOCK (preadwritelock);
494	ooffset = lseek (fd, 0, SEEK_CUR);	694	ooffset = lseek (fd, 0, SEEK_CUR);
495	lseek (fd, offset, SEEK_SET);	695	lseek (fd, offset, SEEK_SET);
496	res = write (fd, buf, count);	696	res = write (fd, buf, count);
497	lseek (fd, offset, SEEK_SET);	697	lseek (fd, offset, SEEK_SET);
498	pthread_mutex_unlock (&preadwritelock);	698	UNLOCK (preadwritelock);
499		699
500	return res;	700	return res;
501	}	701	}
502	#endif	702	#endif
503		703
…		…
508	#if !HAVE_READAHEAD	708	#if !HAVE_READAHEAD
509	# define readahead aio_readahead	709	# define readahead aio_readahead
510		710
511	static ssize_t readahead (int fd, off_t offset, size_t count)	711	static ssize_t readahead (int fd, off_t offset, size_t count)
512	{	712	{
513	char readahead_buf[4096];	713	dBUF;
514		714
515	while (count > 0)	715	while (count > 0)
516	{	716	{
517	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	717	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
518		718
519	pread (fd, readahead_buf, len, offset);	719	pread (fd, aio_buf, len, offset);
520	offset += len;	720	offset += len;
521	count -= len;	721	count -= len;
522	}	722	}
523		723
524	errno = 0;	724	errno = 0;
…		…
533	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)	733	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)
534	{	734	{
535	struct dirent *e;	735	struct dirent *e;
536	int errorno;	736	int errorno;
537		737
538	pthread_mutex_lock (&readdirlock);	738	LOCK (readdirlock);
539		739
540	e = readdir (dirp);	740	e = readdir (dirp);
541	errorno = errno;	741	errorno = errno;
542		742
543	if (e)	743	if (e)
…		…
546	strcpy (ent->d_name, e->d_name);	746	strcpy (ent->d_name, e->d_name);
547	}	747	}
548	else	748	else
549	*res = 0;	749	*res = 0;
550		750
551	pthread_mutex_unlock (&readdirlock);	751	UNLOCK (readdirlock);
552		752
553	errno = errorno;	753	errno = errorno;
554	return e ? 0 : -1;	754	return e ? 0 : -1;
555	}	755	}
556	#endif	756	#endif
557		757
558	/* sendfile always needs emulation */	758	/* sendfile always needs emulation */
559	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)	759	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
560	{	760	{
561	ssize_t res;	761	ssize_t res;
562		762
563	if (!count)	763	if (!count)
564	return 0;	764	return 0;
…		…
613	#endif	813	#endif
614	)	814	)
615	)	815	)
616	{	816	{
617	/* emulate sendfile. this is a major pain in the ass */	817	/* emulate sendfile. this is a major pain in the ass */
618	char buf[4096];	818	dBUF;
		819
619	res = 0;	820	res = 0;
620		821
621	while (count)	822	while (count)
622	{	823	{
623	ssize_t cnt;	824	ssize_t cnt;
624		825
625	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	826	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
626		827
627	if (cnt <= 0)	828	if (cnt <= 0)
628	{	829	{
629	if (cnt && !res) res = -1;	830	if (cnt && !res) res = -1;
630	break;	831	break;
631	}	832	}
632		833
633	cnt = write (ofd, buf, cnt);	834	cnt = write (ofd, aio_buf, cnt);
634		835
635	if (cnt <= 0)	836	if (cnt <= 0)
636	{	837	{
637	if (cnt && !res) res = -1;	838	if (cnt && !res) res = -1;
638	break;	839	break;
…		…
646		847
647	return res;	848	return res;
648	}	849	}
649		850
650	/* read a full directory */	851	/* read a full directory */
651	static int scandir_ (const char path, void *namesp)	852	static void scandir_ (aio_req req, worker *self)
652	{	853	{
653	DIR *dirp = opendir (path);	854	DIR *dirp;
654	union	855	union
655	{	856	{
656	struct dirent d;	857	struct dirent d;
657	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	858	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
658	} u;	859	} *u;
659	struct dirent *entp;	860	struct dirent *entp;
660	char name, names;	861	char name, names;
661	int memlen = 4096;	862	int memlen = 4096;
662	int memofs = 0;	863	int memofs = 0;
663	int res = 0;	864	int res = 0;
664	int errorno;	865	int errorno;
665		866
666	if (!dirp)	867	LOCK (wrklock);
667	return -1;	868	self->dirp = dirp = opendir (req->dataptr);
		869	self->dbuf = u = malloc (sizeof (*u));
		870	UNLOCK (wrklock);
668		871
669	names = malloc (memlen);	872	req->data2ptr = names = malloc (memlen);
670		873
		874	if (dirp && u && names)
671	for (;;)	875	for (;;)
672	{	876	{
		877	errno = 0;
673	errno = 0, readdir_r (dirp, &u.d, &entp);	878	readdir_r (dirp, &u->d, &entp);
674		879
675	if (!entp)	880	if (!entp)
676	break;	881	break;
677		882
678	name = entp->d_name;	883	name = entp->d_name;
679		884
680	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	885	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
681	{	886	{
682	int len = strlen (name) + 1;	887	int len = strlen (name) + 1;
683		888
684	res++;	889	res++;
685		890
686	while (memofs + len > memlen)	891	while (memofs + len > memlen)
687	{	892	{
688	memlen *= 2;	893	memlen *= 2;
		894	LOCK (wrklock);
689	names = realloc (names, memlen);	895	req->data2ptr = names = realloc (names, memlen);
		896	UNLOCK (wrklock);
		897
690	if (!names)	898	if (!names)
691	break;	899	break;
692	}	900	}
693		901
694	memcpy (names + memofs, name, len);	902	memcpy (names + memofs, name, len);
695	memofs += len;	903	memofs += len;
696	}	904	}
697	}	905	}
698		906
699	errorno = errno;
700	closedir (dirp);
701
702	if (errorno)	907	if (errno)
703	{
704	free (names);
705	errno = errorno;
706	res = -1;	908	res = -1;
707	}	909
708		910	req->result = res;
709	namesp = (void )names;
710	return res;
711	}	911	}
712		912
713	/*****************************************************************************/	913	/*****************************************************************************/
714		914
715	static void aio_proc (void thr_arg)	915	static void aio_proc (void thr_arg)
716	{	916	{
717	aio_req req;	917	aio_req req;
718	int type;	918	int type;
		919	worker self = (worker )thr_arg;
719		920
720	do	921	do
721	{	922	{
722	pthread_mutex_lock (&reqlock);	923	LOCK (reqlock);
723		924
724	for (;;)	925	for (;;)
725	{	926	{
726	req = reqs;	927	self->req = req = reqq_shift (&req_queue);
727
728	if (reqs)
729	{
730	reqs = reqs->next;
731	if (!reqs) reqe = 0;
732	}
733		928
734	if (req)	929	if (req)
735	break;	930	break;
736		931
737	pthread_cond_wait (&reqwait, &reqlock);	932	pthread_cond_wait (&reqwait, &reqlock);
738	}	933	}
739		934
740	pthread_mutex_unlock (&reqlock);	935	UNLOCK (reqlock);
741		936
742	errno = 0; /* strictly unnecessary */	937	errno = 0; /* strictly unnecessary */
		938	type = req->type; /* remember type for QUIT check */
743		939
744	if (!req->cancelled)	940	if (!(req->flags & FLAG_CANCELLED))
745	switch (req->type)	941	switch (type)
746	{	942	{
747	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	943	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
748	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	944	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
749		945
750	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	946	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
751	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;	947	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
752		948
753	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	949	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
754	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	950	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
755	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	951	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
756		952
…		…
762	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	958	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
763	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	959	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
764		960
765	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	961	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
766	case REQ_FSYNC: req->result = fsync (req->fd); break;	962	case REQ_FSYNC: req->result = fsync (req->fd); break;
767	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	963	case REQ_READDIR: scandir_ (req, self); break;
768		964
769	case REQ_SLEEP:	965	case REQ_BUSY:
770	{	966	{
771	struct timeval tv;	967	struct timeval tv;
772		968
773	tv.tv_sec = req->fd;	969	tv.tv_sec = req->fd;
774	tv.tv_usec = req->fd2;	970	tv.tv_usec = req->fd2;
775		971
776	req->result = select (0, 0, 0, 0, &tv);	972	req->result = select (0, 0, 0, 0, &tv);
777	}	973	}
778		974
		975	case REQ_GROUP:
		976	case REQ_NOP:
779	case REQ_QUIT:	977	case REQ_QUIT:
780	break;	978	break;
781		979
782	default:	980	default:
783	req->result = ENOSYS;	981	req->result = ENOSYS;
784	break;	982	break;
785	}	983	}
786		984
787	req->errorno = errno;	985	req->errorno = errno;
788		986
789	pthread_mutex_lock (&reslock);	987	LOCK (reslock);
790		988
791	req->next = 0;	989	if (!reqq_push (&res_queue, req))
792
793	if (rese)
794	{
795	rese->next = req;
796	rese = req;
797	}
798	else
799	{
800	rese = ress = req;
801
802	/* write a dummy byte to the pipe so fh becomes ready */	990	/* write a dummy byte to the pipe so fh becomes ready */
803	write (respipe [1], &respipe, 1);	991	write (respipe [1], &respipe, 1);
804	}
805		992
806	pthread_mutex_unlock (&reslock);	993	self->req = 0;
		994	worker_clear (self);
		995
		996	UNLOCK (reslock);
807	}	997	}
808	while (type != REQ_QUIT);	998	while (type != REQ_QUIT);
809		999
		1000	LOCK (wrklock);
		1001	worker_free (self);
		1002	UNLOCK (wrklock);
		1003
810	return 0;	1004	return 0;
811	}	1005	}
812		1006
813	/*****************************************************************************/	1007	/*****************************************************************************/
814		1008
815	static void atfork_prepare (void)	1009	static void atfork_prepare (void)
816	{	1010	{
817	pthread_mutex_lock (&reqlock);	1011	LOCK (wrklock);
818	pthread_mutex_lock (&reslock);	1012	LOCK (reqlock);
		1013	LOCK (reslock);
819	#if !HAVE_PREADWRITE	1014	#if !HAVE_PREADWRITE
820	pthread_mutex_lock (&preadwritelock);	1015	LOCK (preadwritelock);
821	#endif	1016	#endif
822	#if !HAVE_READDIR_R	1017	#if !HAVE_READDIR_R
823	pthread_mutex_lock (&readdirlock);	1018	LOCK (readdirlock);
824	#endif	1019	#endif
825	}	1020	}
826		1021
827	static void atfork_parent (void)	1022	static void atfork_parent (void)
828	{	1023	{
829	#if !HAVE_READDIR_R	1024	#if !HAVE_READDIR_R
830	pthread_mutex_unlock (&readdirlock);	1025	UNLOCK (readdirlock);
831	#endif	1026	#endif
832	#if !HAVE_PREADWRITE	1027	#if !HAVE_PREADWRITE
833	pthread_mutex_unlock (&preadwritelock);	1028	UNLOCK (preadwritelock);
834	#endif	1029	#endif
835	pthread_mutex_unlock (&reslock);	1030	UNLOCK (reslock);
836	pthread_mutex_unlock (&reqlock);	1031	UNLOCK (reqlock);
		1032	UNLOCK (wrklock);
837	}	1033	}
838		1034
839	static void atfork_child (void)	1035	static void atfork_child (void)
840	{	1036	{
841	aio_req prv;	1037	aio_req prv;
842		1038
		1039	while (prv = reqq_shift (&req_queue))
		1040	req_free (prv);
		1041
		1042	while (prv = reqq_shift (&res_queue))
		1043	req_free (prv);
		1044
		1045	while (wrk_first.next != &wrk_first)
		1046	{
		1047	worker *wrk = wrk_first.next;
		1048
		1049	if (wrk->req)
		1050	req_free (wrk->req);
		1051
		1052	worker_clear (wrk);
		1053	worker_free (wrk);
		1054	}
		1055
843	started = 0;	1056	started = 0;
844		1057	nreqs = 0;
845	while (reqs)
846	{
847	prv = reqs;
848	reqs = prv->next;
849	req_free (prv);
850	}
851
852	reqs = reqe = 0;
853
854	while (ress)
855	{
856	prv = ress;
857	ress = prv->next;
858	req_free (prv);
859	}
860
861	ress = rese = 0;
862		1058
863	close (respipe [0]);	1059	close (respipe [0]);
864	close (respipe [1]);	1060	close (respipe [1]);
865	create_pipe ();	1061	create_pipe ();
866		1062
867	atfork_parent ();	1063	atfork_parent ();
868	}	1064	}
869		1065
870	#define dREQ \	1066	#define dREQ \
871	aio_req req; \	1067	aio_req req; \
		1068	int req_pri = next_pri; \
		1069	next_pri = DEFAULT_PRI + PRI_BIAS; \
872	\	1070	\
873	if (SvOK (callback) && !SvROK (callback)) \	1071	if (SvOK (callback) && !SvROK (callback)) \
874	croak ("callback must be undef or of reference type"); \	1072	croak ("callback must be undef or of reference type"); \
875	\	1073	\
876	Newz (0, req, 1, aio_cb); \	1074	Newz (0, req, 1, aio_cb); \
877	if (!req) \	1075	if (!req) \
878	croak ("out of memory during aio_req allocation"); \	1076	croak ("out of memory during aio_req allocation"); \
879	\	1077	\
880	req->callback = newSVsv (callback)	1078	req->callback = newSVsv (callback); \
		1079	req->pri = req_pri
881		1080
882	#define REQ_SEND \	1081	#define REQ_SEND \
883	req_send (req); \	1082	req_send (req); \
884	\	1083	\
885	if (GIMME_V != G_VOID) \	1084	if (GIMME_V != G_VOID) \
…		…
1139		1338
1140	REQ_SEND;	1339	REQ_SEND;
1141	}	1340	}
1142		1341
1143	void	1342	void
1144	aio_sleep (delay,callback=&PL_sv_undef)	1343	aio_busy (delay,callback=&PL_sv_undef)
1145	double delay	1344	double delay
1146	SV * callback	1345	SV * callback
1147	PPCODE:	1346	PPCODE:
1148	{	1347	{
1149	dREQ;	1348	dREQ;
1150		1349
1151	req->type = REQ_SLEEP;	1350	req->type = REQ_BUSY;
1152	req->fd = delay < 0. ? 0 : delay;	1351	req->fd = delay < 0. ? 0 : delay;
1153	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1352	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1154		1353
1155	REQ_SEND;	1354	REQ_SEND;
1156	}	1355	}
…		…
1160	SV * callback	1359	SV * callback
1161	PROTOTYPE: ;$	1360	PROTOTYPE: ;$
1162	PPCODE:	1361	PPCODE:
1163	{	1362	{
1164	dREQ;	1363	dREQ;
		1364
1165	req->type = REQ_GROUP;	1365	req->type = REQ_GROUP;
1166	req->grp_next = req;
1167	req->grp_prev = req;
1168
1169	req_send (req);	1366	req_send (req);
		1367
1170	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1368	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1171	}	1369	}
		1370
		1371	void
		1372	aio_nop (callback=&PL_sv_undef)
		1373	SV * callback
		1374	PPCODE:
		1375	{
		1376	dREQ;
		1377
		1378	req->type = REQ_NOP;
		1379
		1380	REQ_SEND;
		1381	}
		1382
		1383	void
		1384	aioreq_pri (int pri = DEFAULT_PRI)
		1385	CODE:
		1386	if (pri < PRI_MIN) pri = PRI_MIN;
		1387	if (pri > PRI_MAX) pri = PRI_MAX;
		1388	next_pri = pri + PRI_BIAS;
		1389
		1390	void
		1391	aioreq_nice (int nice = 0)
		1392	CODE:
		1393	nice = next_pri - nice;
		1394	if (nice < PRI_MIN) nice = PRI_MIN;
		1395	if (nice > PRI_MAX) nice = PRI_MAX;
		1396	next_pri = nice + PRI_BIAS;
1172		1397
1173	void	1398	void
1174	flush ()	1399	flush ()
1175	PROTOTYPE:	1400	PROTOTYPE:
1176	CODE:	1401	CODE:
…		…
1225		1450
1226	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1451	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1227		1452
1228	void	1453	void
1229	cancel (aio_req_ornot req)	1454	cancel (aio_req_ornot req)
1230	PROTOTYPE:
1231	CODE:	1455	CODE:
1232	req_cancel (req);	1456	req_cancel (req);
1233		1457
		1458	void
		1459	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
		1460	CODE:
		1461	SvREFCNT_dec (req->callback);
		1462	req->callback = newSVsv (callback);
		1463
1234	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1464	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1235		1465
1236	void	1466	void
1237	add (aio_req grp, ...)	1467	add (aio_req grp, ...)
1238	PPCODE:	1468	PPCODE:
1239	{	1469	{
1240	int i;	1470	int i;
		1471	aio_req req;
		1472
		1473	if (grp->fd == 2)
		1474	croak ("cannot add requests to IO::AIO::GRP after the group finished");
1241		1475
1242	for (i = 1; i < items; ++i )	1476	for (i = 1; i < items; ++i )
1243	{	1477	{
1244	if (GIMME_V != G_VOID)	1478	if (GIMME_V != G_VOID)
1245	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1479	XPUSHs (sv_2mortal (newSVsv (ST (i))));
1246		1480
1247	aio_req req = SvAIO_REQ (ST (i));	1481	req = SvAIO_REQ (ST (i));
1248		1482
1249	if (req)	1483	if (req)
1250	{	1484	{
1251	req->grp_prev = grp;	1485	++grp->length;
1252	req->grp_next = grp->grp_next;
1253	grp->grp_next->grp_prev = req;
1254	grp->grp_next = req;
1255
1256	req->grp = grp;	1486	req->grp = grp;
		1487
		1488	req->grp_prev = 0;
		1489	req->grp_next = grp->grp_first;
		1490
		1491	if (grp->grp_first)
		1492	grp->grp_first->grp_prev = req;
		1493
		1494	grp->grp_first = req;
1257	}	1495	}
1258	}	1496	}
1259	}	1497	}
1260		1498
1261	void	1499	void
1262	result (aio_req grp, ...)	1500	result (aio_req grp, ...)
		1501	CODE:
		1502	{
		1503	int i;
		1504	AV *av = newAV ();
		1505
		1506	for (i = 1; i < items; ++i )
		1507	av_push (av, newSVsv (ST (i)));
		1508
		1509	SvREFCNT_dec (grp->data);
		1510	grp->data = (SV *)av;
		1511	}
		1512
		1513	void
		1514	limit (aio_req grp, int limit)
1263	CODE:	1515	CODE:
1264	{	1516	grp->fd2 = limit;
1265	int i;	1517	aio_grp_feed (grp);
1266	AV *av = newAV ();
1267		1518
1268	if (grp->data)	1519	void
		1520	feed (aio_req grp, SV *callback=&PL_sv_undef)
		1521	CODE:
		1522	{
1269	SvREFCNT_dec (grp->data);	1523	SvREFCNT_dec (grp->fh2);
		1524	grp->fh2 = newSVsv (callback);
1270		1525
1271	for (i = 1; i < items; ++i )	1526	if (grp->fd2 <= 0)
1272	av_push (av, newSVsv (ST (i)));	1527	grp->fd2 = 2;
1273		1528
1274	grp->data = (SV *)av;	1529	aio_grp_feed (grp);
1275	}	1530	}
1276		1531

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.48 by root, Sun Oct 22 10:33:19 2006 UTC vs. Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.48 by root, Sun Oct 22 10:33:19 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC