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

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

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.61 by root, Mon Oct 23 22:44:21 2006 UTC vs. Revision 1.73 by root, Tue Oct 24 21:26:30 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.61 by root, Mon Oct 23 22:44:21 2006 UTC vs.
Revision 1.73 by root, Tue Oct 24 21:26:30 2006 UTC