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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.48 by root, Sun Oct 22 10:33:19 2006 UTC vs.
Revision 1.70 by root, Tue Oct 24 15:15:56 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 = malloc (AIO_BUFSIZE); \
		65	if (!aio_buf) \
		66	return -1;
		67
		68	#define fBUF free (aio_buf)
49		69
50	enum {	70	enum {
51	REQ_QUIT,	71	REQ_QUIT,
52	REQ_OPEN, REQ_CLOSE,	72	REQ_OPEN, REQ_CLOSE,
53	REQ_READ, REQ_WRITE, REQ_READAHEAD,	73	REQ_READ, REQ_WRITE, REQ_READAHEAD,
…		…
55	REQ_STAT, REQ_LSTAT, REQ_FSTAT,	75	REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56	REQ_FSYNC, REQ_FDATASYNC,	76	REQ_FSYNC, REQ_FDATASYNC,
57	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	77	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58	REQ_READDIR,	78	REQ_READDIR,
59	REQ_LINK, REQ_SYMLINK,	79	REQ_LINK, REQ_SYMLINK,
60	REQ_SLEEP,	80	REQ_GROUP, REQ_NOP,
61	REQ_GROUP,	81	REQ_BUSY,
62	};	82	};
63		83
64	#define AIO_REQ_KLASS "IO::AIO::REQ"	84	#define AIO_REQ_KLASS "IO::AIO::REQ"
65	#define AIO_GRP_KLASS "IO::AIO::GRP"	85	#define AIO_GRP_KLASS "IO::AIO::GRP"
66		86
67	typedef struct aio_cb	87	typedef struct aio_cb
68	{	88	{
69	struct aio_cb grp, grp_prev, *grp_next;
70
71	struct aio_cb *volatile next;	89	struct aio_cb *volatile next;
72
73	SV self; / the perl counterpart of this request, if any */
74		90
75	SV data, callback;	91	SV data, callback;
76	SV fh, fh2;	92	SV fh, fh2;
77	void dataptr, data2ptr;	93	void dataptr, data2ptr;
78	Stat_t *statdata;	94	Stat_t *statdata;
79	off_t offset;	95	off_t offset;
80	size_t length;	96	size_t length;
81	ssize_t result;	97	ssize_t result;
82		98
		99	STRLEN dataoffset;
83	int type;	100	int type;
84	int fd, fd2;	101	int fd, fd2;
85	int errorno;	102	int errorno;
86	STRLEN dataoffset;
87	mode_t mode; /* open */	103	mode_t mode; /* open */
		104
88	unsigned char cancelled;	105	unsigned char flags;
		106	unsigned char pri;
		107
		108	SV self; / the perl counterpart of this request, if any */
		109	struct aio_cb grp, grp_prev, grp_next, grp_first;
89	} aio_cb;	110	} aio_cb;
		111
		112	enum {
		113	FLAG_CANCELLED = 0x01,
		114	};
90		115
91	typedef aio_cb *aio_req;	116	typedef aio_cb *aio_req;
92	typedef aio_cb *aio_req_ornot;	117	typedef aio_cb *aio_req_ornot;
		118
		119	enum {
		120	PRI_MIN = -4,
		121	PRI_MAX = 4,
		122
		123	DEFAULT_PRI = 0,
		124	PRI_BIAS = -PRI_MIN,
		125	NUM_PRI = PRI_MAX + PRI_BIAS + 1,
		126	};
		127
		128	static int next_pri = DEFAULT_PRI + PRI_BIAS;
93		129
94	static int started, wanted;	130	static int started, wanted;
95	static volatile int nreqs;	131	static volatile int nreqs;
96	static int max_outstanding = 1<<30;	132	static int max_outstanding = 1<<30;
97	static int respipe [2];	133	static int respipe [2];
98		134
		135	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
		136	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
		137	#else
		138	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
		139	#endif
		140
99	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	141	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	142	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	143	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102		144
103	static volatile aio_req reqs, reqe; /* queue start, queue end */	145	/*
104	static volatile aio_req ress, rese; /* queue start, queue end */	146	* a somewhat faster data structure might be nice, but
		147	* with 8 priorities this actually needs <20 insns
		148	* per shift, the most expensive operation.
		149	*/
		150	typedef struct {
		151	aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
		152	int size;
		153	} reqq;
105		154
		155	static reqq req_queue;
		156	static reqq res_queue;
		157
		158	int reqq_push (reqq *q, aio_req req)
		159	{
		160	int pri = req->pri;
		161	req->next = 0;
		162
		163	if (q->qe[pri])
		164	{
		165	q->qe[pri]->next = req;
		166	q->qe[pri] = req;
		167	}
		168	else
		169	q->qe[pri] = q->qs[pri] = req;
		170
		171	return q->size++;
		172	}
		173
		174	aio_req reqq_shift (reqq *q)
		175	{
		176	int pri;
		177
		178	if (!q->size)
		179	return 0;
		180
		181	--q->size;
		182
		183	for (pri = NUM_PRI; pri--; )
		184	{
		185	aio_req req = q->qs[pri];
		186
		187	if (req)
		188	{
		189	if (!(q->qs[pri] = req->next))
		190	q->qe[pri] = 0;
		191
		192	return req;
		193	}
		194	}
		195
		196	abort ();
		197	}
		198
		199	static void req_invoke (aio_req req);
106	static void req_free (aio_req req);	200	static void req_free (aio_req req);
107		201
108	/* must be called at most once */	202	/* must be called at most once */
109	static SV req_sv (aio_req req, const char klass)	203	static SV req_sv (aio_req req, const char klass)
110	{	204	{
		205	if (!req->self)
		206	{
111	req->self = (SV *)newHV ();	207	req->self = (SV *)newHV ();
112	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	208	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		209	}
113		210
114	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));	211	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
115	}	212	}
116		213
117	static aio_req SvAIO_REQ (SV *sv)	214	static aio_req SvAIO_REQ (SV *sv)
118	{	215	{
		216	MAGIC *mg;
		217
119	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	218	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
120	croak ("object of class " AIO_REQ_KLASS " expected");	219	croak ("object of class " AIO_REQ_KLASS " expected");
121		220
122	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	221	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123		222
124	return mg ? (aio_req)mg->mg_ptr : 0;	223	return mg ? (aio_req)mg->mg_ptr : 0;
125	}	224	}
126		225
		226	static void aio_grp_feed (aio_req grp)
		227	{
		228	while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
		229	{
		230	int old_len = grp->length;
		231
		232	if (grp->fh2 && SvOK (grp->fh2))
		233	{
		234	dSP;
		235
		236	ENTER;
		237	SAVETMPS;
		238	PUSHMARK (SP);
		239	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
		240	PUTBACK;
		241	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
		242	SPAGAIN;
		243	FREETMPS;
		244	LEAVE;
		245	}
		246
		247	/* stop if no progress has been made */
		248	if (old_len == grp->length)
		249	{
		250	SvREFCNT_dec (grp->fh2);
		251	grp->fh2 = 0;
		252	break;
		253	}
		254	}
		255	}
		256
		257	static void aio_grp_dec (aio_req grp)
		258	{
		259	--grp->length;
		260
		261	/* call feeder, if applicable */
		262	aio_grp_feed (grp);
		263
		264	/* finish, if done */
		265	if (!grp->length && grp->fd)
		266	{
		267	req_invoke (grp);
		268	req_free (grp);
		269	}
		270	}
		271
127	static void poll_wait ()	272	static void poll_wait ()
128	{	273	{
129	if (nreqs && !ress)
130	{
131	fd_set rfd;	274	fd_set rfd;
		275
		276	while (nreqs)
		277	{
		278	int size;
		279	#if !(__i386 \|\| __x86_64) /* safe without sempahore on this archs */
		280	pthread_mutex_lock (&reslock);
		281	#endif
		282	size = res_queue.size;
		283	#if !(__i386 \|\| __x86_64) /* safe without sempahore on this archs */
		284	pthread_mutex_unlock (&reslock);
		285	#endif
		286
		287	if (size)
		288	return;
		289
132	FD_ZERO(&rfd);	290	FD_ZERO(&rfd);
133	FD_SET(respipe [0], &rfd);	291	FD_SET(respipe [0], &rfd);
134		292
135	select (respipe [0] + 1, &rfd, 0, 0, 0);	293	select (respipe [0] + 1, &rfd, 0, 0, 0);
136	}	294	}
137	}	295	}
138		296
139	static void req_invoke (aio_req req)	297	static void req_invoke (aio_req req)
140	{	298	{
141	dSP;	299	dSP;
142	int errorno = errno;
143		300
144	if (req->cancelled \|\| !SvOK (req->callback))	301	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
145	return;	302	{
146
147	errno = req->errorno;	303	errno = req->errorno;
148		304
149	ENTER;	305	ENTER;
		306	SAVETMPS;
150	PUSHMARK (SP);	307	PUSHMARK (SP);
151	EXTEND (SP, 1);	308	EXTEND (SP, 1);
152		309
153	switch (req->type)	310	switch (req->type)
154	{
155	case REQ_READDIR:
156	{	311	{
157	SV *rv = &PL_sv_undef;	312	case REQ_READDIR:
158
159	if (req->result >= 0)
160	{	313	{
161	char *buf = req->data2ptr;	314	SV *rv = &PL_sv_undef;
162	AV *av = newAV ();
163		315
164	while (req->result)	316	if (req->result >= 0)
165	{	317	{
		318	char *buf = req->data2ptr;
		319	AV *av = newAV ();
		320
		321	while (req->result)
		322	{
166	SV *sv = newSVpv (buf, 0);	323	SV *sv = newSVpv (buf, 0);
167		324
168	av_push (av, sv);	325	av_push (av, sv);
169	buf += SvCUR (sv) + 1;	326	buf += SvCUR (sv) + 1;
170	req->result--;	327	req->result--;
		328	}
		329
		330	rv = sv_2mortal (newRV_noinc ((SV *)av));
171	}	331	}
172		332
173	rv = sv_2mortal (newRV_noinc ((SV *)av));	333	PUSHs (rv);
174	}	334	}
		335	break;
175		336
176	PUSHs (rv);	337	case REQ_OPEN:
		338	{
		339	/* convert fd to fh */
		340	SV *fh;
		341
		342	PUSHs (sv_2mortal (newSViv (req->result)));
		343	PUTBACK;
		344	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
		345	SPAGAIN;
		346
		347	fh = SvREFCNT_inc (POPs);
		348
		349	PUSHMARK (SP);
		350	XPUSHs (sv_2mortal (fh));
		351	}
		352	break;
		353
		354	case REQ_GROUP:
		355	req->fd = 2; /* mark group as finished */
		356
		357	if (req->data)
		358	{
		359	int i;
		360	AV av = (AV )req->data;
		361
		362	EXTEND (SP, AvFILL (av) + 1);
		363	for (i = 0; i <= AvFILL (av); ++i)
		364	PUSHs (*av_fetch (av, i, 0));
		365	}
		366	break;
		367
		368	case REQ_NOP:
		369	case REQ_BUSY:
		370	break;
		371
		372	default:
		373	PUSHs (sv_2mortal (newSViv (req->result)));
		374	break;
177	}	375	}
178	break;
179		376
180	case REQ_OPEN:
181	{
182	/* convert fd to fh */
183	SV *fh;
184		377
185	PUSHs (sv_2mortal (newSViv (req->result)));
186	PUTBACK;	378	PUTBACK;
187	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
188	SPAGAIN;
189
190	fh = SvREFCNT_inc (POPs);
191
192	PUSHMARK (SP);
193	XPUSHs (sv_2mortal (fh));
194	}
195	break;
196
197	case REQ_GROUP:
198	if (req->data)
199	{
200	int i;
201	AV av = (AV )req->data;
202
203	EXTEND (SP, AvFILL (av) + 1);
204	for (i = 0; i <= AvFILL (av); ++i)
205	PUSHs (*av_fetch (av, i, 0));
206	}
207	break;
208
209	case REQ_SLEEP:
210	break;
211
212	default:
213	PUSHs (sv_2mortal (newSViv (req->result)));
214	break;
215	}
216
217
218	PUTBACK;
219	call_sv (req->callback, G_VOID \| G_EVAL);	379	call_sv (req->callback, G_VOID \| G_EVAL);
220	SPAGAIN;	380	SPAGAIN;
		381
		382	FREETMPS;
		383	LEAVE;
		384	}
		385
		386	if (req->grp)
		387	{
		388	aio_req grp = req->grp;
		389
		390	/* unlink request */
		391	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
		392	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
		393
		394	if (grp->grp_first == req)
		395	grp->grp_first = req->grp_next;
		396
		397	aio_grp_dec (grp);
		398	}
221		399
222	if (SvTRUE (ERRSV))	400	if (SvTRUE (ERRSV))
223	{	401	{
224	req_free (req);	402	req_free (req);
225	croak (0);	403	croak (0);
226	}	404	}
227
228	LEAVE;
229
230	errno = errorno;
231	}	405	}
232		406
233	static void req_free (aio_req req)	407	static void req_free (aio_req req)
234	{	408	{
235	if (req->grp)
236	{
237	aio_req grp = req->grp;
238
239	/* unlink request */
240	req->grp_next->grp_prev = req->grp_prev;
241	req->grp_prev->grp_next = req->grp_next;
242
243	if (grp->grp_next == grp && grp->fd)
244	{
245	req_invoke (grp);
246	req_free (grp);
247	}
248	}
249
250	if (req->self)	409	if (req->self)
251	{	410	{
252	sv_unmagic (req->self, PERL_MAGIC_ext);	411	sv_unmagic (req->self, PERL_MAGIC_ext);
253	SvREFCNT_dec (req->self);	412	SvREFCNT_dec (req->self);
254	}	413	}
255		414
256	if (req->data)
257	SvREFCNT_dec (req->data);	415	SvREFCNT_dec (req->data);
258
259	if (req->fh)
260	SvREFCNT_dec (req->fh);	416	SvREFCNT_dec (req->fh);
261
262	if (req->fh2)
263	SvREFCNT_dec (req->fh2);	417	SvREFCNT_dec (req->fh2);
264
265	if (req->statdata)
266	Safefree (req->statdata);
267
268	if (req->callback)
269	SvREFCNT_dec (req->callback);	418	SvREFCNT_dec (req->callback);
		419	Safefree (req->statdata);
270		420
271	if (req->type == REQ_READDIR && req->result >= 0)	421	if (req->type == REQ_READDIR && req->result >= 0)
272	free (req->data2ptr);	422	free (req->data2ptr);
273		423
274	Safefree (req);	424	Safefree (req);
275	}	425	}
276		426
277	static void req_cancel (aio_req req)	427	static void req_cancel (aio_req req)
278	{	428	{
279	req->cancelled = 1;	429	req->flags \|= FLAG_CANCELLED;
280		430
281	if (req->type == REQ_GROUP)	431	if (req->type == REQ_GROUP)
282	{	432	{
283	aio_req sub;	433	aio_req sub;
284		434
285	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	435	for (sub = req->grp_first; sub; sub = sub->grp_next)
286	req_cancel (sub);	436	req_cancel (sub);
287	}	437	}
288	}	438	}
289		439
290	static int poll_cb ()	440	static int poll_cb ()
…		…
295	aio_req req;	445	aio_req req;
296		446
297	for (;;)	447	for (;;)
298	{	448	{
299	pthread_mutex_lock (&reslock);	449	pthread_mutex_lock (&reslock);
300	req = ress;	450	req = reqq_shift (&res_queue);
301		451
302	if (req)	452	if (req)
303	{	453	{
304	ress = req->next;
305
306	if (!ress)	454	if (!res_queue.size)
307	{	455	{
308	/* read any signals sent by the worker threads */	456	/* read any signals sent by the worker threads */
309	char buf [32];	457	char buf [32];
310	while (read (respipe [0], buf, 32) == 32)	458	while (read (respipe [0], buf, 32) == 32)
311	;	459	;
312
313	rese = 0;
314	}	460	}
315	}	461	}
316		462
317	pthread_mutex_unlock (&reslock);	463	pthread_mutex_unlock (&reslock);
318		464
319	if (!req)	465	if (!req)
320	break;	466	break;
321		467
322	nreqs--;	468	--nreqs;
323		469
324	if (req->type == REQ_QUIT)	470	if (req->type == REQ_QUIT)
325	started--;	471	started--;
326	else if (req->type == REQ_GROUP && req->grp_next != req)	472	else if (req->type == REQ_GROUP && req->length)
327	{	473	{
328	req->fd = 1; /* mark request as delayed */	474	req->fd = 1; /* mark request as delayed */
329	continue;	475	continue;
330	}	476	}
331	else	477	else
…		…
378	static void req_send (aio_req req)	524	static void req_send (aio_req req)
379	{	525	{
380	while (started < wanted && nreqs >= started)	526	while (started < wanted && nreqs >= started)
381	start_thread ();	527	start_thread ();
382		528
383	nreqs++;	529	++nreqs;
384		530
385	pthread_mutex_lock (&reqlock);	531	pthread_mutex_lock (&reqlock);
386		532	reqq_push (&req_queue, req);
387	req->next = 0;
388
389	if (reqe)
390	{
391	reqe->next = req;
392	reqe = req;
393	}
394	else
395	reqe = reqs = req;
396
397	pthread_cond_signal (&reqwait);	533	pthread_cond_signal (&reqwait);
398	pthread_mutex_unlock (&reqlock);	534	pthread_mutex_unlock (&reqlock);
399		535
400	if (nreqs > max_outstanding)	536	if (nreqs > max_outstanding)
401	for (;;)	537	for (;;)
…		…
410	}	546	}
411		547
412	static void end_thread (void)	548	static void end_thread (void)
413	{	549	{
414	aio_req req;	550	aio_req req;
		551
415	Newz (0, req, 1, aio_cb);	552	Newz (0, req, 1, aio_cb);
		553
416	req->type = REQ_QUIT;	554	req->type = REQ_QUIT;
		555	req->pri = PRI_MAX + PRI_BIAS;
417		556
418	req_send (req);	557	req_send (req);
419	}	558	}
420		559
421	static void min_parallel (int nthreads)	560	static void min_parallel (int nthreads)
…		…
508	#if !HAVE_READAHEAD	647	#if !HAVE_READAHEAD
509	# define readahead aio_readahead	648	# define readahead aio_readahead
510		649
511	static ssize_t readahead (int fd, off_t offset, size_t count)	650	static ssize_t readahead (int fd, off_t offset, size_t count)
512	{	651	{
513	char readahead_buf[4096];	652	dBUF;
514		653
515	while (count > 0)	654	while (count > 0)
516	{	655	{
517	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	656	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
518		657
519	pread (fd, readahead_buf, len, offset);	658	pread (fd, aio_buf, len, offset);
520	offset += len;	659	offset += len;
521	count -= len;	660	count -= len;
522	}	661	}
		662
		663	fBUF;
523		664
524	errno = 0;	665	errno = 0;
525	}	666	}
526	#endif	667	#endif
527		668
…		…
613	#endif	754	#endif
614	)	755	)
615	)	756	)
616	{	757	{
617	/* emulate sendfile. this is a major pain in the ass */	758	/* emulate sendfile. this is a major pain in the ass */
618	char buf[4096];	759	dBUF;
		760
619	res = 0;	761	res = 0;
620		762
621	while (count)	763	while (count)
622	{	764	{
623	ssize_t cnt;	765	ssize_t cnt;
624		766
625	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	767	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
626		768
627	if (cnt <= 0)	769	if (cnt <= 0)
628	{	770	{
629	if (cnt && !res) res = -1;	771	if (cnt && !res) res = -1;
630	break;	772	break;
631	}	773	}
632		774
633	cnt = write (ofd, buf, cnt);	775	cnt = write (ofd, aio_buf, cnt);
634		776
635	if (cnt <= 0)	777	if (cnt <= 0)
636	{	778	{
637	if (cnt && !res) res = -1;	779	if (cnt && !res) res = -1;
638	break;	780	break;
…		…
640		782
641	offset += cnt;	783	offset += cnt;
642	res += cnt;	784	res += cnt;
643	count -= cnt;	785	count -= cnt;
644	}	786	}
		787
		788	fBUF;
645	}	789	}
646		790
647	return res;	791	return res;
648	}	792	}
649		793
650	/* read a full directory */	794	/* read a full directory */
651	static int scandir_ (const char path, void *namesp)	795	static int scandir_ (const char path, void *namesp)
652	{	796	{
653	DIR *dirp = opendir (path);	797	DIR *dirp;
654	union	798	union
655	{	799	{
656	struct dirent d;	800	struct dirent d;
657	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	801	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
658	} u;	802	} *u;
659	struct dirent *entp;	803	struct dirent *entp;
660	char name, names;	804	char name, names;
661	int memlen = 4096;	805	int memlen = 4096;
662	int memofs = 0;	806	int memofs = 0;
663	int res = 0;	807	int res = 0;
664	int errorno;	808	int errorno;
665		809
		810	dirp = opendir (path);
666	if (!dirp)	811	if (!dirp)
667	return -1;	812	return -1;
668		813
		814	u = malloc (sizeof (*u));
669	names = malloc (memlen);	815	names = malloc (memlen);
670		816
		817	if (u && names)
671	for (;;)	818	for (;;)
672	{	819	{
		820	errno = 0;
673	errno = 0, readdir_r (dirp, &u.d, &entp);	821	readdir_r (dirp, &u->d, &entp);
674		822
675	if (!entp)	823	if (!entp)
676	break;	824	break;
677		825
678	name = entp->d_name;	826	name = entp->d_name;
679		827
680	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	828	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
681	{	829	{
682	int len = strlen (name) + 1;	830	int len = strlen (name) + 1;
683		831
684	res++;	832	res++;
685		833
686	while (memofs + len > memlen)	834	while (memofs + len > memlen)
687	{	835	{
688	memlen *= 2;	836	memlen *= 2;
689	names = realloc (names, memlen);	837	names = realloc (names, memlen);
690	if (!names)	838	if (!names)
691	break;	839	break;
692	}	840	}
693		841
694	memcpy (names + memofs, name, len);	842	memcpy (names + memofs, name, len);
695	memofs += len;	843	memofs += len;
696	}	844	}
697	}	845	}
698		846
699	errorno = errno;	847	errorno = errno;
		848	free (u);
700	closedir (dirp);	849	closedir (dirp);
701		850
702	if (errorno)	851	if (errorno)
703	{	852	{
704	free (names);	853	free (names);
…		…
721	{	870	{
722	pthread_mutex_lock (&reqlock);	871	pthread_mutex_lock (&reqlock);
723		872
724	for (;;)	873	for (;;)
725	{	874	{
726	req = reqs;	875	req = reqq_shift (&req_queue);
727
728	if (reqs)
729	{
730	reqs = reqs->next;
731	if (!reqs) reqe = 0;
732	}
733		876
734	if (req)	877	if (req)
735	break;	878	break;
736		879
737	pthread_cond_wait (&reqwait, &reqlock);	880	pthread_cond_wait (&reqwait, &reqlock);
738	}	881	}
739		882
740	pthread_mutex_unlock (&reqlock);	883	pthread_mutex_unlock (&reqlock);
741		884
742	errno = 0; /* strictly unnecessary */	885	errno = 0; /* strictly unnecessary */
		886	type = req->type; /* remember type for QUIT check */
743		887
744	if (!req->cancelled)	888	if (!(req->flags & FLAG_CANCELLED))
745	switch (req->type)	889	switch (type)
746	{	890	{
747	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	891	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
748	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	892	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
749		893
750	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	894	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
…		…
764		908
765	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	909	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
766	case REQ_FSYNC: req->result = fsync (req->fd); break;	910	case REQ_FSYNC: req->result = fsync (req->fd); break;
767	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	911	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
768		912
769	case REQ_SLEEP:	913	case REQ_BUSY:
770	{	914	{
771	struct timeval tv;	915	struct timeval tv;
772		916
773	tv.tv_sec = req->fd;	917	tv.tv_sec = req->fd;
774	tv.tv_usec = req->fd2;	918	tv.tv_usec = req->fd2;
775		919
776	req->result = select (0, 0, 0, 0, &tv);	920	req->result = select (0, 0, 0, 0, &tv);
777	}	921	}
778		922
		923	case REQ_GROUP:
		924	case REQ_NOP:
779	case REQ_QUIT:	925	case REQ_QUIT:
780	break;	926	break;
781		927
782	default:	928	default:
783	req->result = ENOSYS;	929	req->result = ENOSYS;
…		…
786		932
787	req->errorno = errno;	933	req->errorno = errno;
788		934
789	pthread_mutex_lock (&reslock);	935	pthread_mutex_lock (&reslock);
790		936
791	req->next = 0;	937	if (!reqq_push (&res_queue, req))
792
793	if (rese)
794	{
795	rese->next = req;
796	rese = req;
797	}
798	else
799	{
800	rese = ress = req;
801
802	/* write a dummy byte to the pipe so fh becomes ready */	938	/* write a dummy byte to the pipe so fh becomes ready */
803	write (respipe [1], &respipe, 1);	939	write (respipe [1], &respipe, 1);
804	}
805		940
806	pthread_mutex_unlock (&reslock);	941	pthread_mutex_unlock (&reslock);
807	}	942	}
808	while (type != REQ_QUIT);	943	while (type != REQ_QUIT);
809		944
…		…
840	{	975	{
841	aio_req prv;	976	aio_req prv;
842		977
843	started = 0;	978	started = 0;
844		979
845	while (reqs)	980	while (prv = reqq_shift (&req_queue))
846	{
847	prv = reqs;
848	reqs = prv->next;
849	req_free (prv);	981	req_free (prv);
850	}
851		982
852	reqs = reqe = 0;	983	while (prv = reqq_shift (&res_queue))
853
854	while (ress)
855	{
856	prv = ress;
857	ress = prv->next;
858	req_free (prv);	984	req_free (prv);
859	}	985
860
861	ress = rese = 0;
862
863	close (respipe [0]);	986	close (respipe [0]);
864	close (respipe [1]);	987	close (respipe [1]);
865	create_pipe ();	988	create_pipe ();
866		989
867	atfork_parent ();	990	atfork_parent ();
868	}	991	}
869		992
870	#define dREQ \	993	#define dREQ \
871	aio_req req; \	994	aio_req req; \
		995	int req_pri = next_pri; \
		996	next_pri = DEFAULT_PRI + PRI_BIAS; \
872	\	997	\
873	if (SvOK (callback) && !SvROK (callback)) \	998	if (SvOK (callback) && !SvROK (callback)) \
874	croak ("callback must be undef or of reference type"); \	999	croak ("callback must be undef or of reference type"); \
875	\	1000	\
876	Newz (0, req, 1, aio_cb); \	1001	Newz (0, req, 1, aio_cb); \
877	if (!req) \	1002	if (!req) \
878	croak ("out of memory during aio_req allocation"); \	1003	croak ("out of memory during aio_req allocation"); \
879	\	1004	\
880	req->callback = newSVsv (callback)	1005	req->callback = newSVsv (callback); \
		1006	req->pri = req_pri
881		1007
882	#define REQ_SEND \	1008	#define REQ_SEND \
883	req_send (req); \	1009	req_send (req); \
884	\	1010	\
885	if (GIMME_V != G_VOID) \	1011	if (GIMME_V != G_VOID) \
…		…
1139		1265
1140	REQ_SEND;	1266	REQ_SEND;
1141	}	1267	}
1142		1268
1143	void	1269	void
1144	aio_sleep (delay,callback=&PL_sv_undef)	1270	aio_busy (delay,callback=&PL_sv_undef)
1145	double delay	1271	double delay
1146	SV * callback	1272	SV * callback
1147	PPCODE:	1273	PPCODE:
1148	{	1274	{
1149	dREQ;	1275	dREQ;
1150		1276
1151	req->type = REQ_SLEEP;	1277	req->type = REQ_BUSY;
1152	req->fd = delay < 0. ? 0 : delay;	1278	req->fd = delay < 0. ? 0 : delay;
1153	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1279	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1154		1280
1155	REQ_SEND;	1281	REQ_SEND;
1156	}	1282	}
…		…
1160	SV * callback	1286	SV * callback
1161	PROTOTYPE: ;$	1287	PROTOTYPE: ;$
1162	PPCODE:	1288	PPCODE:
1163	{	1289	{
1164	dREQ;	1290	dREQ;
		1291
1165	req->type = REQ_GROUP;	1292	req->type = REQ_GROUP;
1166	req->grp_next = req;
1167	req->grp_prev = req;
1168
1169	req_send (req);	1293	req_send (req);
		1294
1170	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1295	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1171	}	1296	}
		1297
		1298	void
		1299	aio_nop (callback=&PL_sv_undef)
		1300	SV * callback
		1301	PPCODE:
		1302	{
		1303	dREQ;
		1304
		1305	req->type = REQ_NOP;
		1306
		1307	REQ_SEND;
		1308	}
		1309
		1310	void
		1311	aioreq_pri (int pri = DEFAULT_PRI)
		1312	CODE:
		1313	if (pri < PRI_MIN) pri = PRI_MIN;
		1314	if (pri > PRI_MAX) pri = PRI_MAX;
		1315	next_pri = pri + PRI_BIAS;
		1316
		1317	void
		1318	aioreq_nice (int nice = 0)
		1319	CODE:
		1320	nice = next_pri - nice;
		1321	if (nice < PRI_MIN) nice = PRI_MIN;
		1322	if (nice > PRI_MAX) nice = PRI_MAX;
		1323	next_pri = nice + PRI_BIAS;
1172		1324
1173	void	1325	void
1174	flush ()	1326	flush ()
1175	PROTOTYPE:	1327	PROTOTYPE:
1176	CODE:	1328	CODE:
…		…
1225		1377
1226	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1378	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1227		1379
1228	void	1380	void
1229	cancel (aio_req_ornot req)	1381	cancel (aio_req_ornot req)
1230	PROTOTYPE:
1231	CODE:	1382	CODE:
1232	req_cancel (req);	1383	req_cancel (req);
1233		1384
		1385	void
		1386	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
		1387	CODE:
		1388	SvREFCNT_dec (req->callback);
		1389	req->callback = newSVsv (callback);
		1390
1234	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1391	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1235		1392
1236	void	1393	void
1237	add (aio_req grp, ...)	1394	add (aio_req grp, ...)
1238	PPCODE:	1395	PPCODE:
1239	{	1396	{
1240	int i;	1397	int i;
		1398	aio_req req;
		1399
		1400	if (grp->fd == 2)
		1401	croak ("cannot add requests to IO::AIO::GRP after the group finished");
1241		1402
1242	for (i = 1; i < items; ++i )	1403	for (i = 1; i < items; ++i )
1243	{	1404	{
1244	if (GIMME_V != G_VOID)	1405	if (GIMME_V != G_VOID)
1245	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1406	XPUSHs (sv_2mortal (newSVsv (ST (i))));
1246		1407
1247	aio_req req = SvAIO_REQ (ST (i));	1408	req = SvAIO_REQ (ST (i));
1248		1409
1249	if (req)	1410	if (req)
1250	{	1411	{
1251	req->grp_prev = grp;	1412	++grp->length;
1252	req->grp_next = grp->grp_next;
1253	grp->grp_next->grp_prev = req;
1254	grp->grp_next = req;
1255
1256	req->grp = grp;	1413	req->grp = grp;
		1414
		1415	req->grp_prev = 0;
		1416	req->grp_next = grp->grp_first;
		1417
		1418	if (grp->grp_first)
		1419	grp->grp_first->grp_prev = req;
		1420
		1421	grp->grp_first = req;
1257	}	1422	}
1258	}	1423	}
1259	}	1424	}
1260		1425
1261	void	1426	void
1262	result (aio_req grp, ...)	1427	result (aio_req grp, ...)
		1428	CODE:
		1429	{
		1430	int i;
		1431	AV *av = newAV ();
		1432
		1433	for (i = 1; i < items; ++i )
		1434	av_push (av, newSVsv (ST (i)));
		1435
		1436	SvREFCNT_dec (grp->data);
		1437	grp->data = (SV *)av;
		1438	}
		1439
		1440	void
		1441	limit (aio_req grp, int limit)
1263	CODE:	1442	CODE:
1264	{	1443	grp->fd2 = limit;
1265	int i;	1444	aio_grp_feed (grp);
1266	AV *av = newAV ();
1267		1445
1268	if (grp->data)	1446	void
		1447	feed (aio_req grp, SV *callback=&PL_sv_undef)
		1448	CODE:
		1449	{
1269	SvREFCNT_dec (grp->data);	1450	SvREFCNT_dec (grp->fh2);
		1451	grp->fh2 = newSVsv (callback);
1270		1452
1271	for (i = 1; i < items; ++i )	1453	if (grp->fd2 <= 0)
1272	av_push (av, newSVsv (ST (i)));	1454	grp->fd2 = 2;
1273		1455
1274	grp->data = (SV *)av;	1456	aio_grp_feed (grp);
1275	}	1457	}
1276		1458

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.48 by root, Sun Oct 22 10:33:19 2006 UTC vs. Revision 1.70 by root, Tue Oct 24 15:15:56 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.48 by root, Sun Oct 22 10:33:19 2006 UTC vs.
Revision 1.70 by root, Tue Oct 24 15:15:56 2006 UTC