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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.66 by root, Tue Oct 24 00:34:47 2006 UTC vs.
Revision 1.73 by root, Tue Oct 24 21:26: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
56		59
57	/* buffer size for various temporary buffers */	60	/* buffer size for various temporary buffers */
58	#define AIO_BUFSIZE 65536	61	#define AIO_BUFSIZE 65536
59		62
60	#define dBUF \	63	#define dBUF \
		64	char *aio_buf; \
		65	LOCK (wrklock); \
61	char *aio_buf = malloc (AIO_BUFSIZE); \	66	self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
		67	UNLOCK (wrklock); \
62	if (!aio_buf) \	68	if (!aio_buf) \
63	return -1;	69	return -1;
64
65	#define fBUF free (aio_buf)
66		70
67	enum {	71	enum {
68	REQ_QUIT,	72	REQ_QUIT,
69	REQ_OPEN, REQ_CLOSE,	73	REQ_OPEN, REQ_CLOSE,
70	REQ_READ, REQ_WRITE, REQ_READAHEAD,	74	REQ_READ, REQ_WRITE, REQ_READAHEAD,
…		…
73	REQ_FSYNC, REQ_FDATASYNC,	77	REQ_FSYNC, REQ_FDATASYNC,
74	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	78	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75	REQ_READDIR,	79	REQ_READDIR,
76	REQ_LINK, REQ_SYMLINK,	80	REQ_LINK, REQ_SYMLINK,
77	REQ_GROUP, REQ_NOP,	81	REQ_GROUP, REQ_NOP,
78	REQ_SLEEP,	82	REQ_BUSY,
79	};	83	};
80		84
81	#define AIO_REQ_KLASS "IO::AIO::REQ"	85	#define AIO_REQ_KLASS "IO::AIO::REQ"
82	#define AIO_GRP_KLASS "IO::AIO::GRP"	86	#define AIO_GRP_KLASS "IO::AIO::GRP"
83		87
…		…
117	PRI_MIN = -4,	121	PRI_MIN = -4,
118	PRI_MAX = 4,	122	PRI_MAX = 4,
119		123
120	DEFAULT_PRI = 0,	124	DEFAULT_PRI = 0,
121	PRI_BIAS = -PRI_MIN,	125	PRI_BIAS = -PRI_MIN,
		126	NUM_PRI = PRI_MAX + PRI_BIAS + 1,
122	};	127	};
123		128
124	static int next_pri = DEFAULT_PRI + PRI_BIAS;	129	static int next_pri = DEFAULT_PRI + PRI_BIAS;
125		130
126	static int started, wanted;	131	static int started, wanted;
…		…
132	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP	137	# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133	#else	138	#else
134	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER	139	# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135	#endif	140	#endif
136		141
		142	#define LOCK(mutex) pthread_mutex_lock (&(mutex))
		143	#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
		144
		145	/* worker threasd management */
		146	static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
		147
		148	typedef struct worker {
		149	/* locked by wrklock */
		150	struct worker prev, next;
		151
		152	pthread_t tid;
		153
		154	/* locked by reslock, reqlock or wrklock */
		155	aio_req req; /* currently processed request */
		156	void *dbuf;
		157	DIR *dirp;
		158	} worker;
		159
		160	static worker wrk_first = { &wrk_first, &wrk_first, 0 };
		161
		162	static void worker_clear (worker *wrk)
		163	{
		164	if (wrk->dirp)
		165	{
		166	closedir (wrk->dirp);
		167	wrk->dirp = 0;
		168	}
		169
		170	if (wrk->dbuf)
		171	{
		172	free (wrk->dbuf);
		173	wrk->dbuf = 0;
		174	}
		175	}
		176
		177	static void worker_free (worker *wrk)
		178	{
		179	wrk->next->prev = wrk->prev;
		180	wrk->prev->next = wrk->next;
		181
		182	free (wrk);
		183	}
		184
137	static pthread_mutex_t reslock = AIO_MUTEX_INIT;	185	static pthread_mutex_t reslock = AIO_MUTEX_INIT;
138	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;	186	static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
139	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	187	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
140		188
141	static volatile aio_req reqs, reqe; /* queue start, queue end */	189	/*
142	static volatile aio_req ress, rese; /* queue start, queue end */	190	* a somewhat faster data structure might be nice, but
		191	* with 8 priorities this actually needs <20 insns
		192	* per shift, the most expensive operation.
		193	*/
		194	typedef struct {
		195	aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
		196	int size;
		197	} reqq;
		198
		199	static reqq req_queue;
		200	static reqq res_queue;
		201
		202	int reqq_push (reqq *q, aio_req req)
		203	{
		204	int pri = req->pri;
		205	req->next = 0;
		206
		207	if (q->qe[pri])
		208	{
		209	q->qe[pri]->next = req;
		210	q->qe[pri] = req;
		211	}
		212	else
		213	q->qe[pri] = q->qs[pri] = req;
		214
		215	return q->size++;
		216	}
		217
		218	aio_req reqq_shift (reqq *q)
		219	{
		220	int pri;
		221
		222	if (!q->size)
		223	return 0;
		224
		225	--q->size;
		226
		227	for (pri = NUM_PRI; pri--; )
		228	{
		229	aio_req req = q->qs[pri];
		230
		231	if (req)
		232	{
		233	if (!(q->qs[pri] = req->next))
		234	q->qe[pri] = 0;
		235
		236	return req;
		237	}
		238	}
		239
		240	abort ();
		241	}
143		242
144	static void req_invoke (aio_req req);	243	static void req_invoke (aio_req req);
145	static void req_free (aio_req req);	244	static void req_free (aio_req req);
		245	static void req_cancel (aio_req req);
146		246
147	/* must be called at most once */	247	/* must be called at most once */
148	static SV req_sv (aio_req req, const char klass)	248	static SV req_sv (aio_req req, const char klass)
149	{	249	{
150	if (!req->self)	250	if (!req->self)
…		…
181	ENTER;	281	ENTER;
182	SAVETMPS;	282	SAVETMPS;
183	PUSHMARK (SP);	283	PUSHMARK (SP);
184	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	284	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185	PUTBACK;	285	PUTBACK;
186	call_sv (grp->fh2, G_VOID \| G_EVAL);	286	call_sv (grp->fh2, G_VOID \| G_EVAL \| G_KEEPERR);
187	SPAGAIN;	287	SPAGAIN;
188	FREETMPS;	288	FREETMPS;
189	LEAVE;	289	LEAVE;
190	}	290	}
191		291
…		…
218	{	318	{
219	fd_set rfd;	319	fd_set rfd;
220		320
221	while (nreqs)	321	while (nreqs)
222	{	322	{
223	aio_req req;	323	int size;
224	#if !(__i386 \|\| __x86_64) /* safe without sempahore on this archs */	324	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
225	pthread_mutex_lock (&reslock);	325	LOCK (reslock);
226	#endif	326	#endif
227	req = ress;	327	size = res_queue.size;
228	#if !(__i386 \|\| __x86_64) /* safe without sempahore on this archs */	328	#if !(__i386 \|\| __x86_64) /* safe without sempahore on these archs */
229	pthread_mutex_unlock (&reslock);	329	UNLOCK (reslock);
230	#endif	330	#endif
231		331
232	if (req)	332	if (size)
233	return;	333	return;
234		334
235	FD_ZERO(&rfd);	335	FD_ZERO(&rfd);
236	FD_SET(respipe [0], &rfd);	336	FD_SET(respipe [0], &rfd);
237		337
…		…
240	}	340	}
241		341
242	static void req_invoke (aio_req req)	342	static void req_invoke (aio_req req)
243	{	343	{
244	dSP;	344	dSP;
245	int errorno = errno;
246		345
247	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))	346	if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
248	return;	347	{
249
250	errno = req->errorno;	348	errno = req->errorno;
251		349
252	ENTER;	350	ENTER;
253	SAVETMPS;	351	SAVETMPS;
254	PUSHMARK (SP);	352	PUSHMARK (SP);
255	EXTEND (SP, 1);	353	EXTEND (SP, 1);
256		354
257	switch (req->type)	355	switch (req->type)
258	{
259	case REQ_READDIR:
260	{	356	{
261	SV *rv = &PL_sv_undef;	357	case REQ_READDIR:
262
263	if (req->result >= 0)
264	{	358	{
265	char *buf = req->data2ptr;	359	SV *rv = &PL_sv_undef;
266	AV *av = newAV ();
267		360
268	while (req->result)	361	if (req->result >= 0)
269	{	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	{
270	SV *sv = newSVpv (buf, 0);	371	SV *sv = newSVpv (buf, 0);
271		372
272	av_push (av, sv);	373	av_store (av, i, sv);
273	buf += SvCUR (sv) + 1;	374	buf += SvCUR (sv) + 1;
274	req->result--;	375	}
		376
		377	rv = sv_2mortal (newRV_noinc ((SV *)av));
275	}	378	}
276		379
277	rv = sv_2mortal (newRV_noinc ((SV *)av));	380	PUSHs (rv);
278	}	381	}
		382	break;
279		383
280	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;
281	}	422	}
282	break;
283		423
284	case REQ_OPEN:
285	{
286	/* convert fd to fh */
287	SV *fh;
288		424
289	PUSHs (sv_2mortal (newSViv (req->result)));
290	PUTBACK;	425	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);	426	call_sv (req->callback, G_VOID \| G_EVAL);
327	SPAGAIN;	427	SPAGAIN;
328		428
329	FREETMPS;	429	FREETMPS;
330	LEAVE;	430	LEAVE;
331
332	errno = errorno;
333
334	if (SvTRUE (ERRSV))
335	{	431	}
336	req_free (req);
337	croak (0);
338	}
339	}
340		432
341	static void req_free (aio_req req)
342	{
343	if (req->grp)	433	if (req->grp)
344	{	434	{
345	aio_req grp = req->grp;	435	aio_req grp = req->grp;
346		436
347	/* unlink request */	437	/* unlink request */
…		…
352	grp->grp_first = req->grp_next;	442	grp->grp_first = req->grp_next;
353		443
354	aio_grp_dec (grp);	444	aio_grp_dec (grp);
355	}	445	}
356		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	{
357	if (req->self)	456	if (req->self)
358	{	457	{
359	sv_unmagic (req->self, PERL_MAGIC_ext);	458	sv_unmagic (req->self, PERL_MAGIC_ext);
360	SvREFCNT_dec (req->self);	459	SvREFCNT_dec (req->self);
361	}	460	}
…		…
364	SvREFCNT_dec (req->fh);	463	SvREFCNT_dec (req->fh);
365	SvREFCNT_dec (req->fh2);	464	SvREFCNT_dec (req->fh2);
366	SvREFCNT_dec (req->callback);	465	SvREFCNT_dec (req->callback);
367	Safefree (req->statdata);	466	Safefree (req->statdata);
368		467
369	if (req->type == REQ_READDIR && req->result >= 0)	468	if (req->type == REQ_READDIR)
370	free (req->data2ptr);	469	free (req->data2ptr);
371		470
372	Safefree (req);	471	Safefree (req);
373	}	472	}
374		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
375	static void req_cancel (aio_req req)	488	static void req_cancel (aio_req req)
376	{	489	{
377	req->flags \|= FLAG_CANCELLED;	490	req->flags \|= FLAG_CANCELLED;
378		491
379	if (req->type == REQ_GROUP)	492	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	}	493	}
387		494
388	static int poll_cb ()	495	static int poll_cb ()
389	{	496	{
390	dSP;	497	dSP;
…		…
392	int do_croak = 0;	499	int do_croak = 0;
393	aio_req req;	500	aio_req req;
394		501
395	for (;;)	502	for (;;)
396	{	503	{
397	pthread_mutex_lock (&reslock);	504	LOCK (reslock);
398	req = ress;	505	req = reqq_shift (&res_queue);
399		506
400	if (req)	507	if (req)
401	{	508	{
402	ress = req->next;
403
404	if (!ress)	509	if (!res_queue.size)
405	{	510	{
406	/* read any signals sent by the worker threads */	511	/* read any signals sent by the worker threads */
407	char buf [32];	512	char buf [32];
408	while (read (respipe [0], buf, 32) == 32)	513	while (read (respipe [0], buf, 32) == 32)
409	;	514	;
410
411	rese = 0;
412	}	515	}
413	}	516	}
414		517
415	pthread_mutex_unlock (&reslock);	518	UNLOCK (reslock);
416		519
417	if (!req)	520	if (!req)
418	break;	521	break;
419		522
420	--nreqs;	523	--nreqs;
…		…
455	static void aio_proc(void arg);	558	static void aio_proc(void arg);
456		559
457	static void start_thread (void)	560	static void start_thread (void)
458	{	561	{
459	sigset_t fullsigset, oldsigset;	562	sigset_t fullsigset, oldsigset;
460	pthread_t tid;
461	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");
462		569
463	pthread_attr_init (&attr);	570	pthread_attr_init (&attr);
464	pthread_attr_setstacksize (&attr, STACKSIZE);	571	pthread_attr_setstacksize (&attr, STACKSIZE);
465	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);	572	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
466		573
467	sigfillset (&fullsigset);	574	sigfillset (&fullsigset);
		575
		576	LOCK (wrklock);
468	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);	577	sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469		578
470	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;
471	started++;	585	started++;
		586	}
		587	else
		588	free (wrk);
472		589
473	sigprocmask (SIG_SETMASK, &oldsigset, 0);	590	sigprocmask (SIG_SETMASK, &oldsigset, 0);
		591	UNLOCK (wrklock);
474	}	592	}
475		593
476	static void req_send (aio_req req)	594	static void req_send (aio_req req)
477	{	595	{
478	while (started < wanted && nreqs >= started)	596	while (started < wanted && nreqs >= started)
479	start_thread ();	597	start_thread ();
480		598
481	++nreqs;	599	++nreqs;
482		600
483	pthread_mutex_lock (&reqlock);	601	LOCK (reqlock);
484		602	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);	603	pthread_cond_signal (&reqwait);
496	pthread_mutex_unlock (&reqlock);	604	UNLOCK (reqlock);
497		605
498	if (nreqs > max_outstanding)	606	if (nreqs > max_outstanding)
499	for (;;)	607	for (;;)
500	{	608	{
501	poll_cb ();	609	poll_cb ();
…		…
508	}	616	}
509		617
510	static void end_thread (void)	618	static void end_thread (void)
511	{	619	{
512	aio_req req;	620	aio_req req;
		621
513	Newz (0, req, 1, aio_cb);	622	Newz (0, req, 1, aio_cb);
		623
514	req->type = REQ_QUIT;	624	req->type = REQ_QUIT;
		625	req->pri = PRI_MAX + PRI_BIAS;
515		626
516	req_send (req);	627	req_send (req);
517	}	628	}
518		629
519	static void min_parallel (int nthreads)	630	static void min_parallel (int nthreads)
…		…
571	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)
572	{	683	{
573	ssize_t res;	684	ssize_t res;
574	off_t ooffset;	685	off_t ooffset;
575		686
576	pthread_mutex_lock (&preadwritelock);	687	LOCK (preadwritelock);
577	ooffset = lseek (fd, 0, SEEK_CUR);	688	ooffset = lseek (fd, 0, SEEK_CUR);
578	lseek (fd, offset, SEEK_SET);	689	lseek (fd, offset, SEEK_SET);
579	res = read (fd, buf, count);	690	res = read (fd, buf, count);
580	lseek (fd, ooffset, SEEK_SET);	691	lseek (fd, ooffset, SEEK_SET);
581	pthread_mutex_unlock (&preadwritelock);	692	UNLOCK (preadwritelock);
582		693
583	return res;	694	return res;
584	}	695	}
585		696
586	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)
587	{	698	{
588	ssize_t res;	699	ssize_t res;
589	off_t ooffset;	700	off_t ooffset;
590		701
591	pthread_mutex_lock (&preadwritelock);	702	LOCK (preadwritelock);
592	ooffset = lseek (fd, 0, SEEK_CUR);	703	ooffset = lseek (fd, 0, SEEK_CUR);
593	lseek (fd, offset, SEEK_SET);	704	lseek (fd, offset, SEEK_SET);
594	res = write (fd, buf, count);	705	res = write (fd, buf, count);
595	lseek (fd, offset, SEEK_SET);	706	lseek (fd, offset, SEEK_SET);
596	pthread_mutex_unlock (&preadwritelock);	707	UNLOCK (preadwritelock);
597		708
598	return res;	709	return res;
599	}	710	}
600	#endif	711	#endif
601		712
…		…
617	pread (fd, aio_buf, len, offset);	728	pread (fd, aio_buf, len, offset);
618	offset += len;	729	offset += len;
619	count -= len;	730	count -= len;
620	}	731	}
621		732
622	fBUF;
623
624	errno = 0;	733	errno = 0;
625	}	734	}
626	#endif	735	#endif
627		736
628	#if !HAVE_READDIR_R	737	#if !HAVE_READDIR_R
…		…
633	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)
634	{	743	{
635	struct dirent *e;	744	struct dirent *e;
636	int errorno;	745	int errorno;
637		746
638	pthread_mutex_lock (&readdirlock);	747	LOCK (readdirlock);
639		748
640	e = readdir (dirp);	749	e = readdir (dirp);
641	errorno = errno;	750	errorno = errno;
642		751
643	if (e)	752	if (e)
…		…
646	strcpy (ent->d_name, e->d_name);	755	strcpy (ent->d_name, e->d_name);
647	}	756	}
648	else	757	else
649	*res = 0;	758	*res = 0;
650		759
651	pthread_mutex_unlock (&readdirlock);	760	UNLOCK (readdirlock);
652		761
653	errno = errorno;	762	errno = errorno;
654	return e ? 0 : -1;	763	return e ? 0 : -1;
655	}	764	}
656	#endif	765	#endif
657		766
658	/* sendfile always needs emulation */	767	/* sendfile always needs emulation */
659	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)
660	{	769	{
661	ssize_t res;	770	ssize_t res;
662		771
663	if (!count)	772	if (!count)
664	return 0;	773	return 0;
…		…
741		850
742	offset += cnt;	851	offset += cnt;
743	res += cnt;	852	res += cnt;
744	count -= cnt;	853	count -= cnt;
745	}	854	}
746
747	fBUF;
748	}	855	}
749		856
750	return res;	857	return res;
751	}	858	}
752		859
753	/* read a full directory */	860	/* read a full directory */
754	static int scandir_ (const char path, void *namesp)	861	static void scandir_ (aio_req req, worker *self)
755	{	862	{
756	DIR *dirp;	863	DIR *dirp;
757	union	864	union
758	{	865	{
759	struct dirent d;	866	struct dirent d;
…		…
764	int memlen = 4096;	871	int memlen = 4096;
765	int memofs = 0;	872	int memofs = 0;
766	int res = 0;	873	int res = 0;
767	int errorno;	874	int errorno;
768		875
769	dirp = opendir (path);	876	LOCK (wrklock);
770	if (!dirp)	877	self->dirp = dirp = opendir (req->dataptr);
771	return -1;
772
773	u = malloc (sizeof (*u));	878	self->dbuf = u = malloc (sizeof (*u));
		879	UNLOCK (wrklock);
		880
774	names = malloc (memlen);	881	req->data2ptr = names = malloc (memlen);
775		882
776	if (u && names)	883	if (dirp && u && names)
777	for (;;)	884	for (;;)
778	{	885	{
779	errno = 0;	886	errno = 0;
780	readdir_r (dirp, &u->d, &entp);	887	readdir_r (dirp, &u->d, &entp);
781		888
…		…
791	res++;	898	res++;
792		899
793	while (memofs + len > memlen)	900	while (memofs + len > memlen)
794	{	901	{
795	memlen *= 2;	902	memlen *= 2;
		903	LOCK (wrklock);
796	names = realloc (names, memlen);	904	req->data2ptr = names = realloc (names, memlen);
		905	UNLOCK (wrklock);
		906
797	if (!names)	907	if (!names)
798	break;	908	break;
799	}	909	}
800		910
801	memcpy (names + memofs, name, len);	911	memcpy (names + memofs, name, len);
802	memofs += len;	912	memofs += len;
803	}	913	}
804	}	914	}
805		915
806	errorno = errno;
807	free (u);
808	closedir (dirp);
809
810	if (errorno)	916	if (errno)
811	{
812	free (names);
813	errno = errorno;
814	res = -1;	917	res = -1;
815	}	918
816		919	req->result = res;
817	namesp = (void )names;
818	return res;
819	}	920	}
820		921
821	/*****************************************************************************/	922	/*****************************************************************************/
822		923
823	static void aio_proc (void thr_arg)	924	static void aio_proc (void thr_arg)
824	{	925	{
825	aio_req req;	926	aio_req req;
826	int type;	927	int type;
		928	worker self = (worker )thr_arg;
827		929
828	do	930	do
829	{	931	{
830	pthread_mutex_lock (&reqlock);	932	LOCK (reqlock);
831		933
832	for (;;)	934	for (;;)
833	{	935	{
834	req = reqs;	936	self->req = req = reqq_shift (&req_queue);
835
836	if (reqs)
837	{
838	reqs = reqs->next;
839	if (!reqs) reqe = 0;
840	}
841		937
842	if (req)	938	if (req)
843	break;	939	break;
844		940
845	pthread_cond_wait (&reqwait, &reqlock);	941	pthread_cond_wait (&reqwait, &reqlock);
846	}	942	}
847		943
848	pthread_mutex_unlock (&reqlock);	944	UNLOCK (reqlock);
849		945
850	errno = 0; /* strictly unnecessary */	946	errno = 0; /* strictly unnecessary */
851	type = req->type; /* remember type for QUIT check */	947	type = req->type; /* remember type for QUIT check */
852		948
853	if (!(req->flags & FLAG_CANCELLED))	949	if (!(req->flags & FLAG_CANCELLED))
…		…
855	{	951	{
856	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;
857	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;
858		954
859	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;
860	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;
861		957
862	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	958	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
863	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	959	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
864	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	960	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
865		961
…		…
871	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;	967	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
872	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;	968	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
873		969
874	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	970	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
875	case REQ_FSYNC: req->result = fsync (req->fd); break;	971	case REQ_FSYNC: req->result = fsync (req->fd); break;
876	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;	972	case REQ_READDIR: scandir_ (req, self); break;
877		973
878	case REQ_SLEEP:	974	case REQ_BUSY:
879	{	975	{
880	struct timeval tv;	976	struct timeval tv;
881		977
882	tv.tv_sec = req->fd;	978	tv.tv_sec = req->fd;
883	tv.tv_usec = req->fd2;	979	tv.tv_usec = req->fd2;
…		…
895	break;	991	break;
896	}	992	}
897		993
898	req->errorno = errno;	994	req->errorno = errno;
899		995
900	pthread_mutex_lock (&reslock);	996	LOCK (reslock);
901		997
902	req->next = 0;	998	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 */	999	/* write a dummy byte to the pipe so fh becomes ready */
914	write (respipe [1], &respipe, 1);	1000	write (respipe [1], &respipe, 1);
915	}
916		1001
917	pthread_mutex_unlock (&reslock);	1002	self->req = 0;
		1003	worker_clear (self);
		1004
		1005	UNLOCK (reslock);
918	}	1006	}
919	while (type != REQ_QUIT);	1007	while (type != REQ_QUIT);
920		1008
		1009	LOCK (wrklock);
		1010	worker_free (self);
		1011	UNLOCK (wrklock);
		1012
921	return 0;	1013	return 0;
922	}	1014	}
923		1015
924	/*****************************************************************************/	1016	/*****************************************************************************/
925		1017
926	static void atfork_prepare (void)	1018	static void atfork_prepare (void)
927	{	1019	{
928	pthread_mutex_lock (&reqlock);	1020	LOCK (wrklock);
929	pthread_mutex_lock (&reslock);	1021	LOCK (reqlock);
		1022	LOCK (reslock);
930	#if !HAVE_PREADWRITE	1023	#if !HAVE_PREADWRITE
931	pthread_mutex_lock (&preadwritelock);	1024	LOCK (preadwritelock);
932	#endif	1025	#endif
933	#if !HAVE_READDIR_R	1026	#if !HAVE_READDIR_R
934	pthread_mutex_lock (&readdirlock);	1027	LOCK (readdirlock);
935	#endif	1028	#endif
936	}	1029	}
937		1030
938	static void atfork_parent (void)	1031	static void atfork_parent (void)
939	{	1032	{
940	#if !HAVE_READDIR_R	1033	#if !HAVE_READDIR_R
941	pthread_mutex_unlock (&readdirlock);	1034	UNLOCK (readdirlock);
942	#endif	1035	#endif
943	#if !HAVE_PREADWRITE	1036	#if !HAVE_PREADWRITE
944	pthread_mutex_unlock (&preadwritelock);	1037	UNLOCK (preadwritelock);
945	#endif	1038	#endif
946	pthread_mutex_unlock (&reslock);	1039	UNLOCK (reslock);
947	pthread_mutex_unlock (&reqlock);	1040	UNLOCK (reqlock);
		1041	UNLOCK (wrklock);
948	}	1042	}
949		1043
950	static void atfork_child (void)	1044	static void atfork_child (void)
951	{	1045	{
952	aio_req prv;	1046	aio_req prv;
953		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
954	started = 0;	1065	started = 0;
955		1066	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		1067
974	close (respipe [0]);	1068	close (respipe [0]);
975	close (respipe [1]);	1069	close (respipe [1]);
976	create_pipe ();	1070	create_pipe ();
977		1071
…		…
1253		1347
1254	REQ_SEND;	1348	REQ_SEND;
1255	}	1349	}
1256		1350
1257	void	1351	void
1258	aio_sleep (delay,callback=&PL_sv_undef)	1352	aio_busy (delay,callback=&PL_sv_undef)
1259	double delay	1353	double delay
1260	SV * callback	1354	SV * callback
1261	PPCODE:	1355	PPCODE:
1262	{	1356	{
1263	dREQ;	1357	dREQ;
1264		1358
1265	req->type = REQ_SLEEP;	1359	req->type = REQ_BUSY;
1266	req->fd = delay < 0. ? 0 : delay;	1360	req->fd = delay < 0. ? 0 : delay;
1267	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);	1361	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1268		1362
1269	REQ_SEND;	1363	REQ_SEND;
1270	}	1364	}
…		…
1293	req->type = REQ_NOP;	1387	req->type = REQ_NOP;
1294		1388
1295	REQ_SEND;	1389	REQ_SEND;
1296	}	1390	}
1297		1391
1298	#if 0
1299
1300	void	1392	void
1301	aio_pri (int pri = DEFAULT_PRI)	1393	aioreq_pri (int pri = DEFAULT_PRI)
1302	CODE:	1394	CODE:
1303	if (pri < PRI_MIN) pri = PRI_MIN;	1395	if (pri < PRI_MIN) pri = PRI_MIN;
1304	if (pri > PRI_MAX) pri = PRI_MAX;	1396	if (pri > PRI_MAX) pri = PRI_MAX;
1305	next_pri = pri + PRI_BIAS;	1397	next_pri = pri + PRI_BIAS;
1306		1398
1307	#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;
1308		1406
1309	void	1407	void
1310	flush ()	1408	flush ()
1311	PROTOTYPE:	1409	PROTOTYPE:
1312	CODE:	1410	CODE:
…		…
1406	}	1504	}
1407	}	1505	}
1408	}	1506	}
1409		1507
1410	void	1508	void
		1509	cancel_subs (aio_req_ornot req)
		1510	CODE:
		1511	req_cancel_subs (req);
		1512
		1513	void
1411	result (aio_req grp, ...)	1514	result (aio_req grp, ...)
1412	CODE:	1515	CODE:
1413	{	1516	{
1414	int i;	1517	int i;
1415	AV *av = newAV ();	1518	AV *av = newAV ();
…		…
1420	SvREFCNT_dec (grp->data);	1523	SvREFCNT_dec (grp->data);
1421	grp->data = (SV *)av;	1524	grp->data = (SV *)av;
1422	}	1525	}
1423		1526
1424	void	1527	void
1425	feed_limit (aio_req grp, int limit)	1528	limit (aio_req grp, int limit)
1426	CODE:	1529	CODE:
1427	grp->fd2 = limit;	1530	grp->fd2 = limit;
1428	aio_grp_feed (grp);	1531	aio_grp_feed (grp);
1429		1532
1430	void	1533	void

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.66 by root, Tue Oct 24 00:34:47 2006 UTC vs. Revision 1.73 by root, Tue Oct 24 21:26:30 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.66 by root, Tue Oct 24 00:34:47 2006 UTC vs.
Revision 1.73 by root, Tue Oct 24 21:26:30 2006 UTC