[ViewVC] Diff of: cvs/cvsroot/libeio/eio.c

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.13 by root, Tue May 13 19:34:11 2008 UTC vs.
Revision 1.21 by root, Sat Jun 21 00:13:13 2008 UTC

…		…
		1	/*
		2	* libeio implementation
		3	*
		4	* Copyright (c) 2007,2008 Marc Alexander Lehmann <libeio@schmorp.de>
		5	* All rights reserved.
		6	*
		7	* Redistribution and use in source and binary forms, with or without modifica-
		8	* tion, are permitted provided that the following conditions are met:
		9	*
		10	* 1. Redistributions of source code must retain the above copyright notice,
		11	* this list of conditions and the following disclaimer.
		12	*
		13	* 2. Redistributions in binary form must reproduce the above copyright
		14	* notice, this list of conditions and the following disclaimer in the
		15	* documentation and/or other materials provided with the distribution.
		16	*
		17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
		18	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
		19	* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
		20	* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
		21	* CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
		22	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
		23	* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		24	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
		25	* ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
		26	* OF THE POSSIBILITY OF SUCH DAMAGE.
		27	*
		28	* Alternatively, the contents of this file may be used under the terms of
		29	* the GNU General Public License ("GPL") version 2 or any later version,
		30	* in which case the provisions of the GPL are applicable instead of
		31	* the above. If you wish to allow the use of your version of this file
		32	* only under the terms of the GPL and not to allow others to use your
		33	* version of this file under the BSD license, indicate your decision
		34	* by deleting the provisions above and replace them with the notice
		35	* and other provisions required by the GPL. If you do not delete the
		36	* provisions above, a recipient may use your version of this file under
		37	* either the BSD or the GPL.
		38	*/
		39
1	#include "eio.h"	40	#include "eio.h"
2	#include "xthread.h"	41	#include "xthread.h"
3		42
4	#include <errno.h>	43	#include <errno.h>
5	#include <stddef.h>	44	#include <stddef.h>
70	/* buffer size for various temporary buffers */	109	/* buffer size for various temporary buffers */
71	#define EIO_BUFSIZE 65536	110	#define EIO_BUFSIZE 65536
72		111
73	#define dBUF \	112	#define dBUF \
74	char *eio_buf; \	113	char *eio_buf; \
75	X_LOCK (etplock); \	114	ETP_WORKER_LOCK (self); \
76	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	115	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \
77	X_UNLOCK (etplock); \	116	ETP_WORKER_UNLOCK (self); \
78	errno = ENOMEM; \	117	errno = ENOMEM; \
79	if (!eio_buf) \	118	if (!eio_buf) \
80	return -1;	119	return -1;
81		120
82	#define EIO_TICKS ((1000000 + 1023) >> 10)	121	#define EIO_TICKS ((1000000 + 1023) >> 10)
83		122
84	/*****************************************************************************/	123	/*****************************************************************************/
85		124
		125	#define ETP_PRI_MIN EIO_PRI_MIN
		126	#define ETP_PRI_MAX EIO_PRI_MAX
		127
		128	struct etp_worker;
		129
		130	#define ETP_REQ eio_req
		131	#define ETP_DESTROY(req) eio_destroy (req)
		132	static int eio_finish (eio_req *req);
		133	#define ETP_FINISH(req) eio_finish (req)
		134	static void eio_execute (struct etp_worker self, eio_req req);
		135	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
		136
		137	#define ETP_WORKER_CLEAR(req) \
		138	if (wrk->dbuf) \
		139	{ \
		140	free (wrk->dbuf); \
		141	wrk->dbuf = 0; \
		142	} \
		143	\
		144	if (wrk->dirp) \
		145	{ \
		146	closedir (wrk->dirp); \
		147	wrk->dirp = 0; \
		148	}
		149	#define ETP_WORKER_COMMON \
		150	void *dbuf; \
		151	DIR *dirp;
		152
		153	/*****************************************************************************/
		154
		155	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
		156
86	/* calculcate time difference in ~1/EIO_TICKS of a second */	157	/* calculcate time difference in ~1/EIO_TICKS of a second */
87	static int tvdiff (struct timeval tv1, struct timeval tv2)	158	static int tvdiff (struct timeval tv1, struct timeval tv2)
88	{	159	{
89	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	160	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
90	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	161	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
91	}	162	}
92		163
93	static unsigned int started, idle, wanted = 4;	164	static unsigned int started, idle, wanted = 4;
94		165
95	typedef struct etp_pool
96	{
97	void (*want_poll_cb) (void);	166	static void (*want_poll_cb) (void);
98	void (*done_poll_cb) (void);	167	static void (*done_poll_cb) (void);
99		168
100	unsigned int max_poll_time;	169	static unsigned int max_poll_time; /* reslock */
101	unsigned int max_poll_reqs;	170	static unsigned int max_poll_reqs; /* reslock */
102	} etp_pool;
103		171
104	static volatile unsigned int nreqs, nready, npending;	172	static volatile unsigned int nreqs; /* reqlock */
		173	static volatile unsigned int nready; /* reqlock */
		174	static volatile unsigned int npending; /* reqlock */
105	static volatile unsigned int max_idle = 4;	175	static volatile unsigned int max_idle = 4;
106		176
107	static mutex_t etplock = X_MUTEX_INIT;	177	static mutex_t wrklock = X_MUTEX_INIT;
108	static mutex_t reslock = X_MUTEX_INIT;	178	static mutex_t reslock = X_MUTEX_INIT;
109	static mutex_t reqlock = X_MUTEX_INIT;	179	static mutex_t reqlock = X_MUTEX_INIT;
110	static cond_t reqwait = X_COND_INIT;	180	static cond_t reqwait = X_COND_INIT;
111		181
112	typedef struct worker	182	typedef struct etp_worker
113	{	183	{
114	/* locked by etplock */	184	/* locked by wrklock */
115	struct worker prev, next;	185	struct etp_worker prev, next;
116		186
117	thread_t tid;	187	thread_t tid;
118		188
119	/* locked by reslock, reqlock or etplock */	189	/* locked by reslock, reqlock or wrklock */
120	eio_req req; / currently processed request */	190	ETP_REQ req; / currently processed request */
121	void *dbuf;	191
122	DIR *dirp;	192	ETP_WORKER_COMMON
123	} worker;	193	} etp_worker;
124		194
125	static worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	195	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
		196
		197	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
		198	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
126		199
127	/* worker threads management */	200	/* worker threads management */
128		201
129	static void worker_clear (worker *wrk)	202	static void etp_worker_clear (etp_worker *wrk)
130	{	203	{
131	if (wrk->dirp)	204	ETP_WORKER_CLEAR (wrk);
132	{
133	closedir (wrk->dirp);
134	wrk->dirp = 0;
135	}
136
137	if (wrk->dbuf)
138	{
139	free (wrk->dbuf);
140	wrk->dbuf = 0;
141	}
142	}	205	}
143		206
144	static void worker_free (worker *wrk)	207	static void etp_worker_free (etp_worker *wrk)
145	{	208	{
146	wrk->next->prev = wrk->prev;	209	wrk->next->prev = wrk->prev;
147	wrk->prev->next = wrk->next;	210	wrk->prev->next = wrk->next;
148		211
149	free (wrk);	212	free (wrk);
150	}	213	}
151		214
152	unsigned int eio_nreqs (void)	215	static unsigned int etp_nreqs (void)
153	{	216	{
		217	int retval;
		218	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
		219	retval = nreqs;
		220	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
154	return nreqs;	221	return retval;
155	}	222	}
156		223
157	unsigned int eio_nready (void)	224	static unsigned int etp_nready (void)
158	{	225	{
159	unsigned int retval;	226	unsigned int retval;
160		227
161	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	228	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
162	retval = nready;	229	retval = nready;
163	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	230	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
164		231
165	return retval;	232	return retval;
166	}	233	}
167		234
168	unsigned int eio_npending (void)	235	static unsigned int etp_npending (void)
169	{	236	{
170	unsigned int retval;	237	unsigned int retval;
171		238
172	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	239	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
173	retval = npending;	240	retval = npending;
174	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	241	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
175		242
176	return retval;	243	return retval;
177	}	244	}
178		245
179	unsigned int eio_nthreads (void)	246	static unsigned int etp_nthreads (void)
180	{	247	{
181	unsigned int retval;	248	unsigned int retval;
182		249
183	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	250	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
184	retval = started;	251	retval = started;
…		…
191	* a somewhat faster data structure might be nice, but	258	* a somewhat faster data structure might be nice, but
192	* with 8 priorities this actually needs <20 insns	259	* with 8 priorities this actually needs <20 insns
193	* per shift, the most expensive operation.	260	* per shift, the most expensive operation.
194	*/	261	*/
195	typedef struct {	262	typedef struct {
196	eio_req qs[EIO_NUM_PRI], qe[EIO_NUM_PRI]; /* qstart, qend */	263	ETP_REQ qs[ETP_NUM_PRI], qe[ETP_NUM_PRI]; /* qstart, qend */
197	int size;	264	int size;
198	} reqq;	265	} etp_reqq;
199		266
200	static reqq req_queue;	267	static etp_reqq req_queue;
201	static reqq res_queue;	268	static etp_reqq res_queue;
202		269
203	static int reqq_push (reqq q, eio_req req)	270	static int reqq_push (etp_reqq q, ETP_REQ req)
204	{	271	{
205	int pri = req->pri;	272	int pri = req->pri;
206	req->next = 0;	273	req->next = 0;
207		274
208	if (q->qe[pri])	275	if (q->qe[pri])
…		…
214	q->qe[pri] = q->qs[pri] = req;	281	q->qe[pri] = q->qs[pri] = req;
215		282
216	return q->size++;	283	return q->size++;
217	}	284	}
218		285
219	static eio_req reqq_shift (reqq q)	286	static ETP_REQ reqq_shift (etp_reqq q)
220	{	287	{
221	int pri;	288	int pri;
222		289
223	if (!q->size)	290	if (!q->size)
224	return 0;	291	return 0;
225		292
226	--q->size;	293	--q->size;
227		294
228	for (pri = EIO_NUM_PRI; pri--; )	295	for (pri = ETP_NUM_PRI; pri--; )
229	{	296	{
230	eio_req *req = q->qs[pri];	297	eio_req *req = q->qs[pri];
231		298
232	if (req)	299	if (req)
233	{	300	{
…		…
241	abort ();	308	abort ();
242	}	309	}
243		310
244	static void etp_atfork_prepare (void)	311	static void etp_atfork_prepare (void)
245	{	312	{
246	X_LOCK (etplock);	313	X_LOCK (wrklock);
247	X_LOCK (reqlock);	314	X_LOCK (reqlock);
248	X_LOCK (reslock);	315	X_LOCK (reslock);
249	#if !HAVE_PREADWRITE	316	#if !HAVE_PREADWRITE
250	X_LOCK (preadwritelock);	317	X_LOCK (preadwritelock);
251	#endif	318	#endif
252	#if !HAVE_READDIR_R
253	X_LOCK (readdirlock);
254	#endif
255	}	319	}
256		320
257	static void etp_atfork_parent (void)	321	static void etp_atfork_parent (void)
258	{	322	{
259	#if !HAVE_READDIR_R
260	X_UNLOCK (readdirlock);
261	#endif
262	#if !HAVE_PREADWRITE	323	#if !HAVE_PREADWRITE
263	X_UNLOCK (preadwritelock);	324	X_UNLOCK (preadwritelock);
264	#endif	325	#endif
265	X_UNLOCK (reslock);	326	X_UNLOCK (reslock);
266	X_UNLOCK (reqlock);	327	X_UNLOCK (reqlock);
267	X_UNLOCK (etplock);	328	X_UNLOCK (wrklock);
268	}	329	}
269		330
270	static void etp_atfork_child (void)	331	static void etp_atfork_child (void)
271	{	332	{
272	eio_req *prv;	333	ETP_REQ *prv;
273		334
274	while (prv = reqq_shift (&req_queue))	335	while ((prv = reqq_shift (&req_queue)))
275	eio_destroy (prv);	336	ETP_DESTROY (prv);
276		337
277	while (prv = reqq_shift (&res_queue))	338	while ((prv = reqq_shift (&res_queue)))
278	eio_destroy (prv);	339	ETP_DESTROY (prv);
279		340
280	while (wrk_first.next != &wrk_first)	341	while (wrk_first.next != &wrk_first)
281	{	342	{
282	worker *wrk = wrk_first.next;	343	etp_worker *wrk = wrk_first.next;
283		344
284	if (wrk->req)	345	if (wrk->req)
285	eio_destroy (wrk->req);	346	ETP_DESTROY (wrk->req);
286		347
287	worker_clear (wrk);	348	etp_worker_clear (wrk);
288	worker_free (wrk);	349	etp_worker_free (wrk);
289	}	350	}
290		351
291	started = 0;	352	started = 0;
292	idle = 0;	353	idle = 0;
293	nreqs = 0;	354	nreqs = 0;
…		…
302	{	363	{
303	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);	364	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
304	}	365	}
305		366
306	static int	367	static int
307	etp_init (etp_pool etp, void (want_poll)(void), void (*done_poll)(void))	368	etp_init (void (want_poll)(void), void (done_poll)(void))
308	{	369	{
309	static pthread_once_t doinit = PTHREAD_ONCE_INIT;	370	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
310		371
311	pthread_once (&doinit, etp_once_init);	372	pthread_once (&doinit, etp_once_init);
312		373
313	memset (etp, 0, sizeof *etp);
314
315	etp->want_poll_cb = want_poll;	374	want_poll_cb = want_poll;
316	etp->done_poll_cb = done_poll;	375	done_poll_cb = done_poll;
317	}
318		376
319	static etp_pool etp;
320
321	/*****************************************************************************/
322
323	static void grp_try_feed (eio_req *grp)
324	{
325	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
326	{
327	int old_len = grp->size;
328
329	EIO_FEED (grp);
330
331	/* stop if no progress has been made */
332	if (old_len == grp->size)
333	{
334	grp->feed = 0;
335	break;
336	}
337	}
338	}
339
340	static int eio_finish (eio_req *req);
341
342	static int grp_dec (eio_req *grp)
343	{
344	--grp->size;
345
346	/* call feeder, if applicable */
347	grp_try_feed (grp);
348
349	/* finish, if done */
350	if (!grp->size && grp->int1)
351	return eio_finish (grp);
352	else
353	return 0;	377	return 0;
354	}	378	}
355		379
356	void eio_destroy (eio_req *req)
357	{
358	if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
359	if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
360
361	EIO_DESTROY (req);
362	}
363
364	static int eio_finish (eio_req *req)
365	{
366	int res = EIO_FINISH (req);
367
368	if (req->grp)
369	{
370	int res2;
371	eio_req *grp = req->grp;
372
373	/* unlink request */
374	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
375	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
376
377	if (grp->grp_first == req)
378	grp->grp_first = req->grp_next;
379
380	res2 = grp_dec (grp);
381
382	if (!res && res2)
383	res = res2;
384	}
385
386	eio_destroy (req);
387
388	return res;
389	}
390
391	void eio_grp_cancel (eio_req *grp)
392	{
393	for (grp = grp->grp_first; grp; grp = grp->grp_next)
394	eio_cancel (grp);
395	}
396
397	void eio_cancel (eio_req *req)
398	{
399	X_LOCK (etplock);
400	req->flags \|= EIO_FLAG_CANCELLED;
401	X_UNLOCK (etplock);
402
403	eio_grp_cancel (req);
404	}
405
406	X_THREAD_PROC (eio_proc);	380	X_THREAD_PROC (etp_proc);
407		381
408	static void start_thread (void)	382	static void etp_start_thread (void)
409	{	383	{
410	worker *wrk = calloc (1, sizeof (worker));	384	etp_worker *wrk = calloc (1, sizeof (etp_worker));
411		385
412	/TODO/	386	/TODO/
413	assert (("unable to allocate worker thread data", wrk));	387	assert (("unable to allocate worker thread data", wrk));
414		388
415	X_LOCK (etplock);	389	X_LOCK (wrklock);
416		390
417	if (thread_create (&wrk->tid, eio_proc, (void *)wrk))	391	if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
418	{	392	{
419	wrk->prev = &wrk_first;	393	wrk->prev = &wrk_first;
420	wrk->next = wrk_first.next;	394	wrk->next = wrk_first.next;
421	wrk_first.next->prev = wrk;	395	wrk_first.next->prev = wrk;
422	wrk_first.next = wrk;	396	wrk_first.next = wrk;
423	++started;	397	++started;
424	}	398	}
425	else	399	else
426	free (wrk);	400	free (wrk);
427		401
428	X_UNLOCK (etplock);	402	X_UNLOCK (wrklock);
429	}	403	}
430		404
431	static void maybe_start_thread (void)	405	static void etp_maybe_start_thread (void)
432	{	406	{
433	if (eio_nthreads () >= wanted)	407	if (etp_nthreads () >= wanted)
434	return;	408	return;
435		409
436	/* todo: maybe use idle here, but might be less exact */	410	/* todo: maybe use idle here, but might be less exact */
437	if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ())	411	if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())
438	return;	412	return;
439		413
440	start_thread ();	414	etp_start_thread ();
441	}	415	}
442		416
443	void eio_submit (eio_req *req)
444	{
445	req->pri += EIO_PRI_BIAS;
446
447	if (req->pri < EIO_PRI_MIN + EIO_PRI_BIAS) req->pri = EIO_PRI_MIN + EIO_PRI_BIAS;
448	if (req->pri > EIO_PRI_MAX + EIO_PRI_BIAS) req->pri = EIO_PRI_MAX + EIO_PRI_BIAS;
449
450	++nreqs;
451
452	X_LOCK (reqlock);
453	++nready;
454	reqq_push (&req_queue, req);
455	X_COND_SIGNAL (reqwait);
456	X_UNLOCK (reqlock);
457
458	maybe_start_thread ();
459	}
460
461	static void end_thread (void)	417	static void etp_end_thread (void)
462	{	418	{
463	eio_req *req = calloc (1, sizeof (eio_req));	419	eio_req *req = calloc (1, sizeof (eio_req));
464		420
465	req->type = EIO_QUIT;	421	req->type = -1;
466	req->pri = EIO_PRI_MAX + EIO_PRI_BIAS;	422	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
467		423
468	X_LOCK (reqlock);	424	X_LOCK (reqlock);
469	reqq_push (&req_queue, req);	425	reqq_push (&req_queue, req);
470	X_COND_SIGNAL (reqwait);	426	X_COND_SIGNAL (reqwait);
471	X_UNLOCK (reqlock);	427	X_UNLOCK (reqlock);
472		428
473	X_LOCK (etplock);	429	X_LOCK (wrklock);
474	--started;	430	--started;
475	X_UNLOCK (etplock);	431	X_UNLOCK (wrklock);
476	}	432	}
477		433
478	void eio_set_max_poll_time (double nseconds)
479	{
480	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
481	etp.max_poll_time = nseconds;
482	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
483	}
484
485	void eio_set_max_poll_reqs (unsigned int maxreqs)
486	{
487	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
488	etp.max_poll_reqs = maxreqs;
489	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
490	}
491
492	void eio_set_max_idle (unsigned int nthreads)
493	{
494	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
495	max_idle = nthreads <= 0 ? 1 : nthreads;
496	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
497	}
498
499	void eio_set_min_parallel (unsigned int nthreads)
500	{
501	if (wanted < nthreads)
502	wanted = nthreads;
503	}
504
505	void eio_set_max_parallel (unsigned int nthreads)
506	{
507	if (wanted > nthreads)
508	wanted = nthreads;
509
510	while (started > wanted)
511	end_thread ();
512	}
513
514	int eio_poll (void)	434	static int etp_poll (void)
515	{	435	{
516	int maxreqs = etp.max_poll_reqs;	436	unsigned int maxreqs;
		437	unsigned int maxtime;
517	struct timeval tv_start, tv_now;	438	struct timeval tv_start, tv_now;
518	eio_req *req;
519		439
520	if (etp.max_poll_time)	440	X_LOCK (reslock);
		441	maxreqs = max_poll_reqs;
		442	maxtime = max_poll_time;
		443	X_UNLOCK (reslock);
		444
		445	if (maxtime)
521	gettimeofday (&tv_start, 0);	446	gettimeofday (&tv_start, 0);
522		447
523	for (;;)	448	for (;;)
524	{	449	{
		450	ETP_REQ *req;
		451
525	maybe_start_thread ();	452	etp_maybe_start_thread ();
526		453
527	X_LOCK (reslock);	454	X_LOCK (reslock);
528	req = reqq_shift (&res_queue);	455	req = reqq_shift (&res_queue);
529		456
530	if (req)	457	if (req)
531	{	458	{
532	--npending;	459	--npending;
533		460
534	if (!res_queue.size && etp.done_poll_cb)	461	if (!res_queue.size && done_poll_cb)
535	etp.done_poll_cb ();	462	done_poll_cb ();
536	}	463	}
537		464
538	X_UNLOCK (reslock);	465	X_UNLOCK (reslock);
539		466
540	if (!req)	467	if (!req)
541	return 0;	468	return 0;
542		469
		470	X_LOCK (reqlock);
543	--nreqs;	471	--nreqs;
		472	X_UNLOCK (reqlock);
544		473
545	if (req->type == EIO_GROUP && req->size)	474	if (req->type == EIO_GROUP && req->size)
546	{	475	{
547	req->int1 = 1; /* mark request as delayed */	476	req->int1 = 1; /* mark request as delayed */
548	continue;	477	continue;
549	}	478	}
550	else	479	else
551	{	480	{
552	int res = eio_finish (req);	481	int res = ETP_FINISH (req);
553	if (res)	482	if (res)
554	return res;	483	return res;
555	}	484	}
556		485
557	if (maxreqs && !--maxreqs)	486	if (maxreqs && !--maxreqs)
558	break;	487	break;
559		488
560	if (etp.max_poll_time)	489	if (maxtime)
561	{	490	{
562	gettimeofday (&tv_now, 0);	491	gettimeofday (&tv_now, 0);
563		492
564	if (tvdiff (&tv_start, &tv_now) >= etp.max_poll_time)	493	if (tvdiff (&tv_start, &tv_now) >= maxtime)
565	break;	494	break;
566	}	495	}
567	}	496	}
568		497
569	errno = EAGAIN;	498	errno = EAGAIN;
570	return -1;	499	return -1;
		500	}
		501
		502	static void etp_cancel (ETP_REQ *req)
		503	{
		504	X_LOCK (wrklock);
		505	req->flags \|= EIO_FLAG_CANCELLED;
		506	X_UNLOCK (wrklock);
		507
		508	eio_grp_cancel (req);
		509	}
		510
		511	static void etp_submit (ETP_REQ *req)
		512	{
		513	req->pri -= ETP_PRI_MIN;
		514
		515	if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
		516	if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
		517
		518	X_LOCK (reqlock);
		519	++nreqs;
		520	++nready;
		521	reqq_push (&req_queue, req);
		522	X_COND_SIGNAL (reqwait);
		523	X_UNLOCK (reqlock);
		524
		525	etp_maybe_start_thread ();
		526	}
		527
		528	static void etp_set_max_poll_time (double nseconds)
		529	{
		530	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
		531	max_poll_time = nseconds;
		532	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
		533	}
		534
		535	static void etp_set_max_poll_reqs (unsigned int maxreqs)
		536	{
		537	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
		538	max_poll_reqs = maxreqs;
		539	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
		540	}
		541
		542	static void etp_set_max_idle (unsigned int nthreads)
		543	{
		544	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
		545	max_idle = nthreads <= 0 ? 1 : nthreads;
		546	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
		547	}
		548
		549	static void etp_set_min_parallel (unsigned int nthreads)
		550	{
		551	if (wanted < nthreads)
		552	wanted = nthreads;
		553	}
		554
		555	static void etp_set_max_parallel (unsigned int nthreads)
		556	{
		557	if (wanted > nthreads)
		558	wanted = nthreads;
		559
		560	while (started > wanted)
		561	etp_end_thread ();
		562	}
		563
		564	/*****************************************************************************/
		565
		566	static void grp_try_feed (eio_req *grp)
		567	{
		568	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
		569	{
		570	int old_len = grp->size;
		571
		572	EIO_FEED (grp);
		573
		574	/* stop if no progress has been made */
		575	if (old_len == grp->size)
		576	{
		577	grp->feed = 0;
		578	break;
		579	}
		580	}
		581	}
		582
		583	static int grp_dec (eio_req *grp)
		584	{
		585	--grp->size;
		586
		587	/* call feeder, if applicable */
		588	grp_try_feed (grp);
		589
		590	/* finish, if done */
		591	if (!grp->size && grp->int1)
		592	return eio_finish (grp);
		593	else
		594	return 0;
		595	}
		596
		597	void eio_destroy (eio_req *req)
		598	{
		599	if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
		600	if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
		601
		602	EIO_DESTROY (req);
		603	}
		604
		605	static int eio_finish (eio_req *req)
		606	{
		607	int res = EIO_FINISH (req);
		608
		609	if (req->grp)
		610	{
		611	int res2;
		612	eio_req *grp = req->grp;
		613
		614	/* unlink request */
		615	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
		616	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
		617
		618	if (grp->grp_first == req)
		619	grp->grp_first = req->grp_next;
		620
		621	res2 = grp_dec (grp);
		622
		623	if (!res && res2)
		624	res = res2;
		625	}
		626
		627	eio_destroy (req);
		628
		629	return res;
		630	}
		631
		632	void eio_grp_cancel (eio_req *grp)
		633	{
		634	for (grp = grp->grp_first; grp; grp = grp->grp_next)
		635	eio_cancel (grp);
		636	}
		637
		638	void eio_cancel (eio_req *req)
		639	{
		640	etp_cancel (req);
		641	}
		642
		643	void eio_submit (eio_req *req)
		644	{
		645	etp_submit (req);
		646	}
		647
		648	unsigned int eio_nreqs (void)
		649	{
		650	return etp_nreqs ();
		651	}
		652
		653	unsigned int eio_nready (void)
		654	{
		655	return etp_nready ();
		656	}
		657
		658	unsigned int eio_npending (void)
		659	{
		660	return etp_npending ();
		661	}
		662
		663	unsigned int eio_nthreads (void)
		664	{
		665	return etp_nthreads ();
		666	}
		667
		668	void eio_set_max_poll_time (double nseconds)
		669	{
		670	etp_set_max_poll_time (nseconds);
		671	}
		672
		673	void eio_set_max_poll_reqs (unsigned int maxreqs)
		674	{
		675	etp_set_max_poll_reqs (maxreqs);
		676	}
		677
		678	void eio_set_max_idle (unsigned int nthreads)
		679	{
		680	etp_set_max_idle (nthreads);
		681	}
		682
		683	void eio_set_min_parallel (unsigned int nthreads)
		684	{
		685	etp_set_min_parallel (nthreads);
		686	}
		687
		688	void eio_set_max_parallel (unsigned int nthreads)
		689	{
		690	etp_set_max_parallel (nthreads);
		691	}
		692
		693	int eio_poll (void)
		694	{
		695	return etp_poll ();
571	}	696	}
572		697
573	/*****************************************************************************/	698	/*****************************************************************************/
574	/* work around various missing functions */	699	/* work around various missing functions */
575		700
…		…
652		777
653	#if !HAVE_READAHEAD	778	#if !HAVE_READAHEAD
654	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	779	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
655		780
656	static ssize_t	781	static ssize_t
657	eio__readahead (int fd, off_t offset, size_t count, worker *self)	782	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
658	{	783	{
659	size_t todo = count;	784	size_t todo = count;
660	dBUF;	785	dBUF;
661		786
662	while (todo > 0)	787	while (todo > 0)
…		…
672	return count;	797	return count;
673	}	798	}
674		799
675	#endif	800	#endif
676		801
677	#if !HAVE_READDIR_R
678	# define readdir_r eio__readdir_r
679
680	static mutex_t readdirlock = X_MUTEX_INIT;
681
682	static int
683	eio__readdir_r (DIR dirp, EIO_STRUCT_DIRENT ent, EIO_STRUCT_DIRENT **res)
684	{
685	EIO_STRUCT_DIRENT *e;
686	int errorno;
687
688	X_LOCK (readdirlock);
689
690	e = readdir (dirp);
691	errorno = errno;
692
693	if (e)
694	{
695	*res = ent;
696	strcpy (ent->d_name, e->d_name);
697	}
698	else
699	*res = 0;
700
701	X_UNLOCK (readdirlock);
702
703	errno = errorno;
704	return e ? 0 : -1;
705	}
706	#endif
707
708	/* sendfile always needs emulation */	802	/* sendfile always needs emulation */
709	static ssize_t	803	static ssize_t
710	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self)	804	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
711	{	805	{
712	ssize_t res;	806	ssize_t res;
713		807
714	if (!count)	808	if (!count)
715	return 0;	809	return 0;
…		…
799	return res;	893	return res;
800	}	894	}
801		895
802	/* read a full directory */	896	/* read a full directory */
803	static void	897	static void
804	eio__scandir (eio_req req, worker self)	898	eio__scandir (eio_req req, etp_worker self)
805	{	899	{
806	DIR *dirp;	900	DIR *dirp;
807	union
808	{
809	EIO_STRUCT_DIRENT d;
810	char b [offsetof (EIO_STRUCT_DIRENT, d_name) + NAME_MAX + 1];
811	} *u;
812	EIO_STRUCT_DIRENT *entp;	901	EIO_STRUCT_DIRENT *entp;
813	char name, names;	902	char name, names;
814	int memlen = 4096;	903	int memlen = 4096;
815	int memofs = 0;	904	int memofs = 0;
816	int res = 0;	905	int res = 0;
817		906
818	X_LOCK (etplock);	907	X_LOCK (wrklock);
		908	/* the corresponding closedir is in ETP_WORKER_CLEAR */
819	self->dirp = dirp = opendir (req->ptr1);	909	self->dirp = dirp = opendir (req->ptr1);
820	self->dbuf = u = malloc (sizeof (*u));
821	req->flags \|= EIO_FLAG_PTR2_FREE;	910	req->flags \|= EIO_FLAG_PTR2_FREE;
822	req->ptr2 = names = malloc (memlen);	911	req->ptr2 = names = malloc (memlen);
823	X_UNLOCK (etplock);	912	X_UNLOCK (wrklock);
824		913
825	if (dirp && u && names)	914	if (dirp && names)
826	for (;;)	915	for (;;)
827	{	916	{
828	errno = 0;	917	errno = 0;
829	readdir_r (dirp, &u->d, &entp);	918	entp = readdir (dirp);
830		919
831	if (!entp)	920	if (!entp)
832	break;	921	break;
833		922
834	name = entp->d_name;	923	name = entp->d_name;
…		…
840	res++;	929	res++;
841		930
842	while (memofs + len > memlen)	931	while (memofs + len > memlen)
843	{	932	{
844	memlen *= 2;	933	memlen *= 2;
845	X_LOCK (etplock);	934	X_LOCK (wrklock);
846	req->ptr2 = names = realloc (names, memlen);	935	req->ptr2 = names = realloc (names, memlen);
847	X_UNLOCK (etplock);	936	X_UNLOCK (wrklock);
848		937
849	if (!names)	938	if (!names)
850	break;	939	break;
851	}	940	}
852		941
…		…
864	/*****************************************************************************/	953	/*****************************************************************************/
865		954
866	#define ALLOC(len) \	955	#define ALLOC(len) \
867	if (!req->ptr2) \	956	if (!req->ptr2) \
868	{ \	957	{ \
869	X_LOCK (etplock); \	958	X_LOCK (wrklock); \
870	req->flags \|= EIO_FLAG_PTR2_FREE; \	959	req->flags \|= EIO_FLAG_PTR2_FREE; \
871	X_UNLOCK (etplock); \	960	X_UNLOCK (wrklock); \
872	req->ptr2 = malloc (len); \	961	req->ptr2 = malloc (len); \
873	if (!req->ptr2) \	962	if (!req->ptr2) \
874	{ \	963	{ \
875	errno = ENOMEM; \	964	errno = ENOMEM; \
876	req->result = -1; \	965	req->result = -1; \
877	break; \	966	break; \
878	} \	967	} \
879	}	968	}
880		969
881	X_THREAD_PROC (eio_proc)	970	X_THREAD_PROC (etp_proc)
882	{	971	{
883	eio_req *req;	972	ETP_REQ *req;
884	struct timespec ts;	973	struct timespec ts;
885	worker self = (worker )thr_arg;	974	etp_worker self = (etp_worker )thr_arg;
886		975
887	/* try to distribute timeouts somewhat randomly */	976	/* try to distribute timeouts somewhat randomly */
888	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	977	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
889		978
890	for (;;)	979	for (;;)
891	{	980	{
892	ts.tv_sec = time (0) + IDLE_TIMEOUT;
893
894	X_LOCK (reqlock);	981	X_LOCK (reqlock);
895		982
896	for (;;)	983	for (;;)
897	{	984	{
898	self->req = req = reqq_shift (&req_queue);	985	self->req = req = reqq_shift (&req_queue);
…		…
900	if (req)	987	if (req)
901	break;	988	break;
902		989
903	++idle;	990	++idle;
904		991
		992	ts.tv_sec = time (0) + IDLE_TIMEOUT;
905	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)	993	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
906	{	994	{
907	if (idle > max_idle)	995	if (idle > max_idle)
908	{	996	{
909	--idle;	997	--idle;
910	X_UNLOCK (reqlock);	998	X_UNLOCK (reqlock);
911	X_LOCK (etplock);	999	X_LOCK (wrklock);
912	--started;	1000	--started;
913	X_UNLOCK (etplock);	1001	X_UNLOCK (wrklock);
914	goto quit;	1002	goto quit;
915	}	1003	}
916		1004
917	/* we are allowed to idle, so do so without any timeout */	1005	/* we are allowed to idle, so do so without any timeout */
918	X_COND_WAIT (reqwait, reqlock);	1006	X_COND_WAIT (reqwait, reqlock);
919	ts.tv_sec = time (0) + IDLE_TIMEOUT;
920	}	1007	}
921		1008
922	--idle;	1009	--idle;
923	}	1010	}
924		1011
925	--nready;	1012	--nready;
926		1013
927	X_UNLOCK (reqlock);	1014	X_UNLOCK (reqlock);
928		1015
929	errno = 0; /* strictly unnecessary */	1016	if (req->type < 0)
		1017	goto quit;
930		1018
931	if (!EIO_CANCELLED (req))	1019	if (!EIO_CANCELLED (req))
932	switch (req->type)	1020	ETP_EXECUTE (self, req);
933	{
934	case EIO_READ: ALLOC (req->size);
935	req->result = req->offs >= 0
936	? pread (req->int1, req->ptr2, req->size, req->offs)
937	: read (req->int1, req->ptr2, req->size); break;
938	case EIO_WRITE: req->result = req->offs >= 0
939	? pwrite (req->int1, req->ptr2, req->size, req->offs)
940	: write (req->int1, req->ptr2, req->size); break;
941
942	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
943	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
944
945	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
946	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
947	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
948	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
949	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
950	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
951
952	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
953	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
954	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
955	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
956	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
957	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
958
959	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
960	case EIO_CLOSE: req->result = close (req->int1); break;
961	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
962	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
963	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
964	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
965	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
966	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
967	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
968	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
969
970	case EIO_READLINK: ALLOC (NAME_MAX);
971	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
972
973	case EIO_SYNC: req->result = 0; sync (); break;
974	case EIO_FSYNC: req->result = fsync (req->int1); break;
975	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
976
977	case EIO_READDIR: eio__scandir (req, self); break;
978
979	case EIO_BUSY:
980	#ifdef _WIN32
981	Sleep (req->nv1 * 1000.);
982	#else
983	{
984	struct timeval tv;
985
986	tv.tv_sec = req->nv1;
987	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
988
989	req->result = select (0, 0, 0, 0, &tv);
990	}
991	#endif
992	break;
993
994	case EIO_UTIME:
995	case EIO_FUTIME:
996	{
997	struct timeval tv[2];
998	struct timeval *times;
999
1000	if (req->nv1 != -1. \|\| req->nv2 != -1.)
1001	{
1002	tv[0].tv_sec = req->nv1;
1003	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1004	tv[1].tv_sec = req->nv2;
1005	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1006
1007	times = tv;
1008	}
1009	else
1010	times = 0;
1011
1012
1013	req->result = req->type == EIO_FUTIME
1014	? futimes (req->int1, times)
1015	: utimes (req->ptr1, times);
1016	}
1017
1018	case EIO_GROUP:
1019	case EIO_NOP:
1020	req->result = 0;
1021	break;
1022
1023	case EIO_QUIT:
1024	goto quit;
1025
1026	default:
1027	req->result = -1;
1028	break;
1029	}
1030
1031	req->errorno = errno;
1032		1021
1033	X_LOCK (reslock);	1022	X_LOCK (reslock);
1034		1023
1035	++npending;	1024	++npending;
1036		1025
1037	if (!reqq_push (&res_queue, req) && etp.want_poll_cb)	1026	if (!reqq_push (&res_queue, req) && want_poll_cb)
1038	etp.want_poll_cb ();	1027	want_poll_cb ();
1039		1028
1040	self->req = 0;	1029	self->req = 0;
1041	worker_clear (self);	1030	etp_worker_clear (self);
1042		1031
1043	X_UNLOCK (reslock);	1032	X_UNLOCK (reslock);
1044	}	1033	}
1045		1034
1046	quit:	1035	quit:
1047	X_LOCK (etplock);	1036	X_LOCK (wrklock);
1048	worker_free (self);	1037	etp_worker_free (self);
1049	X_UNLOCK (etplock);	1038	X_UNLOCK (wrklock);
1050		1039
1051	return 0;	1040	return 0;
1052	}	1041	}
1053		1042
1054	/*****************************************************************************/	1043	/*****************************************************************************/
1055		1044
1056	int eio_init (void (want_poll)(void), void (done_poll)(void))	1045	int eio_init (void (want_poll)(void), void (done_poll)(void))
1057	{	1046	{
1058	etp_init (&etp, want_poll, done_poll);	1047	return etp_init (want_poll, done_poll);
1059	}	1048	}
1060		1049
1061	static void eio_api_destroy (eio_req *req)	1050	static void eio_api_destroy (eio_req *req)
1062	{	1051	{
1063	free (req);	1052	free (req);
…		…
1085	{ \	1074	{ \
1086	eio_api_destroy (req); \	1075	eio_api_destroy (req); \
1087	return 0; \	1076	return 0; \
1088	}	1077	}
1089		1078
		1079	static void eio_execute (etp_worker self, eio_req req)
		1080	{
		1081	errno = 0;
		1082
		1083	switch (req->type)
		1084	{
		1085	case EIO_READ: ALLOC (req->size);
		1086	req->result = req->offs >= 0
		1087	? pread (req->int1, req->ptr2, req->size, req->offs)
		1088	: read (req->int1, req->ptr2, req->size); break;
		1089	case EIO_WRITE: req->result = req->offs >= 0
		1090	? pwrite (req->int1, req->ptr2, req->size, req->offs)
		1091	: write (req->int1, req->ptr2, req->size); break;
		1092
		1093	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
		1094	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
		1095
		1096	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		1097	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
		1098	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		1099	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
		1100	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		1101	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
		1102
		1103	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
		1104	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
		1105	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
		1106	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
		1107	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
		1108	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
		1109
		1110	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
		1111	case EIO_CLOSE: req->result = close (req->int1); break;
		1112	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
		1113	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
		1114	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
		1115	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
		1116	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
		1117	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
		1118	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
		1119	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
		1120
		1121	case EIO_READLINK: ALLOC (NAME_MAX);
		1122	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
		1123
		1124	case EIO_SYNC: req->result = 0; sync (); break;
		1125	case EIO_FSYNC: req->result = fsync (req->int1); break;
		1126	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		1127
		1128	case EIO_READDIR: eio__scandir (req, self); break;
		1129
		1130	case EIO_BUSY:
		1131	#ifdef _WIN32
		1132	Sleep (req->nv1 * 1000.);
		1133	#else
		1134	{
		1135	struct timeval tv;
		1136
		1137	tv.tv_sec = req->nv1;
		1138	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
		1139
		1140	req->result = select (0, 0, 0, 0, &tv);
		1141	}
		1142	#endif
		1143	break;
		1144
		1145	case EIO_UTIME:
		1146	case EIO_FUTIME:
		1147	{
		1148	struct timeval tv[2];
		1149	struct timeval *times;
		1150
		1151	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		1152	{
		1153	tv[0].tv_sec = req->nv1;
		1154	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
		1155	tv[1].tv_sec = req->nv2;
		1156	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
		1157
		1158	times = tv;
		1159	}
		1160	else
		1161	times = 0;
		1162
		1163
		1164	req->result = req->type == EIO_FUTIME
		1165	? futimes (req->int1, times)
		1166	: utimes (req->ptr1, times);
		1167	}
		1168
		1169	case EIO_GROUP:
		1170	case EIO_NOP:
		1171	req->result = 0;
		1172	break;
		1173
		1174	case EIO_CUSTOM:
		1175	req->feed (req);
		1176	break;
		1177
		1178	default:
		1179	req->result = -1;
		1180	break;
		1181	}
		1182
		1183	req->errorno = errno;
		1184	}
		1185
1090	#ifndef EIO_NO_WRAPPERS	1186	#ifndef EIO_NO_WRAPPERS
1091		1187
1092	eio_req eio_nop (int pri, eio_cb cb, void data)	1188	eio_req eio_nop (int pri, eio_cb cb, void data)
1093	{	1189	{
1094	REQ (EIO_NOP); SEND;	1190	REQ (EIO_NOP); SEND;
…		…
1235	return eio__1path (EIO_READDIR, path, pri, cb, data);	1331	return eio__1path (EIO_READDIR, path, pri, cb, data);
1236	}	1332	}
1237		1333
1238	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1334	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1239	{	1335	{
1240	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND;	1336	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1241	}	1337	}
1242		1338
1243	static eio_req *	1339	static eio_req *
1244	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)	1340	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1245	{	1341	{
…		…
1269	eio_req eio_rename (const char path, const char new_path, int pri, eio_cb cb, void data)	1365	eio_req eio_rename (const char path, const char new_path, int pri, eio_cb cb, void data)
1270	{	1366	{
1271	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	1367	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1272	}	1368	}
1273		1369
		1370	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)
		1371	{
		1372	REQ (EIO_CUSTOM); req->feed = execute; SEND;
		1373	}
		1374
1274	#endif	1375	#endif
1275		1376
1276	eio_req eio_grp (eio_cb cb, void data)	1377	eio_req eio_grp (eio_cb cb, void data)
1277	{	1378	{
1278	const int pri = EIO_PRI_MAX;	1379	const int pri = EIO_PRI_MAX;
…		…
1321	/*****************************************************************************/	1422	/*****************************************************************************/
1322	/* misc garbage */	1423	/* misc garbage */
1323		1424
1324	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	1425	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1325	{	1426	{
1326	worker wrk;	1427	etp_worker wrk;
1327		1428
1328	wrk.dbuf = 0;	1429	wrk.dbuf = 0;
1329		1430
1330	eio__sendfile (ofd, ifd, offset, count, &wrk);	1431	eio__sendfile (ofd, ifd, offset, count, &wrk);
1331		1432

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.13 by root, Tue May 13 19:34:11 2008 UTC vs. Revision 1.21 by root, Sat Jun 21 00:13:13 2008 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.13 by root, Tue May 13 19:34:11 2008 UTC vs.
Revision 1.21 by root, Sat Jun 21 00:13:13 2008 UTC