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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.65 by root, Tue Oct 24 00:26:32 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
56		59
57	/* buffer size for various temporary buffers */	60	/* buffer size for various temporary buffers */
58	#define AIO_BUFSIZE 65536	61	#define AIO_BUFSIZE 65536
59		62
60	#define dBUF \	63	#define dBUF \
		64	char *aio_buf; \
		65	LOCK (wrklock); \
61	char *aio_buf = malloc (AIO_BUFSIZE); \	66	self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
		67	UNLOCK (wrklock); \
62	if (!aio_buf) \	68	if (!aio_buf) \
63	return -1;	69	return -1;
64
65	#define fBUF free (aio_buf)
66		70
67	enum {	71	enum {
68	REQ_QUIT,	72	REQ_QUIT,
69	REQ_OPEN, REQ_CLOSE,	73	REQ_OPEN, REQ_CLOSE,
70	REQ_READ, REQ_WRITE, REQ_READAHEAD,	74	REQ_READ, REQ_WRITE, REQ_READAHEAD,
…		…
73	REQ_FSYNC, REQ_FDATASYNC,	77	REQ_FSYNC, REQ_FDATASYNC,
74	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	78	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75	REQ_READDIR,	79	REQ_READDIR,
76	REQ_LINK, REQ_SYMLINK,	80	REQ_LINK, REQ_SYMLINK,
77	REQ_GROUP, REQ_NOP,	81	REQ_GROUP, REQ_NOP,
78	REQ_SLEEP,	82	REQ_BUSY,
79	};	83	};
80		84
81	#define AIO_REQ_KLASS "IO::AIO::REQ"	85	#define AIO_REQ_KLASS "IO::AIO::REQ"
82	#define AIO_GRP_KLASS "IO::AIO::GRP"	86	#define AIO_GRP_KLASS "IO::AIO::GRP"
83		87
…		…
117	PRI_MIN = -4,	121	PRI_MIN = -4,
118	PRI_MAX = 4,	122	PRI_MAX = 4,
119		123
120	DEFAULT_PRI = 0,	124	DEFAULT_PRI = 0,
121	PRI_BIAS = -PRI_MIN,	125	PRI_BIAS = -PRI_MIN,
		126	NUM_PRI = PRI_MAX + PRI_BIAS + 1,
122	};	127	};
123		128
124	static int next_pri = DEFAULT_PRI + PRI_BIAS;	129	static int next_pri = DEFAULT_PRI + PRI_BIAS;
125		130
126	static int started, wanted;	131	static int started, wanted;
…		…
132	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP	137	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133	#else	138	#else
134	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER	139	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135	#endif	140	#endif
136		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
137	static pthread_mutex_t reslock = AIO_MUTEX_INIT;	185	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
138	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;	186	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
139	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	187	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
140		188
141	static volatile aio_req reqs, reqe; /* queue start, queue end */	189	/*
142	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	}
143		242
144	static void req_invoke (aio_req req);	243	static void req_invoke (aio_req req);
145	static void req_free (aio_req req);	244	static void req_free (aio_req req);
146		245
147	/* must be called at most once */	246	/* must be called at most once */
…		…
181	ENTER;	280	ENTER;
182	SAVETMPS;	281	SAVETMPS;
183	PUSHMARK (SP);	282	PUSHMARK (SP);
184	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	283	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185	PUTBACK;	284	PUTBACK;
186	call_sv (grp->fh2, G_VOID \| G_EVAL);	285	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
187	SPAGAIN;	286	SPAGAIN;
188	FREETMPS;	287	FREETMPS;
189	LEAVE;	288	LEAVE;
190	}	289	}
191		290
…		…
218	{	317	{
219	fd_set rfd;	318	fd_set rfd;
220		319
221	while (nreqs)	320	while (nreqs)
222	{	321	{
223	aio_req req;	322	int size;
224	#if !(__i386 \|\| __x86_64) /* safe without sempahore on this archs */	323	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
225	pthread_mutex_lock (&reslock);	324	LOCK (reslock);
226	#endif	325	#endif
227	req = ress;	326	size = res_queue.size;
228	#if !(__i386 \|\| __x86_64) /* safe without sempahore on this archs */	327	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
229	pthread_mutex_unlock (&reslock);	328	UNLOCK (reslock);
230	#endif	329	#endif
231		330
232	if (req)	331	if (size)
233	return;	332	return;
234		333
235	FD_ZERO(&rfd);	334	FD_ZERO(&rfd);
236	FD_SET(respipe [0], &rfd);	335	FD_SET(respipe [0], &rfd);
237		336
…		…
240	}	339	}
241		340
242	static void req_invoke (aio_req req)	341	static void req_invoke (aio_req req)
243	{	342	{
244	dSP;	343	dSP;
245	int errorno = errno;
246		344
247	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))	345	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
248	return;	346	{
249
250	errno = req->errorno;	347	errno = req->errorno;
251		348
252	ENTER;	349	ENTER;
253	SAVETMPS;	350	SAVETMPS;
254	PUSHMARK (SP);	351	PUSHMARK (SP);
255	EXTEND (SP, 1);	352	EXTEND (SP, 1);
256		353
257	switch (req->type)	354	switch (req->type)
258	{
259	case REQ_READDIR:
260	{	355	{
261	SV *rv = &PL_sv_undef;	356	case REQ_READDIR:
262
263	if (req->result >= 0)
264	{	357	{
265	char *buf = req->data2ptr;	358	SV *rv = &PL_sv_undef;
266	AV *av = newAV ();
267		359
268	while (req->result)	360	if (req->result >= 0)
269	{	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	{
270	SV *sv = newSVpv (buf, 0);	370	SV *sv = newSVpv (buf, 0);
271		371
272	av_push (av, sv);	372	av_store (av, i, sv);
273	buf += SvCUR (sv) + 1;	373	buf += SvCUR (sv) + 1;
274	req->result--;	374	}
		375
		376	rv = sv_2mortal (newRV_noinc ((SV *)av));
275	}	377	}
276		378
277	rv = sv_2mortal (newRV_noinc ((SV *)av));	379	PUSHs (rv);
278	}	380	}
		381	break;
279		382
280	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;
281	}	421	}
282	break;
283		422
284	case REQ_OPEN:
285	{
286	/* convert fd to fh */
287	SV *fh;
288		423
289	PUSHs (sv_2mortal (newSViv (req->result)));
290	PUTBACK;	424	PUTBACK;
291	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
292	SPAGAIN;
293
294	fh = SvREFCNT_inc (POPs);
295
296	PUSHMARK (SP);
297	XPUSHs (sv_2mortal (fh));
298	}
299	break;
300
301	case REQ_GROUP:
302	req->fd = 2; /* mark group as finished */
303
304	if (req->data)
305	{
306	int i;
307	AV av = (AV )req->data;
308
309	EXTEND (SP, AvFILL (av) + 1);
310	for (i = 0; i <= AvFILL (av); ++i)
311	PUSHs (*av_fetch (av, i, 0));
312	}
313	break;
314
315	case REQ_NOP:
316	case REQ_SLEEP:
317	break;
318
319	default:
320	PUSHs (sv_2mortal (newSViv (req->result)));
321	break;
322	}
323
324
325	PUTBACK;
326	call_sv (req->callback, G_VOID \| G_EVAL);	425	call_sv (req->callback, G_VOID \| G_EVAL);
327	SPAGAIN;	426	SPAGAIN;
328		427
329	FREETMPS;	428	FREETMPS;
330	LEAVE;	429	LEAVE;
331
332	errno = errorno;
333
334	if (SvTRUE (ERRSV))
335	{	430	}
336	req_free (req);
337	croak (0);
338	}
339	}
340		431
341	static void req_free (aio_req req)
342	{
343	if (req->grp)	432	if (req->grp)
344	{	433	{
345	aio_req grp = req->grp;	434	aio_req grp = req->grp;
346		435
347	/* unlink request */	436	/* unlink request */
…		…
352	grp->grp_first = req->grp_next;	441	grp->grp_first = req->grp_next;
353		442
354	aio_grp_dec (grp);	443	aio_grp_dec (grp);
355	}	444	}
356		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	{
357	if (req->self)	455	if (req->self)
358	{	456	{
359	sv_unmagic (req->self, PERL_MAGIC_ext);	457	sv_unmagic (req->self, PERL_MAGIC_ext);
360	SvREFCNT_dec (req->self);	458	SvREFCNT_dec (req->self);
361	}	459	}
…		…
364	SvREFCNT_dec (req->fh);	462	SvREFCNT_dec (req->fh);
365	SvREFCNT_dec (req->fh2);	463	SvREFCNT_dec (req->fh2);
366	SvREFCNT_dec (req->callback);	464	SvREFCNT_dec (req->callback);
367	Safefree (req->statdata);	465	Safefree (req->statdata);
368		466
369	if (req->type == REQ_READDIR && req->result >= 0)	467	if (req->type == REQ_READDIR)
370	free (req->data2ptr);	468	free (req->data2ptr);
371		469
372	Safefree (req);	470	Safefree (req);
373	}	471	}
374		472
…		…
392	int do_croak = 0;	490	int do_croak = 0;
393	aio_req req;	491	aio_req req;
394		492
395	for (;;)	493	for (;;)
396	{	494	{
397	pthread_mutex_lock (&reslock);	495	LOCK (reslock);
398	req = ress;	496	req = reqq_shift (&res_queue);
399		497
400	if (req)	498	if (req)
401	{	499	{
402	ress = req->next;
403
404	if (!ress)	500	if (!res_queue.size)
405	{	501	{
406	/* read any signals sent by the worker threads */	502	/* read any signals sent by the worker threads */
407	char buf [32];	503	char buf [32];
408	while (read (respipe [0], buf, 32) == 32)	504	while (read (respipe [0], buf, 32) == 32)
409	;	505	;
410
411	rese = 0;
412	}	506	}
413	}	507	}
414		508
415	pthread_mutex_unlock (&reslock);	509	UNLOCK (reslock);
416		510
417	if (!req)	511	if (!req)
418	break;	512	break;
419		513
420	--nreqs;	514	--nreqs;
…		…
454		548
455	static void aio_proc(void arg);	549	static void aio_proc(void arg);
456		550
457	static void start_thread (void)	551	static void start_thread (void)
458	{	552	{
		553	worker *wrk = calloc (1, sizeof (worker));
		554
		555	if (!wrk)
		556	croak ("unable to allocate worker thread data");
		557
459	sigset_t fullsigset, oldsigset;	558	sigset_t fullsigset, oldsigset;
460	pthread_t tid;
461	pthread_attr_t attr;	559	pthread_attr_t attr;
462		560
463	pthread_attr_init (&attr);	561	pthread_attr_init (&attr);
464	pthread_attr_setstacksize (&attr, STACKSIZE);	562	pthread_attr_setstacksize (&attr, STACKSIZE);
465	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	563	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
466		564
467	sigfillset (&fullsigset);	565	sigfillset (&fullsigset);
		566
		567	LOCK (wrklock);
468	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	568	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469		569
470	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;
471	started++;	576	started++;
		577	}
		578	else
		579	free (wrk);
472		580
473	sigprocmask (SIG_SETMASK, &oldsigset, 0);	581	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		582	UNLOCK (wrklock);
474	}	583	}
475		584
476	static void req_send (aio_req req)	585	static void req_send (aio_req req)
477	{	586	{
478	while (started < wanted && nreqs >= started)	587	while (started < wanted && nreqs >= started)
479	start_thread ();	588	start_thread ();
480		589
481	++nreqs;	590	++nreqs;
482		591
483	pthread_mutex_lock (&reqlock);	592	LOCK (reqlock);
484		593	reqq_push (&req_queue, req);
485	req->next = 0;
486
487	if (reqe)
488	{
489	reqe->next = req;
490	reqe = req;
491	}
492	else
493	reqe = reqs = req;
494
495	pthread_cond_signal (&reqwait);	594	pthread_cond_signal (&reqwait);
496	pthread_mutex_unlock (&reqlock);	595	UNLOCK (reqlock);
497		596
498	if (nreqs > max_outstanding)	597	if (nreqs > max_outstanding)
499	for (;;)	598	for (;;)
500	{	599	{
501	poll_cb ();	600	poll_cb ();
…		…
508	}	607	}
509		608
510	static void end_thread (void)	609	static void end_thread (void)
511	{	610	{
512	aio_req req;	611	aio_req req;
		612
513	Newz (0, req, 1, aio_cb);	613	Newz (0, req, 1, aio_cb);
		614
514	req->type = REQ_QUIT;	615	req->type = REQ_QUIT;
		616	req->pri = PRI_MAX + PRI_BIAS;
515		617
516	req_send (req);	618	req_send (req);
517	}	619	}
518		620
519	static void min_parallel (int nthreads)	621	static void min_parallel (int nthreads)
…		…
571	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)
572	{	674	{
573	ssize_t res;	675	ssize_t res;
574	off_t ooffset;	676	off_t ooffset;
575		677
576	pthread_mutex_lock (&preadwritelock);	678	LOCK (preadwritelock);
577	ooffset = lseek (fd, 0, SEEK_CUR);	679	ooffset = lseek (fd, 0, SEEK_CUR);
578	lseek (fd, offset, SEEK_SET);	680	lseek (fd, offset, SEEK_SET);
579	res = read (fd, buf, count);	681	res = read (fd, buf, count);
580	lseek (fd, ooffset, SEEK_SET);	682	lseek (fd, ooffset, SEEK_SET);
581	pthread_mutex_unlock (&preadwritelock);	683	UNLOCK (preadwritelock);
582		684
583	return res;	685	return res;
584	}	686	}
585		687
586	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)
587	{	689	{
588	ssize_t res;	690	ssize_t res;
589	off_t ooffset;	691	off_t ooffset;
590		692
591	pthread_mutex_lock (&preadwritelock);	693	LOCK (preadwritelock);
592	ooffset = lseek (fd, 0, SEEK_CUR);	694	ooffset = lseek (fd, 0, SEEK_CUR);
593	lseek (fd, offset, SEEK_SET);	695	lseek (fd, offset, SEEK_SET);
594	res = write (fd, buf, count);	696	res = write (fd, buf, count);
595	lseek (fd, offset, SEEK_SET);	697	lseek (fd, offset, SEEK_SET);
596	pthread_mutex_unlock (&preadwritelock);	698	UNLOCK (preadwritelock);
597		699
598	return res;	700	return res;
599	}	701	}
600	#endif	702	#endif
601		703
…		…
617	pread (fd, aio_buf, len, offset);	719	pread (fd, aio_buf, len, offset);
618	offset += len;	720	offset += len;
619	count -= len;	721	count -= len;
620	}	722	}
621		723
622	fBUF;
623
624	errno = 0;	724	errno = 0;
625	}	725	}
626	#endif	726	#endif
627		727
628	#if !HAVE_READDIR_R	728	#if !HAVE_READDIR_R
…		…
633	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)
634	{	734	{
635	struct dirent *e;	735	struct dirent *e;
636	int errorno;	736	int errorno;
637		737
638	pthread_mutex_lock (&readdirlock);	738	LOCK (readdirlock);
639		739
640	e = readdir (dirp);	740	e = readdir (dirp);
641	errorno = errno;	741	errorno = errno;
642		742
643	if (e)	743	if (e)
…		…
646	strcpy (ent->d_name, e->d_name);	746	strcpy (ent->d_name, e->d_name);
647	}	747	}
648	else	748	else
649	*res = 0;	749	*res = 0;
650		750
651	pthread_mutex_unlock (&readdirlock);	751	UNLOCK (readdirlock);
652		752
653	errno = errorno;	753	errno = errorno;
654	return e ? 0 : -1;	754	return e ? 0 : -1;
655	}	755	}
656	#endif	756	#endif
657		757
658	/* sendfile always needs emulation */	758	/* sendfile always needs emulation */
659	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)
660	{	760	{
661	ssize_t res;	761	ssize_t res;
662		762
663	if (!count)	763	if (!count)
664	return 0;	764	return 0;
…		…
741		841
742	offset += cnt;	842	offset += cnt;
743	res += cnt;	843	res += cnt;
744	count -= cnt;	844	count -= cnt;
745	}	845	}
746
747	fBUF;
748	}	846	}
749		847
750	return res;	848	return res;
751	}	849	}
752		850
753	/* read a full directory */	851	/* read a full directory */
754	static int scandir_ (const char path, void *namesp)	852	static void scandir_ (aio_req req, worker *self)
755	{	853	{
756	DIR *dirp;	854	DIR *dirp;
757	union	855	union
758	{	856	{
759	struct dirent d;	857	struct dirent d;
…		…
764	int memlen = 4096;	862	int memlen = 4096;
765	int memofs = 0;	863	int memofs = 0;
766	int res = 0;	864	int res = 0;
767	int errorno;	865	int errorno;
768		866
769	dirp = opendir (path);	867	LOCK (wrklock);
770	if (!dirp)	868	self->dirp = dirp = opendir (req->dataptr);
771	return -1;
772
773	u = malloc (sizeof (*u));	869	self->dbuf = u = malloc (sizeof (*u));
		870	UNLOCK (wrklock);
		871
774	names = malloc (memlen);	872	req->data2ptr = names = malloc (memlen);
775		873
776	if (u && names)	874	if (dirp && u && names)
777	for (;;)	875	for (;;)
778	{	876	{
779	errno = 0;	877	errno = 0;
780	readdir_r (dirp, &u->d, &entp);	878	readdir_r (dirp, &u->d, &entp);
781		879
…		…
791	res++;	889	res++;
792		890
793	while (memofs + len > memlen)	891	while (memofs + len > memlen)
794	{	892	{
795	memlen *= 2;	893	memlen *= 2;
		894	LOCK (wrklock);
796	names = realloc (names, memlen);	895	req->data2ptr = names = realloc (names, memlen);
		896	UNLOCK (wrklock);
		897
797	if (!names)	898	if (!names)
798	break;	899	break;
799	}	900	}
800		901
801	memcpy (names + memofs, name, len);	902	memcpy (names + memofs, name, len);
802	memofs += len;	903	memofs += len;
803	}	904	}
804	}	905	}
805		906
806	errorno = errno;
807	free (u);
808	closedir (dirp);
809
810	if (errorno)	907	if (errno)
811	{
812	free (names);
813	errno = errorno;
814	res = -1;	908	res = -1;
815	}	909
816		910	req->result = res;
817	namesp = (void )names;
818	return res;
819	}	911	}
820		912
821	/*****************************************************************************/	913	/*****************************************************************************/
822		914
823	static void aio_proc (void thr_arg)	915	static void aio_proc (void thr_arg)
824	{	916	{
825	aio_req req;	917	aio_req req;
826	int type;	918	int type;
		919	worker self = (worker )thr_arg;
827		920
828	do	921	do
829	{	922	{
830	pthread_mutex_lock (&reqlock);	923	LOCK (reqlock);
831		924
832	for (;;)	925	for (;;)
833	{	926	{
834	req = reqs;	927	self->req = req = reqq_shift (&req_queue);
835
836	if (reqs)
837	{
838	reqs = reqs->next;
839	if (!reqs) reqe = 0;
840	}
841		928
842	if (req)	929	if (req)
843	break;	930	break;
844		931
845	pthread_cond_wait (&reqwait, &reqlock);	932	pthread_cond_wait (&reqwait, &reqlock);
846	}	933	}
847		934
848	pthread_mutex_unlock (&reqlock);	935	UNLOCK (reqlock);
849		936
850	errno = 0; /* strictly unnecessary */	937	errno = 0; /* strictly unnecessary */
851	type = req->type; /* remember type for QUIT check */	938	type = req->type; /* remember type for QUIT check */
852		939
853	if (!(req->flags & FLAG_CANCELLED))	940	if (!(req->flags & FLAG_CANCELLED))
…		…
855	{	942	{
856	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;
857	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;
858		945
859	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;
860	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;
861		948
862	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	949	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
863	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	950	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
864	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	951	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
865		952
…		…
871	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	958	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
872	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	959	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
873		960
874	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	961	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
875	case REQ_FSYNC: req->result = fsync (req->fd); break;	962	case REQ_FSYNC: req->result = fsync (req->fd); break;
876	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	963	case REQ_READDIR: scandir_ (req, self); break;
877		964
878	case REQ_SLEEP:	965	case REQ_BUSY:
879	{	966	{
880	struct timeval tv;	967	struct timeval tv;
881		968
882	tv.tv_sec = req->fd;	969	tv.tv_sec = req->fd;
883	tv.tv_usec = req->fd2;	970	tv.tv_usec = req->fd2;
…		…
895	break;	982	break;
896	}	983	}
897		984
898	req->errorno = errno;	985	req->errorno = errno;
899		986
900	pthread_mutex_lock (&reslock);	987	LOCK (reslock);
901		988
902	req->next = 0;	989	if (!reqq_push (&res_queue, req))
903
904	if (rese)
905	{
906	rese->next = req;
907	rese = req;
908	}
909	else
910	{
911	rese = ress = req;
912
913	/* write a dummy byte to the pipe so fh becomes ready */	990	/* write a dummy byte to the pipe so fh becomes ready */
914	write (respipe [1], &respipe, 1);	991	write (respipe [1], &respipe, 1);
915	}
916		992
917	pthread_mutex_unlock (&reslock);	993	self->req = 0;
		994	worker_clear (self);
		995
		996	UNLOCK (reslock);
918	}	997	}
919	while (type != REQ_QUIT);	998	while (type != REQ_QUIT);
920		999
		1000	LOCK (wrklock);
		1001	worker_free (self);
		1002	UNLOCK (wrklock);
		1003
921	return 0;	1004	return 0;
922	}	1005	}
923		1006
924	/*****************************************************************************/	1007	/*****************************************************************************/
925		1008
926	static void atfork_prepare (void)	1009	static void atfork_prepare (void)
927	{	1010	{
928	pthread_mutex_lock (&reqlock);	1011	LOCK (wrklock);
929	pthread_mutex_lock (&reslock);	1012	LOCK (reqlock);
		1013	LOCK (reslock);
930	#if !HAVE_PREADWRITE	1014	#if !HAVE_PREADWRITE
931	pthread_mutex_lock (&preadwritelock);	1015	LOCK (preadwritelock);
932	#endif	1016	#endif
933	#if !HAVE_READDIR_R	1017	#if !HAVE_READDIR_R
934	pthread_mutex_lock (&readdirlock);	1018	LOCK (readdirlock);
935	#endif	1019	#endif
936	}	1020	}
937		1021
938	static void atfork_parent (void)	1022	static void atfork_parent (void)
939	{	1023	{
940	#if !HAVE_READDIR_R	1024	#if !HAVE_READDIR_R
941	pthread_mutex_unlock (&readdirlock);	1025	UNLOCK (readdirlock);
942	#endif	1026	#endif
943	#if !HAVE_PREADWRITE	1027	#if !HAVE_PREADWRITE
944	pthread_mutex_unlock (&preadwritelock);	1028	UNLOCK (preadwritelock);
945	#endif	1029	#endif
946	pthread_mutex_unlock (&reslock);	1030	UNLOCK (reslock);
947	pthread_mutex_unlock (&reqlock);	1031	UNLOCK (reqlock);
		1032	UNLOCK (wrklock);
948	}	1033	}
949		1034
950	static void atfork_child (void)	1035	static void atfork_child (void)
951	{	1036	{
952	aio_req prv;	1037	aio_req prv;
953		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
954	started = 0;	1056	started = 0;
955		1057	nreqs = 0;
956	while (reqs)
957	{
958	prv = reqs;
959	reqs = prv->next;
960	req_free (prv);
961	}
962
963	reqs = reqe = 0;
964
965	while (ress)
966	{
967	prv = ress;
968	ress = prv->next;
969	req_free (prv);
970	}
971
972	ress = rese = 0;
973		1058
974	close (respipe [0]);	1059	close (respipe [0]);
975	close (respipe [1]);	1060	close (respipe [1]);
976	create_pipe ();	1061	create_pipe ();
977		1062
…		…
1253		1338
1254	REQ_SEND;	1339	REQ_SEND;
1255	}	1340	}
1256		1341
1257	void	1342	void
1258	aio_sleep (delay,callback=&PL_sv_undef)	1343	aio_busy (delay,callback=&PL_sv_undef)
1259	double delay	1344	double delay
1260	SV * callback	1345	SV * callback
1261	PPCODE:	1346	PPCODE:
1262	{	1347	{
1263	dREQ;	1348	dREQ;
1264		1349
1265	req->type = REQ_SLEEP;	1350	req->type = REQ_BUSY;
1266	req->fd = delay < 0. ? 0 : delay;	1351	req->fd = delay < 0. ? 0 : delay;
1267	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1352	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1268		1353
1269	REQ_SEND;	1354	REQ_SEND;
1270	}	1355	}
…		…
1293	req->type = REQ_NOP;	1378	req->type = REQ_NOP;
1294		1379
1295	REQ_SEND;	1380	REQ_SEND;
1296	}	1381	}
1297		1382
1298	#if 0
1299
1300	void	1383	void
1301	aio_pri (int pri = DEFAULT_PRI)	1384	aioreq_pri (int pri = DEFAULT_PRI)
1302	CODE:	1385	CODE:
1303	if (pri < PRI_MIN) pri = PRI_MIN;	1386	if (pri < PRI_MIN) pri = PRI_MIN;
1304	if (pri > PRI_MAX) pri = PRI_MAX;	1387	if (pri > PRI_MAX) pri = PRI_MAX;
1305	next_pri = pri + PRI_BIAS;	1388	next_pri = pri + PRI_BIAS;
1306		1389
1307	#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;
1308		1397
1309	void	1398	void
1310	flush ()	1399	flush ()
1311	PROTOTYPE:	1400	PROTOTYPE:
1312	CODE:	1401	CODE:
…		…
1361		1450
1362	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1451	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363		1452
1364	void	1453	void
1365	cancel (aio_req_ornot req)	1454	cancel (aio_req_ornot req)
1366	PROTOTYPE:
1367	CODE:	1455	CODE:
1368	req_cancel (req);	1456	req_cancel (req);
1369		1457
1370	void	1458	void
1371	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1459	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
…		…
1421	SvREFCNT_dec (grp->data);	1509	SvREFCNT_dec (grp->data);
1422	grp->data = (SV *)av;	1510	grp->data = (SV *)av;
1423	}	1511	}
1424		1512
1425	void	1513	void
1426	feed_limit (aio_req grp, int limit)	1514	limit (aio_req grp, int limit)
1427	CODE:	1515	CODE:
1428	grp->fd2 = limit;	1516	grp->fd2 = limit;
1429	aio_grp_feed (grp);	1517	aio_grp_feed (grp);
1430		1518
1431	void	1519	void

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.65 by root, Tue Oct 24 00:26:32 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.65 by root, Tue Oct 24 00:26:32 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC