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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.63 by root, Mon Oct 23 23:48:31 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC

…		…
		1	/* solaris */
		2	#define _POSIX_PTHREAD_SEMANTICS 1
		3
1	#if __linux	4	#if __linux
2	# define _GNU_SOURCE	5	# define _GNU_SOURCE
3	#endif	6	#endif
4		7
5	#define _REENTRANT 1	8	#define _REENTRANT 1
46	# define NAME_MAX 4096	49	# define NAME_MAX 4096
47	#endif	50	#endif
48		51
49	#if __ia64	52	#if __ia64
50	# define STACKSIZE 65536	53	# define STACKSIZE 65536
		54	#elif __i386 \|\| __x86_64 /* 16k is unreasonably high :( */
		55	# define STACKSIZE PTHREAD_STACK_MIN
51	#else	56	#else
52	# define STACKSIZE 8192	57	# define STACKSIZE 16384
53	#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;
54		70
55	enum {	71	enum {
56	REQ_QUIT,	72	REQ_QUIT,
57	REQ_OPEN, REQ_CLOSE,	73	REQ_OPEN, REQ_CLOSE,
58	REQ_READ, REQ_WRITE, REQ_READAHEAD,	74	REQ_READ, REQ_WRITE, REQ_READAHEAD,
…		…
61	REQ_FSYNC, REQ_FDATASYNC,	77	REQ_FSYNC, REQ_FDATASYNC,
62	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	78	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
63	REQ_READDIR,	79	REQ_READDIR,
64	REQ_LINK, REQ_SYMLINK,	80	REQ_LINK, REQ_SYMLINK,
65	REQ_GROUP, REQ_NOP,	81	REQ_GROUP, REQ_NOP,
66	REQ_SLEEP,	82	REQ_BUSY,
67	};	83	};
68		84
69	#define AIO_REQ_KLASS "IO::AIO::REQ"	85	#define AIO_REQ_KLASS "IO::AIO::REQ"
70	#define AIO_GRP_KLASS "IO::AIO::GRP"	86	#define AIO_GRP_KLASS "IO::AIO::GRP"
71		87
…		…
105	PRI_MIN = -4,	121	PRI_MIN = -4,
106	PRI_MAX = 4,	122	PRI_MAX = 4,
107		123
108	DEFAULT_PRI = 0,	124	DEFAULT_PRI = 0,
109	PRI_BIAS = -PRI_MIN,	125	PRI_BIAS = -PRI_MIN,
		126	NUM_PRI = PRI_MAX + PRI_BIAS + 1,
110	};	127	};
111		128
112	static int next_pri = DEFAULT_PRI + PRI_BIAS;	129	static int next_pri = DEFAULT_PRI + PRI_BIAS;
113		130
114	static int started, wanted;	131	static int started, wanted;
…		…
120	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP	137	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121	#else	138	#else
122	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER	139	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123	#endif	140	#endif
124		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
125	static pthread_mutex_t reslock = AIO_MUTEX_INIT;	185	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
126	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;	186	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	187	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128		188
129	static volatile aio_req reqs, reqe; /* queue start, queue end */	189	/*
130	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	}
131		242
132	static void req_invoke (aio_req req);	243	static void req_invoke (aio_req req);
133	static void req_free (aio_req req);	244	static void req_free (aio_req req);
134		245
135	/* must be called at most once */	246	/* must be called at most once */
…		…
169	ENTER;	280	ENTER;
170	SAVETMPS;	281	SAVETMPS;
171	PUSHMARK (SP);	282	PUSHMARK (SP);
172	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	283	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
173	PUTBACK;	284	PUTBACK;
174	call_sv (grp->fh2, G_VOID \| G_EVAL);	285	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
175	SPAGAIN;	286	SPAGAIN;
176	FREETMPS;	287	FREETMPS;
177	LEAVE;	288	LEAVE;
178	}	289	}
179		290
…		…
206	{	317	{
207	fd_set rfd;	318	fd_set rfd;
208		319
209	while (nreqs)	320	while (nreqs)
210	{	321	{
211	aio_req req;	322	int size;
212	pthread_mutex_lock (&reslock);	323	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
213	req = ress;	324	LOCK (reslock);
214	pthread_mutex_unlock (&reslock);	325	#endif
		326	size = res_queue.size;
		327	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
		328	UNLOCK (reslock);
		329	#endif
215		330
216	if (req)	331	if (size)
217	return;	332	return;
218		333
219	FD_ZERO(&rfd);	334	FD_ZERO(&rfd);
220	FD_SET(respipe [0], &rfd);	335	FD_SET(respipe [0], &rfd);
221		336
…		…
224	}	339	}
225		340
226	static void req_invoke (aio_req req)	341	static void req_invoke (aio_req req)
227	{	342	{
228	dSP;	343	dSP;
229	int errorno = errno;
230		344
231	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))	345	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
232	return;	346	{
233
234	errno = req->errorno;	347	errno = req->errorno;
235		348
236	ENTER;	349	ENTER;
237	SAVETMPS;	350	SAVETMPS;
238	PUSHMARK (SP);	351	PUSHMARK (SP);
239	EXTEND (SP, 1);	352	EXTEND (SP, 1);
240		353
241	switch (req->type)	354	switch (req->type)
242	{
243	case REQ_READDIR:
244	{	355	{
245	SV *rv = &PL_sv_undef;	356	case REQ_READDIR:
246
247	if (req->result >= 0)
248	{	357	{
249	char *buf = req->data2ptr;	358	SV *rv = &PL_sv_undef;
250	AV *av = newAV ();
251		359
252	while (req->result)	360	if (req->result >= 0)
253	{	361	{
		362	int i;
		363	char *buf = req->data2ptr;
		364	AV *av = newAV ();
		365
		366	av_extend (av, req->result - 1);
		367
		368	for (i = 0; i < req->result; ++i)
		369	{
254	SV *sv = newSVpv (buf, 0);	370	SV *sv = newSVpv (buf, 0);
255		371
256	av_push (av, sv);	372	av_store (av, i, sv);
257	buf += SvCUR (sv) + 1;	373	buf += SvCUR (sv) + 1;
258	req->result--;	374	}
		375
		376	rv = sv_2mortal (newRV_noinc ((SV *)av));
259	}	377	}
260		378
261	rv = sv_2mortal (newRV_noinc ((SV *)av));	379	PUSHs (rv);
262	}	380	}
		381	break;
263		382
264	PUSHs (rv);	383	case REQ_OPEN:
		384	{
		385	/* convert fd to fh */
		386	SV *fh;
		387
		388	PUSHs (sv_2mortal (newSViv (req->result)));
		389	PUTBACK;
		390	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
		391	SPAGAIN;
		392
		393	fh = SvREFCNT_inc (POPs);
		394
		395	PUSHMARK (SP);
		396	XPUSHs (sv_2mortal (fh));
		397	}
		398	break;
		399
		400	case REQ_GROUP:
		401	req->fd = 2; /* mark group as finished */
		402
		403	if (req->data)
		404	{
		405	int i;
		406	AV av = (AV )req->data;
		407
		408	EXTEND (SP, AvFILL (av) + 1);
		409	for (i = 0; i <= AvFILL (av); ++i)
		410	PUSHs (*av_fetch (av, i, 0));
		411	}
		412	break;
		413
		414	case REQ_NOP:
		415	case REQ_BUSY:
		416	break;
		417
		418	default:
		419	PUSHs (sv_2mortal (newSViv (req->result)));
		420	break;
265	}	421	}
266	break;
267		422
268	case REQ_OPEN:
269	{
270	/* convert fd to fh */
271	SV *fh;
272		423
273	PUSHs (sv_2mortal (newSViv (req->result)));
274	PUTBACK;	424	PUTBACK;
275	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
276	SPAGAIN;
277
278	fh = SvREFCNT_inc (POPs);
279
280	PUSHMARK (SP);
281	XPUSHs (sv_2mortal (fh));
282	}
283	break;
284
285	case REQ_GROUP:
286	req->fd = 2; /* mark group as finished */
287
288	if (req->data)
289	{
290	int i;
291	AV av = (AV )req->data;
292
293	EXTEND (SP, AvFILL (av) + 1);
294	for (i = 0; i <= AvFILL (av); ++i)
295	PUSHs (*av_fetch (av, i, 0));
296	}
297	break;
298
299	case REQ_NOP:
300	case REQ_SLEEP:
301	break;
302
303	default:
304	PUSHs (sv_2mortal (newSViv (req->result)));
305	break;
306	}
307
308
309	PUTBACK;
310	call_sv (req->callback, G_VOID \| G_EVAL);	425	call_sv (req->callback, G_VOID \| G_EVAL);
311	SPAGAIN;	426	SPAGAIN;
312		427
313	FREETMPS;	428	FREETMPS;
314	LEAVE;	429	LEAVE;
315
316	errno = errorno;
317
318	if (SvTRUE (ERRSV))
319	{	430	}
320	req_free (req);
321	croak (0);
322	}
323	}
324		431
325	static void req_free (aio_req req)
326	{
327	if (req->grp)	432	if (req->grp)
328	{	433	{
329	aio_req grp = req->grp;	434	aio_req grp = req->grp;
330		435
331	/* unlink request */	436	/* unlink request */
…		…
336	grp->grp_first = req->grp_next;	441	grp->grp_first = req->grp_next;
337		442
338	aio_grp_dec (grp);	443	aio_grp_dec (grp);
339	}	444	}
340		445
		446	if (SvTRUE (ERRSV))
		447	{
		448	req_free (req);
		449	croak (0);
		450	}
		451	}
		452
		453	static void req_free (aio_req req)
		454	{
341	if (req->self)	455	if (req->self)
342	{	456	{
343	sv_unmagic (req->self, PERL_MAGIC_ext);	457	sv_unmagic (req->self, PERL_MAGIC_ext);
344	SvREFCNT_dec (req->self);	458	SvREFCNT_dec (req->self);
345	}	459	}
…		…
348	SvREFCNT_dec (req->fh);	462	SvREFCNT_dec (req->fh);
349	SvREFCNT_dec (req->fh2);	463	SvREFCNT_dec (req->fh2);
350	SvREFCNT_dec (req->callback);	464	SvREFCNT_dec (req->callback);
351	Safefree (req->statdata);	465	Safefree (req->statdata);
352		466
353	if (req->type == REQ_READDIR && req->result >= 0)	467	if (req->type == REQ_READDIR)
354	free (req->data2ptr);	468	free (req->data2ptr);
355		469
356	Safefree (req);	470	Safefree (req);
357	}	471	}
358		472
…		…
376	int do_croak = 0;	490	int do_croak = 0;
377	aio_req req;	491	aio_req req;
378		492
379	for (;;)	493	for (;;)
380	{	494	{
381	pthread_mutex_lock (&reslock);	495	LOCK (reslock);
382	req = ress;	496	req = reqq_shift (&res_queue);
383		497
384	if (req)	498	if (req)
385	{	499	{
386	ress = req->next;
387
388	if (!ress)	500	if (!res_queue.size)
389	{	501	{
390	/* read any signals sent by the worker threads */	502	/* read any signals sent by the worker threads */
391	char buf [32];	503	char buf [32];
392	while (read (respipe [0], buf, 32) == 32)	504	while (read (respipe [0], buf, 32) == 32)
393	;	505	;
394
395	rese = 0;
396	}	506	}
397	}	507	}
398		508
399	pthread_mutex_unlock (&reslock);	509	UNLOCK (reslock);
400		510
401	if (!req)	511	if (!req)
402	break;	512	break;
403		513
404	--nreqs;	514	--nreqs;
…		…
438		548
439	static void aio_proc(void arg);	549	static void aio_proc(void arg);
440		550
441	static void start_thread (void)	551	static void start_thread (void)
442	{	552	{
		553	worker *wrk = calloc (1, sizeof (worker));
		554
		555	if (!wrk)
		556	croak ("unable to allocate worker thread data");
		557
443	sigset_t fullsigset, oldsigset;	558	sigset_t fullsigset, oldsigset;
444	pthread_t tid;
445	pthread_attr_t attr;	559	pthread_attr_t attr;
446		560
447	pthread_attr_init (&attr);	561	pthread_attr_init (&attr);
448	pthread_attr_setstacksize (&attr, STACKSIZE);	562	pthread_attr_setstacksize (&attr, STACKSIZE);
449	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	563	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
450		564
451	sigfillset (&fullsigset);	565	sigfillset (&fullsigset);
		566
		567	LOCK (wrklock);
452	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	568	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
453		569
454	if (pthread_create (&tid, &attr, aio_proc, 0) == 0)	570	if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
		571	{
		572	wrk->prev = &wrk_first;
		573	wrk->next = wrk_first.next;
		574	wrk_first.next->prev = wrk;
		575	wrk_first.next = wrk;
455	started++;	576	started++;
		577	}
		578	else
		579	free (wrk);
456		580
457	sigprocmask (SIG_SETMASK, &oldsigset, 0);	581	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		582	UNLOCK (wrklock);
458	}	583	}
459		584
460	static void req_send (aio_req req)	585	static void req_send (aio_req req)
461	{	586	{
462	while (started < wanted && nreqs >= started)	587	while (started < wanted && nreqs >= started)
463	start_thread ();	588	start_thread ();
464		589
465	++nreqs;	590	++nreqs;
466		591
467	pthread_mutex_lock (&reqlock);	592	LOCK (reqlock);
468		593	reqq_push (&req_queue, req);
469	req->next = 0;
470
471	if (reqe)
472	{
473	reqe->next = req;
474	reqe = req;
475	}
476	else
477	reqe = reqs = req;
478
479	pthread_cond_signal (&reqwait);	594	pthread_cond_signal (&reqwait);
480	pthread_mutex_unlock (&reqlock);	595	UNLOCK (reqlock);
481		596
482	if (nreqs > max_outstanding)	597	if (nreqs > max_outstanding)
483	for (;;)	598	for (;;)
484	{	599	{
485	poll_cb ();	600	poll_cb ();
…		…
492	}	607	}
493		608
494	static void end_thread (void)	609	static void end_thread (void)
495	{	610	{
496	aio_req req;	611	aio_req req;
		612
497	Newz (0, req, 1, aio_cb);	613	Newz (0, req, 1, aio_cb);
		614
498	req->type = REQ_QUIT;	615	req->type = REQ_QUIT;
		616	req->pri = PRI_MAX + PRI_BIAS;
499		617
500	req_send (req);	618	req_send (req);
501	}	619	}
502		620
503	static void min_parallel (int nthreads)	621	static void min_parallel (int nthreads)
…		…
555	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)	673	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
556	{	674	{
557	ssize_t res;	675	ssize_t res;
558	off_t ooffset;	676	off_t ooffset;
559		677
560	pthread_mutex_lock (&preadwritelock);	678	LOCK (preadwritelock);
561	ooffset = lseek (fd, 0, SEEK_CUR);	679	ooffset = lseek (fd, 0, SEEK_CUR);
562	lseek (fd, offset, SEEK_SET);	680	lseek (fd, offset, SEEK_SET);
563	res = read (fd, buf, count);	681	res = read (fd, buf, count);
564	lseek (fd, ooffset, SEEK_SET);	682	lseek (fd, ooffset, SEEK_SET);
565	pthread_mutex_unlock (&preadwritelock);	683	UNLOCK (preadwritelock);
566		684
567	return res;	685	return res;
568	}	686	}
569		687
570	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)	688	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
571	{	689	{
572	ssize_t res;	690	ssize_t res;
573	off_t ooffset;	691	off_t ooffset;
574		692
575	pthread_mutex_lock (&preadwritelock);	693	LOCK (preadwritelock);
576	ooffset = lseek (fd, 0, SEEK_CUR);	694	ooffset = lseek (fd, 0, SEEK_CUR);
577	lseek (fd, offset, SEEK_SET);	695	lseek (fd, offset, SEEK_SET);
578	res = write (fd, buf, count);	696	res = write (fd, buf, count);
579	lseek (fd, offset, SEEK_SET);	697	lseek (fd, offset, SEEK_SET);
580	pthread_mutex_unlock (&preadwritelock);	698	UNLOCK (preadwritelock);
581		699
582	return res;	700	return res;
583	}	701	}
584	#endif	702	#endif
585		703
…		…
590	#if !HAVE_READAHEAD	708	#if !HAVE_READAHEAD
591	# define readahead aio_readahead	709	# define readahead aio_readahead
592		710
593	static ssize_t readahead (int fd, off_t offset, size_t count)	711	static ssize_t readahead (int fd, off_t offset, size_t count)
594	{	712	{
595	char readahead_buf[4096];	713	dBUF;
596		714
597	while (count > 0)	715	while (count > 0)
598	{	716	{
599	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	717	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
600		718
601	pread (fd, readahead_buf, len, offset);	719	pread (fd, aio_buf, len, offset);
602	offset += len;	720	offset += len;
603	count -= len;	721	count -= len;
604	}	722	}
605		723
606	errno = 0;	724	errno = 0;
…		…
615	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)	733	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)
616	{	734	{
617	struct dirent *e;	735	struct dirent *e;
618	int errorno;	736	int errorno;
619		737
620	pthread_mutex_lock (&readdirlock);	738	LOCK (readdirlock);
621		739
622	e = readdir (dirp);	740	e = readdir (dirp);
623	errorno = errno;	741	errorno = errno;
624		742
625	if (e)	743	if (e)
…		…
628	strcpy (ent->d_name, e->d_name);	746	strcpy (ent->d_name, e->d_name);
629	}	747	}
630	else	748	else
631	*res = 0;	749	*res = 0;
632		750
633	pthread_mutex_unlock (&readdirlock);	751	UNLOCK (readdirlock);
634		752
635	errno = errorno;	753	errno = errorno;
636	return e ? 0 : -1;	754	return e ? 0 : -1;
637	}	755	}
638	#endif	756	#endif
639		757
640	/* sendfile always needs emulation */	758	/* sendfile always needs emulation */
641	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)	759	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
642	{	760	{
643	ssize_t res;	761	ssize_t res;
644		762
645	if (!count)	763	if (!count)
646	return 0;	764	return 0;
…		…
695	#endif	813	#endif
696	)	814	)
697	)	815	)
698	{	816	{
699	/* emulate sendfile. this is a major pain in the ass */	817	/* emulate sendfile. this is a major pain in the ass */
700	char buf[4096];	818	dBUF;
		819
701	res = 0;	820	res = 0;
702		821
703	while (count)	822	while (count)
704	{	823	{
705	ssize_t cnt;	824	ssize_t cnt;
706		825
707	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	826	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
708		827
709	if (cnt <= 0)	828	if (cnt <= 0)
710	{	829	{
711	if (cnt && !res) res = -1;	830	if (cnt && !res) res = -1;
712	break;	831	break;
713	}	832	}
714		833
715	cnt = write (ofd, buf, cnt);	834	cnt = write (ofd, aio_buf, cnt);
716		835
717	if (cnt <= 0)	836	if (cnt <= 0)
718	{	837	{
719	if (cnt && !res) res = -1;	838	if (cnt && !res) res = -1;
720	break;	839	break;
…		…
728		847
729	return res;	848	return res;
730	}	849	}
731		850
732	/* read a full directory */	851	/* read a full directory */
733	static int scandir_ (const char path, void *namesp)	852	static void scandir_ (aio_req req, worker *self)
734	{	853	{
735	DIR *dirp = opendir (path);	854	DIR *dirp;
736	union	855	union
737	{	856	{
738	struct dirent d;	857	struct dirent d;
739	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	858	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
740	} u;	859	} *u;
741	struct dirent *entp;	860	struct dirent *entp;
742	char name, names;	861	char name, names;
743	int memlen = 4096;	862	int memlen = 4096;
744	int memofs = 0;	863	int memofs = 0;
745	int res = 0;	864	int res = 0;
746	int errorno;	865	int errorno;
747		866
748	if (!dirp)	867	LOCK (wrklock);
749	return -1;	868	self->dirp = dirp = opendir (req->dataptr);
		869	self->dbuf = u = malloc (sizeof (*u));
		870	UNLOCK (wrklock);
750		871
751	names = malloc (memlen);	872	req->data2ptr = names = malloc (memlen);
752		873
		874	if (dirp && u && names)
753	for (;;)	875	for (;;)
754	{	876	{
		877	errno = 0;
755	errno = 0, readdir_r (dirp, &u.d, &entp);	878	readdir_r (dirp, &u->d, &entp);
756		879
757	if (!entp)	880	if (!entp)
758	break;	881	break;
759		882
760	name = entp->d_name;	883	name = entp->d_name;
761		884
762	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	885	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
763	{	886	{
764	int len = strlen (name) + 1;	887	int len = strlen (name) + 1;
765		888
766	res++;	889	res++;
767		890
768	while (memofs + len > memlen)	891	while (memofs + len > memlen)
769	{	892	{
770	memlen *= 2;	893	memlen *= 2;
		894	LOCK (wrklock);
771	names = realloc (names, memlen);	895	req->data2ptr = names = realloc (names, memlen);
		896	UNLOCK (wrklock);
		897
772	if (!names)	898	if (!names)
773	break;	899	break;
774	}	900	}
775		901
776	memcpy (names + memofs, name, len);	902	memcpy (names + memofs, name, len);
777	memofs += len;	903	memofs += len;
778	}	904	}
779	}	905	}
780		906
781	errorno = errno;
782	closedir (dirp);
783
784	if (errorno)	907	if (errno)
785	{
786	free (names);
787	errno = errorno;
788	res = -1;	908	res = -1;
789	}	909
790		910	req->result = res;
791	namesp = (void )names;
792	return res;
793	}	911	}
794		912
795	/*****************************************************************************/	913	/*****************************************************************************/
796		914
797	static void aio_proc (void thr_arg)	915	static void aio_proc (void thr_arg)
798	{	916	{
799	aio_req req;	917	aio_req req;
800	int type;	918	int type;
		919	worker self = (worker )thr_arg;
801		920
802	do	921	do
803	{	922	{
804	pthread_mutex_lock (&reqlock);	923	LOCK (reqlock);
805		924
806	for (;;)	925	for (;;)
807	{	926	{
808	req = reqs;	927	self->req = req = reqq_shift (&req_queue);
809
810	if (reqs)
811	{
812	reqs = reqs->next;
813	if (!reqs) reqe = 0;
814	}
815		928
816	if (req)	929	if (req)
817	break;	930	break;
818		931
819	pthread_cond_wait (&reqwait, &reqlock);	932	pthread_cond_wait (&reqwait, &reqlock);
820	}	933	}
821		934
822	pthread_mutex_unlock (&reqlock);	935	UNLOCK (reqlock);
823		936
824	errno = 0; /* strictly unnecessary */	937	errno = 0; /* strictly unnecessary */
825	type = req->type; /* remember type for QUIT check */	938	type = req->type; /* remember type for QUIT check */
826		939
827	if (!(req->flags & FLAG_CANCELLED))	940	if (!(req->flags & FLAG_CANCELLED))
…		…
829	{	942	{
830	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	943	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
831	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	944	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
832		945
833	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	946	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
834	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;	947	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
835		948
836	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	949	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
837	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	950	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
838	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	951	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
839		952
…		…
845	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	958	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
846	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	959	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
847		960
848	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	961	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
849	case REQ_FSYNC: req->result = fsync (req->fd); break;	962	case REQ_FSYNC: req->result = fsync (req->fd); break;
850	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	963	case REQ_READDIR: scandir_ (req, self); break;
851		964
852	case REQ_SLEEP:	965	case REQ_BUSY:
853	{	966	{
854	struct timeval tv;	967	struct timeval tv;
855		968
856	tv.tv_sec = req->fd;	969	tv.tv_sec = req->fd;
857	tv.tv_usec = req->fd2;	970	tv.tv_usec = req->fd2;
…		…
869	break;	982	break;
870	}	983	}
871		984
872	req->errorno = errno;	985	req->errorno = errno;
873		986
874	pthread_mutex_lock (&reslock);	987	LOCK (reslock);
875		988
876	req->next = 0;	989	if (!reqq_push (&res_queue, req))
877
878	if (rese)
879	{
880	rese->next = req;
881	rese = req;
882	}
883	else
884	{
885	rese = ress = req;
886
887	/* write a dummy byte to the pipe so fh becomes ready */	990	/* write a dummy byte to the pipe so fh becomes ready */
888	write (respipe [1], &respipe, 1);	991	write (respipe [1], &respipe, 1);
889	}
890		992
891	pthread_mutex_unlock (&reslock);	993	self->req = 0;
		994	worker_clear (self);
		995
		996	UNLOCK (reslock);
892	}	997	}
893	while (type != REQ_QUIT);	998	while (type != REQ_QUIT);
894		999
		1000	LOCK (wrklock);
		1001	worker_free (self);
		1002	UNLOCK (wrklock);
		1003
895	return 0;	1004	return 0;
896	}	1005	}
897		1006
898	/*****************************************************************************/	1007	/*****************************************************************************/
899		1008
900	static void atfork_prepare (void)	1009	static void atfork_prepare (void)
901	{	1010	{
902	pthread_mutex_lock (&reqlock);	1011	LOCK (wrklock);
903	pthread_mutex_lock (&reslock);	1012	LOCK (reqlock);
		1013	LOCK (reslock);
904	#if !HAVE_PREADWRITE	1014	#if !HAVE_PREADWRITE
905	pthread_mutex_lock (&preadwritelock);	1015	LOCK (preadwritelock);
906	#endif	1016	#endif
907	#if !HAVE_READDIR_R	1017	#if !HAVE_READDIR_R
908	pthread_mutex_lock (&readdirlock);	1018	LOCK (readdirlock);
909	#endif	1019	#endif
910	}	1020	}
911		1021
912	static void atfork_parent (void)	1022	static void atfork_parent (void)
913	{	1023	{
914	#if !HAVE_READDIR_R	1024	#if !HAVE_READDIR_R
915	pthread_mutex_unlock (&readdirlock);	1025	UNLOCK (readdirlock);
916	#endif	1026	#endif
917	#if !HAVE_PREADWRITE	1027	#if !HAVE_PREADWRITE
918	pthread_mutex_unlock (&preadwritelock);	1028	UNLOCK (preadwritelock);
919	#endif	1029	#endif
920	pthread_mutex_unlock (&reslock);	1030	UNLOCK (reslock);
921	pthread_mutex_unlock (&reqlock);	1031	UNLOCK (reqlock);
		1032	UNLOCK (wrklock);
922	}	1033	}
923		1034
924	static void atfork_child (void)	1035	static void atfork_child (void)
925	{	1036	{
926	aio_req prv;	1037	aio_req prv;
927		1038
		1039	while (prv = reqq_shift (&req_queue))
		1040	req_free (prv);
		1041
		1042	while (prv = reqq_shift (&res_queue))
		1043	req_free (prv);
		1044
		1045	while (wrk_first.next != &wrk_first)
		1046	{
		1047	worker *wrk = wrk_first.next;
		1048
		1049	if (wrk->req)
		1050	req_free (wrk->req);
		1051
		1052	worker_clear (wrk);
		1053	worker_free (wrk);
		1054	}
		1055
928	started = 0;	1056	started = 0;
929		1057	nreqs = 0;
930	while (reqs)
931	{
932	prv = reqs;
933	reqs = prv->next;
934	req_free (prv);
935	}
936
937	reqs = reqe = 0;
938
939	while (ress)
940	{
941	prv = ress;
942	ress = prv->next;
943	req_free (prv);
944	}
945
946	ress = rese = 0;
947		1058
948	close (respipe [0]);	1059	close (respipe [0]);
949	close (respipe [1]);	1060	close (respipe [1]);
950	create_pipe ();	1061	create_pipe ();
951		1062
…		…
1227		1338
1228	REQ_SEND;	1339	REQ_SEND;
1229	}	1340	}
1230		1341
1231	void	1342	void
1232	aio_sleep (delay,callback=&PL_sv_undef)	1343	aio_busy (delay,callback=&PL_sv_undef)
1233	double delay	1344	double delay
1234	SV * callback	1345	SV * callback
1235	PPCODE:	1346	PPCODE:
1236	{	1347	{
1237	dREQ;	1348	dREQ;
1238		1349
1239	req->type = REQ_SLEEP;	1350	req->type = REQ_BUSY;
1240	req->fd = delay < 0. ? 0 : delay;	1351	req->fd = delay < 0. ? 0 : delay;
1241	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1352	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1242		1353
1243	REQ_SEND;	1354	REQ_SEND;
1244	}	1355	}
…		…
1267	req->type = REQ_NOP;	1378	req->type = REQ_NOP;
1268		1379
1269	REQ_SEND;	1380	REQ_SEND;
1270	}	1381	}
1271		1382
1272	#if 0
1273
1274	void	1383	void
1275	aio_pri (int pri = DEFAULT_PRI)	1384	aioreq_pri (int pri = DEFAULT_PRI)
1276	CODE:	1385	CODE:
1277	if (pri < PRI_MIN) pri = PRI_MIN;	1386	if (pri < PRI_MIN) pri = PRI_MIN;
1278	if (pri > PRI_MAX) pri = PRI_MAX;	1387	if (pri > PRI_MAX) pri = PRI_MAX;
1279	next_pri = pri + PRI_BIAS;	1388	next_pri = pri + PRI_BIAS;
1280		1389
1281	#endif	1390	void
		1391	aioreq_nice (int nice = 0)
		1392	CODE:
		1393	nice = next_pri - nice;
		1394	if (nice < PRI_MIN) nice = PRI_MIN;
		1395	if (nice > PRI_MAX) nice = PRI_MAX;
		1396	next_pri = nice + PRI_BIAS;
1282		1397
1283	void	1398	void
1284	flush ()	1399	flush ()
1285	PROTOTYPE:	1400	PROTOTYPE:
1286	CODE:	1401	CODE:
…		…
1335		1450
1336	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1451	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1337		1452
1338	void	1453	void
1339	cancel (aio_req_ornot req)	1454	cancel (aio_req_ornot req)
1340	PROTOTYPE:
1341	CODE:	1455	CODE:
1342	req_cancel (req);	1456	req_cancel (req);
1343		1457
1344	void	1458	void
1345	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1459	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
…		…
1395	SvREFCNT_dec (grp->data);	1509	SvREFCNT_dec (grp->data);
1396	grp->data = (SV *)av;	1510	grp->data = (SV *)av;
1397	}	1511	}
1398		1512
1399	void	1513	void
1400	feed_limit (aio_req grp, int limit)	1514	limit (aio_req grp, int limit)
1401	CODE:	1515	CODE:
1402	grp->fd2 = limit;	1516	grp->fd2 = limit;
1403	aio_grp_feed (grp);	1517	aio_grp_feed (grp);
1404		1518
1405	void	1519	void

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.63 by root, Mon Oct 23 23:48:31 2006 UTC vs. Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.63 by root, Mon Oct 23 23:48:31 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC