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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.54 by root, Mon Oct 23 00:34:36 2006 UTC vs.
Revision 1.72 by root, Tue Oct 24 17:22:17 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,
…		…
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_GROUP, REQ_NOP,	81	REQ_GROUP, REQ_NOP,
61	REQ_SLEEP,	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 *volatile next;	90	struct aio_cb *volatile next;
70
71	struct aio_cb grp, grp_prev, grp_next, grp_first;
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;
		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	}
105		242
106	static void req_invoke (aio_req req);	243	static void req_invoke (aio_req req);
107	static void req_free (aio_req req);	244	static void req_free (aio_req req);
		245	static void req_cancel (aio_req req);
108		246
109	/* must be called at most once */	247	/* must be called at most once */
110	static SV req_sv (aio_req req, const char klass)	248	static SV req_sv (aio_req req, const char klass)
111	{	249	{
112	if (!req->self)	250	if (!req->self)
…		…
130	return mg ? (aio_req)mg->mg_ptr : 0;	268	return mg ? (aio_req)mg->mg_ptr : 0;
131	}	269	}
132		270
133	static void aio_grp_feed (aio_req grp)	271	static void aio_grp_feed (aio_req grp)
134	{	272	{
135	while (grp->length < grp->fd2)	273	while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
136	{	274	{
137	int old_len = grp->length;	275	int old_len = grp->length;
138		276
139	if (grp->fh2 && SvOK (grp->fh2))	277	if (grp->fh2 && SvOK (grp->fh2))
140	{	278	{
…		…
143	ENTER;	281	ENTER;
144	SAVETMPS;	282	SAVETMPS;
145	PUSHMARK (SP);	283	PUSHMARK (SP);
146	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	284	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
147	PUTBACK;	285	PUTBACK;
148	call_sv (grp->fh2, G_VOID \| G_EVAL);	286	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
149	SPAGAIN;	287	SPAGAIN;
150	FREETMPS;	288	FREETMPS;
151	LEAVE;	289	LEAVE;
152	}	290	}
153		291
…		…
176	}	314	}
177	}	315	}
178		316
179	static void poll_wait ()	317	static void poll_wait ()
180	{	318	{
181	if (nreqs && !ress)
182	{
183	fd_set rfd;	319	fd_set rfd;
		320
		321	while (nreqs)
		322	{
		323	int size;
		324	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		325	LOCK (reslock);
		326	#endif
		327	size = res_queue.size;
		328	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		329	UNLOCK (reslock);
		330	#endif
		331
		332	if (size)
		333	return;
		334
184	FD_ZERO(&rfd);	335	FD_ZERO(&rfd);
185	FD_SET(respipe [0], &rfd);	336	FD_SET(respipe [0], &rfd);
186		337
187	select (respipe [0] + 1, &rfd, 0, 0, 0);	338	select (respipe [0] + 1, &rfd, 0, 0, 0);
188	}	339	}
189	}	340	}
190		341
191	static void req_invoke (aio_req req)	342	static void req_invoke (aio_req req)
192	{	343	{
193	dSP;	344	dSP;
194	int errorno = errno;
195		345
196	if (req->cancelled \|\| !SvOK (req->callback))	346	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
197	return;	347	{
198
199	errno = req->errorno;	348	errno = req->errorno;
200		349
201	ENTER;	350	ENTER;
202	SAVETMPS;	351	SAVETMPS;
203	PUSHMARK (SP);	352	PUSHMARK (SP);
204	EXTEND (SP, 1);	353	EXTEND (SP, 1);
205		354
206	switch (req->type)	355	switch (req->type)
207	{
208	case REQ_READDIR:
209	{	356	{
210	SV *rv = &PL_sv_undef;	357	case REQ_READDIR:
211
212	if (req->result >= 0)
213	{	358	{
214	char *buf = req->data2ptr;	359	SV *rv = &PL_sv_undef;
215	AV *av = newAV ();
216		360
217	while (req->result)	361	if (req->result >= 0)
218	{	362	{
		363	int i;
		364	char *buf = req->data2ptr;
		365	AV *av = newAV ();
		366
		367	av_extend (av, req->result - 1);
		368
		369	for (i = 0; i < req->result; ++i)
		370	{
219	SV *sv = newSVpv (buf, 0);	371	SV *sv = newSVpv (buf, 0);
220		372
221	av_push (av, sv);	373	av_store (av, i, sv);
222	buf += SvCUR (sv) + 1;	374	buf += SvCUR (sv) + 1;
223	req->result--;	375	}
		376
		377	rv = sv_2mortal (newRV_noinc ((SV *)av));
224	}	378	}
225		379
226	rv = sv_2mortal (newRV_noinc ((SV *)av));	380	PUSHs (rv);
227	}	381	}
		382	break;
228		383
229	PUSHs (rv);	384	case REQ_OPEN:
		385	{
		386	/* convert fd to fh */
		387	SV *fh;
		388
		389	PUSHs (sv_2mortal (newSViv (req->result)));
		390	PUTBACK;
		391	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
		392	SPAGAIN;
		393
		394	fh = SvREFCNT_inc (POPs);
		395
		396	PUSHMARK (SP);
		397	XPUSHs (sv_2mortal (fh));
		398	}
		399	break;
		400
		401	case REQ_GROUP:
		402	req->fd = 2; /* mark group as finished */
		403
		404	if (req->data)
		405	{
		406	int i;
		407	AV av = (AV )req->data;
		408
		409	EXTEND (SP, AvFILL (av) + 1);
		410	for (i = 0; i <= AvFILL (av); ++i)
		411	PUSHs (*av_fetch (av, i, 0));
		412	}
		413	break;
		414
		415	case REQ_NOP:
		416	case REQ_BUSY:
		417	break;
		418
		419	default:
		420	PUSHs (sv_2mortal (newSViv (req->result)));
		421	break;
230	}	422	}
231	break;
232		423
233	case REQ_OPEN:
234	{
235	/* convert fd to fh */
236	SV *fh;
237		424
238	PUSHs (sv_2mortal (newSViv (req->result)));
239	PUTBACK;	425	PUTBACK;
240	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
241	SPAGAIN;
242
243	fh = SvREFCNT_inc (POPs);
244
245	PUSHMARK (SP);
246	XPUSHs (sv_2mortal (fh));
247	}
248	break;
249
250	case REQ_GROUP:
251	req->fd = 2; /* mark group as finished */
252
253	if (req->data)
254	{
255	int i;
256	AV av = (AV )req->data;
257
258	EXTEND (SP, AvFILL (av) + 1);
259	for (i = 0; i <= AvFILL (av); ++i)
260	PUSHs (*av_fetch (av, i, 0));
261	}
262	break;
263
264	case REQ_NOP:
265	case REQ_SLEEP:
266	break;
267
268	default:
269	PUSHs (sv_2mortal (newSViv (req->result)));
270	break;
271	}
272
273
274	PUTBACK;
275	call_sv (req->callback, G_VOID \| G_EVAL);	426	call_sv (req->callback, G_VOID \| G_EVAL);
276	SPAGAIN;	427	SPAGAIN;
277		428
278	FREETMPS;	429	FREETMPS;
279	LEAVE;	430	LEAVE;
280
281	errno = errorno;
282
283	if (SvTRUE (ERRSV))
284	{	431	}
285	req_free (req);
286	croak (0);
287	}
288	}
289		432
290	static void req_free (aio_req req)
291	{
292	if (req->grp)	433	if (req->grp)
293	{	434	{
294	aio_req grp = req->grp;	435	aio_req grp = req->grp;
295		436
296	/* unlink request */	437	/* unlink request */
…		…
301	grp->grp_first = req->grp_next;	442	grp->grp_first = req->grp_next;
302		443
303	aio_grp_dec (grp);	444	aio_grp_dec (grp);
304	}	445	}
305		446
		447	if (SvTRUE (ERRSV))
		448	{
		449	req_free (req);
		450	croak (0);
		451	}
		452	}
		453
		454	static void req_free (aio_req req)
		455	{
306	if (req->self)	456	if (req->self)
307	{	457	{
308	sv_unmagic (req->self, PERL_MAGIC_ext);	458	sv_unmagic (req->self, PERL_MAGIC_ext);
309	SvREFCNT_dec (req->self);	459	SvREFCNT_dec (req->self);
310	}	460	}
…		…
313	SvREFCNT_dec (req->fh);	463	SvREFCNT_dec (req->fh);
314	SvREFCNT_dec (req->fh2);	464	SvREFCNT_dec (req->fh2);
315	SvREFCNT_dec (req->callback);	465	SvREFCNT_dec (req->callback);
316	Safefree (req->statdata);	466	Safefree (req->statdata);
317		467
318	if (req->type == REQ_READDIR && req->result >= 0)	468	if (req->type == REQ_READDIR)
319	free (req->data2ptr);	469	free (req->data2ptr);
320		470
321	Safefree (req);	471	Safefree (req);
322	}	472	}
323		473
		474	static void req_cancel_subs (aio_req grp)
		475	{
		476	aio_req sub;
		477
		478	if (grp->type != REQ_GROUP)
		479	return;
		480
		481	SvREFCNT_dec (grp->fh2);
		482	grp->fh2 = 0;
		483
		484	for (sub = grp->grp_first; sub; sub = sub->grp_next)
		485	req_cancel (sub);
		486	}
		487
324	static void req_cancel (aio_req req)	488	static void req_cancel (aio_req req)
325	{	489	{
326	req->cancelled = 1;	490	req->flags \|= FLAG_CANCELLED;
327		491
328	if (req->type == REQ_GROUP)	492	req_cancel_subs (req);
329	{
330	aio_req sub;
331
332	for (sub = req->grp_first; sub; sub = sub->grp_next)
333	req_cancel (sub);
334	}
335	}	493	}
336		494
337	static int poll_cb ()	495	static int poll_cb ()
338	{	496	{
339	dSP;	497	dSP;
…		…
341	int do_croak = 0;	499	int do_croak = 0;
342	aio_req req;	500	aio_req req;
343		501
344	for (;;)	502	for (;;)
345	{	503	{
346	pthread_mutex_lock (&reslock);	504	LOCK (reslock);
347	req = ress;	505	req = reqq_shift (&res_queue);
348		506
349	if (req)	507	if (req)
350	{	508	{
351	ress = req->next;
352
353	if (!ress)	509	if (!res_queue.size)
354	{	510	{
355	/* read any signals sent by the worker threads */	511	/* read any signals sent by the worker threads */
356	char buf [32];	512	char buf [32];
357	while (read (respipe [0], buf, 32) == 32)	513	while (read (respipe [0], buf, 32) == 32)
358	;	514	;
359
360	rese = 0;
361	}	515	}
362	}	516	}
363		517
364	pthread_mutex_unlock (&reslock);	518	UNLOCK (reslock);
365		519
366	if (!req)	520	if (!req)
367	break;	521	break;
368		522
369	--nreqs;	523	--nreqs;
…		…
403		557
404	static void aio_proc(void arg);	558	static void aio_proc(void arg);
405		559
406	static void start_thread (void)	560	static void start_thread (void)
407	{	561	{
		562	worker *wrk = calloc (1, sizeof (worker));
		563
		564	if (!wrk)
		565	croak ("unable to allocate worker thread data");
		566
408	sigset_t fullsigset, oldsigset;	567	sigset_t fullsigset, oldsigset;
409	pthread_t tid;
410	pthread_attr_t attr;	568	pthread_attr_t attr;
411		569
412	pthread_attr_init (&attr);	570	pthread_attr_init (&attr);
413	pthread_attr_setstacksize (&attr, STACKSIZE);	571	pthread_attr_setstacksize (&attr, STACKSIZE);
414	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	572	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
415		573
416	sigfillset (&fullsigset);	574	sigfillset (&fullsigset);
		575
		576	LOCK (wrklock);
417	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	577	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
418		578
419	if (pthread_create (&tid, &attr, aio_proc, 0) == 0)	579	if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
		580	{
		581	wrk->prev = &wrk_first;
		582	wrk->next = wrk_first.next;
		583	wrk_first.next->prev = wrk;
		584	wrk_first.next = wrk;
420	started++;	585	started++;
		586	}
		587	else
		588	free (wrk);
421		589
422	sigprocmask (SIG_SETMASK, &oldsigset, 0);	590	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		591	UNLOCK (wrklock);
423	}	592	}
424		593
425	static void req_send (aio_req req)	594	static void req_send (aio_req req)
426	{	595	{
427	while (started < wanted && nreqs >= started)	596	while (started < wanted && nreqs >= started)
428	start_thread ();	597	start_thread ();
429		598
430	++nreqs;	599	++nreqs;
431		600
432	pthread_mutex_lock (&reqlock);	601	LOCK (reqlock);
433		602	reqq_push (&req_queue, req);
434	req->next = 0;
435
436	if (reqe)
437	{
438	reqe->next = req;
439	reqe = req;
440	}
441	else
442	reqe = reqs = req;
443
444	pthread_cond_signal (&reqwait);	603	pthread_cond_signal (&reqwait);
445	pthread_mutex_unlock (&reqlock);	604	UNLOCK (reqlock);
446		605
447	if (nreqs > max_outstanding)	606	if (nreqs > max_outstanding)
448	for (;;)	607	for (;;)
449	{	608	{
450	poll_cb ();	609	poll_cb ();
…		…
457	}	616	}
458		617
459	static void end_thread (void)	618	static void end_thread (void)
460	{	619	{
461	aio_req req;	620	aio_req req;
		621
462	Newz (0, req, 1, aio_cb);	622	Newz (0, req, 1, aio_cb);
		623
463	req->type = REQ_QUIT;	624	req->type = REQ_QUIT;
		625	req->pri = PRI_MAX + PRI_BIAS;
464		626
465	req_send (req);	627	req_send (req);
466	}	628	}
467		629
468	static void min_parallel (int nthreads)	630	static void min_parallel (int nthreads)
…		…
520	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)	682	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
521	{	683	{
522	ssize_t res;	684	ssize_t res;
523	off_t ooffset;	685	off_t ooffset;
524		686
525	pthread_mutex_lock (&preadwritelock);	687	LOCK (preadwritelock);
526	ooffset = lseek (fd, 0, SEEK_CUR);	688	ooffset = lseek (fd, 0, SEEK_CUR);
527	lseek (fd, offset, SEEK_SET);	689	lseek (fd, offset, SEEK_SET);
528	res = read (fd, buf, count);	690	res = read (fd, buf, count);
529	lseek (fd, ooffset, SEEK_SET);	691	lseek (fd, ooffset, SEEK_SET);
530	pthread_mutex_unlock (&preadwritelock);	692	UNLOCK (preadwritelock);
531		693
532	return res;	694	return res;
533	}	695	}
534		696
535	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)	697	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
536	{	698	{
537	ssize_t res;	699	ssize_t res;
538	off_t ooffset;	700	off_t ooffset;
539		701
540	pthread_mutex_lock (&preadwritelock);	702	LOCK (preadwritelock);
541	ooffset = lseek (fd, 0, SEEK_CUR);	703	ooffset = lseek (fd, 0, SEEK_CUR);
542	lseek (fd, offset, SEEK_SET);	704	lseek (fd, offset, SEEK_SET);
543	res = write (fd, buf, count);	705	res = write (fd, buf, count);
544	lseek (fd, offset, SEEK_SET);	706	lseek (fd, offset, SEEK_SET);
545	pthread_mutex_unlock (&preadwritelock);	707	UNLOCK (preadwritelock);
546		708
547	return res;	709	return res;
548	}	710	}
549	#endif	711	#endif
550		712
…		…
555	#if !HAVE_READAHEAD	717	#if !HAVE_READAHEAD
556	# define readahead aio_readahead	718	# define readahead aio_readahead
557		719
558	static ssize_t readahead (int fd, off_t offset, size_t count)	720	static ssize_t readahead (int fd, off_t offset, size_t count)
559	{	721	{
560	char readahead_buf[4096];	722	dBUF;
561		723
562	while (count > 0)	724	while (count > 0)
563	{	725	{
564	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	726	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
565		727
566	pread (fd, readahead_buf, len, offset);	728	pread (fd, aio_buf, len, offset);
567	offset += len;	729	offset += len;
568	count -= len;	730	count -= len;
569	}	731	}
570		732
571	errno = 0;	733	errno = 0;
…		…
580	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)	742	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)
581	{	743	{
582	struct dirent *e;	744	struct dirent *e;
583	int errorno;	745	int errorno;
584		746
585	pthread_mutex_lock (&readdirlock);	747	LOCK (readdirlock);
586		748
587	e = readdir (dirp);	749	e = readdir (dirp);
588	errorno = errno;	750	errorno = errno;
589		751
590	if (e)	752	if (e)
…		…
593	strcpy (ent->d_name, e->d_name);	755	strcpy (ent->d_name, e->d_name);
594	}	756	}
595	else	757	else
596	*res = 0;	758	*res = 0;
597		759
598	pthread_mutex_unlock (&readdirlock);	760	UNLOCK (readdirlock);
599		761
600	errno = errorno;	762	errno = errorno;
601	return e ? 0 : -1;	763	return e ? 0 : -1;
602	}	764	}
603	#endif	765	#endif
604		766
605	/* sendfile always needs emulation */	767	/* sendfile always needs emulation */
606	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)	768	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
607	{	769	{
608	ssize_t res;	770	ssize_t res;
609		771
610	if (!count)	772	if (!count)
611	return 0;	773	return 0;
…		…
660	#endif	822	#endif
661	)	823	)
662	)	824	)
663	{	825	{
664	/* emulate sendfile. this is a major pain in the ass */	826	/* emulate sendfile. this is a major pain in the ass */
665	char buf[4096];	827	dBUF;
		828
666	res = 0;	829	res = 0;
667		830
668	while (count)	831	while (count)
669	{	832	{
670	ssize_t cnt;	833	ssize_t cnt;
671		834
672	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	835	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
673		836
674	if (cnt <= 0)	837	if (cnt <= 0)
675	{	838	{
676	if (cnt && !res) res = -1;	839	if (cnt && !res) res = -1;
677	break;	840	break;
678	}	841	}
679		842
680	cnt = write (ofd, buf, cnt);	843	cnt = write (ofd, aio_buf, cnt);
681		844
682	if (cnt <= 0)	845	if (cnt <= 0)
683	{	846	{
684	if (cnt && !res) res = -1;	847	if (cnt && !res) res = -1;
685	break;	848	break;
…		…
693		856
694	return res;	857	return res;
695	}	858	}
696		859
697	/* read a full directory */	860	/* read a full directory */
698	static int scandir_ (const char path, void *namesp)	861	static void scandir_ (aio_req req, worker *self)
699	{	862	{
700	DIR *dirp = opendir (path);	863	DIR *dirp;
701	union	864	union
702	{	865	{
703	struct dirent d;	866	struct dirent d;
704	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	867	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
705	} u;	868	} *u;
706	struct dirent *entp;	869	struct dirent *entp;
707	char name, names;	870	char name, names;
708	int memlen = 4096;	871	int memlen = 4096;
709	int memofs = 0;	872	int memofs = 0;
710	int res = 0;	873	int res = 0;
711	int errorno;	874	int errorno;
712		875
713	if (!dirp)	876	LOCK (wrklock);
714	return -1;	877	self->dirp = dirp = opendir (req->dataptr);
		878	self->dbuf = u = malloc (sizeof (*u));
		879	UNLOCK (wrklock);
715		880
716	names = malloc (memlen);	881	req->data2ptr = names = malloc (memlen);
717		882
		883	if (dirp && u && names)
718	for (;;)	884	for (;;)
719	{	885	{
		886	errno = 0;
720	errno = 0, readdir_r (dirp, &u.d, &entp);	887	readdir_r (dirp, &u->d, &entp);
721		888
722	if (!entp)	889	if (!entp)
723	break;	890	break;
724		891
725	name = entp->d_name;	892	name = entp->d_name;
726		893
727	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	894	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
728	{	895	{
729	int len = strlen (name) + 1;	896	int len = strlen (name) + 1;
730		897
731	res++;	898	res++;
732		899
733	while (memofs + len > memlen)	900	while (memofs + len > memlen)
734	{	901	{
735	memlen *= 2;	902	memlen *= 2;
		903	LOCK (wrklock);
736	names = realloc (names, memlen);	904	req->data2ptr = names = realloc (names, memlen);
		905	UNLOCK (wrklock);
		906
737	if (!names)	907	if (!names)
738	break;	908	break;
739	}	909	}
740		910
741	memcpy (names + memofs, name, len);	911	memcpy (names + memofs, name, len);
742	memofs += len;	912	memofs += len;
743	}	913	}
744	}	914	}
745		915
746	errorno = errno;
747	closedir (dirp);
748
749	if (errorno)	916	if (errno)
750	{
751	free (names);
752	errno = errorno;
753	res = -1;	917	res = -1;
754	}	918
755		919	req->result = res;
756	namesp = (void )names;
757	return res;
758	}	920	}
759		921
760	/*****************************************************************************/	922	/*****************************************************************************/
761		923
762	static void aio_proc (void thr_arg)	924	static void aio_proc (void thr_arg)
763	{	925	{
764	aio_req req;	926	aio_req req;
765	int type;	927	int type;
		928	worker self = (worker )thr_arg;
766		929
767	do	930	do
768	{	931	{
769	pthread_mutex_lock (&reqlock);	932	LOCK (reqlock);
770		933
771	for (;;)	934	for (;;)
772	{	935	{
773	req = reqs;	936	self->req = req = reqq_shift (&req_queue);
774
775	if (reqs)
776	{
777	reqs = reqs->next;
778	if (!reqs) reqe = 0;
779	}
780		937
781	if (req)	938	if (req)
782	break;	939	break;
783		940
784	pthread_cond_wait (&reqwait, &reqlock);	941	pthread_cond_wait (&reqwait, &reqlock);
785	}	942	}
786		943
787	pthread_mutex_unlock (&reqlock);	944	UNLOCK (reqlock);
788		945
789	errno = 0; /* strictly unnecessary */	946	errno = 0; /* strictly unnecessary */
790
791	if (!req->cancelled)
792	switch (type = req->type) /* remember type for QUIT check */	947	type = req->type; /* remember type for QUIT check */
		948
		949	if (!(req->flags & FLAG_CANCELLED))
		950	switch (type)
793	{	951	{
794	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	952	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
795	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	953	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
796		954
797	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	955	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
798	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;	956	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
799		957
800	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	958	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
801	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	959	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
802	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	960	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
803		961
…		…
809	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	967	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
810	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	968	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
811		969
812	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	970	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
813	case REQ_FSYNC: req->result = fsync (req->fd); break;	971	case REQ_FSYNC: req->result = fsync (req->fd); break;
814	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	972	case REQ_READDIR: scandir_ (req, self); break;
815		973
816	case REQ_SLEEP:	974	case REQ_BUSY:
817	{	975	{
818	struct timeval tv;	976	struct timeval tv;
819		977
820	tv.tv_sec = req->fd;	978	tv.tv_sec = req->fd;
821	tv.tv_usec = req->fd2;	979	tv.tv_usec = req->fd2;
822		980
823	req->result = select (0, 0, 0, 0, &tv);	981	req->result = select (0, 0, 0, 0, &tv);
824	}	982	}
825		983
826	case REQ_GROUP: /TODO: should not be handled here /	984	case REQ_GROUP:
827	case REQ_NOP: /TODO: should not be handled here /	985	case REQ_NOP:
828	case REQ_QUIT:	986	case REQ_QUIT:
829	break;	987	break;
830		988
831	default:	989	default:
832	req->result = ENOSYS;	990	req->result = ENOSYS;
833	break;	991	break;
834	}	992	}
835		993
836	req->errorno = errno;	994	req->errorno = errno;
837		995
838	pthread_mutex_lock (&reslock);	996	LOCK (reslock);
839		997
840	req->next = 0;	998	if (!reqq_push (&res_queue, req))
841
842	if (rese)
843	{
844	rese->next = req;
845	rese = req;
846	}
847	else
848	{
849	rese = ress = req;
850
851	/* write a dummy byte to the pipe so fh becomes ready */	999	/* write a dummy byte to the pipe so fh becomes ready */
852	write (respipe [1], &respipe, 1);	1000	write (respipe [1], &respipe, 1);
853	}
854		1001
855	pthread_mutex_unlock (&reslock);	1002	self->req = 0;
		1003	worker_clear (self);
		1004
		1005	UNLOCK (reslock);
856	}	1006	}
857	while (type != REQ_QUIT);	1007	while (type != REQ_QUIT);
858		1008
		1009	LOCK (wrklock);
		1010	worker_free (self);
		1011	UNLOCK (wrklock);
		1012
859	return 0;	1013	return 0;
860	}	1014	}
861		1015
862	/*****************************************************************************/	1016	/*****************************************************************************/
863		1017
864	static void atfork_prepare (void)	1018	static void atfork_prepare (void)
865	{	1019	{
866	pthread_mutex_lock (&reqlock);	1020	LOCK (wrklock);
867	pthread_mutex_lock (&reslock);	1021	LOCK (reqlock);
		1022	LOCK (reslock);
868	#if !HAVE_PREADWRITE	1023	#if !HAVE_PREADWRITE
869	pthread_mutex_lock (&preadwritelock);	1024	LOCK (preadwritelock);
870	#endif	1025	#endif
871	#if !HAVE_READDIR_R	1026	#if !HAVE_READDIR_R
872	pthread_mutex_lock (&readdirlock);	1027	LOCK (readdirlock);
873	#endif	1028	#endif
874	}	1029	}
875		1030
876	static void atfork_parent (void)	1031	static void atfork_parent (void)
877	{	1032	{
878	#if !HAVE_READDIR_R	1033	#if !HAVE_READDIR_R
879	pthread_mutex_unlock (&readdirlock);	1034	UNLOCK (readdirlock);
880	#endif	1035	#endif
881	#if !HAVE_PREADWRITE	1036	#if !HAVE_PREADWRITE
882	pthread_mutex_unlock (&preadwritelock);	1037	UNLOCK (preadwritelock);
883	#endif	1038	#endif
884	pthread_mutex_unlock (&reslock);	1039	UNLOCK (reslock);
885	pthread_mutex_unlock (&reqlock);	1040	UNLOCK (reqlock);
		1041	UNLOCK (wrklock);
886	}	1042	}
887		1043
888	static void atfork_child (void)	1044	static void atfork_child (void)
889	{	1045	{
890	aio_req prv;	1046	aio_req prv;
891		1047
		1048	while (prv = reqq_shift (&req_queue))
		1049	req_free (prv);
		1050
		1051	while (prv = reqq_shift (&res_queue))
		1052	req_free (prv);
		1053
		1054	while (wrk_first.next != &wrk_first)
		1055	{
		1056	worker *wrk = wrk_first.next;
		1057
		1058	if (wrk->req)
		1059	req_free (wrk->req);
		1060
		1061	worker_clear (wrk);
		1062	worker_free (wrk);
		1063	}
		1064
892	started = 0;	1065	started = 0;
893		1066	nreqs = 0;
894	while (reqs)
895	{
896	prv = reqs;
897	reqs = prv->next;
898	req_free (prv);
899	}
900
901	reqs = reqe = 0;
902
903	while (ress)
904	{
905	prv = ress;
906	ress = prv->next;
907	req_free (prv);
908	}
909
910	ress = rese = 0;
911		1067
912	close (respipe [0]);	1068	close (respipe [0]);
913	close (respipe [1]);	1069	close (respipe [1]);
914	create_pipe ();	1070	create_pipe ();
915		1071
916	atfork_parent ();	1072	atfork_parent ();
917	}	1073	}
918		1074
919	#define dREQ \	1075	#define dREQ \
920	aio_req req; \	1076	aio_req req; \
		1077	int req_pri = next_pri; \
		1078	next_pri = DEFAULT_PRI + PRI_BIAS; \
921	\	1079	\
922	if (SvOK (callback) && !SvROK (callback)) \	1080	if (SvOK (callback) && !SvROK (callback)) \
923	croak ("callback must be undef or of reference type"); \	1081	croak ("callback must be undef or of reference type"); \
924	\	1082	\
925	Newz (0, req, 1, aio_cb); \	1083	Newz (0, req, 1, aio_cb); \
926	if (!req) \	1084	if (!req) \
927	croak ("out of memory during aio_req allocation"); \	1085	croak ("out of memory during aio_req allocation"); \
928	\	1086	\
929	req->callback = newSVsv (callback)	1087	req->callback = newSVsv (callback); \
		1088	req->pri = req_pri
930		1089
931	#define REQ_SEND \	1090	#define REQ_SEND \
932	req_send (req); \	1091	req_send (req); \
933	\	1092	\
934	if (GIMME_V != G_VOID) \	1093	if (GIMME_V != G_VOID) \
…		…
1188		1347
1189	REQ_SEND;	1348	REQ_SEND;
1190	}	1349	}
1191		1350
1192	void	1351	void
1193	aio_sleep (delay,callback=&PL_sv_undef)	1352	aio_busy (delay,callback=&PL_sv_undef)
1194	double delay	1353	double delay
1195	SV * callback	1354	SV * callback
1196	PPCODE:	1355	PPCODE:
1197	{	1356	{
1198	dREQ;	1357	dREQ;
1199		1358
1200	req->type = REQ_SLEEP;	1359	req->type = REQ_BUSY;
1201	req->fd = delay < 0. ? 0 : delay;	1360	req->fd = delay < 0. ? 0 : delay;
1202	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1361	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1203		1362
1204	REQ_SEND;	1363	REQ_SEND;
1205	}	1364	}
…		…
1209	SV * callback	1368	SV * callback
1210	PROTOTYPE: ;$	1369	PROTOTYPE: ;$
1211	PPCODE:	1370	PPCODE:
1212	{	1371	{
1213	dREQ;	1372	dREQ;
		1373
1214	req->type = REQ_GROUP;	1374	req->type = REQ_GROUP;
1215	req_send (req);	1375	req_send (req);
		1376
1216	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1377	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1217	}	1378	}
1218		1379
1219	void	1380	void
1220	aio_nop (callback=&PL_sv_undef)	1381	aio_nop (callback=&PL_sv_undef)
…		…
1225		1386
1226	req->type = REQ_NOP;	1387	req->type = REQ_NOP;
1227		1388
1228	REQ_SEND;	1389	REQ_SEND;
1229	}	1390	}
		1391
		1392	void
		1393	aioreq_pri (int pri = DEFAULT_PRI)
		1394	CODE:
		1395	if (pri < PRI_MIN) pri = PRI_MIN;
		1396	if (pri > PRI_MAX) pri = PRI_MAX;
		1397	next_pri = pri + PRI_BIAS;
		1398
		1399	void
		1400	aioreq_nice (int nice = 0)
		1401	CODE:
		1402	nice = next_pri - nice;
		1403	if (nice < PRI_MIN) nice = PRI_MIN;
		1404	if (nice > PRI_MAX) nice = PRI_MAX;
		1405	next_pri = nice + PRI_BIAS;
1230		1406
1231	void	1407	void
1232	flush ()	1408	flush ()
1233	PROTOTYPE:	1409	PROTOTYPE:
1234	CODE:	1410	CODE:
…		…
1283		1459
1284	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1460	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1285		1461
1286	void	1462	void
1287	cancel (aio_req_ornot req)	1463	cancel (aio_req_ornot req)
1288	PROTOTYPE:
1289	CODE:	1464	CODE:
1290	req_cancel (req);	1465	req_cancel (req);
		1466
		1467	void
		1468	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
		1469	CODE:
		1470	SvREFCNT_dec (req->callback);
		1471	req->callback = newSVsv (callback);
1291		1472
1292	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1473	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1293		1474
1294	void	1475	void
1295	add (aio_req grp, ...)	1476	add (aio_req grp, ...)
…		…
1323	}	1504	}
1324	}	1505	}
1325	}	1506	}
1326		1507
1327	void	1508	void
		1509	cancel_subs (aio_req_ornot req)
		1510	CODE:
		1511	req_cancel_subs (req);
		1512
		1513	void
1328	result (aio_req grp, ...)	1514	result (aio_req grp, ...)
1329	CODE:	1515	CODE:
1330	{	1516	{
1331	int i;	1517	int i;
1332	AV *av = newAV ();	1518	AV *av = newAV ();
…		…
1337	SvREFCNT_dec (grp->data);	1523	SvREFCNT_dec (grp->data);
1338	grp->data = (SV *)av;	1524	grp->data = (SV *)av;
1339	}	1525	}
1340		1526
1341	void	1527	void
1342	lock (aio_req grp)
1343	CODE:
1344	++grp->length;
1345
1346	void
1347	unlock (aio_req grp)
1348	CODE:
1349	aio_grp_dec (grp);
1350
1351	void
1352	feeder_limit (aio_req grp, int limit)	1528	limit (aio_req grp, int limit)
1353	CODE:	1529	CODE:
1354	grp->fd2 = limit;	1530	grp->fd2 = limit;
1355	aio_grp_feed (grp);	1531	aio_grp_feed (grp);
1356		1532
1357	void	1533	void
1358	set_feeder (aio_req grp, SV *callback=&PL_sv_undef)	1534	feed (aio_req grp, SV *callback=&PL_sv_undef)
1359	CODE:	1535	CODE:
1360	{	1536	{
1361	SvREFCNT_dec (grp->fh2);	1537	SvREFCNT_dec (grp->fh2);
1362	grp->fh2 = newSVsv (callback);	1538	grp->fh2 = newSVsv (callback);
1363		1539

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.54 by root, Mon Oct 23 00:34:36 2006 UTC vs. Revision 1.72 by root, Tue Oct 24 17:22:17 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.54 by root, Mon Oct 23 00:34:36 2006 UTC vs.
Revision 1.72 by root, Tue Oct 24 17:22:17 2006 UTC