[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.75 by root, Thu Oct 26 06:44:48 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
44	/* used for struct dirent, AIX doesn't provide it */	47	/* used for struct dirent, AIX doesn't provide it */
45	#ifndef NAME_MAX	48	#ifndef NAME_MAX
46	# define NAME_MAX 4096	49	# define NAME_MAX 4096
47	#endif	50	#endif
48		51
		52	#ifndef PTHREAD_STACK_MIN
		53	/* care for broken platforms, e.g. windows */
		54	# define PTHREAD_STACK_MIN 16384
		55	#endif
		56
49	#if __ia64	57	#if __ia64
50	# define STACKSIZE 65536	58	# define STACKSIZE 65536
51	#elif __i386 \|\| __x86_64 /* 16k is unreasonably high :( */	59	#elif __i386 \|\| __x86_64 /* 16k is unreasonably high :( */
52	# define STACKSIZE PTHREAD_STACK_MIN	60	# define STACKSIZE PTHREAD_STACK_MIN
53	#else	61	#else
…		…
56		64
57	/* buffer size for various temporary buffers */	65	/* buffer size for various temporary buffers */
58	#define AIO_BUFSIZE 65536	66	#define AIO_BUFSIZE 65536
59		67
60	#define dBUF \	68	#define dBUF \
		69	char *aio_buf; \
		70	LOCK (wrklock); \
61	char *aio_buf = malloc (AIO_BUFSIZE); \	71	self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
		72	UNLOCK (wrklock); \
62	if (!aio_buf) \	73	if (!aio_buf) \
63	return -1;	74	return -1;
64
65	#define fBUF free (aio_buf)
66		75
67	enum {	76	enum {
68	REQ_QUIT,	77	REQ_QUIT,
69	REQ_OPEN, REQ_CLOSE,	78	REQ_OPEN, REQ_CLOSE,
70	REQ_READ, REQ_WRITE, REQ_READAHEAD,	79	REQ_READ, REQ_WRITE, REQ_READAHEAD,
…		…
73	REQ_FSYNC, REQ_FDATASYNC,	82	REQ_FSYNC, REQ_FDATASYNC,
74	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	83	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75	REQ_READDIR,	84	REQ_READDIR,
76	REQ_LINK, REQ_SYMLINK,	85	REQ_LINK, REQ_SYMLINK,
77	REQ_GROUP, REQ_NOP,	86	REQ_GROUP, REQ_NOP,
78	REQ_SLEEP,	87	REQ_BUSY,
79	};	88	};
80		89
81	#define AIO_REQ_KLASS "IO::AIO::REQ"	90	#define AIO_REQ_KLASS "IO::AIO::REQ"
82	#define AIO_GRP_KLASS "IO::AIO::GRP"	91	#define AIO_GRP_KLASS "IO::AIO::GRP"
83		92
…		…
117	PRI_MIN = -4,	126	PRI_MIN = -4,
118	PRI_MAX = 4,	127	PRI_MAX = 4,
119		128
120	DEFAULT_PRI = 0,	129	DEFAULT_PRI = 0,
121	PRI_BIAS = -PRI_MIN,	130	PRI_BIAS = -PRI_MIN,
		131	NUM_PRI = PRI_MAX + PRI_BIAS + 1,
122	};	132	};
123		133
124	static int next_pri = DEFAULT_PRI + PRI_BIAS;	134	static int next_pri = DEFAULT_PRI + PRI_BIAS;
125		135
126	static int started, wanted;	136	static int started, wanted;
127	static volatile int nreqs;	137	static volatile int nreqs;
128	static int max_outstanding = 1<<30;
129	static int respipe [2];	138	static int respipe [2];
130		139
131	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)	140	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
132	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP	141	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133	#else	142	#else
134	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER	143	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135	#endif	144	#endif
136		145
		146	#define LOCK(mutex) pthread_mutex_lock (&(mutex))
		147	#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
		148
		149	/* worker threasd management */
		150	static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
		151
		152	typedef struct worker {
		153	/* locked by wrklock */
		154	struct worker prev, next;
		155
		156	pthread_t tid;
		157
		158	/* locked by reslock, reqlock or wrklock */
		159	aio_req req; /* currently processed request */
		160	void *dbuf;
		161	DIR *dirp;
		162	} worker;
		163
		164	static worker wrk_first = { &wrk_first, &wrk_first, 0 };
		165
		166	static void worker_clear (worker *wrk)
		167	{
		168	if (wrk->dirp)
		169	{
		170	closedir (wrk->dirp);
		171	wrk->dirp = 0;
		172	}
		173
		174	if (wrk->dbuf)
		175	{
		176	free (wrk->dbuf);
		177	wrk->dbuf = 0;
		178	}
		179	}
		180
		181	static void worker_free (worker *wrk)
		182	{
		183	wrk->next->prev = wrk->prev;
		184	wrk->prev->next = wrk->next;
		185
		186	free (wrk);
		187	}
		188
137	static pthread_mutex_t reslock = AIO_MUTEX_INIT;	189	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
138	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;	190	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
139	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	191	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
140		192
141	static volatile aio_req reqs, reqe; /* queue start, queue end */	193	/*
142	static volatile aio_req ress, rese; /* queue start, queue end */	194	* a somewhat faster data structure might be nice, but
		195	* with 8 priorities this actually needs <20 insns
		196	* per shift, the most expensive operation.
		197	*/
		198	typedef struct {
		199	aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
		200	int size;
		201	} reqq;
143		202
		203	static reqq req_queue;
		204	static reqq res_queue;
		205
		206	int reqq_push (reqq *q, aio_req req)
		207	{
		208	int pri = req->pri;
		209	req->next = 0;
		210
		211	if (q->qe[pri])
		212	{
		213	q->qe[pri]->next = req;
		214	q->qe[pri] = req;
		215	}
		216	else
		217	q->qe[pri] = q->qs[pri] = req;
		218
		219	return q->size++;
		220	}
		221
		222	aio_req reqq_shift (reqq *q)
		223	{
		224	int pri;
		225
		226	if (!q->size)
		227	return 0;
		228
		229	--q->size;
		230
		231	for (pri = NUM_PRI; pri--; )
		232	{
		233	aio_req req = q->qs[pri];
		234
		235	if (req)
		236	{
		237	if (!(q->qs[pri] = req->next))
		238	q->qe[pri] = 0;
		239
		240	return req;
		241	}
		242	}
		243
		244	abort ();
		245	}
		246
		247	static int poll_cb ();
144	static void req_invoke (aio_req req);	248	static void req_invoke (aio_req req);
145	static void req_free (aio_req req);	249	static void req_free (aio_req req);
		250	static void req_cancel (aio_req req);
146		251
147	/* must be called at most once */	252	/* must be called at most once */
148	static SV req_sv (aio_req req, const char klass)	253	static SV req_sv (aio_req req, const char klass)
149	{	254	{
150	if (!req->self)	255	if (!req->self)
…		…
181	ENTER;	286	ENTER;
182	SAVETMPS;	287	SAVETMPS;
183	PUSHMARK (SP);	288	PUSHMARK (SP);
184	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	289	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185	PUTBACK;	290	PUTBACK;
186	call_sv (grp->fh2, G_VOID \| G_EVAL);	291	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
187	SPAGAIN;	292	SPAGAIN;
188	FREETMPS;	293	FREETMPS;
189	LEAVE;	294	LEAVE;
190	}	295	}
191		296
…		…
218	{	323	{
219	fd_set rfd;	324	fd_set rfd;
220		325
221	while (nreqs)	326	while (nreqs)
222	{	327	{
223	aio_req req;	328	int size;
224	#if !(__i386 \|\| __x86_64) /* safe without sempahore on this archs */	329	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
225	pthread_mutex_lock (&reslock);	330	LOCK (reslock);
226	#endif	331	#endif
227	req = ress;	332	size = res_queue.size;
228	#if !(__i386 \|\| __x86_64) /* safe without sempahore on this archs */	333	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
229	pthread_mutex_unlock (&reslock);	334	UNLOCK (reslock);
230	#endif	335	#endif
231		336
232	if (req)	337	if (size)
233	return;	338	return;
234		339
235	FD_ZERO(&rfd);	340	FD_ZERO(&rfd);
236	FD_SET(respipe [0], &rfd);	341	FD_SET(respipe [0], &rfd);
237		342
…		…
240	}	345	}
241		346
242	static void req_invoke (aio_req req)	347	static void req_invoke (aio_req req)
243	{	348	{
244	dSP;	349	dSP;
245	int errorno = errno;
246		350
247	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))	351	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
248	return;	352	{
249
250	errno = req->errorno;	353	errno = req->errorno;
251		354
252	ENTER;	355	ENTER;
253	SAVETMPS;	356	SAVETMPS;
254	PUSHMARK (SP);	357	PUSHMARK (SP);
255	EXTEND (SP, 1);	358	EXTEND (SP, 1);
256		359
257	switch (req->type)	360	switch (req->type)
258	{
259	case REQ_READDIR:
260	{	361	{
261	SV *rv = &PL_sv_undef;	362	case REQ_READDIR:
262
263	if (req->result >= 0)
264	{	363	{
265	char *buf = req->data2ptr;	364	SV *rv = &PL_sv_undef;
266	AV *av = newAV ();
267		365
268	while (req->result)	366	if (req->result >= 0)
269	{	367	{
		368	int i;
		369	char *buf = req->data2ptr;
		370	AV *av = newAV ();
		371
		372	av_extend (av, req->result - 1);
		373
		374	for (i = 0; i < req->result; ++i)
		375	{
270	SV *sv = newSVpv (buf, 0);	376	SV *sv = newSVpv (buf, 0);
271		377
272	av_push (av, sv);	378	av_store (av, i, sv);
273	buf += SvCUR (sv) + 1;	379	buf += SvCUR (sv) + 1;
274	req->result--;	380	}
		381
		382	rv = sv_2mortal (newRV_noinc ((SV *)av));
275	}	383	}
276		384
277	rv = sv_2mortal (newRV_noinc ((SV *)av));	385	PUSHs (rv);
278	}	386	}
		387	break;
279		388
280	PUSHs (rv);	389	case REQ_OPEN:
		390	{
		391	/* convert fd to fh */
		392	SV *fh;
		393
		394	PUSHs (sv_2mortal (newSViv (req->result)));
		395	PUTBACK;
		396	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
		397	SPAGAIN;
		398
		399	fh = SvREFCNT_inc (POPs);
		400
		401	PUSHMARK (SP);
		402	XPUSHs (sv_2mortal (fh));
		403	}
		404	break;
		405
		406	case REQ_GROUP:
		407	req->fd = 2; /* mark group as finished */
		408
		409	if (req->data)
		410	{
		411	int i;
		412	AV av = (AV )req->data;
		413
		414	EXTEND (SP, AvFILL (av) + 1);
		415	for (i = 0; i <= AvFILL (av); ++i)
		416	PUSHs (*av_fetch (av, i, 0));
		417	}
		418	break;
		419
		420	case REQ_NOP:
		421	case REQ_BUSY:
		422	break;
		423
		424	default:
		425	PUSHs (sv_2mortal (newSViv (req->result)));
		426	break;
281	}	427	}
282	break;
283		428
284	case REQ_OPEN:
285	{
286	/* convert fd to fh */
287	SV *fh;
288		429
289	PUSHs (sv_2mortal (newSViv (req->result)));
290	PUTBACK;	430	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);	431	call_sv (req->callback, G_VOID \| G_EVAL);
327	SPAGAIN;	432	SPAGAIN;
328		433
329	FREETMPS;	434	FREETMPS;
330	LEAVE;	435	LEAVE;
331
332	errno = errorno;
333
334	if (SvTRUE (ERRSV))
335	{	436	}
336	req_free (req);
337	croak (0);
338	}
339	}
340		437
341	static void req_free (aio_req req)
342	{
343	if (req->grp)	438	if (req->grp)
344	{	439	{
345	aio_req grp = req->grp;	440	aio_req grp = req->grp;
346		441
347	/* unlink request */	442	/* unlink request */
…		…
352	grp->grp_first = req->grp_next;	447	grp->grp_first = req->grp_next;
353		448
354	aio_grp_dec (grp);	449	aio_grp_dec (grp);
355	}	450	}
356		451
		452	if (SvTRUE (ERRSV))
		453	{
		454	req_free (req);
		455	croak (0);
		456	}
		457	}
		458
		459	static void req_free (aio_req req)
		460	{
357	if (req->self)	461	if (req->self)
358	{	462	{
359	sv_unmagic (req->self, PERL_MAGIC_ext);	463	sv_unmagic (req->self, PERL_MAGIC_ext);
360	SvREFCNT_dec (req->self);	464	SvREFCNT_dec (req->self);
361	}	465	}
…		…
364	SvREFCNT_dec (req->fh);	468	SvREFCNT_dec (req->fh);
365	SvREFCNT_dec (req->fh2);	469	SvREFCNT_dec (req->fh2);
366	SvREFCNT_dec (req->callback);	470	SvREFCNT_dec (req->callback);
367	Safefree (req->statdata);	471	Safefree (req->statdata);
368		472
369	if (req->type == REQ_READDIR && req->result >= 0)	473	if (req->type == REQ_READDIR)
370	free (req->data2ptr);	474	free (req->data2ptr);
371		475
372	Safefree (req);	476	Safefree (req);
373	}	477	}
374		478
		479	static void req_cancel_subs (aio_req grp)
		480	{
		481	aio_req sub;
		482
		483	if (grp->type != REQ_GROUP)
		484	return;
		485
		486	SvREFCNT_dec (grp->fh2);
		487	grp->fh2 = 0;
		488
		489	for (sub = grp->grp_first; sub; sub = sub->grp_next)
		490	req_cancel (sub);
		491	}
		492
375	static void req_cancel (aio_req req)	493	static void req_cancel (aio_req req)
376	{	494	{
377	req->flags \|= FLAG_CANCELLED;	495	req->flags \|= FLAG_CANCELLED;
378		496
379	if (req->type == REQ_GROUP)	497	req_cancel_subs (req);
380	{
381	aio_req sub;
382
383	for (sub = req->grp_first; sub; sub = sub->grp_next)
384	req_cancel (sub);
385	}
386	}	498	}
387		499
388	static int poll_cb ()	500	static int poll_cb ()
389	{	501	{
390	dSP;	502	dSP;
…		…
392	int do_croak = 0;	504	int do_croak = 0;
393	aio_req req;	505	aio_req req;
394		506
395	for (;;)	507	for (;;)
396	{	508	{
397	pthread_mutex_lock (&reslock);	509	LOCK (reslock);
398	req = ress;	510	req = reqq_shift (&res_queue);
399		511
400	if (req)	512	if (req)
401	{	513	{
402	ress = req->next;
403
404	if (!ress)	514	if (!res_queue.size)
405	{	515	{
406	/* read any signals sent by the worker threads */	516	/* read any signals sent by the worker threads */
407	char buf [32];	517	char buf [32];
408	while (read (respipe [0], buf, 32) == 32)	518	while (read (respipe [0], buf, 32) == 32)
409	;	519	;
410
411	rese = 0;
412	}	520	}
413	}	521	}
414		522
415	pthread_mutex_unlock (&reslock);	523	UNLOCK (reslock);
416		524
417	if (!req)	525	if (!req)
418	break;	526	break;
419		527
420	--nreqs;	528	--nreqs;
…		…
455	static void aio_proc(void arg);	563	static void aio_proc(void arg);
456		564
457	static void start_thread (void)	565	static void start_thread (void)
458	{	566	{
459	sigset_t fullsigset, oldsigset;	567	sigset_t fullsigset, oldsigset;
460	pthread_t tid;
461	pthread_attr_t attr;	568	pthread_attr_t attr;
		569
		570	worker *wrk = calloc (1, sizeof (worker));
		571
		572	if (!wrk)
		573	croak ("unable to allocate worker thread data");
462		574
463	pthread_attr_init (&attr);	575	pthread_attr_init (&attr);
464	pthread_attr_setstacksize (&attr, STACKSIZE);	576	pthread_attr_setstacksize (&attr, STACKSIZE);
465	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	577	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
466		578
467	sigfillset (&fullsigset);	579	sigfillset (&fullsigset);
		580
		581	LOCK (wrklock);
468	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	582	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469		583
470	if (pthread_create (&tid, &attr, aio_proc, 0) == 0)	584	if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
		585	{
		586	wrk->prev = &wrk_first;
		587	wrk->next = wrk_first.next;
		588	wrk_first.next->prev = wrk;
		589	wrk_first.next = wrk;
471	started++;	590	started++;
		591	}
		592	else
		593	free (wrk);
472		594
473	sigprocmask (SIG_SETMASK, &oldsigset, 0);	595	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		596	UNLOCK (wrklock);
474	}	597	}
475		598
476	static void req_send (aio_req req)	599	static void req_send (aio_req req)
477	{	600	{
478	while (started < wanted && nreqs >= started)	601	while (started < wanted && nreqs >= started)
479	start_thread ();	602	start_thread ();
480		603
481	++nreqs;	604	++nreqs;
482		605
483	pthread_mutex_lock (&reqlock);	606	LOCK (reqlock);
484		607	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);	608	pthread_cond_signal (&reqwait);
496	pthread_mutex_unlock (&reqlock);	609	UNLOCK (reqlock);
497
498	if (nreqs > max_outstanding)
499	for (;;)
500	{
501	poll_cb ();
502
503	if (nreqs <= max_outstanding)
504	break;
505
506	poll_wait ();
507	}
508	}	610	}
509		611
510	static void end_thread (void)	612	static void end_thread (void)
511	{	613	{
512	aio_req req;	614	aio_req req;
		615
513	Newz (0, req, 1, aio_cb);	616	Newz (0, req, 1, aio_cb);
		617
514	req->type = REQ_QUIT;	618	req->type = REQ_QUIT;
		619	req->pri = PRI_MAX + PRI_BIAS;
515		620
516	req_send (req);	621	req_send (req);
517	}	622	}
518		623
519	static void min_parallel (int nthreads)	624	static void min_parallel (int nthreads)
…		…
571	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)	676	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
572	{	677	{
573	ssize_t res;	678	ssize_t res;
574	off_t ooffset;	679	off_t ooffset;
575		680
576	pthread_mutex_lock (&preadwritelock);	681	LOCK (preadwritelock);
577	ooffset = lseek (fd, 0, SEEK_CUR);	682	ooffset = lseek (fd, 0, SEEK_CUR);
578	lseek (fd, offset, SEEK_SET);	683	lseek (fd, offset, SEEK_SET);
579	res = read (fd, buf, count);	684	res = read (fd, buf, count);
580	lseek (fd, ooffset, SEEK_SET);	685	lseek (fd, ooffset, SEEK_SET);
581	pthread_mutex_unlock (&preadwritelock);	686	UNLOCK (preadwritelock);
582		687
583	return res;	688	return res;
584	}	689	}
585		690
586	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)	691	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
587	{	692	{
588	ssize_t res;	693	ssize_t res;
589	off_t ooffset;	694	off_t ooffset;
590		695
591	pthread_mutex_lock (&preadwritelock);	696	LOCK (preadwritelock);
592	ooffset = lseek (fd, 0, SEEK_CUR);	697	ooffset = lseek (fd, 0, SEEK_CUR);
593	lseek (fd, offset, SEEK_SET);	698	lseek (fd, offset, SEEK_SET);
594	res = write (fd, buf, count);	699	res = write (fd, buf, count);
595	lseek (fd, offset, SEEK_SET);	700	lseek (fd, offset, SEEK_SET);
596	pthread_mutex_unlock (&preadwritelock);	701	UNLOCK (preadwritelock);
597		702
598	return res;	703	return res;
599	}	704	}
600	#endif	705	#endif
601		706
602	#if !HAVE_FDATASYNC	707	#if !HAVE_FDATASYNC
603	# define fdatasync fsync	708	# define fdatasync fsync
604	#endif	709	#endif
605		710
606	#if !HAVE_READAHEAD	711	#if !HAVE_READAHEAD
607	# define readahead aio_readahead	712	# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
608		713
609	static ssize_t readahead (int fd, off_t offset, size_t count)	714	static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
610	{	715	{
611	dBUF;	716	dBUF;
612		717
613	while (count > 0)	718	while (count > 0)
614	{	719	{
…		…
617	pread (fd, aio_buf, len, offset);	722	pread (fd, aio_buf, len, offset);
618	offset += len;	723	offset += len;
619	count -= len;	724	count -= len;
620	}	725	}
621		726
622	fBUF;
623
624	errno = 0;	727	errno = 0;
625	}	728	}
		729
626	#endif	730	#endif
627		731
628	#if !HAVE_READDIR_R	732	#if !HAVE_READDIR_R
629	# define readdir_r aio_readdir_r	733	# define readdir_r aio_readdir_r
630		734
…		…
633	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)	737	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)
634	{	738	{
635	struct dirent *e;	739	struct dirent *e;
636	int errorno;	740	int errorno;
637		741
638	pthread_mutex_lock (&readdirlock);	742	LOCK (readdirlock);
639		743
640	e = readdir (dirp);	744	e = readdir (dirp);
641	errorno = errno;	745	errorno = errno;
642		746
643	if (e)	747	if (e)
…		…
646	strcpy (ent->d_name, e->d_name);	750	strcpy (ent->d_name, e->d_name);
647	}	751	}
648	else	752	else
649	*res = 0;	753	*res = 0;
650		754
651	pthread_mutex_unlock (&readdirlock);	755	UNLOCK (readdirlock);
652		756
653	errno = errorno;	757	errno = errorno;
654	return e ? 0 : -1;	758	return e ? 0 : -1;
655	}	759	}
656	#endif	760	#endif
657		761
658	/* sendfile always needs emulation */	762	/* sendfile always needs emulation */
659	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)	763	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
660	{	764	{
661	ssize_t res;	765	ssize_t res;
662		766
663	if (!count)	767	if (!count)
664	return 0;	768	return 0;
…		…
741		845
742	offset += cnt;	846	offset += cnt;
743	res += cnt;	847	res += cnt;
744	count -= cnt;	848	count -= cnt;
745	}	849	}
746
747	fBUF;
748	}	850	}
749		851
750	return res;	852	return res;
751	}	853	}
752		854
753	/* read a full directory */	855	/* read a full directory */
754	static int scandir_ (const char path, void *namesp)	856	static void scandir_ (aio_req req, worker *self)
755	{	857	{
756	DIR *dirp;	858	DIR *dirp;
757	union	859	union
758	{	860	{
759	struct dirent d;	861	struct dirent d;
…		…
764	int memlen = 4096;	866	int memlen = 4096;
765	int memofs = 0;	867	int memofs = 0;
766	int res = 0;	868	int res = 0;
767	int errorno;	869	int errorno;
768		870
769	dirp = opendir (path);	871	LOCK (wrklock);
770	if (!dirp)	872	self->dirp = dirp = opendir (req->dataptr);
771	return -1;
772
773	u = malloc (sizeof (*u));	873	self->dbuf = u = malloc (sizeof (*u));
		874	UNLOCK (wrklock);
		875
774	names = malloc (memlen);	876	req->data2ptr = names = malloc (memlen);
775		877
776	if (u && names)	878	if (dirp && u && names)
777	for (;;)	879	for (;;)
778	{	880	{
779	errno = 0;	881	errno = 0;
780	readdir_r (dirp, &u->d, &entp);	882	readdir_r (dirp, &u->d, &entp);
781		883
…		…
791	res++;	893	res++;
792		894
793	while (memofs + len > memlen)	895	while (memofs + len > memlen)
794	{	896	{
795	memlen *= 2;	897	memlen *= 2;
		898	LOCK (wrklock);
796	names = realloc (names, memlen);	899	req->data2ptr = names = realloc (names, memlen);
		900	UNLOCK (wrklock);
		901
797	if (!names)	902	if (!names)
798	break;	903	break;
799	}	904	}
800		905
801	memcpy (names + memofs, name, len);	906	memcpy (names + memofs, name, len);
802	memofs += len;	907	memofs += len;
803	}	908	}
804	}	909	}
805		910
806	errorno = errno;
807	free (u);
808	closedir (dirp);
809
810	if (errorno)	911	if (errno)
811	{
812	free (names);
813	errno = errorno;
814	res = -1;	912	res = -1;
815	}	913
816		914	req->result = res;
817	namesp = (void )names;
818	return res;
819	}	915	}
820		916
821	/*****************************************************************************/	917	/*****************************************************************************/
822		918
823	static void aio_proc (void thr_arg)	919	static void aio_proc (void thr_arg)
824	{	920	{
825	aio_req req;	921	aio_req req;
826	int type;	922	int type;
		923	worker self = (worker )thr_arg;
827		924
828	do	925	do
829	{	926	{
830	pthread_mutex_lock (&reqlock);	927	LOCK (reqlock);
831		928
832	for (;;)	929	for (;;)
833	{	930	{
834	req = reqs;	931	self->req = req = reqq_shift (&req_queue);
835
836	if (reqs)
837	{
838	reqs = reqs->next;
839	if (!reqs) reqe = 0;
840	}
841		932
842	if (req)	933	if (req)
843	break;	934	break;
844		935
845	pthread_cond_wait (&reqwait, &reqlock);	936	pthread_cond_wait (&reqwait, &reqlock);
846	}	937	}
847		938
848	pthread_mutex_unlock (&reqlock);	939	UNLOCK (reqlock);
849		940
850	errno = 0; /* strictly unnecessary */	941	errno = 0; /* strictly unnecessary */
851	type = req->type; /* remember type for QUIT check */	942	type = req->type; /* remember type for QUIT check */
852		943
853	if (!(req->flags & FLAG_CANCELLED))	944	if (!(req->flags & FLAG_CANCELLED))
…		…
855	{	946	{
856	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	947	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
857	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	948	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
858		949
859	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	950	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
860	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;	951	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
861		952
862	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	953	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
863	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	954	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
864	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	955	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
865		956
…		…
871	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	962	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
872	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	963	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
873		964
874	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	965	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
875	case REQ_FSYNC: req->result = fsync (req->fd); break;	966	case REQ_FSYNC: req->result = fsync (req->fd); break;
876	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	967	case REQ_READDIR: scandir_ (req, self); break;
877		968
878	case REQ_SLEEP:	969	case REQ_BUSY:
879	{	970	{
880	struct timeval tv;	971	struct timeval tv;
881		972
882	tv.tv_sec = req->fd;	973	tv.tv_sec = req->fd;
883	tv.tv_usec = req->fd2;	974	tv.tv_usec = req->fd2;
…		…
895	break;	986	break;
896	}	987	}
897		988
898	req->errorno = errno;	989	req->errorno = errno;
899		990
900	pthread_mutex_lock (&reslock);	991	LOCK (reslock);
901		992
902	req->next = 0;	993	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 */	994	/* write a dummy byte to the pipe so fh becomes ready */
914	write (respipe [1], &respipe, 1);	995	write (respipe [1], &respipe, 1);
915	}
916		996
917	pthread_mutex_unlock (&reslock);	997	self->req = 0;
		998	worker_clear (self);
		999
		1000	UNLOCK (reslock);
918	}	1001	}
919	while (type != REQ_QUIT);	1002	while (type != REQ_QUIT);
920		1003
		1004	LOCK (wrklock);
		1005	worker_free (self);
		1006	UNLOCK (wrklock);
		1007
921	return 0;	1008	return 0;
922	}	1009	}
923		1010
924	/*****************************************************************************/	1011	/*****************************************************************************/
925		1012
926	static void atfork_prepare (void)	1013	static void atfork_prepare (void)
927	{	1014	{
928	pthread_mutex_lock (&reqlock);	1015	LOCK (wrklock);
929	pthread_mutex_lock (&reslock);	1016	LOCK (reqlock);
		1017	LOCK (reslock);
930	#if !HAVE_PREADWRITE	1018	#if !HAVE_PREADWRITE
931	pthread_mutex_lock (&preadwritelock);	1019	LOCK (preadwritelock);
932	#endif	1020	#endif
933	#if !HAVE_READDIR_R	1021	#if !HAVE_READDIR_R
934	pthread_mutex_lock (&readdirlock);	1022	LOCK (readdirlock);
935	#endif	1023	#endif
936	}	1024	}
937		1025
938	static void atfork_parent (void)	1026	static void atfork_parent (void)
939	{	1027	{
940	#if !HAVE_READDIR_R	1028	#if !HAVE_READDIR_R
941	pthread_mutex_unlock (&readdirlock);	1029	UNLOCK (readdirlock);
942	#endif	1030	#endif
943	#if !HAVE_PREADWRITE	1031	#if !HAVE_PREADWRITE
944	pthread_mutex_unlock (&preadwritelock);	1032	UNLOCK (preadwritelock);
945	#endif	1033	#endif
946	pthread_mutex_unlock (&reslock);	1034	UNLOCK (reslock);
947	pthread_mutex_unlock (&reqlock);	1035	UNLOCK (reqlock);
		1036	UNLOCK (wrklock);
948	}	1037	}
949		1038
950	static void atfork_child (void)	1039	static void atfork_child (void)
951	{	1040	{
952	aio_req prv;	1041	aio_req prv;
953		1042
		1043	while (prv = reqq_shift (&req_queue))
		1044	req_free (prv);
		1045
		1046	while (prv = reqq_shift (&res_queue))
		1047	req_free (prv);
		1048
		1049	while (wrk_first.next != &wrk_first)
		1050	{
		1051	worker *wrk = wrk_first.next;
		1052
		1053	if (wrk->req)
		1054	req_free (wrk->req);
		1055
		1056	worker_clear (wrk);
		1057	worker_free (wrk);
		1058	}
		1059
954	started = 0;	1060	started = 0;
955		1061	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		1062
974	close (respipe [0]);	1063	close (respipe [0]);
975	close (respipe [1]);	1064	close (respipe [1]);
976	create_pipe ();	1065	create_pipe ();
977		1066
…		…
1022	void	1111	void
1023	max_parallel (nthreads)	1112	max_parallel (nthreads)
1024	int nthreads	1113	int nthreads
1025	PROTOTYPE: $	1114	PROTOTYPE: $
1026		1115
1027	int
1028	max_outstanding (nreqs)
1029	int nreqs
1030	PROTOTYPE: $
1031	CODE:
1032	RETVAL = max_outstanding;
1033	max_outstanding = nreqs;
1034
1035	void	1116	void
1036	aio_open (pathname,flags,mode,callback=&PL_sv_undef)	1117	aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1037	SV * pathname	1118	SV * pathname
1038	int flags	1119	int flags
1039	int mode	1120	int mode
…		…
1253		1334
1254	REQ_SEND;	1335	REQ_SEND;
1255	}	1336	}
1256		1337
1257	void	1338	void
1258	aio_sleep (delay,callback=&PL_sv_undef)	1339	aio_busy (delay,callback=&PL_sv_undef)
1259	double delay	1340	double delay
1260	SV * callback	1341	SV * callback
1261	PPCODE:	1342	PPCODE:
1262	{	1343	{
1263	dREQ;	1344	dREQ;
1264		1345
1265	req->type = REQ_SLEEP;	1346	req->type = REQ_BUSY;
1266	req->fd = delay < 0. ? 0 : delay;	1347	req->fd = delay < 0. ? 0 : delay;
1267	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1348	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1268		1349
1269	REQ_SEND;	1350	REQ_SEND;
1270	}	1351	}
…		…
1293	req->type = REQ_NOP;	1374	req->type = REQ_NOP;
1294		1375
1295	REQ_SEND;	1376	REQ_SEND;
1296	}	1377	}
1297		1378
1298	#if 0
1299
1300	void	1379	void
1301	aio_pri (int pri = DEFAULT_PRI)	1380	aioreq_pri (int pri = DEFAULT_PRI)
1302	CODE:	1381	CODE:
1303	if (pri < PRI_MIN) pri = PRI_MIN;	1382	if (pri < PRI_MIN) pri = PRI_MIN;
1304	if (pri > PRI_MAX) pri = PRI_MAX;	1383	if (pri > PRI_MAX) pri = PRI_MAX;
1305	next_pri = pri + PRI_BIAS;	1384	next_pri = pri + PRI_BIAS;
1306		1385
1307	#endif	1386	void
		1387	aioreq_nice (int nice = 0)
		1388	CODE:
		1389	nice = next_pri - nice;
		1390	if (nice < PRI_MIN) nice = PRI_MIN;
		1391	if (nice > PRI_MAX) nice = PRI_MAX;
		1392	next_pri = nice + PRI_BIAS;
1308		1393
1309	void	1394	void
1310	flush ()	1395	flush ()
1311	PROTOTYPE:	1396	PROTOTYPE:
1312	CODE:	1397	CODE:
…		…
1361		1446
1362	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1447	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363		1448
1364	void	1449	void
1365	cancel (aio_req_ornot req)	1450	cancel (aio_req_ornot req)
1366	PROTOTYPE:
1367	CODE:	1451	CODE:
1368	req_cancel (req);	1452	req_cancel (req);
1369		1453
1370	void	1454	void
1371	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1455	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
…		…
1407	}	1491	}
1408	}	1492	}
1409	}	1493	}
1410		1494
1411	void	1495	void
		1496	cancel_subs (aio_req_ornot req)
		1497	CODE:
		1498	req_cancel_subs (req);
		1499
		1500	void
1412	result (aio_req grp, ...)	1501	result (aio_req grp, ...)
1413	CODE:	1502	CODE:
1414	{	1503	{
1415	int i;	1504	int i;
1416	AV *av = newAV ();	1505	AV *av = newAV ();
…		…
1421	SvREFCNT_dec (grp->data);	1510	SvREFCNT_dec (grp->data);
1422	grp->data = (SV *)av;	1511	grp->data = (SV *)av;
1423	}	1512	}
1424		1513
1425	void	1514	void
1426	feed_limit (aio_req grp, int limit)	1515	limit (aio_req grp, int limit)
1427	CODE:	1516	CODE:
1428	grp->fd2 = limit;	1517	grp->fd2 = limit;
1429	aio_grp_feed (grp);	1518	aio_grp_feed (grp);
1430		1519
1431	void	1520	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.75 by root, Thu Oct 26 06:44:48 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.75 by root, Thu Oct 26 06:44:48 2006 UTC