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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.58 by root, Mon Oct 23 18:48:08 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,
…		…
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
		106	unsigned char flags;
88	unsigned char pri;	107	unsigned char pri;
89	unsigned char flags;	108
		109	SV self; / the perl counterpart of this request, if any */
		110	struct aio_cb grp, grp_prev, grp_next, grp_first;
90	} aio_cb;	111	} aio_cb;
91		112
92	enum {	113	enum {
93	FLAG_CANCELLED = 0x01,	114	FLAG_CANCELLED = 0x01,
94	};	115	};
95		116
96	typedef aio_cb *aio_req;	117	typedef aio_cb *aio_req;
97	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;
98		130
99	static int started, wanted;	131	static int started, wanted;
100	static volatile int nreqs;	132	static volatile int nreqs;
101	static int max_outstanding = 1<<30;	133	static int max_outstanding = 1<<30;
102	static int respipe [2];	134	static int respipe [2];
103		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
104	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	185	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
105	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	186	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
106	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	187	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
107		188
108	static volatile aio_req reqs, reqe; /* queue start, queue end */	189	/*
109	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	}
110		242
111	static void req_invoke (aio_req req);	243	static void req_invoke (aio_req req);
112	static void req_free (aio_req req);	244	static void req_free (aio_req req);
113		245
114	/* must be called at most once */	246	/* must be called at most once */
…		…
148	ENTER;	280	ENTER;
149	SAVETMPS;	281	SAVETMPS;
150	PUSHMARK (SP);	282	PUSHMARK (SP);
151	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	283	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
152	PUTBACK;	284	PUTBACK;
153	call_sv (grp->fh2, G_VOID \| G_EVAL);	285	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
154	SPAGAIN;	286	SPAGAIN;
155	FREETMPS;	287	FREETMPS;
156	LEAVE;	288	LEAVE;
157	}	289	}
158		290
…		…
181	}	313	}
182	}	314	}
183		315
184	static void poll_wait ()	316	static void poll_wait ()
185	{	317	{
186	if (nreqs && !ress)
187	{
188	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
189	FD_ZERO(&rfd);	334	FD_ZERO(&rfd);
190	FD_SET(respipe [0], &rfd);	335	FD_SET(respipe [0], &rfd);
191		336
192	select (respipe [0] + 1, &rfd, 0, 0, 0);	337	select (respipe [0] + 1, &rfd, 0, 0, 0);
193	}	338	}
194	}	339	}
195		340
196	static void req_invoke (aio_req req)	341	static void req_invoke (aio_req req)
197	{	342	{
198	dSP;	343	dSP;
199	int errorno = errno;
200		344
201	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))	345	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
202	return;	346	{
203
204	errno = req->errorno;	347	errno = req->errorno;
205		348
206	ENTER;	349	ENTER;
207	SAVETMPS;	350	SAVETMPS;
208	PUSHMARK (SP);	351	PUSHMARK (SP);
209	EXTEND (SP, 1);	352	EXTEND (SP, 1);
210		353
211	switch (req->type)	354	switch (req->type)
212	{
213	case REQ_READDIR:
214	{	355	{
215	SV *rv = &PL_sv_undef;	356	case REQ_READDIR:
216
217	if (req->result >= 0)
218	{	357	{
219	char *buf = req->data2ptr;	358	SV *rv = &PL_sv_undef;
220	AV *av = newAV ();
221		359
222	while (req->result)	360	if (req->result >= 0)
223	{	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	{
224	SV *sv = newSVpv (buf, 0);	370	SV *sv = newSVpv (buf, 0);
225		371
226	av_push (av, sv);	372	av_store (av, i, sv);
227	buf += SvCUR (sv) + 1;	373	buf += SvCUR (sv) + 1;
228	req->result--;	374	}
		375
		376	rv = sv_2mortal (newRV_noinc ((SV *)av));
229	}	377	}
230		378
231	rv = sv_2mortal (newRV_noinc ((SV *)av));	379	PUSHs (rv);
232	}	380	}
		381	break;
233		382
234	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;
235	}	421	}
236	break;
237		422
238	case REQ_OPEN:
239	{
240	/* convert fd to fh */
241	SV *fh;
242		423
243	PUSHs (sv_2mortal (newSViv (req->result)));
244	PUTBACK;	424	PUTBACK;
245	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
246	SPAGAIN;
247
248	fh = SvREFCNT_inc (POPs);
249
250	PUSHMARK (SP);
251	XPUSHs (sv_2mortal (fh));
252	}
253	break;
254
255	case REQ_GROUP:
256	req->fd = 2; /* mark group as finished */
257
258	if (req->data)
259	{
260	int i;
261	AV av = (AV )req->data;
262
263	EXTEND (SP, AvFILL (av) + 1);
264	for (i = 0; i <= AvFILL (av); ++i)
265	PUSHs (*av_fetch (av, i, 0));
266	}
267	break;
268
269	case REQ_NOP:
270	case REQ_SLEEP:
271	break;
272
273	default:
274	PUSHs (sv_2mortal (newSViv (req->result)));
275	break;
276	}
277
278
279	PUTBACK;
280	call_sv (req->callback, G_VOID \| G_EVAL);	425	call_sv (req->callback, G_VOID \| G_EVAL);
281	SPAGAIN;	426	SPAGAIN;
282		427
283	FREETMPS;	428	FREETMPS;
284	LEAVE;	429	LEAVE;
285
286	errno = errorno;
287
288	if (SvTRUE (ERRSV))
289	{	430	}
290	req_free (req);
291	croak (0);
292	}
293	}
294		431
295	static void req_free (aio_req req)
296	{
297	if (req->grp)	432	if (req->grp)
298	{	433	{
299	aio_req grp = req->grp;	434	aio_req grp = req->grp;
300		435
301	/* unlink request */	436	/* unlink request */
…		…
306	grp->grp_first = req->grp_next;	441	grp->grp_first = req->grp_next;
307		442
308	aio_grp_dec (grp);	443	aio_grp_dec (grp);
309	}	444	}
310		445
		446	if (SvTRUE (ERRSV))
		447	{
		448	req_free (req);
		449	croak (0);
		450	}
		451	}
		452
		453	static void req_free (aio_req req)
		454	{
311	if (req->self)	455	if (req->self)
312	{	456	{
313	sv_unmagic (req->self, PERL_MAGIC_ext);	457	sv_unmagic (req->self, PERL_MAGIC_ext);
314	SvREFCNT_dec (req->self);	458	SvREFCNT_dec (req->self);
315	}	459	}
…		…
318	SvREFCNT_dec (req->fh);	462	SvREFCNT_dec (req->fh);
319	SvREFCNT_dec (req->fh2);	463	SvREFCNT_dec (req->fh2);
320	SvREFCNT_dec (req->callback);	464	SvREFCNT_dec (req->callback);
321	Safefree (req->statdata);	465	Safefree (req->statdata);
322		466
323	if (req->type == REQ_READDIR && req->result >= 0)	467	if (req->type == REQ_READDIR)
324	free (req->data2ptr);	468	free (req->data2ptr);
325		469
326	Safefree (req);	470	Safefree (req);
327	}	471	}
328		472
…		…
346	int do_croak = 0;	490	int do_croak = 0;
347	aio_req req;	491	aio_req req;
348		492
349	for (;;)	493	for (;;)
350	{	494	{
351	pthread_mutex_lock (&reslock);	495	LOCK (reslock);
352	req = ress;	496	req = reqq_shift (&res_queue);
353		497
354	if (req)	498	if (req)
355	{	499	{
356	ress = req->next;
357
358	if (!ress)	500	if (!res_queue.size)
359	{	501	{
360	/* read any signals sent by the worker threads */	502	/* read any signals sent by the worker threads */
361	char buf [32];	503	char buf [32];
362	while (read (respipe [0], buf, 32) == 32)	504	while (read (respipe [0], buf, 32) == 32)
363	;	505	;
364
365	rese = 0;
366	}	506	}
367	}	507	}
368		508
369	pthread_mutex_unlock (&reslock);	509	UNLOCK (reslock);
370		510
371	if (!req)	511	if (!req)
372	break;	512	break;
373		513
374	--nreqs;	514	--nreqs;
…		…
408		548
409	static void aio_proc(void arg);	549	static void aio_proc(void arg);
410		550
411	static void start_thread (void)	551	static void start_thread (void)
412	{	552	{
		553	worker *wrk = calloc (1, sizeof (worker));
		554
		555	if (!wrk)
		556	croak ("unable to allocate worker thread data");
		557
413	sigset_t fullsigset, oldsigset;	558	sigset_t fullsigset, oldsigset;
414	pthread_t tid;
415	pthread_attr_t attr;	559	pthread_attr_t attr;
416		560
417	pthread_attr_init (&attr);	561	pthread_attr_init (&attr);
418	pthread_attr_setstacksize (&attr, STACKSIZE);	562	pthread_attr_setstacksize (&attr, STACKSIZE);
419	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	563	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
420		564
421	sigfillset (&fullsigset);	565	sigfillset (&fullsigset);
		566
		567	LOCK (wrklock);
422	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	568	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
423		569
424	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;
425	started++;	576	started++;
		577	}
		578	else
		579	free (wrk);
426		580
427	sigprocmask (SIG_SETMASK, &oldsigset, 0);	581	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		582	UNLOCK (wrklock);
428	}	583	}
429		584
430	static void req_send (aio_req req)	585	static void req_send (aio_req req)
431	{	586	{
432	while (started < wanted && nreqs >= started)	587	while (started < wanted && nreqs >= started)
433	start_thread ();	588	start_thread ();
434		589
435	++nreqs;	590	++nreqs;
436		591
437	pthread_mutex_lock (&reqlock);	592	LOCK (reqlock);
438		593	reqq_push (&req_queue, req);
439	req->next = 0;
440
441	if (reqe)
442	{
443	reqe->next = req;
444	reqe = req;
445	}
446	else
447	reqe = reqs = req;
448
449	pthread_cond_signal (&reqwait);	594	pthread_cond_signal (&reqwait);
450	pthread_mutex_unlock (&reqlock);	595	UNLOCK (reqlock);
451		596
452	if (nreqs > max_outstanding)	597	if (nreqs > max_outstanding)
453	for (;;)	598	for (;;)
454	{	599	{
455	poll_cb ();	600	poll_cb ();
…		…
462	}	607	}
463		608
464	static void end_thread (void)	609	static void end_thread (void)
465	{	610	{
466	aio_req req;	611	aio_req req;
		612
467	Newz (0, req, 1, aio_cb);	613	Newz (0, req, 1, aio_cb);
		614
468	req->type = REQ_QUIT;	615	req->type = REQ_QUIT;
		616	req->pri = PRI_MAX + PRI_BIAS;
469		617
470	req_send (req);	618	req_send (req);
471	}	619	}
472		620
473	static void min_parallel (int nthreads)	621	static void min_parallel (int nthreads)
…		…
525	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)
526	{	674	{
527	ssize_t res;	675	ssize_t res;
528	off_t ooffset;	676	off_t ooffset;
529		677
530	pthread_mutex_lock (&preadwritelock);	678	LOCK (preadwritelock);
531	ooffset = lseek (fd, 0, SEEK_CUR);	679	ooffset = lseek (fd, 0, SEEK_CUR);
532	lseek (fd, offset, SEEK_SET);	680	lseek (fd, offset, SEEK_SET);
533	res = read (fd, buf, count);	681	res = read (fd, buf, count);
534	lseek (fd, ooffset, SEEK_SET);	682	lseek (fd, ooffset, SEEK_SET);
535	pthread_mutex_unlock (&preadwritelock);	683	UNLOCK (preadwritelock);
536		684
537	return res;	685	return res;
538	}	686	}
539		687
540	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)
541	{	689	{
542	ssize_t res;	690	ssize_t res;
543	off_t ooffset;	691	off_t ooffset;
544		692
545	pthread_mutex_lock (&preadwritelock);	693	LOCK (preadwritelock);
546	ooffset = lseek (fd, 0, SEEK_CUR);	694	ooffset = lseek (fd, 0, SEEK_CUR);
547	lseek (fd, offset, SEEK_SET);	695	lseek (fd, offset, SEEK_SET);
548	res = write (fd, buf, count);	696	res = write (fd, buf, count);
549	lseek (fd, offset, SEEK_SET);	697	lseek (fd, offset, SEEK_SET);
550	pthread_mutex_unlock (&preadwritelock);	698	UNLOCK (preadwritelock);
551		699
552	return res;	700	return res;
553	}	701	}
554	#endif	702	#endif
555		703
…		…
560	#if !HAVE_READAHEAD	708	#if !HAVE_READAHEAD
561	# define readahead aio_readahead	709	# define readahead aio_readahead
562		710
563	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)
564	{	712	{
565	char readahead_buf[4096];	713	dBUF;
566		714
567	while (count > 0)	715	while (count > 0)
568	{	716	{
569	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	717	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
570		718
571	pread (fd, readahead_buf, len, offset);	719	pread (fd, aio_buf, len, offset);
572	offset += len;	720	offset += len;
573	count -= len;	721	count -= len;
574	}	722	}
575		723
576	errno = 0;	724	errno = 0;
…		…
585	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)
586	{	734	{
587	struct dirent *e;	735	struct dirent *e;
588	int errorno;	736	int errorno;
589		737
590	pthread_mutex_lock (&readdirlock);	738	LOCK (readdirlock);
591		739
592	e = readdir (dirp);	740	e = readdir (dirp);
593	errorno = errno;	741	errorno = errno;
594		742
595	if (e)	743	if (e)
…		…
598	strcpy (ent->d_name, e->d_name);	746	strcpy (ent->d_name, e->d_name);
599	}	747	}
600	else	748	else
601	*res = 0;	749	*res = 0;
602		750
603	pthread_mutex_unlock (&readdirlock);	751	UNLOCK (readdirlock);
604		752
605	errno = errorno;	753	errno = errorno;
606	return e ? 0 : -1;	754	return e ? 0 : -1;
607	}	755	}
608	#endif	756	#endif
609		757
610	/* sendfile always needs emulation */	758	/* sendfile always needs emulation */
611	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)
612	{	760	{
613	ssize_t res;	761	ssize_t res;
614		762
615	if (!count)	763	if (!count)
616	return 0;	764	return 0;
…		…
665	#endif	813	#endif
666	)	814	)
667	)	815	)
668	{	816	{
669	/* emulate sendfile. this is a major pain in the ass */	817	/* emulate sendfile. this is a major pain in the ass */
670	char buf[4096];	818	dBUF;
		819
671	res = 0;	820	res = 0;
672		821
673	while (count)	822	while (count)
674	{	823	{
675	ssize_t cnt;	824	ssize_t cnt;
676		825
677	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	826	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
678		827
679	if (cnt <= 0)	828	if (cnt <= 0)
680	{	829	{
681	if (cnt && !res) res = -1;	830	if (cnt && !res) res = -1;
682	break;	831	break;
683	}	832	}
684		833
685	cnt = write (ofd, buf, cnt);	834	cnt = write (ofd, aio_buf, cnt);
686		835
687	if (cnt <= 0)	836	if (cnt <= 0)
688	{	837	{
689	if (cnt && !res) res = -1;	838	if (cnt && !res) res = -1;
690	break;	839	break;
…		…
698		847
699	return res;	848	return res;
700	}	849	}
701		850
702	/* read a full directory */	851	/* read a full directory */
703	static int scandir_ (const char path, void *namesp)	852	static void scandir_ (aio_req req, worker *self)
704	{	853	{
705	DIR *dirp = opendir (path);	854	DIR *dirp;
706	union	855	union
707	{	856	{
708	struct dirent d;	857	struct dirent d;
709	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	858	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
710	} u;	859	} *u;
711	struct dirent *entp;	860	struct dirent *entp;
712	char name, names;	861	char name, names;
713	int memlen = 4096;	862	int memlen = 4096;
714	int memofs = 0;	863	int memofs = 0;
715	int res = 0;	864	int res = 0;
716	int errorno;	865	int errorno;
717		866
718	if (!dirp)	867	LOCK (wrklock);
719	return -1;	868	self->dirp = dirp = opendir (req->dataptr);
		869	self->dbuf = u = malloc (sizeof (*u));
		870	UNLOCK (wrklock);
720		871
721	names = malloc (memlen);	872	req->data2ptr = names = malloc (memlen);
722		873
		874	if (dirp && u && names)
723	for (;;)	875	for (;;)
724	{	876	{
		877	errno = 0;
725	errno = 0, readdir_r (dirp, &u.d, &entp);	878	readdir_r (dirp, &u->d, &entp);
726		879
727	if (!entp)	880	if (!entp)
728	break;	881	break;
729		882
730	name = entp->d_name;	883	name = entp->d_name;
731		884
732	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	885	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
733	{	886	{
734	int len = strlen (name) + 1;	887	int len = strlen (name) + 1;
735		888
736	res++;	889	res++;
737		890
738	while (memofs + len > memlen)	891	while (memofs + len > memlen)
739	{	892	{
740	memlen *= 2;	893	memlen *= 2;
		894	LOCK (wrklock);
741	names = realloc (names, memlen);	895	req->data2ptr = names = realloc (names, memlen);
		896	UNLOCK (wrklock);
		897
742	if (!names)	898	if (!names)
743	break;	899	break;
744	}	900	}
745		901
746	memcpy (names + memofs, name, len);	902	memcpy (names + memofs, name, len);
747	memofs += len;	903	memofs += len;
748	}	904	}
749	}	905	}
750		906
751	errorno = errno;
752	closedir (dirp);
753
754	if (errorno)	907	if (errno)
755	{
756	free (names);
757	errno = errorno;
758	res = -1;	908	res = -1;
759	}	909
760		910	req->result = res;
761	namesp = (void )names;
762	return res;
763	}	911	}
764		912
765	/*****************************************************************************/	913	/*****************************************************************************/
766		914
767	static void aio_proc (void thr_arg)	915	static void aio_proc (void thr_arg)
768	{	916	{
769	aio_req req;	917	aio_req req;
770	int type;	918	int type;
		919	worker self = (worker )thr_arg;
771		920
772	do	921	do
773	{	922	{
774	pthread_mutex_lock (&reqlock);	923	LOCK (reqlock);
775		924
776	for (;;)	925	for (;;)
777	{	926	{
778	req = reqs;	927	self->req = req = reqq_shift (&req_queue);
779
780	if (reqs)
781	{
782	reqs = reqs->next;
783	if (!reqs) reqe = 0;
784	}
785		928
786	if (req)	929	if (req)
787	break;	930	break;
788		931
789	pthread_cond_wait (&reqwait, &reqlock);	932	pthread_cond_wait (&reqwait, &reqlock);
790	}	933	}
791		934
792	pthread_mutex_unlock (&reqlock);	935	UNLOCK (reqlock);
793		936
794	errno = 0; /* strictly unnecessary */	937	errno = 0; /* strictly unnecessary */
		938	type = req->type; /* remember type for QUIT check */
795		939
796	if (!(req->flags & FLAG_CANCELLED))	940	if (!(req->flags & FLAG_CANCELLED))
797	switch (type = req->type) /* remember type for QUIT check */	941	switch (type)
798	{	942	{
799	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;
800	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;
801		945
802	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;
803	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;
804		948
805	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	949	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
806	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	950	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
807	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	951	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
808		952
…		…
814	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	958	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
815	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	959	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
816		960
817	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	961	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
818	case REQ_FSYNC: req->result = fsync (req->fd); break;	962	case REQ_FSYNC: req->result = fsync (req->fd); break;
819	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	963	case REQ_READDIR: scandir_ (req, self); break;
820		964
821	case REQ_SLEEP:	965	case REQ_BUSY:
822	{	966	{
823	struct timeval tv;	967	struct timeval tv;
824		968
825	tv.tv_sec = req->fd;	969	tv.tv_sec = req->fd;
826	tv.tv_usec = req->fd2;	970	tv.tv_usec = req->fd2;
…		…
838	break;	982	break;
839	}	983	}
840		984
841	req->errorno = errno;	985	req->errorno = errno;
842		986
843	pthread_mutex_lock (&reslock);	987	LOCK (reslock);
844		988
845	req->next = 0;	989	if (!reqq_push (&res_queue, req))
846
847	if (rese)
848	{
849	rese->next = req;
850	rese = req;
851	}
852	else
853	{
854	rese = ress = req;
855
856	/* write a dummy byte to the pipe so fh becomes ready */	990	/* write a dummy byte to the pipe so fh becomes ready */
857	write (respipe [1], &respipe, 1);	991	write (respipe [1], &respipe, 1);
858	}
859		992
860	pthread_mutex_unlock (&reslock);	993	self->req = 0;
		994	worker_clear (self);
		995
		996	UNLOCK (reslock);
861	}	997	}
862	while (type != REQ_QUIT);	998	while (type != REQ_QUIT);
863		999
		1000	LOCK (wrklock);
		1001	worker_free (self);
		1002	UNLOCK (wrklock);
		1003
864	return 0;	1004	return 0;
865	}	1005	}
866		1006
867	/*****************************************************************************/	1007	/*****************************************************************************/
868		1008
869	static void atfork_prepare (void)	1009	static void atfork_prepare (void)
870	{	1010	{
871	pthread_mutex_lock (&reqlock);	1011	LOCK (wrklock);
872	pthread_mutex_lock (&reslock);	1012	LOCK (reqlock);
		1013	LOCK (reslock);
873	#if !HAVE_PREADWRITE	1014	#if !HAVE_PREADWRITE
874	pthread_mutex_lock (&preadwritelock);	1015	LOCK (preadwritelock);
875	#endif	1016	#endif
876	#if !HAVE_READDIR_R	1017	#if !HAVE_READDIR_R
877	pthread_mutex_lock (&readdirlock);	1018	LOCK (readdirlock);
878	#endif	1019	#endif
879	}	1020	}
880		1021
881	static void atfork_parent (void)	1022	static void atfork_parent (void)
882	{	1023	{
883	#if !HAVE_READDIR_R	1024	#if !HAVE_READDIR_R
884	pthread_mutex_unlock (&readdirlock);	1025	UNLOCK (readdirlock);
885	#endif	1026	#endif
886	#if !HAVE_PREADWRITE	1027	#if !HAVE_PREADWRITE
887	pthread_mutex_unlock (&preadwritelock);	1028	UNLOCK (preadwritelock);
888	#endif	1029	#endif
889	pthread_mutex_unlock (&reslock);	1030	UNLOCK (reslock);
890	pthread_mutex_unlock (&reqlock);	1031	UNLOCK (reqlock);
		1032	UNLOCK (wrklock);
891	}	1033	}
892		1034
893	static void atfork_child (void)	1035	static void atfork_child (void)
894	{	1036	{
895	aio_req prv;	1037	aio_req prv;
896		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
897	started = 0;	1056	started = 0;
898		1057	nreqs = 0;
899	while (reqs)
900	{
901	prv = reqs;
902	reqs = prv->next;
903	req_free (prv);
904	}
905
906	reqs = reqe = 0;
907
908	while (ress)
909	{
910	prv = ress;
911	ress = prv->next;
912	req_free (prv);
913	}
914
915	ress = rese = 0;
916		1058
917	close (respipe [0]);	1059	close (respipe [0]);
918	close (respipe [1]);	1060	close (respipe [1]);
919	create_pipe ();	1061	create_pipe ();
920		1062
921	atfork_parent ();	1063	atfork_parent ();
922	}	1064	}
923		1065
924	#define dREQ \	1066	#define dREQ \
925	aio_req req; \	1067	aio_req req; \
		1068	int req_pri = next_pri; \
		1069	next_pri = DEFAULT_PRI + PRI_BIAS; \
926	\	1070	\
927	if (SvOK (callback) && !SvROK (callback)) \	1071	if (SvOK (callback) && !SvROK (callback)) \
928	croak ("callback must be undef or of reference type"); \	1072	croak ("callback must be undef or of reference type"); \
929	\	1073	\
930	Newz (0, req, 1, aio_cb); \	1074	Newz (0, req, 1, aio_cb); \
931	if (!req) \	1075	if (!req) \
932	croak ("out of memory during aio_req allocation"); \	1076	croak ("out of memory during aio_req allocation"); \
933	\	1077	\
934	req->callback = newSVsv (callback)	1078	req->callback = newSVsv (callback); \
		1079	req->pri = req_pri
935		1080
936	#define REQ_SEND \	1081	#define REQ_SEND \
937	req_send (req); \	1082	req_send (req); \
938	\	1083	\
939	if (GIMME_V != G_VOID) \	1084	if (GIMME_V != G_VOID) \
…		…
1193		1338
1194	REQ_SEND;	1339	REQ_SEND;
1195	}	1340	}
1196		1341
1197	void	1342	void
1198	aio_sleep (delay,callback=&PL_sv_undef)	1343	aio_busy (delay,callback=&PL_sv_undef)
1199	double delay	1344	double delay
1200	SV * callback	1345	SV * callback
1201	PPCODE:	1346	PPCODE:
1202	{	1347	{
1203	dREQ;	1348	dREQ;
1204		1349
1205	req->type = REQ_SLEEP;	1350	req->type = REQ_BUSY;
1206	req->fd = delay < 0. ? 0 : delay;	1351	req->fd = delay < 0. ? 0 : delay;
1207	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1352	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1208		1353
1209	REQ_SEND;	1354	REQ_SEND;
1210	}	1355	}
…		…
1214	SV * callback	1359	SV * callback
1215	PROTOTYPE: ;$	1360	PROTOTYPE: ;$
1216	PPCODE:	1361	PPCODE:
1217	{	1362	{
1218	dREQ;	1363	dREQ;
		1364
1219	req->type = REQ_GROUP;	1365	req->type = REQ_GROUP;
1220	req_send (req);	1366	req_send (req);
		1367
1221	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1368	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1222	}	1369	}
1223		1370
1224	void	1371	void
1225	aio_nop (callback=&PL_sv_undef)	1372	aio_nop (callback=&PL_sv_undef)
…		…
1230		1377
1231	req->type = REQ_NOP;	1378	req->type = REQ_NOP;
1232		1379
1233	REQ_SEND;	1380	REQ_SEND;
1234	}	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;
1235		1397
1236	void	1398	void
1237	flush ()	1399	flush ()
1238	PROTOTYPE:	1400	PROTOTYPE:
1239	CODE:	1401	CODE:
…		…
1288		1450
1289	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1451	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1290		1452
1291	void	1453	void
1292	cancel (aio_req_ornot req)	1454	cancel (aio_req_ornot req)
1293	PROTOTYPE:
1294	CODE:	1455	CODE:
1295	req_cancel (req);	1456	req_cancel (req);
1296		1457
1297	void	1458	void
1298	cb (aio_req req, SV *callback=&PL_sv_undef)	1459	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1299	CODE:	1460	CODE:
1300	SvREFCNT_dec (req->callback);	1461	SvREFCNT_dec (req->callback);
1301	req->callback = newSVsv (callback);	1462	req->callback = newSVsv (callback);
1302		1463
1303	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1464	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
…		…
1348	SvREFCNT_dec (grp->data);	1509	SvREFCNT_dec (grp->data);
1349	grp->data = (SV *)av;	1510	grp->data = (SV *)av;
1350	}	1511	}
1351		1512
1352	void	1513	void
1353	feed_limit (aio_req grp, int limit)	1514	limit (aio_req grp, int limit)
1354	CODE:	1515	CODE:
1355	grp->fd2 = limit;	1516	grp->fd2 = limit;
1356	aio_grp_feed (grp);	1517	aio_grp_feed (grp);
1357		1518
1358	void	1519	void

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.58 by root, Mon Oct 23 18:48:08 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.58 by root, Mon Oct 23 18:48:08 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC