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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.59 by root, Mon Oct 23 18:56:27 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
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);
		245	static void req_cancel (aio_req req);
113		246
114	/* must be called at most once */	247	/* must be called at most once */
115	static SV req_sv (aio_req req, const char klass)	248	static SV req_sv (aio_req req, const char klass)
116	{	249	{
117	if (!req->self)	250	if (!req->self)
…		…
148	ENTER;	281	ENTER;
149	SAVETMPS;	282	SAVETMPS;
150	PUSHMARK (SP);	283	PUSHMARK (SP);
151	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	284	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
152	PUTBACK;	285	PUTBACK;
153	call_sv (grp->fh2, G_VOID \| G_EVAL);	286	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
154	SPAGAIN;	287	SPAGAIN;
155	FREETMPS;	288	FREETMPS;
156	LEAVE;	289	LEAVE;
157	}	290	}
158		291
…		…
181	}	314	}
182	}	315	}
183		316
184	static void poll_wait ()	317	static void poll_wait ()
185	{	318	{
186	if (nreqs && !ress)
187	{
188	fd_set rfd;	319	fd_set rfd;
		320
		321	while (nreqs)
		322	{
		323	int size;
		324	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		325	LOCK (reslock);
		326	#endif
		327	size = res_queue.size;
		328	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		329	UNLOCK (reslock);
		330	#endif
		331
		332	if (size)
		333	return;
		334
189	FD_ZERO(&rfd);	335	FD_ZERO(&rfd);
190	FD_SET(respipe [0], &rfd);	336	FD_SET(respipe [0], &rfd);
191		337
192	select (respipe [0] + 1, &rfd, 0, 0, 0);	338	select (respipe [0] + 1, &rfd, 0, 0, 0);
193	}	339	}
194	}	340	}
195		341
196	static void req_invoke (aio_req req)	342	static void req_invoke (aio_req req)
197	{	343	{
198	dSP;	344	dSP;
199	int errorno = errno;
200		345
201	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))	346	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
202	return;	347	{
203
204	errno = req->errorno;	348	errno = req->errorno;
205		349
206	ENTER;	350	ENTER;
207	SAVETMPS;	351	SAVETMPS;
208	PUSHMARK (SP);	352	PUSHMARK (SP);
209	EXTEND (SP, 1);	353	EXTEND (SP, 1);
210		354
211	switch (req->type)	355	switch (req->type)
212	{
213	case REQ_READDIR:
214	{	356	{
215	SV *rv = &PL_sv_undef;	357	case REQ_READDIR:
216
217	if (req->result >= 0)
218	{	358	{
219	char *buf = req->data2ptr;	359	SV *rv = &PL_sv_undef;
220	AV *av = newAV ();
221		360
222	while (req->result)	361	if (req->result >= 0)
223	{	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	{
224	SV *sv = newSVpv (buf, 0);	371	SV *sv = newSVpv (buf, 0);
225		372
226	av_push (av, sv);	373	av_store (av, i, sv);
227	buf += SvCUR (sv) + 1;	374	buf += SvCUR (sv) + 1;
228	req->result--;	375	}
		376
		377	rv = sv_2mortal (newRV_noinc ((SV *)av));
229	}	378	}
230		379
231	rv = sv_2mortal (newRV_noinc ((SV *)av));	380	PUSHs (rv);
232	}	381	}
		382	break;
233		383
234	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;
235	}	422	}
236	break;
237		423
238	case REQ_OPEN:
239	{
240	/* convert fd to fh */
241	SV *fh;
242		424
243	PUSHs (sv_2mortal (newSViv (req->result)));
244	PUTBACK;	425	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);	426	call_sv (req->callback, G_VOID \| G_EVAL);
281	SPAGAIN;	427	SPAGAIN;
282		428
283	FREETMPS;	429	FREETMPS;
284	LEAVE;	430	LEAVE;
285
286	errno = errorno;
287
288	if (SvTRUE (ERRSV))
289	{	431	}
290	req_free (req);
291	croak (0);
292	}
293	}
294		432
295	static void req_free (aio_req req)
296	{
297	if (req->grp)	433	if (req->grp)
298	{	434	{
299	aio_req grp = req->grp;	435	aio_req grp = req->grp;
300		436
301	/* unlink request */	437	/* unlink request */
…		…
306	grp->grp_first = req->grp_next;	442	grp->grp_first = req->grp_next;
307		443
308	aio_grp_dec (grp);	444	aio_grp_dec (grp);
309	}	445	}
310		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	{
311	if (req->self)	456	if (req->self)
312	{	457	{
313	sv_unmagic (req->self, PERL_MAGIC_ext);	458	sv_unmagic (req->self, PERL_MAGIC_ext);
314	SvREFCNT_dec (req->self);	459	SvREFCNT_dec (req->self);
315	}	460	}
…		…
318	SvREFCNT_dec (req->fh);	463	SvREFCNT_dec (req->fh);
319	SvREFCNT_dec (req->fh2);	464	SvREFCNT_dec (req->fh2);
320	SvREFCNT_dec (req->callback);	465	SvREFCNT_dec (req->callback);
321	Safefree (req->statdata);	466	Safefree (req->statdata);
322		467
323	if (req->type == REQ_READDIR && req->result >= 0)	468	if (req->type == REQ_READDIR)
324	free (req->data2ptr);	469	free (req->data2ptr);
325		470
326	Safefree (req);	471	Safefree (req);
327	}	472	}
328		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
329	static void req_cancel (aio_req req)	488	static void req_cancel (aio_req req)
330	{	489	{
331	req->flags \|= FLAG_CANCELLED;	490	req->flags \|= FLAG_CANCELLED;
332		491
333	if (req->type == REQ_GROUP)	492	req_cancel_subs (req);
334	{
335	aio_req sub;
336
337	for (sub = req->grp_first; sub; sub = sub->grp_next)
338	req_cancel (sub);
339	}
340	}	493	}
341		494
342	static int poll_cb ()	495	static int poll_cb ()
343	{	496	{
344	dSP;	497	dSP;
…		…
346	int do_croak = 0;	499	int do_croak = 0;
347	aio_req req;	500	aio_req req;
348		501
349	for (;;)	502	for (;;)
350	{	503	{
351	pthread_mutex_lock (&reslock);	504	LOCK (reslock);
352	req = ress;	505	req = reqq_shift (&res_queue);
353		506
354	if (req)	507	if (req)
355	{	508	{
356	ress = req->next;
357
358	if (!ress)	509	if (!res_queue.size)
359	{	510	{
360	/* read any signals sent by the worker threads */	511	/* read any signals sent by the worker threads */
361	char buf [32];	512	char buf [32];
362	while (read (respipe [0], buf, 32) == 32)	513	while (read (respipe [0], buf, 32) == 32)
363	;	514	;
364
365	rese = 0;
366	}	515	}
367	}	516	}
368		517
369	pthread_mutex_unlock (&reslock);	518	UNLOCK (reslock);
370		519
371	if (!req)	520	if (!req)
372	break;	521	break;
373		522
374	--nreqs;	523	--nreqs;
…		…
409	static void aio_proc(void arg);	558	static void aio_proc(void arg);
410		559
411	static void start_thread (void)	560	static void start_thread (void)
412	{	561	{
413	sigset_t fullsigset, oldsigset;	562	sigset_t fullsigset, oldsigset;
414	pthread_t tid;
415	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");
416		569
417	pthread_attr_init (&attr);	570	pthread_attr_init (&attr);
418	pthread_attr_setstacksize (&attr, STACKSIZE);	571	pthread_attr_setstacksize (&attr, STACKSIZE);
419	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	572	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
420		573
421	sigfillset (&fullsigset);	574	sigfillset (&fullsigset);
		575
		576	LOCK (wrklock);
422	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	577	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
423		578
424	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;
425	started++;	585	started++;
		586	}
		587	else
		588	free (wrk);
426		589
427	sigprocmask (SIG_SETMASK, &oldsigset, 0);	590	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		591	UNLOCK (wrklock);
428	}	592	}
429		593
430	static void req_send (aio_req req)	594	static void req_send (aio_req req)
431	{	595	{
432	while (started < wanted && nreqs >= started)	596	while (started < wanted && nreqs >= started)
433	start_thread ();	597	start_thread ();
434		598
435	++nreqs;	599	++nreqs;
436		600
437	pthread_mutex_lock (&reqlock);	601	LOCK (reqlock);
438		602	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);	603	pthread_cond_signal (&reqwait);
450	pthread_mutex_unlock (&reqlock);	604	UNLOCK (reqlock);
451		605
452	if (nreqs > max_outstanding)	606	if (nreqs > max_outstanding)
453	for (;;)	607	for (;;)
454	{	608	{
455	poll_cb ();	609	poll_cb ();
…		…
462	}	616	}
463		617
464	static void end_thread (void)	618	static void end_thread (void)
465	{	619	{
466	aio_req req;	620	aio_req req;
		621
467	Newz (0, req, 1, aio_cb);	622	Newz (0, req, 1, aio_cb);
		623
468	req->type = REQ_QUIT;	624	req->type = REQ_QUIT;
		625	req->pri = PRI_MAX + PRI_BIAS;
469		626
470	req_send (req);	627	req_send (req);
471	}	628	}
472		629
473	static void min_parallel (int nthreads)	630	static void min_parallel (int nthreads)
…		…
525	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)
526	{	683	{
527	ssize_t res;	684	ssize_t res;
528	off_t ooffset;	685	off_t ooffset;
529		686
530	pthread_mutex_lock (&preadwritelock);	687	LOCK (preadwritelock);
531	ooffset = lseek (fd, 0, SEEK_CUR);	688	ooffset = lseek (fd, 0, SEEK_CUR);
532	lseek (fd, offset, SEEK_SET);	689	lseek (fd, offset, SEEK_SET);
533	res = read (fd, buf, count);	690	res = read (fd, buf, count);
534	lseek (fd, ooffset, SEEK_SET);	691	lseek (fd, ooffset, SEEK_SET);
535	pthread_mutex_unlock (&preadwritelock);	692	UNLOCK (preadwritelock);
536		693
537	return res;	694	return res;
538	}	695	}
539		696
540	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)
541	{	698	{
542	ssize_t res;	699	ssize_t res;
543	off_t ooffset;	700	off_t ooffset;
544		701
545	pthread_mutex_lock (&preadwritelock);	702	LOCK (preadwritelock);
546	ooffset = lseek (fd, 0, SEEK_CUR);	703	ooffset = lseek (fd, 0, SEEK_CUR);
547	lseek (fd, offset, SEEK_SET);	704	lseek (fd, offset, SEEK_SET);
548	res = write (fd, buf, count);	705	res = write (fd, buf, count);
549	lseek (fd, offset, SEEK_SET);	706	lseek (fd, offset, SEEK_SET);
550	pthread_mutex_unlock (&preadwritelock);	707	UNLOCK (preadwritelock);
551		708
552	return res;	709	return res;
553	}	710	}
554	#endif	711	#endif
555		712
…		…
560	#if !HAVE_READAHEAD	717	#if !HAVE_READAHEAD
561	# define readahead aio_readahead	718	# define readahead aio_readahead
562		719
563	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)
564	{	721	{
565	char readahead_buf[4096];	722	dBUF;
566		723
567	while (count > 0)	724	while (count > 0)
568	{	725	{
569	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	726	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
570		727
571	pread (fd, readahead_buf, len, offset);	728	pread (fd, aio_buf, len, offset);
572	offset += len;	729	offset += len;
573	count -= len;	730	count -= len;
574	}	731	}
575		732
576	errno = 0;	733	errno = 0;
…		…
585	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)
586	{	743	{
587	struct dirent *e;	744	struct dirent *e;
588	int errorno;	745	int errorno;
589		746
590	pthread_mutex_lock (&readdirlock);	747	LOCK (readdirlock);
591		748
592	e = readdir (dirp);	749	e = readdir (dirp);
593	errorno = errno;	750	errorno = errno;
594		751
595	if (e)	752	if (e)
…		…
598	strcpy (ent->d_name, e->d_name);	755	strcpy (ent->d_name, e->d_name);
599	}	756	}
600	else	757	else
601	*res = 0;	758	*res = 0;
602		759
603	pthread_mutex_unlock (&readdirlock);	760	UNLOCK (readdirlock);
604		761
605	errno = errorno;	762	errno = errorno;
606	return e ? 0 : -1;	763	return e ? 0 : -1;
607	}	764	}
608	#endif	765	#endif
609		766
610	/* sendfile always needs emulation */	767	/* sendfile always needs emulation */
611	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)
612	{	769	{
613	ssize_t res;	770	ssize_t res;
614		771
615	if (!count)	772	if (!count)
616	return 0;	773	return 0;
…		…
665	#endif	822	#endif
666	)	823	)
667	)	824	)
668	{	825	{
669	/* emulate sendfile. this is a major pain in the ass */	826	/* emulate sendfile. this is a major pain in the ass */
670	char buf[4096];	827	dBUF;
		828
671	res = 0;	829	res = 0;
672		830
673	while (count)	831	while (count)
674	{	832	{
675	ssize_t cnt;	833	ssize_t cnt;
676		834
677	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	835	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
678		836
679	if (cnt <= 0)	837	if (cnt <= 0)
680	{	838	{
681	if (cnt && !res) res = -1;	839	if (cnt && !res) res = -1;
682	break;	840	break;
683	}	841	}
684		842
685	cnt = write (ofd, buf, cnt);	843	cnt = write (ofd, aio_buf, cnt);
686		844
687	if (cnt <= 0)	845	if (cnt <= 0)
688	{	846	{
689	if (cnt && !res) res = -1;	847	if (cnt && !res) res = -1;
690	break;	848	break;
…		…
698		856
699	return res;	857	return res;
700	}	858	}
701		859
702	/* read a full directory */	860	/* read a full directory */
703	static int scandir_ (const char path, void *namesp)	861	static void scandir_ (aio_req req, worker *self)
704	{	862	{
705	DIR *dirp = opendir (path);	863	DIR *dirp;
706	union	864	union
707	{	865	{
708	struct dirent d;	866	struct dirent d;
709	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	867	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
710	} u;	868	} *u;
711	struct dirent *entp;	869	struct dirent *entp;
712	char name, names;	870	char name, names;
713	int memlen = 4096;	871	int memlen = 4096;
714	int memofs = 0;	872	int memofs = 0;
715	int res = 0;	873	int res = 0;
716	int errorno;	874	int errorno;
717		875
718	if (!dirp)	876	LOCK (wrklock);
719	return -1;	877	self->dirp = dirp = opendir (req->dataptr);
		878	self->dbuf = u = malloc (sizeof (*u));
		879	UNLOCK (wrklock);
720		880
721	names = malloc (memlen);	881	req->data2ptr = names = malloc (memlen);
722		882
		883	if (dirp && u && names)
723	for (;;)	884	for (;;)
724	{	885	{
		886	errno = 0;
725	errno = 0, readdir_r (dirp, &u.d, &entp);	887	readdir_r (dirp, &u->d, &entp);
726		888
727	if (!entp)	889	if (!entp)
728	break;	890	break;
729		891
730	name = entp->d_name;	892	name = entp->d_name;
731		893
732	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	894	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
733	{	895	{
734	int len = strlen (name) + 1;	896	int len = strlen (name) + 1;
735		897
736	res++;	898	res++;
737		899
738	while (memofs + len > memlen)	900	while (memofs + len > memlen)
739	{	901	{
740	memlen *= 2;	902	memlen *= 2;
		903	LOCK (wrklock);
741	names = realloc (names, memlen);	904	req->data2ptr = names = realloc (names, memlen);
		905	UNLOCK (wrklock);
		906
742	if (!names)	907	if (!names)
743	break;	908	break;
744	}	909	}
745		910
746	memcpy (names + memofs, name, len);	911	memcpy (names + memofs, name, len);
747	memofs += len;	912	memofs += len;
748	}	913	}
749	}	914	}
750		915
751	errorno = errno;
752	closedir (dirp);
753
754	if (errorno)	916	if (errno)
755	{
756	free (names);
757	errno = errorno;
758	res = -1;	917	res = -1;
759	}	918
760		919	req->result = res;
761	namesp = (void )names;
762	return res;
763	}	920	}
764		921
765	/*****************************************************************************/	922	/*****************************************************************************/
766		923
767	static void aio_proc (void thr_arg)	924	static void aio_proc (void thr_arg)
768	{	925	{
769	aio_req req;	926	aio_req req;
770	int type;	927	int type;
		928	worker self = (worker )thr_arg;
771		929
772	do	930	do
773	{	931	{
774	pthread_mutex_lock (&reqlock);	932	LOCK (reqlock);
775		933
776	for (;;)	934	for (;;)
777	{	935	{
778	req = reqs;	936	self->req = req = reqq_shift (&req_queue);
779
780	if (reqs)
781	{
782	reqs = reqs->next;
783	if (!reqs) reqe = 0;
784	}
785		937
786	if (req)	938	if (req)
787	break;	939	break;
788		940
789	pthread_cond_wait (&reqwait, &reqlock);	941	pthread_cond_wait (&reqwait, &reqlock);
790	}	942	}
791		943
792	pthread_mutex_unlock (&reqlock);	944	UNLOCK (reqlock);
793		945
794	errno = 0; /* strictly unnecessary */	946	errno = 0; /* strictly unnecessary */
		947	type = req->type; /* remember type for QUIT check */
795		948
796	if (!(req->flags & FLAG_CANCELLED))	949	if (!(req->flags & FLAG_CANCELLED))
797	switch (type = req->type) /* remember type for QUIT check */	950	switch (type)
798	{	951	{
799	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;
800	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;
801		954
802	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;
803	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;
804		957
805	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	958	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
806	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	959	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
807	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	960	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
808		961
…		…
814	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	967	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
815	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	968	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
816		969
817	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	970	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
818	case REQ_FSYNC: req->result = fsync (req->fd); break;	971	case REQ_FSYNC: req->result = fsync (req->fd); break;
819	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	972	case REQ_READDIR: scandir_ (req, self); break;
820		973
821	case REQ_SLEEP:	974	case REQ_BUSY:
822	{	975	{
823	struct timeval tv;	976	struct timeval tv;
824		977
825	tv.tv_sec = req->fd;	978	tv.tv_sec = req->fd;
826	tv.tv_usec = req->fd2;	979	tv.tv_usec = req->fd2;
…		…
838	break;	991	break;
839	}	992	}
840		993
841	req->errorno = errno;	994	req->errorno = errno;
842		995
843	pthread_mutex_lock (&reslock);	996	LOCK (reslock);
844		997
845	req->next = 0;	998	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 */	999	/* write a dummy byte to the pipe so fh becomes ready */
857	write (respipe [1], &respipe, 1);	1000	write (respipe [1], &respipe, 1);
858	}
859		1001
860	pthread_mutex_unlock (&reslock);	1002	self->req = 0;
		1003	worker_clear (self);
		1004
		1005	UNLOCK (reslock);
861	}	1006	}
862	while (type != REQ_QUIT);	1007	while (type != REQ_QUIT);
863		1008
		1009	LOCK (wrklock);
		1010	worker_free (self);
		1011	UNLOCK (wrklock);
		1012
864	return 0;	1013	return 0;
865	}	1014	}
866		1015
867	/*****************************************************************************/	1016	/*****************************************************************************/
868		1017
869	static void atfork_prepare (void)	1018	static void atfork_prepare (void)
870	{	1019	{
871	pthread_mutex_lock (&reqlock);	1020	LOCK (wrklock);
872	pthread_mutex_lock (&reslock);	1021	LOCK (reqlock);
		1022	LOCK (reslock);
873	#if !HAVE_PREADWRITE	1023	#if !HAVE_PREADWRITE
874	pthread_mutex_lock (&preadwritelock);	1024	LOCK (preadwritelock);
875	#endif	1025	#endif
876	#if !HAVE_READDIR_R	1026	#if !HAVE_READDIR_R
877	pthread_mutex_lock (&readdirlock);	1027	LOCK (readdirlock);
878	#endif	1028	#endif
879	}	1029	}
880		1030
881	static void atfork_parent (void)	1031	static void atfork_parent (void)
882	{	1032	{
883	#if !HAVE_READDIR_R	1033	#if !HAVE_READDIR_R
884	pthread_mutex_unlock (&readdirlock);	1034	UNLOCK (readdirlock);
885	#endif	1035	#endif
886	#if !HAVE_PREADWRITE	1036	#if !HAVE_PREADWRITE
887	pthread_mutex_unlock (&preadwritelock);	1037	UNLOCK (preadwritelock);
888	#endif	1038	#endif
889	pthread_mutex_unlock (&reslock);	1039	UNLOCK (reslock);
890	pthread_mutex_unlock (&reqlock);	1040	UNLOCK (reqlock);
		1041	UNLOCK (wrklock);
891	}	1042	}
892		1043
893	static void atfork_child (void)	1044	static void atfork_child (void)
894	{	1045	{
895	aio_req prv;	1046	aio_req prv;
896		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
897	started = 0;	1065	started = 0;
898		1066	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		1067
917	close (respipe [0]);	1068	close (respipe [0]);
918	close (respipe [1]);	1069	close (respipe [1]);
919	create_pipe ();	1070	create_pipe ();
920		1071
921	atfork_parent ();	1072	atfork_parent ();
922	}	1073	}
923		1074
924	#define dREQ \	1075	#define dREQ \
925	aio_req req; \	1076	aio_req req; \
		1077	int req_pri = next_pri; \
		1078	next_pri = DEFAULT_PRI + PRI_BIAS; \
926	\	1079	\
927	if (SvOK (callback) && !SvROK (callback)) \	1080	if (SvOK (callback) && !SvROK (callback)) \
928	croak ("callback must be undef or of reference type"); \	1081	croak ("callback must be undef or of reference type"); \
929	\	1082	\
930	Newz (0, req, 1, aio_cb); \	1083	Newz (0, req, 1, aio_cb); \
931	if (!req) \	1084	if (!req) \
932	croak ("out of memory during aio_req allocation"); \	1085	croak ("out of memory during aio_req allocation"); \
933	\	1086	\
934	req->callback = newSVsv (callback)	1087	req->callback = newSVsv (callback); \
		1088	req->pri = req_pri
935		1089
936	#define REQ_SEND \	1090	#define REQ_SEND \
937	req_send (req); \	1091	req_send (req); \
938	\	1092	\
939	if (GIMME_V != G_VOID) \	1093	if (GIMME_V != G_VOID) \
…		…
1193		1347
1194	REQ_SEND;	1348	REQ_SEND;
1195	}	1349	}
1196		1350
1197	void	1351	void
1198	aio_sleep (delay,callback=&PL_sv_undef)	1352	aio_busy (delay,callback=&PL_sv_undef)
1199	double delay	1353	double delay
1200	SV * callback	1354	SV * callback
1201	PPCODE:	1355	PPCODE:
1202	{	1356	{
1203	dREQ;	1357	dREQ;
1204		1358
1205	req->type = REQ_SLEEP;	1359	req->type = REQ_BUSY;
1206	req->fd = delay < 0. ? 0 : delay;	1360	req->fd = delay < 0. ? 0 : delay;
1207	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1361	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1208		1362
1209	REQ_SEND;	1363	REQ_SEND;
1210	}	1364	}
…		…
1214	SV * callback	1368	SV * callback
1215	PROTOTYPE: ;$	1369	PROTOTYPE: ;$
1216	PPCODE:	1370	PPCODE:
1217	{	1371	{
1218	dREQ;	1372	dREQ;
		1373
1219	req->type = REQ_GROUP;	1374	req->type = REQ_GROUP;
1220	req_send (req);	1375	req_send (req);
		1376
1221	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1377	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1222	}	1378	}
1223		1379
1224	void	1380	void
1225	aio_nop (callback=&PL_sv_undef)	1381	aio_nop (callback=&PL_sv_undef)
…		…
1230		1386
1231	req->type = REQ_NOP;	1387	req->type = REQ_NOP;
1232		1388
1233	REQ_SEND;	1389	REQ_SEND;
1234	}	1390	}
		1391
		1392	void
		1393	aioreq_pri (int pri = DEFAULT_PRI)
		1394	CODE:
		1395	if (pri < PRI_MIN) pri = PRI_MIN;
		1396	if (pri > PRI_MAX) pri = PRI_MAX;
		1397	next_pri = pri + PRI_BIAS;
		1398
		1399	void
		1400	aioreq_nice (int nice = 0)
		1401	CODE:
		1402	nice = next_pri - nice;
		1403	if (nice < PRI_MIN) nice = PRI_MIN;
		1404	if (nice > PRI_MAX) nice = PRI_MAX;
		1405	next_pri = nice + PRI_BIAS;
1235		1406
1236	void	1407	void
1237	flush ()	1408	flush ()
1238	PROTOTYPE:	1409	PROTOTYPE:
1239	CODE:	1410	CODE:
…		…
1288		1459
1289	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1460	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1290		1461
1291	void	1462	void
1292	cancel (aio_req_ornot req)	1463	cancel (aio_req_ornot req)
1293	PROTOTYPE:
1294	CODE:	1464	CODE:
1295	req_cancel (req);	1465	req_cancel (req);
1296		1466
1297	void	1467	void
1298	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1468	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
…		…
1334	}	1504	}
1335	}	1505	}
1336	}	1506	}
1337		1507
1338	void	1508	void
		1509	cancel_subs (aio_req_ornot req)
		1510	CODE:
		1511	req_cancel_subs (req);
		1512
		1513	void
1339	result (aio_req grp, ...)	1514	result (aio_req grp, ...)
1340	CODE:	1515	CODE:
1341	{	1516	{
1342	int i;	1517	int i;
1343	AV *av = newAV ();	1518	AV *av = newAV ();
…		…
1348	SvREFCNT_dec (grp->data);	1523	SvREFCNT_dec (grp->data);
1349	grp->data = (SV *)av;	1524	grp->data = (SV *)av;
1350	}	1525	}
1351		1526
1352	void	1527	void
1353	feed_limit (aio_req grp, int limit)	1528	limit (aio_req grp, int limit)
1354	CODE:	1529	CODE:
1355	grp->fd2 = limit;	1530	grp->fd2 = limit;
1356	aio_grp_feed (grp);	1531	aio_grp_feed (grp);
1357		1532
1358	void	1533	void

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.59 by root, Mon Oct 23 18:56:27 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.59 by root, Mon Oct 23 18:56:27 2006 UTC vs.
Revision 1.73 by root, Tue Oct 24 21:26:30 2006 UTC