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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.62 by root, Mon Oct 23 22:45:18 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
…		…
100	PRI_MIN = -4,	121	PRI_MIN = -4,
101	PRI_MAX = 4,	122	PRI_MAX = 4,
102		123
103	DEFAULT_PRI = 0,	124	DEFAULT_PRI = 0,
104	PRI_BIAS = -PRI_MIN,	125	PRI_BIAS = -PRI_MIN,
		126	NUM_PRI = PRI_MAX + PRI_BIAS + 1,
105	};	127	};
106		128
107	static int next_pri = DEFAULT_PRI + PRI_BIAS;	129	static int next_pri = DEFAULT_PRI + PRI_BIAS;
108		130
109	static int started, wanted;	131	static int started, wanted;
110	static volatile int nreqs;	132	static volatile int nreqs;
111	static int max_outstanding = 1<<30;	133	static int max_outstanding = 1<<30;
112	static int respipe [2];	134	static int respipe [2];
113		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
114	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	185	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
115	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	186	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
116	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	187	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
117		188
118	static volatile aio_req reqs, reqe; /* queue start, queue end */	189	/*
119	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	}
120		242
121	static void req_invoke (aio_req req);	243	static void req_invoke (aio_req req);
122	static void req_free (aio_req req);	244	static void req_free (aio_req req);
123		245
124	/* must be called at most once */	246	/* must be called at most once */
…		…
158	ENTER;	280	ENTER;
159	SAVETMPS;	281	SAVETMPS;
160	PUSHMARK (SP);	282	PUSHMARK (SP);
161	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	283	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
162	PUTBACK;	284	PUTBACK;
163	call_sv (grp->fh2, G_VOID \| G_EVAL);	285	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
164	SPAGAIN;	286	SPAGAIN;
165	FREETMPS;	287	FREETMPS;
166	LEAVE;	288	LEAVE;
167	}	289	}
168		290
…		…
195	{	317	{
196	fd_set rfd;	318	fd_set rfd;
197		319
198	while (nreqs)	320	while (nreqs)
199	{	321	{
200	aio_req req;	322	int size;
201	pthread_mutex_lock (&reslock);	323	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
202	req = ress;	324	LOCK (reslock);
203	pthread_mutex_unlock (&reslock);	325	#endif
		326	size = res_queue.size;
		327	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		328	UNLOCK (reslock);
		329	#endif
204		330
205	if (req)	331	if (size)
206	return;	332	return;
207		333
208	FD_ZERO(&rfd);	334	FD_ZERO(&rfd);
209	FD_SET(respipe [0], &rfd);	335	FD_SET(respipe [0], &rfd);
210		336
…		…
213	}	339	}
214		340
215	static void req_invoke (aio_req req)	341	static void req_invoke (aio_req req)
216	{	342	{
217	dSP;	343	dSP;
218	int errorno = errno;
219		344
220	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))	345	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
221	return;	346	{
222
223	errno = req->errorno;	347	errno = req->errorno;
224		348
225	ENTER;	349	ENTER;
226	SAVETMPS;	350	SAVETMPS;
227	PUSHMARK (SP);	351	PUSHMARK (SP);
228	EXTEND (SP, 1);	352	EXTEND (SP, 1);
229		353
230	switch (req->type)	354	switch (req->type)
231	{
232	case REQ_READDIR:
233	{	355	{
234	SV *rv = &PL_sv_undef;	356	case REQ_READDIR:
235
236	if (req->result >= 0)
237	{	357	{
238	char *buf = req->data2ptr;	358	SV *rv = &PL_sv_undef;
239	AV *av = newAV ();
240		359
241	while (req->result)	360	if (req->result >= 0)
242	{	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	{
243	SV *sv = newSVpv (buf, 0);	370	SV *sv = newSVpv (buf, 0);
244		371
245	av_push (av, sv);	372	av_store (av, i, sv);
246	buf += SvCUR (sv) + 1;	373	buf += SvCUR (sv) + 1;
247	req->result--;	374	}
		375
		376	rv = sv_2mortal (newRV_noinc ((SV *)av));
248	}	377	}
249		378
250	rv = sv_2mortal (newRV_noinc ((SV *)av));	379	PUSHs (rv);
251	}	380	}
		381	break;
252		382
253	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;
254	}	421	}
255	break;
256		422
257	case REQ_OPEN:
258	{
259	/* convert fd to fh */
260	SV *fh;
261		423
262	PUSHs (sv_2mortal (newSViv (req->result)));
263	PUTBACK;	424	PUTBACK;
264	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
265	SPAGAIN;
266
267	fh = SvREFCNT_inc (POPs);
268
269	PUSHMARK (SP);
270	XPUSHs (sv_2mortal (fh));
271	}
272	break;
273
274	case REQ_GROUP:
275	req->fd = 2; /* mark group as finished */
276
277	if (req->data)
278	{
279	int i;
280	AV av = (AV )req->data;
281
282	EXTEND (SP, AvFILL (av) + 1);
283	for (i = 0; i <= AvFILL (av); ++i)
284	PUSHs (*av_fetch (av, i, 0));
285	}
286	break;
287
288	case REQ_NOP:
289	case REQ_SLEEP:
290	break;
291
292	default:
293	PUSHs (sv_2mortal (newSViv (req->result)));
294	break;
295	}
296
297
298	PUTBACK;
299	call_sv (req->callback, G_VOID \| G_EVAL);	425	call_sv (req->callback, G_VOID \| G_EVAL);
300	SPAGAIN;	426	SPAGAIN;
301		427
302	FREETMPS;	428	FREETMPS;
303	LEAVE;	429	LEAVE;
304
305	errno = errorno;
306
307	if (SvTRUE (ERRSV))
308	{	430	}
309	req_free (req);
310	croak (0);
311	}
312	}
313		431
314	static void req_free (aio_req req)
315	{
316	if (req->grp)	432	if (req->grp)
317	{	433	{
318	aio_req grp = req->grp;	434	aio_req grp = req->grp;
319		435
320	/* unlink request */	436	/* unlink request */
…		…
325	grp->grp_first = req->grp_next;	441	grp->grp_first = req->grp_next;
326		442
327	aio_grp_dec (grp);	443	aio_grp_dec (grp);
328	}	444	}
329		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	{
330	if (req->self)	455	if (req->self)
331	{	456	{
332	sv_unmagic (req->self, PERL_MAGIC_ext);	457	sv_unmagic (req->self, PERL_MAGIC_ext);
333	SvREFCNT_dec (req->self);	458	SvREFCNT_dec (req->self);
334	}	459	}
…		…
337	SvREFCNT_dec (req->fh);	462	SvREFCNT_dec (req->fh);
338	SvREFCNT_dec (req->fh2);	463	SvREFCNT_dec (req->fh2);
339	SvREFCNT_dec (req->callback);	464	SvREFCNT_dec (req->callback);
340	Safefree (req->statdata);	465	Safefree (req->statdata);
341		466
342	if (req->type == REQ_READDIR && req->result >= 0)	467	if (req->type == REQ_READDIR)
343	free (req->data2ptr);	468	free (req->data2ptr);
344		469
345	Safefree (req);	470	Safefree (req);
346	}	471	}
347		472
…		…
365	int do_croak = 0;	490	int do_croak = 0;
366	aio_req req;	491	aio_req req;
367		492
368	for (;;)	493	for (;;)
369	{	494	{
370	pthread_mutex_lock (&reslock);	495	LOCK (reslock);
371	req = ress;	496	req = reqq_shift (&res_queue);
372		497
373	if (req)	498	if (req)
374	{	499	{
375	ress = req->next;
376
377	if (!ress)	500	if (!res_queue.size)
378	{	501	{
379	/* read any signals sent by the worker threads */	502	/* read any signals sent by the worker threads */
380	char buf [32];	503	char buf [32];
381	while (read (respipe [0], buf, 32) == 32)	504	while (read (respipe [0], buf, 32) == 32)
382	;	505	;
383
384	rese = 0;
385	}	506	}
386	}	507	}
387		508
388	pthread_mutex_unlock (&reslock);	509	UNLOCK (reslock);
389		510
390	if (!req)	511	if (!req)
391	break;	512	break;
392		513
393	--nreqs;	514	--nreqs;
…		…
427		548
428	static void aio_proc(void arg);	549	static void aio_proc(void arg);
429		550
430	static void start_thread (void)	551	static void start_thread (void)
431	{	552	{
		553	worker *wrk = calloc (1, sizeof (worker));
		554
		555	if (!wrk)
		556	croak ("unable to allocate worker thread data");
		557
432	sigset_t fullsigset, oldsigset;	558	sigset_t fullsigset, oldsigset;
433	pthread_t tid;
434	pthread_attr_t attr;	559	pthread_attr_t attr;
435		560
436	pthread_attr_init (&attr);	561	pthread_attr_init (&attr);
437	pthread_attr_setstacksize (&attr, STACKSIZE);	562	pthread_attr_setstacksize (&attr, STACKSIZE);
438	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	563	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
439		564
440	sigfillset (&fullsigset);	565	sigfillset (&fullsigset);
		566
		567	LOCK (wrklock);
441	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	568	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
442		569
443	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;
444	started++;	576	started++;
		577	}
		578	else
		579	free (wrk);
445		580
446	sigprocmask (SIG_SETMASK, &oldsigset, 0);	581	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		582	UNLOCK (wrklock);
447	}	583	}
448		584
449	static void req_send (aio_req req)	585	static void req_send (aio_req req)
450	{	586	{
451	while (started < wanted && nreqs >= started)	587	while (started < wanted && nreqs >= started)
452	start_thread ();	588	start_thread ();
453		589
454	++nreqs;	590	++nreqs;
455		591
456	pthread_mutex_lock (&reqlock);	592	LOCK (reqlock);
457		593	reqq_push (&req_queue, req);
458	req->next = 0;
459
460	if (reqe)
461	{
462	reqe->next = req;
463	reqe = req;
464	}
465	else
466	reqe = reqs = req;
467
468	pthread_cond_signal (&reqwait);	594	pthread_cond_signal (&reqwait);
469	pthread_mutex_unlock (&reqlock);	595	UNLOCK (reqlock);
470		596
471	if (nreqs > max_outstanding)	597	if (nreqs > max_outstanding)
472	for (;;)	598	for (;;)
473	{	599	{
474	poll_cb ();	600	poll_cb ();
…		…
481	}	607	}
482		608
483	static void end_thread (void)	609	static void end_thread (void)
484	{	610	{
485	aio_req req;	611	aio_req req;
		612
486	Newz (0, req, 1, aio_cb);	613	Newz (0, req, 1, aio_cb);
		614
487	req->type = REQ_QUIT;	615	req->type = REQ_QUIT;
		616	req->pri = PRI_MAX + PRI_BIAS;
488		617
489	req_send (req);	618	req_send (req);
490	}	619	}
491		620
492	static void min_parallel (int nthreads)	621	static void min_parallel (int nthreads)
…		…
544	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)
545	{	674	{
546	ssize_t res;	675	ssize_t res;
547	off_t ooffset;	676	off_t ooffset;
548		677
549	pthread_mutex_lock (&preadwritelock);	678	LOCK (preadwritelock);
550	ooffset = lseek (fd, 0, SEEK_CUR);	679	ooffset = lseek (fd, 0, SEEK_CUR);
551	lseek (fd, offset, SEEK_SET);	680	lseek (fd, offset, SEEK_SET);
552	res = read (fd, buf, count);	681	res = read (fd, buf, count);
553	lseek (fd, ooffset, SEEK_SET);	682	lseek (fd, ooffset, SEEK_SET);
554	pthread_mutex_unlock (&preadwritelock);	683	UNLOCK (preadwritelock);
555		684
556	return res;	685	return res;
557	}	686	}
558		687
559	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)
560	{	689	{
561	ssize_t res;	690	ssize_t res;
562	off_t ooffset;	691	off_t ooffset;
563		692
564	pthread_mutex_lock (&preadwritelock);	693	LOCK (preadwritelock);
565	ooffset = lseek (fd, 0, SEEK_CUR);	694	ooffset = lseek (fd, 0, SEEK_CUR);
566	lseek (fd, offset, SEEK_SET);	695	lseek (fd, offset, SEEK_SET);
567	res = write (fd, buf, count);	696	res = write (fd, buf, count);
568	lseek (fd, offset, SEEK_SET);	697	lseek (fd, offset, SEEK_SET);
569	pthread_mutex_unlock (&preadwritelock);	698	UNLOCK (preadwritelock);
570		699
571	return res;	700	return res;
572	}	701	}
573	#endif	702	#endif
574		703
…		…
579	#if !HAVE_READAHEAD	708	#if !HAVE_READAHEAD
580	# define readahead aio_readahead	709	# define readahead aio_readahead
581		710
582	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)
583	{	712	{
584	char readahead_buf[4096];	713	dBUF;
585		714
586	while (count > 0)	715	while (count > 0)
587	{	716	{
588	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	717	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
589		718
590	pread (fd, readahead_buf, len, offset);	719	pread (fd, aio_buf, len, offset);
591	offset += len;	720	offset += len;
592	count -= len;	721	count -= len;
593	}	722	}
594		723
595	errno = 0;	724	errno = 0;
…		…
604	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)
605	{	734	{
606	struct dirent *e;	735	struct dirent *e;
607	int errorno;	736	int errorno;
608		737
609	pthread_mutex_lock (&readdirlock);	738	LOCK (readdirlock);
610		739
611	e = readdir (dirp);	740	e = readdir (dirp);
612	errorno = errno;	741	errorno = errno;
613		742
614	if (e)	743	if (e)
…		…
617	strcpy (ent->d_name, e->d_name);	746	strcpy (ent->d_name, e->d_name);
618	}	747	}
619	else	748	else
620	*res = 0;	749	*res = 0;
621		750
622	pthread_mutex_unlock (&readdirlock);	751	UNLOCK (readdirlock);
623		752
624	errno = errorno;	753	errno = errorno;
625	return e ? 0 : -1;	754	return e ? 0 : -1;
626	}	755	}
627	#endif	756	#endif
628		757
629	/* sendfile always needs emulation */	758	/* sendfile always needs emulation */
630	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)
631	{	760	{
632	ssize_t res;	761	ssize_t res;
633		762
634	if (!count)	763	if (!count)
635	return 0;	764	return 0;
…		…
684	#endif	813	#endif
685	)	814	)
686	)	815	)
687	{	816	{
688	/* emulate sendfile. this is a major pain in the ass */	817	/* emulate sendfile. this is a major pain in the ass */
689	char buf[4096];	818	dBUF;
		819
690	res = 0;	820	res = 0;
691		821
692	while (count)	822	while (count)
693	{	823	{
694	ssize_t cnt;	824	ssize_t cnt;
695		825
696	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	826	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
697		827
698	if (cnt <= 0)	828	if (cnt <= 0)
699	{	829	{
700	if (cnt && !res) res = -1;	830	if (cnt && !res) res = -1;
701	break;	831	break;
702	}	832	}
703		833
704	cnt = write (ofd, buf, cnt);	834	cnt = write (ofd, aio_buf, cnt);
705		835
706	if (cnt <= 0)	836	if (cnt <= 0)
707	{	837	{
708	if (cnt && !res) res = -1;	838	if (cnt && !res) res = -1;
709	break;	839	break;
…		…
717		847
718	return res;	848	return res;
719	}	849	}
720		850
721	/* read a full directory */	851	/* read a full directory */
722	static int scandir_ (const char path, void *namesp)	852	static void scandir_ (aio_req req, worker *self)
723	{	853	{
724	DIR *dirp = opendir (path);	854	DIR *dirp;
725	union	855	union
726	{	856	{
727	struct dirent d;	857	struct dirent d;
728	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	858	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
729	} u;	859	} *u;
730	struct dirent *entp;	860	struct dirent *entp;
731	char name, names;	861	char name, names;
732	int memlen = 4096;	862	int memlen = 4096;
733	int memofs = 0;	863	int memofs = 0;
734	int res = 0;	864	int res = 0;
735	int errorno;	865	int errorno;
736		866
737	if (!dirp)	867	LOCK (wrklock);
738	return -1;	868	self->dirp = dirp = opendir (req->dataptr);
		869	self->dbuf = u = malloc (sizeof (*u));
		870	UNLOCK (wrklock);
739		871
740	names = malloc (memlen);	872	req->data2ptr = names = malloc (memlen);
741		873
		874	if (dirp && u && names)
742	for (;;)	875	for (;;)
743	{	876	{
		877	errno = 0;
744	errno = 0, readdir_r (dirp, &u.d, &entp);	878	readdir_r (dirp, &u->d, &entp);
745		879
746	if (!entp)	880	if (!entp)
747	break;	881	break;
748		882
749	name = entp->d_name;	883	name = entp->d_name;
750		884
751	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	885	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
752	{	886	{
753	int len = strlen (name) + 1;	887	int len = strlen (name) + 1;
754		888
755	res++;	889	res++;
756		890
757	while (memofs + len > memlen)	891	while (memofs + len > memlen)
758	{	892	{
759	memlen *= 2;	893	memlen *= 2;
		894	LOCK (wrklock);
760	names = realloc (names, memlen);	895	req->data2ptr = names = realloc (names, memlen);
		896	UNLOCK (wrklock);
		897
761	if (!names)	898	if (!names)
762	break;	899	break;
763	}	900	}
764		901
765	memcpy (names + memofs, name, len);	902	memcpy (names + memofs, name, len);
766	memofs += len;	903	memofs += len;
767	}	904	}
768	}	905	}
769		906
770	errorno = errno;
771	closedir (dirp);
772
773	if (errorno)	907	if (errno)
774	{
775	free (names);
776	errno = errorno;
777	res = -1;	908	res = -1;
778	}	909
779		910	req->result = res;
780	namesp = (void )names;
781	return res;
782	}	911	}
783		912
784	/*****************************************************************************/	913	/*****************************************************************************/
785		914
786	static void aio_proc (void thr_arg)	915	static void aio_proc (void thr_arg)
787	{	916	{
788	aio_req req;	917	aio_req req;
789	int type;	918	int type;
		919	worker self = (worker )thr_arg;
790		920
791	do	921	do
792	{	922	{
793	pthread_mutex_lock (&reqlock);	923	LOCK (reqlock);
794		924
795	for (;;)	925	for (;;)
796	{	926	{
797	req = reqs;	927	self->req = req = reqq_shift (&req_queue);
798
799	if (reqs)
800	{
801	reqs = reqs->next;
802	if (!reqs) reqe = 0;
803	}
804		928
805	if (req)	929	if (req)
806	break;	930	break;
807		931
808	pthread_cond_wait (&reqwait, &reqlock);	932	pthread_cond_wait (&reqwait, &reqlock);
809	}	933	}
810		934
811	pthread_mutex_unlock (&reqlock);	935	UNLOCK (reqlock);
812		936
813	errno = 0; /* strictly unnecessary */	937	errno = 0; /* strictly unnecessary */
814	type = req->type; /* remember type for QUIT check */	938	type = req->type; /* remember type for QUIT check */
815		939
816	if (!(req->flags & FLAG_CANCELLED))	940	if (!(req->flags & FLAG_CANCELLED))
…		…
818	{	942	{
819	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;
820	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;
821		945
822	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;
823	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;
824		948
825	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	949	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
826	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	950	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
827	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	951	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
828		952
…		…
834	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	958	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
835	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	959	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
836		960
837	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	961	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
838	case REQ_FSYNC: req->result = fsync (req->fd); break;	962	case REQ_FSYNC: req->result = fsync (req->fd); break;
839	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	963	case REQ_READDIR: scandir_ (req, self); break;
840		964
841	case REQ_SLEEP:	965	case REQ_BUSY:
842	{	966	{
843	struct timeval tv;	967	struct timeval tv;
844		968
845	tv.tv_sec = req->fd;	969	tv.tv_sec = req->fd;
846	tv.tv_usec = req->fd2;	970	tv.tv_usec = req->fd2;
…		…
858	break;	982	break;
859	}	983	}
860		984
861	req->errorno = errno;	985	req->errorno = errno;
862		986
863	pthread_mutex_lock (&reslock);	987	LOCK (reslock);
864		988
865	req->next = 0;	989	if (!reqq_push (&res_queue, req))
866
867	if (rese)
868	{
869	rese->next = req;
870	rese = req;
871	}
872	else
873	{
874	rese = ress = req;
875
876	/* write a dummy byte to the pipe so fh becomes ready */	990	/* write a dummy byte to the pipe so fh becomes ready */
877	write (respipe [1], &respipe, 1);	991	write (respipe [1], &respipe, 1);
878	}
879		992
880	pthread_mutex_unlock (&reslock);	993	self->req = 0;
		994	worker_clear (self);
		995
		996	UNLOCK (reslock);
881	}	997	}
882	while (type != REQ_QUIT);	998	while (type != REQ_QUIT);
883		999
		1000	LOCK (wrklock);
		1001	worker_free (self);
		1002	UNLOCK (wrklock);
		1003
884	return 0;	1004	return 0;
885	}	1005	}
886		1006
887	/*****************************************************************************/	1007	/*****************************************************************************/
888		1008
889	static void atfork_prepare (void)	1009	static void atfork_prepare (void)
890	{	1010	{
891	pthread_mutex_lock (&reqlock);	1011	LOCK (wrklock);
892	pthread_mutex_lock (&reslock);	1012	LOCK (reqlock);
		1013	LOCK (reslock);
893	#if !HAVE_PREADWRITE	1014	#if !HAVE_PREADWRITE
894	pthread_mutex_lock (&preadwritelock);	1015	LOCK (preadwritelock);
895	#endif	1016	#endif
896	#if !HAVE_READDIR_R	1017	#if !HAVE_READDIR_R
897	pthread_mutex_lock (&readdirlock);	1018	LOCK (readdirlock);
898	#endif	1019	#endif
899	}	1020	}
900		1021
901	static void atfork_parent (void)	1022	static void atfork_parent (void)
902	{	1023	{
903	#if !HAVE_READDIR_R	1024	#if !HAVE_READDIR_R
904	pthread_mutex_unlock (&readdirlock);	1025	UNLOCK (readdirlock);
905	#endif	1026	#endif
906	#if !HAVE_PREADWRITE	1027	#if !HAVE_PREADWRITE
907	pthread_mutex_unlock (&preadwritelock);	1028	UNLOCK (preadwritelock);
908	#endif	1029	#endif
909	pthread_mutex_unlock (&reslock);	1030	UNLOCK (reslock);
910	pthread_mutex_unlock (&reqlock);	1031	UNLOCK (reqlock);
		1032	UNLOCK (wrklock);
911	}	1033	}
912		1034
913	static void atfork_child (void)	1035	static void atfork_child (void)
914	{	1036	{
915	aio_req prv;	1037	aio_req prv;
916		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
917	started = 0;	1056	started = 0;
918		1057	nreqs = 0;
919	while (reqs)
920	{
921	prv = reqs;
922	reqs = prv->next;
923	req_free (prv);
924	}
925
926	reqs = reqe = 0;
927
928	while (ress)
929	{
930	prv = ress;
931	ress = prv->next;
932	req_free (prv);
933	}
934
935	ress = rese = 0;
936		1058
937	close (respipe [0]);	1059	close (respipe [0]);
938	close (respipe [1]);	1060	close (respipe [1]);
939	create_pipe ();	1061	create_pipe ();
940		1062
…		…
1216		1338
1217	REQ_SEND;	1339	REQ_SEND;
1218	}	1340	}
1219		1341
1220	void	1342	void
1221	aio_sleep (delay,callback=&PL_sv_undef)	1343	aio_busy (delay,callback=&PL_sv_undef)
1222	double delay	1344	double delay
1223	SV * callback	1345	SV * callback
1224	PPCODE:	1346	PPCODE:
1225	{	1347	{
1226	dREQ;	1348	dREQ;
1227		1349
1228	req->type = REQ_SLEEP;	1350	req->type = REQ_BUSY;
1229	req->fd = delay < 0. ? 0 : delay;	1351	req->fd = delay < 0. ? 0 : delay;
1230	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1352	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1231		1353
1232	REQ_SEND;	1354	REQ_SEND;
1233	}	1355	}
…		…
1256	req->type = REQ_NOP;	1378	req->type = REQ_NOP;
1257		1379
1258	REQ_SEND;	1380	REQ_SEND;
1259	}	1381	}
1260		1382
1261	#if 0
1262
1263	void	1383	void
1264	aio_pri (int pri = DEFAULT_PRI)	1384	aioreq_pri (int pri = DEFAULT_PRI)
1265	CODE:	1385	CODE:
1266	if (pri < PRI_MIN) pri = PRI_MIN;	1386	if (pri < PRI_MIN) pri = PRI_MIN;
1267	if (pri > PRI_MAX) pri = PRI_MAX;	1387	if (pri > PRI_MAX) pri = PRI_MAX;
1268	next_pri = pri + PRI_BIAS;	1388	next_pri = pri + PRI_BIAS;
1269		1389
1270	#endif	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;
1271		1397
1272	void	1398	void
1273	flush ()	1399	flush ()
1274	PROTOTYPE:	1400	PROTOTYPE:
1275	CODE:	1401	CODE:
…		…
1324		1450
1325	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1451	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1326		1452
1327	void	1453	void
1328	cancel (aio_req_ornot req)	1454	cancel (aio_req_ornot req)
1329	PROTOTYPE:
1330	CODE:	1455	CODE:
1331	req_cancel (req);	1456	req_cancel (req);
1332		1457
1333	void	1458	void
1334	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1459	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
…		…
1384	SvREFCNT_dec (grp->data);	1509	SvREFCNT_dec (grp->data);
1385	grp->data = (SV *)av;	1510	grp->data = (SV *)av;
1386	}	1511	}
1387		1512
1388	void	1513	void
1389	feed_limit (aio_req grp, int limit)	1514	limit (aio_req grp, int limit)
1390	CODE:	1515	CODE:
1391	grp->fd2 = limit;	1516	grp->fd2 = limit;
1392	aio_grp_feed (grp);	1517	aio_grp_feed (grp);
1393		1518
1394	void	1519	void

Diff Legend

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

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