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

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

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.64 by root, Mon Oct 23 23:54:41 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.64 by root, Mon Oct 23 23:54:41 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC