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