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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.58 by root, Mon Oct 23 18:48:08 2006 UTC vs.
Revision 1.76 by root, Thu Oct 26 12:38:04 2006 UTC

…		…
		1	/* solaris */
		2	#define _POSIX_PTHREAD_SEMANTICS 1
		3
		4	#if __linux && !defined(_GNU_SOURCE)
		5	# define _GNU_SOURCE
		6	#endif
		7
		8	/* just in case */
1	#define _REENTRANT 1	9	#define _REENTRANT 1
		10
2	#include <errno.h>	11	#include <errno.h>
3		12
4	#include "EXTERN.h"	13	#include "EXTERN.h"
5	#include "perl.h"	14	#include "perl.h"
6	#include "XSUB.h"	15	#include "XSUB.h"
39	/* used for struct dirent, AIX doesn't provide it */	48	/* used for struct dirent, AIX doesn't provide it */
40	#ifndef NAME_MAX	49	#ifndef NAME_MAX
41	# define NAME_MAX 4096	50	# define NAME_MAX 4096
42	#endif	51	#endif
43		52
		53	#ifndef PTHREAD_STACK_MIN
		54	/* care for broken platforms, e.g. windows */
		55	# define PTHREAD_STACK_MIN 16384
		56	#endif
		57
44	#if __ia64	58	#if __ia64
45	# define STACKSIZE 65536	59	# define STACKSIZE 65536
		60	#elif __i386 \|\| __x86_64 /* 16k is unreasonably high :( */
		61	# define STACKSIZE PTHREAD_STACK_MIN
46	#else	62	#else
47	# define STACKSIZE 8192	63	# define STACKSIZE 16384
48	#endif	64	#endif
		65
		66	/* buffer size for various temporary buffers */
		67	#define AIO_BUFSIZE 65536
		68
		69	#define dBUF \
		70	char *aio_buf; \
		71	LOCK (wrklock); \
		72	self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
		73	UNLOCK (wrklock); \
		74	if (!aio_buf) \
		75	return -1;
49		76
50	enum {	77	enum {
51	REQ_QUIT,	78	REQ_QUIT,
52	REQ_OPEN, REQ_CLOSE,	79	REQ_OPEN, REQ_CLOSE,
53	REQ_READ, REQ_WRITE, REQ_READAHEAD,	80	REQ_READ, REQ_WRITE, REQ_READAHEAD,
…		…
56	REQ_FSYNC, REQ_FDATASYNC,	83	REQ_FSYNC, REQ_FDATASYNC,
57	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	84	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58	REQ_READDIR,	85	REQ_READDIR,
59	REQ_LINK, REQ_SYMLINK,	86	REQ_LINK, REQ_SYMLINK,
60	REQ_GROUP, REQ_NOP,	87	REQ_GROUP, REQ_NOP,
61	REQ_SLEEP,	88	REQ_BUSY,
62	};	89	};
63		90
64	#define AIO_REQ_KLASS "IO::AIO::REQ"	91	#define AIO_REQ_KLASS "IO::AIO::REQ"
65	#define AIO_GRP_KLASS "IO::AIO::GRP"	92	#define AIO_GRP_KLASS "IO::AIO::GRP"
66		93
67	typedef struct aio_cb	94	typedef struct aio_cb
68	{	95	{
69	struct aio_cb *volatile next;	96	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		97
75	SV data, callback;	98	SV data, callback;
76	SV fh, fh2;	99	SV fh, fh2;
77	void dataptr, data2ptr;	100	void dataptr, data2ptr;
78	Stat_t *statdata;	101	Stat_t *statdata;
79	off_t offset;	102	off_t offset;
80	size_t length;	103	size_t length;
81	ssize_t result;	104	ssize_t result;
82		105
		106	STRLEN dataoffset;
83	int type;	107	int type;
84	int fd, fd2;	108	int fd, fd2;
85	int errorno;	109	int errorno;
86	STRLEN dataoffset;
87	mode_t mode; /* open */	110	mode_t mode; /* open */
		111
		112	unsigned char flags;
88	unsigned char pri;	113	unsigned char pri;
89	unsigned char flags;	114
		115	SV self; / the perl counterpart of this request, if any */
		116	struct aio_cb grp, grp_prev, grp_next, grp_first;
90	} aio_cb;	117	} aio_cb;
91		118
92	enum {	119	enum {
93	FLAG_CANCELLED = 0x01,	120	FLAG_CANCELLED = 0x01,
94	};	121	};
95		122
96	typedef aio_cb *aio_req;	123	typedef aio_cb *aio_req;
97	typedef aio_cb *aio_req_ornot;	124	typedef aio_cb *aio_req_ornot;
98		125
		126	enum {
		127	PRI_MIN = -4,
		128	PRI_MAX = 4,
		129
		130	DEFAULT_PRI = 0,
		131	PRI_BIAS = -PRI_MIN,
		132	NUM_PRI = PRI_MAX + PRI_BIAS + 1,
		133	};
		134
		135	static int next_pri = DEFAULT_PRI + PRI_BIAS;
		136
99	static int started, wanted;	137	static int started, wanted;
100	static volatile int nreqs;	138	static volatile int nreqs;
101	static int max_outstanding = 1<<30;
102	static int respipe [2];	139	static int respipe [2];
103		140
		141	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
		142	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
		143	#else
		144	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
		145	#endif
		146
		147	#define LOCK(mutex) pthread_mutex_lock (&(mutex))
		148	#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
		149
		150	/* worker threads management */
		151	static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
		152
		153	typedef struct worker {
		154	/* locked by wrklock */
		155	struct worker prev, next;
		156
		157	pthread_t tid;
		158
		159	/* locked by reslock, reqlock or wrklock */
		160	aio_req req; /* currently processed request */
		161	void *dbuf;
		162	DIR *dirp;
		163	} worker;
		164
		165	static worker wrk_first = { &wrk_first, &wrk_first, 0 };
		166
		167	static void worker_clear (worker *wrk)
		168	{
		169	if (wrk->dirp)
		170	{
		171	closedir (wrk->dirp);
		172	wrk->dirp = 0;
		173	}
		174
		175	if (wrk->dbuf)
		176	{
		177	free (wrk->dbuf);
		178	wrk->dbuf = 0;
		179	}
		180	}
		181
		182	static void worker_free (worker *wrk)
		183	{
		184	wrk->next->prev = wrk->prev;
		185	wrk->prev->next = wrk->next;
		186
		187	free (wrk);
		188	}
		189
104	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	190	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
105	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	191	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
106	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	192	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
107		193
108	static volatile aio_req reqs, reqe; /* queue start, queue end */	194	/*
109	static volatile aio_req ress, rese; /* queue start, queue end */	195	* a somewhat faster data structure might be nice, but
		196	* with 8 priorities this actually needs <20 insns
		197	* per shift, the most expensive operation.
		198	*/
		199	typedef struct {
		200	aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
		201	int size;
		202	} reqq;
110		203
		204	static reqq req_queue;
		205	static reqq res_queue;
		206
		207	int reqq_push (reqq *q, aio_req req)
		208	{
		209	int pri = req->pri;
		210	req->next = 0;
		211
		212	if (q->qe[pri])
		213	{
		214	q->qe[pri]->next = req;
		215	q->qe[pri] = req;
		216	}
		217	else
		218	q->qe[pri] = q->qs[pri] = req;
		219
		220	return q->size++;
		221	}
		222
		223	aio_req reqq_shift (reqq *q)
		224	{
		225	int pri;
		226
		227	if (!q->size)
		228	return 0;
		229
		230	--q->size;
		231
		232	for (pri = NUM_PRI; pri--; )
		233	{
		234	aio_req req = q->qs[pri];
		235
		236	if (req)
		237	{
		238	if (!(q->qs[pri] = req->next))
		239	q->qe[pri] = 0;
		240
		241	return req;
		242	}
		243	}
		244
		245	abort ();
		246	}
		247
		248	static int poll_cb (int max);
111	static void req_invoke (aio_req req);	249	static void req_invoke (aio_req req);
112	static void req_free (aio_req req);	250	static void req_free (aio_req req);
		251	static void req_cancel (aio_req req);
113		252
114	/* must be called at most once */	253	/* must be called at most once */
115	static SV req_sv (aio_req req, const char klass)	254	static SV req_sv (aio_req req, const char klass)
116	{	255	{
117	if (!req->self)	256	if (!req->self)
…		…
148	ENTER;	287	ENTER;
149	SAVETMPS;	288	SAVETMPS;
150	PUSHMARK (SP);	289	PUSHMARK (SP);
151	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	290	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
152	PUTBACK;	291	PUTBACK;
153	call_sv (grp->fh2, G_VOID \| G_EVAL);	292	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
154	SPAGAIN;	293	SPAGAIN;
155	FREETMPS;	294	FREETMPS;
156	LEAVE;	295	LEAVE;
157	}	296	}
158		297
…		…
181	}	320	}
182	}	321	}
183		322
184	static void poll_wait ()	323	static void poll_wait ()
185	{	324	{
186	if (nreqs && !ress)
187	{
188	fd_set rfd;	325	fd_set rfd;
		326
		327	while (nreqs)
		328	{
		329	int size;
		330	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		331	LOCK (reslock);
		332	#endif
		333	size = res_queue.size;
		334	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		335	UNLOCK (reslock);
		336	#endif
		337
		338	if (size)
		339	return;
		340
189	FD_ZERO(&rfd);	341	FD_ZERO(&rfd);
190	FD_SET(respipe [0], &rfd);	342	FD_SET(respipe [0], &rfd);
191		343
192	select (respipe [0] + 1, &rfd, 0, 0, 0);	344	select (respipe [0] + 1, &rfd, 0, 0, 0);
193	}	345	}
194	}	346	}
195		347
196	static void req_invoke (aio_req req)	348	static void req_invoke (aio_req req)
197	{	349	{
198	dSP;	350	dSP;
199	int errorno = errno;
200		351
201	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))	352	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
202	return;	353	{
203
204	errno = req->errorno;	354	errno = req->errorno;
205		355
206	ENTER;	356	ENTER;
207	SAVETMPS;	357	SAVETMPS;
208	PUSHMARK (SP);	358	PUSHMARK (SP);
209	EXTEND (SP, 1);	359	EXTEND (SP, 1);
210		360
211	switch (req->type)	361	switch (req->type)
212	{
213	case REQ_READDIR:
214	{	362	{
215	SV *rv = &PL_sv_undef;	363	case REQ_READDIR:
216
217	if (req->result >= 0)
218	{	364	{
219	char *buf = req->data2ptr;	365	SV *rv = &PL_sv_undef;
220	AV *av = newAV ();
221		366
222	while (req->result)	367	if (req->result >= 0)
223	{	368	{
		369	int i;
		370	char *buf = req->data2ptr;
		371	AV *av = newAV ();
		372
		373	av_extend (av, req->result - 1);
		374
		375	for (i = 0; i < req->result; ++i)
		376	{
224	SV *sv = newSVpv (buf, 0);	377	SV *sv = newSVpv (buf, 0);
225		378
226	av_push (av, sv);	379	av_store (av, i, sv);
227	buf += SvCUR (sv) + 1;	380	buf += SvCUR (sv) + 1;
228	req->result--;	381	}
		382
		383	rv = sv_2mortal (newRV_noinc ((SV *)av));
229	}	384	}
230		385
231	rv = sv_2mortal (newRV_noinc ((SV *)av));	386	PUSHs (rv);
232	}	387	}
		388	break;
233		389
234	PUSHs (rv);	390	case REQ_OPEN:
		391	{
		392	/* convert fd to fh */
		393	SV *fh;
		394
		395	PUSHs (sv_2mortal (newSViv (req->result)));
		396	PUTBACK;
		397	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
		398	SPAGAIN;
		399
		400	fh = SvREFCNT_inc (POPs);
		401
		402	PUSHMARK (SP);
		403	XPUSHs (sv_2mortal (fh));
		404	}
		405	break;
		406
		407	case REQ_GROUP:
		408	req->fd = 2; /* mark group as finished */
		409
		410	if (req->data)
		411	{
		412	int i;
		413	AV av = (AV )req->data;
		414
		415	EXTEND (SP, AvFILL (av) + 1);
		416	for (i = 0; i <= AvFILL (av); ++i)
		417	PUSHs (*av_fetch (av, i, 0));
		418	}
		419	break;
		420
		421	case REQ_NOP:
		422	case REQ_BUSY:
		423	break;
		424
		425	default:
		426	PUSHs (sv_2mortal (newSViv (req->result)));
		427	break;
235	}	428	}
236	break;
237		429
238	case REQ_OPEN:
239	{
240	/* convert fd to fh */
241	SV *fh;
242		430
243	PUSHs (sv_2mortal (newSViv (req->result)));
244	PUTBACK;	431	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);	432	call_sv (req->callback, G_VOID \| G_EVAL);
281	SPAGAIN;	433	SPAGAIN;
282		434
283	FREETMPS;	435	FREETMPS;
284	LEAVE;	436	LEAVE;
285
286	errno = errorno;
287
288	if (SvTRUE (ERRSV))
289	{	437	}
290	req_free (req);
291	croak (0);
292	}
293	}
294		438
295	static void req_free (aio_req req)
296	{
297	if (req->grp)	439	if (req->grp)
298	{	440	{
299	aio_req grp = req->grp;	441	aio_req grp = req->grp;
300		442
301	/* unlink request */	443	/* unlink request */
…		…
306	grp->grp_first = req->grp_next;	448	grp->grp_first = req->grp_next;
307		449
308	aio_grp_dec (grp);	450	aio_grp_dec (grp);
309	}	451	}
310		452
		453	if (SvTRUE (ERRSV))
		454	{
		455	req_free (req);
		456	croak (0);
		457	}
		458	}
		459
		460	static void req_free (aio_req req)
		461	{
311	if (req->self)	462	if (req->self)
312	{	463	{
313	sv_unmagic (req->self, PERL_MAGIC_ext);	464	sv_unmagic (req->self, PERL_MAGIC_ext);
314	SvREFCNT_dec (req->self);	465	SvREFCNT_dec (req->self);
315	}	466	}
…		…
318	SvREFCNT_dec (req->fh);	469	SvREFCNT_dec (req->fh);
319	SvREFCNT_dec (req->fh2);	470	SvREFCNT_dec (req->fh2);
320	SvREFCNT_dec (req->callback);	471	SvREFCNT_dec (req->callback);
321	Safefree (req->statdata);	472	Safefree (req->statdata);
322		473
323	if (req->type == REQ_READDIR && req->result >= 0)	474	if (req->type == REQ_READDIR)
324	free (req->data2ptr);	475	free (req->data2ptr);
325		476
326	Safefree (req);	477	Safefree (req);
327	}	478	}
328		479
		480	static void req_cancel_subs (aio_req grp)
		481	{
		482	aio_req sub;
		483
		484	if (grp->type != REQ_GROUP)
		485	return;
		486
		487	SvREFCNT_dec (grp->fh2);
		488	grp->fh2 = 0;
		489
		490	for (sub = grp->grp_first; sub; sub = sub->grp_next)
		491	req_cancel (sub);
		492	}
		493
329	static void req_cancel (aio_req req)	494	static void req_cancel (aio_req req)
330	{	495	{
331	req->flags \|= FLAG_CANCELLED;	496	req->flags \|= FLAG_CANCELLED;
332		497
333	if (req->type == REQ_GROUP)	498	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	}	499	}
341		500
342	static int poll_cb ()	501	static int poll_cb (int max)
343	{	502	{
344	dSP;	503	dSP;
345	int count = 0;	504	int count = 0;
346	int do_croak = 0;	505	int do_croak = 0;
347	aio_req req;	506	aio_req req;
348		507
349	for (;;)	508	while (max <= 0 \|\| count < max)
350	{	509	{
351	pthread_mutex_lock (&reslock);	510	LOCK (reslock);
352	req = ress;	511	req = reqq_shift (&res_queue);
353		512
354	if (req)	513	if (req)
355	{	514	{
356	ress = req->next;
357
358	if (!ress)	515	if (!res_queue.size)
359	{	516	{
360	/* read any signals sent by the worker threads */	517	/* read any signals sent by the worker threads */
361	char buf [32];	518	char buf [32];
362	while (read (respipe [0], buf, 32) == 32)	519	while (read (respipe [0], buf, 32) == 32)
363	;	520	;
364
365	rese = 0;
366	}	521	}
367	}	522	}
368		523
369	pthread_mutex_unlock (&reslock);	524	UNLOCK (reslock);
370		525
371	if (!req)	526	if (!req)
372	break;	527	break;
373		528
374	--nreqs;	529	--nreqs;
…		…
409	static void aio_proc(void arg);	564	static void aio_proc(void arg);
410		565
411	static void start_thread (void)	566	static void start_thread (void)
412	{	567	{
413	sigset_t fullsigset, oldsigset;	568	sigset_t fullsigset, oldsigset;
414	pthread_t tid;
415	pthread_attr_t attr;	569	pthread_attr_t attr;
		570
		571	worker *wrk = calloc (1, sizeof (worker));
		572
		573	if (!wrk)
		574	croak ("unable to allocate worker thread data");
416		575
417	pthread_attr_init (&attr);	576	pthread_attr_init (&attr);
418	pthread_attr_setstacksize (&attr, STACKSIZE);	577	pthread_attr_setstacksize (&attr, STACKSIZE);
419	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	578	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
420		579
421	sigfillset (&fullsigset);	580	sigfillset (&fullsigset);
		581
		582	LOCK (wrklock);
422	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	583	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
423		584
424	if (pthread_create (&tid, &attr, aio_proc, 0) == 0)	585	if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
		586	{
		587	wrk->prev = &wrk_first;
		588	wrk->next = wrk_first.next;
		589	wrk_first.next->prev = wrk;
		590	wrk_first.next = wrk;
425	started++;	591	started++;
		592	}
		593	else
		594	free (wrk);
426		595
427	sigprocmask (SIG_SETMASK, &oldsigset, 0);	596	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		597	UNLOCK (wrklock);
428	}	598	}
429		599
430	static void req_send (aio_req req)	600	static void req_send (aio_req req)
431	{	601	{
432	while (started < wanted && nreqs >= started)	602	while (started < wanted && nreqs >= started)
433	start_thread ();	603	start_thread ();
434		604
435	++nreqs;	605	++nreqs;
436		606
437	pthread_mutex_lock (&reqlock);	607	LOCK (reqlock);
438		608	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);	609	pthread_cond_signal (&reqwait);
450	pthread_mutex_unlock (&reqlock);	610	UNLOCK (reqlock);
451
452	if (nreqs > max_outstanding)
453	for (;;)
454	{
455	poll_cb ();
456
457	if (nreqs <= max_outstanding)
458	break;
459
460	poll_wait ();
461	}
462	}	611	}
463		612
464	static void end_thread (void)	613	static void end_thread (void)
465	{	614	{
466	aio_req req;	615	aio_req req;
		616
467	Newz (0, req, 1, aio_cb);	617	Newz (0, req, 1, aio_cb);
		618
468	req->type = REQ_QUIT;	619	req->type = REQ_QUIT;
		620	req->pri = PRI_MAX + PRI_BIAS;
469		621
470	req_send (req);	622	req_send (req);
471	}	623	}
472		624
473	static void min_parallel (int nthreads)	625	static void min_parallel (int nthreads)
…		…
490	}	642	}
491		643
492	while (started > wanted)	644	while (started > wanted)
493	{	645	{
494	poll_wait ();	646	poll_wait ();
495	poll_cb ();	647	poll_cb (0);
496	}	648	}
497	}	649	}
498		650
499	static void create_pipe ()	651	static void create_pipe ()
500	{	652	{
…		…
525	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)	677	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
526	{	678	{
527	ssize_t res;	679	ssize_t res;
528	off_t ooffset;	680	off_t ooffset;
529		681
530	pthread_mutex_lock (&preadwritelock);	682	LOCK (preadwritelock);
531	ooffset = lseek (fd, 0, SEEK_CUR);	683	ooffset = lseek (fd, 0, SEEK_CUR);
532	lseek (fd, offset, SEEK_SET);	684	lseek (fd, offset, SEEK_SET);
533	res = read (fd, buf, count);	685	res = read (fd, buf, count);
534	lseek (fd, ooffset, SEEK_SET);	686	lseek (fd, ooffset, SEEK_SET);
535	pthread_mutex_unlock (&preadwritelock);	687	UNLOCK (preadwritelock);
536		688
537	return res;	689	return res;
538	}	690	}
539		691
540	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)	692	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
541	{	693	{
542	ssize_t res;	694	ssize_t res;
543	off_t ooffset;	695	off_t ooffset;
544		696
545	pthread_mutex_lock (&preadwritelock);	697	LOCK (preadwritelock);
546	ooffset = lseek (fd, 0, SEEK_CUR);	698	ooffset = lseek (fd, 0, SEEK_CUR);
547	lseek (fd, offset, SEEK_SET);	699	lseek (fd, offset, SEEK_SET);
548	res = write (fd, buf, count);	700	res = write (fd, buf, count);
549	lseek (fd, offset, SEEK_SET);	701	lseek (fd, offset, SEEK_SET);
550	pthread_mutex_unlock (&preadwritelock);	702	UNLOCK (preadwritelock);
551		703
552	return res;	704	return res;
553	}	705	}
554	#endif	706	#endif
555		707
556	#if !HAVE_FDATASYNC	708	#if !HAVE_FDATASYNC
557	# define fdatasync fsync	709	# define fdatasync fsync
558	#endif	710	#endif
559		711
560	#if !HAVE_READAHEAD	712	#if !HAVE_READAHEAD
561	# define readahead aio_readahead	713	# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
562		714
563	static ssize_t readahead (int fd, off_t offset, size_t count)	715	static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
564	{	716	{
565	char readahead_buf[4096];	717	dBUF;
566		718
567	while (count > 0)	719	while (count > 0)
568	{	720	{
569	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	721	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
570		722
571	pread (fd, readahead_buf, len, offset);	723	pread (fd, aio_buf, len, offset);
572	offset += len;	724	offset += len;
573	count -= len;	725	count -= len;
574	}	726	}
575		727
576	errno = 0;	728	errno = 0;
577	}	729	}
		730
578	#endif	731	#endif
579		732
580	#if !HAVE_READDIR_R	733	#if !HAVE_READDIR_R
581	# define readdir_r aio_readdir_r	734	# define readdir_r aio_readdir_r
582		735
…		…
585	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)	738	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)
586	{	739	{
587	struct dirent *e;	740	struct dirent *e;
588	int errorno;	741	int errorno;
589		742
590	pthread_mutex_lock (&readdirlock);	743	LOCK (readdirlock);
591		744
592	e = readdir (dirp);	745	e = readdir (dirp);
593	errorno = errno;	746	errorno = errno;
594		747
595	if (e)	748	if (e)
…		…
598	strcpy (ent->d_name, e->d_name);	751	strcpy (ent->d_name, e->d_name);
599	}	752	}
600	else	753	else
601	*res = 0;	754	*res = 0;
602		755
603	pthread_mutex_unlock (&readdirlock);	756	UNLOCK (readdirlock);
604		757
605	errno = errorno;	758	errno = errorno;
606	return e ? 0 : -1;	759	return e ? 0 : -1;
607	}	760	}
608	#endif	761	#endif
609		762
610	/* sendfile always needs emulation */	763	/* sendfile always needs emulation */
611	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)	764	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
612	{	765	{
613	ssize_t res;	766	ssize_t res;
614		767
615	if (!count)	768	if (!count)
616	return 0;	769	return 0;
…		…
665	#endif	818	#endif
666	)	819	)
667	)	820	)
668	{	821	{
669	/* emulate sendfile. this is a major pain in the ass */	822	/* emulate sendfile. this is a major pain in the ass */
670	char buf[4096];	823	dBUF;
		824
671	res = 0;	825	res = 0;
672		826
673	while (count)	827	while (count)
674	{	828	{
675	ssize_t cnt;	829	ssize_t cnt;
676		830
677	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	831	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
678		832
679	if (cnt <= 0)	833	if (cnt <= 0)
680	{	834	{
681	if (cnt && !res) res = -1;	835	if (cnt && !res) res = -1;
682	break;	836	break;
683	}	837	}
684		838
685	cnt = write (ofd, buf, cnt);	839	cnt = write (ofd, aio_buf, cnt);
686		840
687	if (cnt <= 0)	841	if (cnt <= 0)
688	{	842	{
689	if (cnt && !res) res = -1;	843	if (cnt && !res) res = -1;
690	break;	844	break;
…		…
698		852
699	return res;	853	return res;
700	}	854	}
701		855
702	/* read a full directory */	856	/* read a full directory */
703	static int scandir_ (const char path, void *namesp)	857	static void scandir_ (aio_req req, worker *self)
704	{	858	{
705	DIR *dirp = opendir (path);	859	DIR *dirp;
706	union	860	union
707	{	861	{
708	struct dirent d;	862	struct dirent d;
709	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	863	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
710	} u;	864	} *u;
711	struct dirent *entp;	865	struct dirent *entp;
712	char name, names;	866	char name, names;
713	int memlen = 4096;	867	int memlen = 4096;
714	int memofs = 0;	868	int memofs = 0;
715	int res = 0;	869	int res = 0;
716	int errorno;	870	int errorno;
717		871
718	if (!dirp)	872	LOCK (wrklock);
719	return -1;	873	self->dirp = dirp = opendir (req->dataptr);
720		874	self->dbuf = u = malloc (sizeof (*u));
721	names = malloc (memlen);	875	req->data2ptr = names = malloc (memlen);
		876	UNLOCK (wrklock);
722		877
		878	if (dirp && u && names)
723	for (;;)	879	for (;;)
724	{	880	{
		881	errno = 0;
725	errno = 0, readdir_r (dirp, &u.d, &entp);	882	readdir_r (dirp, &u->d, &entp);
726		883
727	if (!entp)	884	if (!entp)
728	break;	885	break;
729		886
730	name = entp->d_name;	887	name = entp->d_name;
731		888
732	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	889	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
733	{	890	{
734	int len = strlen (name) + 1;	891	int len = strlen (name) + 1;
735		892
736	res++;	893	res++;
737		894
738	while (memofs + len > memlen)	895	while (memofs + len > memlen)
739	{	896	{
740	memlen *= 2;	897	memlen *= 2;
		898	LOCK (wrklock);
741	names = realloc (names, memlen);	899	req->data2ptr = names = realloc (names, memlen);
		900	UNLOCK (wrklock);
		901
742	if (!names)	902	if (!names)
743	break;	903	break;
744	}	904	}
745		905
746	memcpy (names + memofs, name, len);	906	memcpy (names + memofs, name, len);
747	memofs += len;	907	memofs += len;
748	}	908	}
749	}	909	}
750		910
751	errorno = errno;
752	closedir (dirp);
753
754	if (errorno)	911	if (errno)
755	{
756	free (names);
757	errno = errorno;
758	res = -1;	912	res = -1;
759	}	913
760		914	req->result = res;
761	namesp = (void )names;
762	return res;
763	}	915	}
764		916
765	/*****************************************************************************/	917	/*****************************************************************************/
766		918
767	static void aio_proc (void thr_arg)	919	static void aio_proc (void thr_arg)
768	{	920	{
769	aio_req req;	921	aio_req req;
770	int type;	922	int type;
		923	worker self = (worker )thr_arg;
771		924
772	do	925	do
773	{	926	{
774	pthread_mutex_lock (&reqlock);	927	LOCK (reqlock);
775		928
776	for (;;)	929	for (;;)
777	{	930	{
778	req = reqs;	931	self->req = req = reqq_shift (&req_queue);
779
780	if (reqs)
781	{
782	reqs = reqs->next;
783	if (!reqs) reqe = 0;
784	}
785		932
786	if (req)	933	if (req)
787	break;	934	break;
788		935
789	pthread_cond_wait (&reqwait, &reqlock);	936	pthread_cond_wait (&reqwait, &reqlock);
790	}	937	}
791		938
792	pthread_mutex_unlock (&reqlock);	939	UNLOCK (reqlock);
793		940
794	errno = 0; /* strictly unnecessary */	941	errno = 0; /* strictly unnecessary */
		942	type = req->type; /* remember type for QUIT check */
795		943
796	if (!(req->flags & FLAG_CANCELLED))	944	if (!(req->flags & FLAG_CANCELLED))
797	switch (type = req->type) /* remember type for QUIT check */	945	switch (type)
798	{	946	{
799	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	947	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;	948	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
801		949
802	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	950	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;	951	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
804		952
805	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	953	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
806	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	954	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
807	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	955	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
808		956
…		…
814	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	962	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
815	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	963	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
816		964
817	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	965	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
818	case REQ_FSYNC: req->result = fsync (req->fd); break;	966	case REQ_FSYNC: req->result = fsync (req->fd); break;
819	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	967	case REQ_READDIR: scandir_ (req, self); break;
820		968
821	case REQ_SLEEP:	969	case REQ_BUSY:
822	{	970	{
823	struct timeval tv;	971	struct timeval tv;
824		972
825	tv.tv_sec = req->fd;	973	tv.tv_sec = req->fd;
826	tv.tv_usec = req->fd2;	974	tv.tv_usec = req->fd2;
…		…
838	break;	986	break;
839	}	987	}
840		988
841	req->errorno = errno;	989	req->errorno = errno;
842		990
843	pthread_mutex_lock (&reslock);	991	LOCK (reslock);
844		992
845	req->next = 0;	993	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 */	994	/* write a dummy byte to the pipe so fh becomes ready */
857	write (respipe [1], &respipe, 1);	995	write (respipe [1], &respipe, 1);
858	}
859		996
860	pthread_mutex_unlock (&reslock);	997	self->req = 0;
		998	worker_clear (self);
		999
		1000	UNLOCK (reslock);
861	}	1001	}
862	while (type != REQ_QUIT);	1002	while (type != REQ_QUIT);
863		1003
		1004	LOCK (wrklock);
		1005	worker_free (self);
		1006	UNLOCK (wrklock);
		1007
864	return 0;	1008	return 0;
865	}	1009	}
866		1010
867	/*****************************************************************************/	1011	/*****************************************************************************/
868		1012
869	static void atfork_prepare (void)	1013	static void atfork_prepare (void)
870	{	1014	{
871	pthread_mutex_lock (&reqlock);	1015	LOCK (wrklock);
872	pthread_mutex_lock (&reslock);	1016	LOCK (reqlock);
		1017	LOCK (reslock);
873	#if !HAVE_PREADWRITE	1018	#if !HAVE_PREADWRITE
874	pthread_mutex_lock (&preadwritelock);	1019	LOCK (preadwritelock);
875	#endif	1020	#endif
876	#if !HAVE_READDIR_R	1021	#if !HAVE_READDIR_R
877	pthread_mutex_lock (&readdirlock);	1022	LOCK (readdirlock);
878	#endif	1023	#endif
879	}	1024	}
880		1025
881	static void atfork_parent (void)	1026	static void atfork_parent (void)
882	{	1027	{
883	#if !HAVE_READDIR_R	1028	#if !HAVE_READDIR_R
884	pthread_mutex_unlock (&readdirlock);	1029	UNLOCK (readdirlock);
885	#endif	1030	#endif
886	#if !HAVE_PREADWRITE	1031	#if !HAVE_PREADWRITE
887	pthread_mutex_unlock (&preadwritelock);	1032	UNLOCK (preadwritelock);
888	#endif	1033	#endif
889	pthread_mutex_unlock (&reslock);	1034	UNLOCK (reslock);
890	pthread_mutex_unlock (&reqlock);	1035	UNLOCK (reqlock);
		1036	UNLOCK (wrklock);
891	}	1037	}
892		1038
893	static void atfork_child (void)	1039	static void atfork_child (void)
894	{	1040	{
895	aio_req prv;	1041	aio_req prv;
896		1042
		1043	while (prv = reqq_shift (&req_queue))
		1044	req_free (prv);
		1045
		1046	while (prv = reqq_shift (&res_queue))
		1047	req_free (prv);
		1048
		1049	while (wrk_first.next != &wrk_first)
		1050	{
		1051	worker *wrk = wrk_first.next;
		1052
		1053	if (wrk->req)
		1054	req_free (wrk->req);
		1055
		1056	worker_clear (wrk);
		1057	worker_free (wrk);
		1058	}
		1059
897	started = 0;	1060	started = 0;
898		1061	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		1062
917	close (respipe [0]);	1063	close (respipe [0]);
918	close (respipe [1]);	1064	close (respipe [1]);
919	create_pipe ();	1065	create_pipe ();
920		1066
921	atfork_parent ();	1067	atfork_parent ();
922	}	1068	}
923		1069
924	#define dREQ \	1070	#define dREQ \
925	aio_req req; \	1071	aio_req req; \
		1072	int req_pri = next_pri; \
		1073	next_pri = DEFAULT_PRI + PRI_BIAS; \
926	\	1074	\
927	if (SvOK (callback) && !SvROK (callback)) \	1075	if (SvOK (callback) && !SvROK (callback)) \
928	croak ("callback must be undef or of reference type"); \	1076	croak ("callback must be undef or of reference type"); \
929	\	1077	\
930	Newz (0, req, 1, aio_cb); \	1078	Newz (0, req, 1, aio_cb); \
931	if (!req) \	1079	if (!req) \
932	croak ("out of memory during aio_req allocation"); \	1080	croak ("out of memory during aio_req allocation"); \
933	\	1081	\
934	req->callback = newSVsv (callback)	1082	req->callback = newSVsv (callback); \
		1083	req->pri = req_pri
935		1084
936	#define REQ_SEND \	1085	#define REQ_SEND \
937	req_send (req); \	1086	req_send (req); \
938	\	1087	\
939	if (GIMME_V != G_VOID) \	1088	if (GIMME_V != G_VOID) \
…		…
961		1110
962	void	1111	void
963	max_parallel (nthreads)	1112	max_parallel (nthreads)
964	int nthreads	1113	int nthreads
965	PROTOTYPE: $	1114	PROTOTYPE: $
966
967	int
968	max_outstanding (nreqs)
969	int nreqs
970	PROTOTYPE: $
971	CODE:
972	RETVAL = max_outstanding;
973	max_outstanding = nreqs;
974		1115
975	void	1116	void
976	aio_open (pathname,flags,mode,callback=&PL_sv_undef)	1117	aio_open (pathname,flags,mode,callback=&PL_sv_undef)
977	SV * pathname	1118	SV * pathname
978	int flags	1119	int flags
…		…
1193		1334
1194	REQ_SEND;	1335	REQ_SEND;
1195	}	1336	}
1196		1337
1197	void	1338	void
1198	aio_sleep (delay,callback=&PL_sv_undef)	1339	aio_busy (delay,callback=&PL_sv_undef)
1199	double delay	1340	double delay
1200	SV * callback	1341	SV * callback
1201	PPCODE:	1342	PPCODE:
1202	{	1343	{
1203	dREQ;	1344	dREQ;
1204		1345
1205	req->type = REQ_SLEEP;	1346	req->type = REQ_BUSY;
1206	req->fd = delay < 0. ? 0 : delay;	1347	req->fd = delay < 0. ? 0 : delay;
1207	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1348	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1208		1349
1209	REQ_SEND;	1350	REQ_SEND;
1210	}	1351	}
…		…
1214	SV * callback	1355	SV * callback
1215	PROTOTYPE: ;$	1356	PROTOTYPE: ;$
1216	PPCODE:	1357	PPCODE:
1217	{	1358	{
1218	dREQ;	1359	dREQ;
		1360
1219	req->type = REQ_GROUP;	1361	req->type = REQ_GROUP;
1220	req_send (req);	1362	req_send (req);
		1363
1221	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1364	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1222	}	1365	}
1223		1366
1224	void	1367	void
1225	aio_nop (callback=&PL_sv_undef)	1368	aio_nop (callback=&PL_sv_undef)
…		…
1230		1373
1231	req->type = REQ_NOP;	1374	req->type = REQ_NOP;
1232		1375
1233	REQ_SEND;	1376	REQ_SEND;
1234	}	1377	}
		1378
		1379	void
		1380	aioreq_pri (int pri = DEFAULT_PRI)
		1381	CODE:
		1382	if (pri < PRI_MIN) pri = PRI_MIN;
		1383	if (pri > PRI_MAX) pri = PRI_MAX;
		1384	next_pri = pri + PRI_BIAS;
		1385
		1386	void
		1387	aioreq_nice (int nice = 0)
		1388	CODE:
		1389	nice = next_pri - nice;
		1390	if (nice < PRI_MIN) nice = PRI_MIN;
		1391	if (nice > PRI_MAX) nice = PRI_MAX;
		1392	next_pri = nice + PRI_BIAS;
1235		1393
1236	void	1394	void
1237	flush ()	1395	flush ()
1238	PROTOTYPE:	1396	PROTOTYPE:
1239	CODE:	1397	CODE:
1240	while (nreqs)	1398	while (nreqs)
1241	{	1399	{
1242	poll_wait ();	1400	poll_wait ();
1243	poll_cb ();	1401	poll_cb (0);
1244	}	1402	}
1245		1403
1246	void	1404	void
1247	poll()	1405	poll()
1248	PROTOTYPE:	1406	PROTOTYPE:
1249	CODE:	1407	CODE:
1250	if (nreqs)	1408	if (nreqs)
1251	{	1409	{
1252	poll_wait ();	1410	poll_wait ();
1253	poll_cb ();	1411	poll_cb (0);
1254	}	1412	}
1255		1413
1256	int	1414	int
1257	poll_fileno()	1415	poll_fileno()
1258	PROTOTYPE:	1416	PROTOTYPE:
…		…
1263		1421
1264	int	1422	int
1265	poll_cb(...)	1423	poll_cb(...)
1266	PROTOTYPE:	1424	PROTOTYPE:
1267	CODE:	1425	CODE:
1268	RETVAL = poll_cb ();	1426	RETVAL = poll_cb (0);
		1427	OUTPUT:
		1428	RETVAL
		1429
		1430	int
		1431	poll_some(int max = 0)
		1432	PROTOTYPE: $
		1433	CODE:
		1434	RETVAL = poll_cb (max);
1269	OUTPUT:	1435	OUTPUT:
1270	RETVAL	1436	RETVAL
1271		1437
1272	void	1438	void
1273	poll_wait()	1439	poll_wait()
…		…
1288		1454
1289	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1455	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1290		1456
1291	void	1457	void
1292	cancel (aio_req_ornot req)	1458	cancel (aio_req_ornot req)
1293	PROTOTYPE:
1294	CODE:	1459	CODE:
1295	req_cancel (req);	1460	req_cancel (req);
1296		1461
1297	void	1462	void
1298	cb (aio_req req, SV *callback=&PL_sv_undef)	1463	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1299	CODE:	1464	CODE:
1300	SvREFCNT_dec (req->callback);	1465	SvREFCNT_dec (req->callback);
1301	req->callback = newSVsv (callback);	1466	req->callback = newSVsv (callback);
1302		1467
1303	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1468	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
…		…
1334	}	1499	}
1335	}	1500	}
1336	}	1501	}
1337		1502
1338	void	1503	void
		1504	cancel_subs (aio_req_ornot req)
		1505	CODE:
		1506	req_cancel_subs (req);
		1507
		1508	void
1339	result (aio_req grp, ...)	1509	result (aio_req grp, ...)
1340	CODE:	1510	CODE:
1341	{	1511	{
1342	int i;	1512	int i;
1343	AV *av = newAV ();	1513	AV *av = newAV ();
…		…
1348	SvREFCNT_dec (grp->data);	1518	SvREFCNT_dec (grp->data);
1349	grp->data = (SV *)av;	1519	grp->data = (SV *)av;
1350	}	1520	}
1351		1521
1352	void	1522	void
1353	feed_limit (aio_req grp, int limit)	1523	limit (aio_req grp, int limit)
1354	CODE:	1524	CODE:
1355	grp->fd2 = limit;	1525	grp->fd2 = limit;
1356	aio_grp_feed (grp);	1526	aio_grp_feed (grp);
1357		1527
1358	void	1528	void

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.58 by root, Mon Oct 23 18:48:08 2006 UTC vs. Revision 1.76 by root, Thu Oct 26 12:38:04 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.58 by root, Mon Oct 23 18:48:08 2006 UTC vs.
Revision 1.76 by root, Thu Oct 26 12:38:04 2006 UTC