[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.74 by root, Wed Oct 25 17:57:30 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;
115	static volatile int nreqs;	132	static volatile int nreqs;
116	static int max_outstanding = 1<<30;
117	static int respipe [2];	133	static int respipe [2];
118		134
119	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)	135	#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
120	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP	136	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121	#else	137	#else
122	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER	138	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123	#endif	139	#endif
124		140
		141	#define LOCK(mutex) pthread_mutex_lock (&(mutex))
		142	#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
		143
		144	/* worker threasd management */
		145	static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
		146
		147	typedef struct worker {
		148	/* locked by wrklock */
		149	struct worker prev, next;
		150
		151	pthread_t tid;
		152
		153	/* locked by reslock, reqlock or wrklock */
		154	aio_req req; /* currently processed request */
		155	void *dbuf;
		156	DIR *dirp;
		157	} worker;
		158
		159	static worker wrk_first = { &wrk_first, &wrk_first, 0 };
		160
		161	static void worker_clear (worker *wrk)
		162	{
		163	if (wrk->dirp)
		164	{
		165	closedir (wrk->dirp);
		166	wrk->dirp = 0;
		167	}
		168
		169	if (wrk->dbuf)
		170	{
		171	free (wrk->dbuf);
		172	wrk->dbuf = 0;
		173	}
		174	}
		175
		176	static void worker_free (worker *wrk)
		177	{
		178	wrk->next->prev = wrk->prev;
		179	wrk->prev->next = wrk->next;
		180
		181	free (wrk);
		182	}
		183
125	static pthread_mutex_t reslock = AIO_MUTEX_INIT;	184	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
126	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;	185	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	186	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128		187
129	static volatile aio_req reqs, reqe; /* queue start, queue end */	188	/*
130	static volatile aio_req ress, rese; /* queue start, queue end */	189	* a somewhat faster data structure might be nice, but
		190	* with 8 priorities this actually needs <20 insns
		191	* per shift, the most expensive operation.
		192	*/
		193	typedef struct {
		194	aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
		195	int size;
		196	} reqq;
131		197
		198	static reqq req_queue;
		199	static reqq res_queue;
		200
		201	int reqq_push (reqq *q, aio_req req)
		202	{
		203	int pri = req->pri;
		204	req->next = 0;
		205
		206	if (q->qe[pri])
		207	{
		208	q->qe[pri]->next = req;
		209	q->qe[pri] = req;
		210	}
		211	else
		212	q->qe[pri] = q->qs[pri] = req;
		213
		214	return q->size++;
		215	}
		216
		217	aio_req reqq_shift (reqq *q)
		218	{
		219	int pri;
		220
		221	if (!q->size)
		222	return 0;
		223
		224	--q->size;
		225
		226	for (pri = NUM_PRI; pri--; )
		227	{
		228	aio_req req = q->qs[pri];
		229
		230	if (req)
		231	{
		232	if (!(q->qs[pri] = req->next))
		233	q->qe[pri] = 0;
		234
		235	return req;
		236	}
		237	}
		238
		239	abort ();
		240	}
		241
		242	static int poll_cb ();
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;
…		…
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	{
443	sigset_t fullsigset, oldsigset;	562	sigset_t fullsigset, oldsigset;
444	pthread_t tid;
445	pthread_attr_t attr;	563	pthread_attr_t attr;
		564
		565	worker *wrk = calloc (1, sizeof (worker));
		566
		567	if (!wrk)
		568	croak ("unable to allocate worker thread data");
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
482	if (nreqs > max_outstanding)
483	for (;;)
484	{
485	poll_cb ();
486
487	if (nreqs <= max_outstanding)
488	break;
489
490	poll_wait ();
491	}
492	}	605	}
493		606
494	static void end_thread (void)	607	static void end_thread (void)
495	{	608	{
496	aio_req req;	609	aio_req req;
		610
497	Newz (0, req, 1, aio_cb);	611	Newz (0, req, 1, aio_cb);
		612
498	req->type = REQ_QUIT;	613	req->type = REQ_QUIT;
		614	req->pri = PRI_MAX + PRI_BIAS;
499		615
500	req_send (req);	616	req_send (req);
501	}	617	}
502		618
503	static void min_parallel (int nthreads)	619	static void min_parallel (int nthreads)
…		…
555	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)	671	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
556	{	672	{
557	ssize_t res;	673	ssize_t res;
558	off_t ooffset;	674	off_t ooffset;
559		675
560	pthread_mutex_lock (&preadwritelock);	676	LOCK (preadwritelock);
561	ooffset = lseek (fd, 0, SEEK_CUR);	677	ooffset = lseek (fd, 0, SEEK_CUR);
562	lseek (fd, offset, SEEK_SET);	678	lseek (fd, offset, SEEK_SET);
563	res = read (fd, buf, count);	679	res = read (fd, buf, count);
564	lseek (fd, ooffset, SEEK_SET);	680	lseek (fd, ooffset, SEEK_SET);
565	pthread_mutex_unlock (&preadwritelock);	681	UNLOCK (preadwritelock);
566		682
567	return res;	683	return res;
568	}	684	}
569		685
570	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)	686	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
571	{	687	{
572	ssize_t res;	688	ssize_t res;
573	off_t ooffset;	689	off_t ooffset;
574		690
575	pthread_mutex_lock (&preadwritelock);	691	LOCK (preadwritelock);
576	ooffset = lseek (fd, 0, SEEK_CUR);	692	ooffset = lseek (fd, 0, SEEK_CUR);
577	lseek (fd, offset, SEEK_SET);	693	lseek (fd, offset, SEEK_SET);
578	res = write (fd, buf, count);	694	res = write (fd, buf, count);
579	lseek (fd, offset, SEEK_SET);	695	lseek (fd, offset, SEEK_SET);
580	pthread_mutex_unlock (&preadwritelock);	696	UNLOCK (preadwritelock);
581		697
582	return res;	698	return res;
583	}	699	}
584	#endif	700	#endif
585		701
…		…
590	#if !HAVE_READAHEAD	706	#if !HAVE_READAHEAD
591	# define readahead aio_readahead	707	# define readahead aio_readahead
592		708
593	static ssize_t readahead (int fd, off_t offset, size_t count)	709	static ssize_t readahead (int fd, off_t offset, size_t count)
594	{	710	{
595	char readahead_buf[4096];	711	dBUF;
596		712
597	while (count > 0)	713	while (count > 0)
598	{	714	{
599	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);	715	size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
600		716
601	pread (fd, readahead_buf, len, offset);	717	pread (fd, aio_buf, len, offset);
602	offset += len;	718	offset += len;
603	count -= len;	719	count -= len;
604	}	720	}
605		721
606	errno = 0;	722	errno = 0;
…		…
615	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)	731	static int readdir_r (DIR dirp, struct dirent ent, struct dirent **res)
616	{	732	{
617	struct dirent *e;	733	struct dirent *e;
618	int errorno;	734	int errorno;
619		735
620	pthread_mutex_lock (&readdirlock);	736	LOCK (readdirlock);
621		737
622	e = readdir (dirp);	738	e = readdir (dirp);
623	errorno = errno;	739	errorno = errno;
624		740
625	if (e)	741	if (e)
…		…
628	strcpy (ent->d_name, e->d_name);	744	strcpy (ent->d_name, e->d_name);
629	}	745	}
630	else	746	else
631	*res = 0;	747	*res = 0;
632		748
633	pthread_mutex_unlock (&readdirlock);	749	UNLOCK (readdirlock);
634		750
635	errno = errorno;	751	errno = errorno;
636	return e ? 0 : -1;	752	return e ? 0 : -1;
637	}	753	}
638	#endif	754	#endif
639		755
640	/* sendfile always needs emulation */	756	/* sendfile always needs emulation */
641	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)	757	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
642	{	758	{
643	ssize_t res;	759	ssize_t res;
644		760
645	if (!count)	761	if (!count)
646	return 0;	762	return 0;
…		…
695	#endif	811	#endif
696	)	812	)
697	)	813	)
698	{	814	{
699	/* emulate sendfile. this is a major pain in the ass */	815	/* emulate sendfile. this is a major pain in the ass */
700	char buf[4096];	816	dBUF;
		817
701	res = 0;	818	res = 0;
702		819
703	while (count)	820	while (count)
704	{	821	{
705	ssize_t cnt;	822	ssize_t cnt;
706		823
707	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);	824	cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
708		825
709	if (cnt <= 0)	826	if (cnt <= 0)
710	{	827	{
711	if (cnt && !res) res = -1;	828	if (cnt && !res) res = -1;
712	break;	829	break;
713	}	830	}
714		831
715	cnt = write (ofd, buf, cnt);	832	cnt = write (ofd, aio_buf, cnt);
716		833
717	if (cnt <= 0)	834	if (cnt <= 0)
718	{	835	{
719	if (cnt && !res) res = -1;	836	if (cnt && !res) res = -1;
720	break;	837	break;
…		…
728		845
729	return res;	846	return res;
730	}	847	}
731		848
732	/* read a full directory */	849	/* read a full directory */
733	static int scandir_ (const char path, void *namesp)	850	static void scandir_ (aio_req req, worker *self)
734	{	851	{
735	DIR *dirp = opendir (path);	852	DIR *dirp;
736	union	853	union
737	{	854	{
738	struct dirent d;	855	struct dirent d;
739	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];	856	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
740	} u;	857	} *u;
741	struct dirent *entp;	858	struct dirent *entp;
742	char name, names;	859	char name, names;
743	int memlen = 4096;	860	int memlen = 4096;
744	int memofs = 0;	861	int memofs = 0;
745	int res = 0;	862	int res = 0;
746	int errorno;	863	int errorno;
747		864
748	if (!dirp)	865	LOCK (wrklock);
749	return -1;	866	self->dirp = dirp = opendir (req->dataptr);
		867	self->dbuf = u = malloc (sizeof (*u));
		868	UNLOCK (wrklock);
750		869
751	names = malloc (memlen);	870	req->data2ptr = names = malloc (memlen);
752		871
		872	if (dirp && u && names)
753	for (;;)	873	for (;;)
754	{	874	{
		875	errno = 0;
755	errno = 0, readdir_r (dirp, &u.d, &entp);	876	readdir_r (dirp, &u->d, &entp);
756		877
757	if (!entp)	878	if (!entp)
758	break;	879	break;
759		880
760	name = entp->d_name;	881	name = entp->d_name;
761		882
762	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	883	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
763	{	884	{
764	int len = strlen (name) + 1;	885	int len = strlen (name) + 1;
765		886
766	res++;	887	res++;
767		888
768	while (memofs + len > memlen)	889	while (memofs + len > memlen)
769	{	890	{
770	memlen *= 2;	891	memlen *= 2;
		892	LOCK (wrklock);
771	names = realloc (names, memlen);	893	req->data2ptr = names = realloc (names, memlen);
		894	UNLOCK (wrklock);
		895
772	if (!names)	896	if (!names)
773	break;	897	break;
774	}	898	}
775		899
776	memcpy (names + memofs, name, len);	900	memcpy (names + memofs, name, len);
777	memofs += len;	901	memofs += len;
778	}	902	}
779	}	903	}
780		904
781	errorno = errno;
782	closedir (dirp);
783
784	if (errorno)	905	if (errno)
785	{
786	free (names);
787	errno = errorno;
788	res = -1;	906	res = -1;
789	}	907
790		908	req->result = res;
791	namesp = (void )names;
792	return res;
793	}	909	}
794		910
795	/*****************************************************************************/	911	/*****************************************************************************/
796		912
797	static void aio_proc (void thr_arg)	913	static void aio_proc (void thr_arg)
798	{	914	{
799	aio_req req;	915	aio_req req;
800	int type;	916	int type;
		917	worker self = (worker )thr_arg;
801		918
802	do	919	do
803	{	920	{
804	pthread_mutex_lock (&reqlock);	921	LOCK (reqlock);
805		922
806	for (;;)	923	for (;;)
807	{	924	{
808	req = reqs;	925	self->req = req = reqq_shift (&req_queue);
809
810	if (reqs)
811	{
812	reqs = reqs->next;
813	if (!reqs) reqe = 0;
814	}
815		926
816	if (req)	927	if (req)
817	break;	928	break;
818		929
819	pthread_cond_wait (&reqwait, &reqlock);	930	pthread_cond_wait (&reqwait, &reqlock);
820	}	931	}
821		932
822	pthread_mutex_unlock (&reqlock);	933	UNLOCK (reqlock);
823		934
824	errno = 0; /* strictly unnecessary */	935	errno = 0; /* strictly unnecessary */
825	type = req->type; /* remember type for QUIT check */	936	type = req->type; /* remember type for QUIT check */
826		937
827	if (!(req->flags & FLAG_CANCELLED))	938	if (!(req->flags & FLAG_CANCELLED))
…		…
829	{	940	{
830	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	941	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;	942	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
832		943
833	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	944	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;	945	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
835		946
836	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	947	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
837	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	948	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
838	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	949	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
839		950
…		…
845	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	956	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
846	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	957	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
847		958
848	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	959	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
849	case REQ_FSYNC: req->result = fsync (req->fd); break;	960	case REQ_FSYNC: req->result = fsync (req->fd); break;
850	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	961	case REQ_READDIR: scandir_ (req, self); break;
851		962
852	case REQ_SLEEP:	963	case REQ_BUSY:
853	{	964	{
854	struct timeval tv;	965	struct timeval tv;
855		966
856	tv.tv_sec = req->fd;	967	tv.tv_sec = req->fd;
857	tv.tv_usec = req->fd2;	968	tv.tv_usec = req->fd2;
…		…
869	break;	980	break;
870	}	981	}
871		982
872	req->errorno = errno;	983	req->errorno = errno;
873		984
874	pthread_mutex_lock (&reslock);	985	LOCK (reslock);
875		986
876	req->next = 0;	987	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 */	988	/* write a dummy byte to the pipe so fh becomes ready */
888	write (respipe [1], &respipe, 1);	989	write (respipe [1], &respipe, 1);
889	}
890		990
891	pthread_mutex_unlock (&reslock);	991	self->req = 0;
		992	worker_clear (self);
		993
		994	UNLOCK (reslock);
892	}	995	}
893	while (type != REQ_QUIT);	996	while (type != REQ_QUIT);
894		997
		998	LOCK (wrklock);
		999	worker_free (self);
		1000	UNLOCK (wrklock);
		1001
895	return 0;	1002	return 0;
896	}	1003	}
897		1004
898	/*****************************************************************************/	1005	/*****************************************************************************/
899		1006
900	static void atfork_prepare (void)	1007	static void atfork_prepare (void)
901	{	1008	{
902	pthread_mutex_lock (&reqlock);	1009	LOCK (wrklock);
903	pthread_mutex_lock (&reslock);	1010	LOCK (reqlock);
		1011	LOCK (reslock);
904	#if !HAVE_PREADWRITE	1012	#if !HAVE_PREADWRITE
905	pthread_mutex_lock (&preadwritelock);	1013	LOCK (preadwritelock);
906	#endif	1014	#endif
907	#if !HAVE_READDIR_R	1015	#if !HAVE_READDIR_R
908	pthread_mutex_lock (&readdirlock);	1016	LOCK (readdirlock);
909	#endif	1017	#endif
910	}	1018	}
911		1019
912	static void atfork_parent (void)	1020	static void atfork_parent (void)
913	{	1021	{
914	#if !HAVE_READDIR_R	1022	#if !HAVE_READDIR_R
915	pthread_mutex_unlock (&readdirlock);	1023	UNLOCK (readdirlock);
916	#endif	1024	#endif
917	#if !HAVE_PREADWRITE	1025	#if !HAVE_PREADWRITE
918	pthread_mutex_unlock (&preadwritelock);	1026	UNLOCK (preadwritelock);
919	#endif	1027	#endif
920	pthread_mutex_unlock (&reslock);	1028	UNLOCK (reslock);
921	pthread_mutex_unlock (&reqlock);	1029	UNLOCK (reqlock);
		1030	UNLOCK (wrklock);
922	}	1031	}
923		1032
924	static void atfork_child (void)	1033	static void atfork_child (void)
925	{	1034	{
926	aio_req prv;	1035	aio_req prv;
927		1036
		1037	while (prv = reqq_shift (&req_queue))
		1038	req_free (prv);
		1039
		1040	while (prv = reqq_shift (&res_queue))
		1041	req_free (prv);
		1042
		1043	while (wrk_first.next != &wrk_first)
		1044	{
		1045	worker *wrk = wrk_first.next;
		1046
		1047	if (wrk->req)
		1048	req_free (wrk->req);
		1049
		1050	worker_clear (wrk);
		1051	worker_free (wrk);
		1052	}
		1053
928	started = 0;	1054	started = 0;
929		1055	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		1056
948	close (respipe [0]);	1057	close (respipe [0]);
949	close (respipe [1]);	1058	close (respipe [1]);
950	create_pipe ();	1059	create_pipe ();
951		1060
…		…
996	void	1105	void
997	max_parallel (nthreads)	1106	max_parallel (nthreads)
998	int nthreads	1107	int nthreads
999	PROTOTYPE: $	1108	PROTOTYPE: $
1000		1109
1001	int
1002	max_outstanding (nreqs)
1003	int nreqs
1004	PROTOTYPE: $
1005	CODE:
1006	RETVAL = max_outstanding;
1007	max_outstanding = nreqs;
1008
1009	void	1110	void
1010	aio_open (pathname,flags,mode,callback=&PL_sv_undef)	1111	aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1011	SV * pathname	1112	SV * pathname
1012	int flags	1113	int flags
1013	int mode	1114	int mode
…		…
1227		1328
1228	REQ_SEND;	1329	REQ_SEND;
1229	}	1330	}
1230		1331
1231	void	1332	void
1232	aio_sleep (delay,callback=&PL_sv_undef)	1333	aio_busy (delay,callback=&PL_sv_undef)
1233	double delay	1334	double delay
1234	SV * callback	1335	SV * callback
1235	PPCODE:	1336	PPCODE:
1236	{	1337	{
1237	dREQ;	1338	dREQ;
1238		1339
1239	req->type = REQ_SLEEP;	1340	req->type = REQ_BUSY;
1240	req->fd = delay < 0. ? 0 : delay;	1341	req->fd = delay < 0. ? 0 : delay;
1241	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1342	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1242		1343
1243	REQ_SEND;	1344	REQ_SEND;
1244	}	1345	}
…		…
1267	req->type = REQ_NOP;	1368	req->type = REQ_NOP;
1268		1369
1269	REQ_SEND;	1370	REQ_SEND;
1270	}	1371	}
1271		1372
1272	#if 0
1273
1274	void	1373	void
1275	aio_pri (int pri = DEFAULT_PRI)	1374	aioreq_pri (int pri = DEFAULT_PRI)
1276	CODE:	1375	CODE:
1277	if (pri < PRI_MIN) pri = PRI_MIN;	1376	if (pri < PRI_MIN) pri = PRI_MIN;
1278	if (pri > PRI_MAX) pri = PRI_MAX;	1377	if (pri > PRI_MAX) pri = PRI_MAX;
1279	next_pri = pri + PRI_BIAS;	1378	next_pri = pri + PRI_BIAS;
1280		1379
1281	#endif	1380	void
		1381	aioreq_nice (int nice = 0)
		1382	CODE:
		1383	nice = next_pri - nice;
		1384	if (nice < PRI_MIN) nice = PRI_MIN;
		1385	if (nice > PRI_MAX) nice = PRI_MAX;
		1386	next_pri = nice + PRI_BIAS;
1282		1387
1283	void	1388	void
1284	flush ()	1389	flush ()
1285	PROTOTYPE:	1390	PROTOTYPE:
1286	CODE:	1391	CODE:
…		…
1335		1440
1336	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1441	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1337		1442
1338	void	1443	void
1339	cancel (aio_req_ornot req)	1444	cancel (aio_req_ornot req)
1340	PROTOTYPE:
1341	CODE:	1445	CODE:
1342	req_cancel (req);	1446	req_cancel (req);
1343		1447
1344	void	1448	void
1345	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1449	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
…		…
1381	}	1485	}
1382	}	1486	}
1383	}	1487	}
1384		1488
1385	void	1489	void
		1490	cancel_subs (aio_req_ornot req)
		1491	CODE:
		1492	req_cancel_subs (req);
		1493
		1494	void
1386	result (aio_req grp, ...)	1495	result (aio_req grp, ...)
1387	CODE:	1496	CODE:
1388	{	1497	{
1389	int i;	1498	int i;
1390	AV *av = newAV ();	1499	AV *av = newAV ();
…		…
1395	SvREFCNT_dec (grp->data);	1504	SvREFCNT_dec (grp->data);
1396	grp->data = (SV *)av;	1505	grp->data = (SV *)av;
1397	}	1506	}
1398		1507
1399	void	1508	void
1400	feed_limit (aio_req grp, int limit)	1509	limit (aio_req grp, int limit)
1401	CODE:	1510	CODE:
1402	grp->fd2 = limit;	1511	grp->fd2 = limit;
1403	aio_grp_feed (grp);	1512	aio_grp_feed (grp);
1404		1513
1405	void	1514	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.74 by root, Wed Oct 25 17:57:30 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.74 by root, Wed Oct 25 17:57:30 2006 UTC