[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.25 by root, Tue Sep 30 17:23:24 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	#if __GNUC__ >= 3
		126	# define expect(expr,value) __builtin_expect ((expr),(value))
		127	#else
		128	# define expect(expr,value) (expr)
		129	#endif
		130
		131	#define expect_false(expr) expect ((expr) != 0, 0)
		132	#define expect_true(expr) expect ((expr) != 0, 1)
		133
		134	/*****************************************************************************/
		135
		136	#define ETP_PRI_MIN EIO_PRI_MIN
		137	#define ETP_PRI_MAX EIO_PRI_MAX
		138
		139	struct etp_worker;
		140
		141	#define ETP_REQ eio_req
		142	#define ETP_DESTROY(req) eio_destroy (req)
		143	static int eio_finish (eio_req *req);
		144	#define ETP_FINISH(req) eio_finish (req)
		145	static void eio_execute (struct etp_worker self, eio_req req);
		146	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
		147
		148	#define ETP_WORKER_CLEAR(req) \
		149	if (wrk->dbuf) \
		150	{ \
		151	free (wrk->dbuf); \
		152	wrk->dbuf = 0; \
		153	} \
		154	\
		155	if (wrk->dirp) \
		156	{ \
		157	closedir (wrk->dirp); \
		158	wrk->dirp = 0; \
		159	}
		160	#define ETP_WORKER_COMMON \
		161	void *dbuf; \
		162	DIR *dirp;
		163
		164	/*****************************************************************************/
		165
		166	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
		167
86	/* calculcate time difference in ~1/EIO_TICKS of a second */	168	/* calculcate time difference in ~1/EIO_TICKS of a second */
87	static int tvdiff (struct timeval tv1, struct timeval tv2)	169	static int tvdiff (struct timeval tv1, struct timeval tv2)
88	{	170	{
89	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	171	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
90	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	172	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
91	}	173	}
92		174
93	static unsigned int started, idle, wanted = 4;	175	static unsigned int started, idle, wanted = 4;
94		176
95	typedef struct etp_pool
96	{
97	void (*want_poll_cb) (void);	177	static void (*want_poll_cb) (void);
98	void (*done_poll_cb) (void);	178	static void (*done_poll_cb) (void);
99		179
100	unsigned int max_poll_time;	180	static unsigned int max_poll_time; /* reslock */
101	unsigned int max_poll_reqs;	181	static unsigned int max_poll_reqs; /* reslock */
102	} etp_pool;
103		182
104	static volatile unsigned int nreqs, nready, npending;	183	static volatile unsigned int nreqs; /* reqlock */
		184	static volatile unsigned int nready; /* reqlock */
		185	static volatile unsigned int npending; /* reqlock */
105	static volatile unsigned int max_idle = 4;	186	static volatile unsigned int max_idle = 4;
106		187
107	static mutex_t etplock = X_MUTEX_INIT;	188	static mutex_t wrklock = X_MUTEX_INIT;
108	static mutex_t reslock = X_MUTEX_INIT;	189	static mutex_t reslock = X_MUTEX_INIT;
109	static mutex_t reqlock = X_MUTEX_INIT;	190	static mutex_t reqlock = X_MUTEX_INIT;
110	static cond_t reqwait = X_COND_INIT;	191	static cond_t reqwait = X_COND_INIT;
111		192
		193	#if !HAVE_PREADWRITE
		194	/*
		195	* make our pread/pwrite emulation safe against themselves, but not against
		196	* normal read/write by using a mutex. slows down execution a lot,
		197	* but that's your problem, not mine.
		198	*/
		199	static mutex_t preadwritelock = X_MUTEX_INIT;
		200	#endif
		201
112	typedef struct worker	202	typedef struct etp_worker
113	{	203	{
114	/* locked by etplock */	204	/* locked by wrklock */
115	struct worker prev, next;	205	struct etp_worker prev, next;
116		206
117	thread_t tid;	207	thread_t tid;
118		208
119	/* locked by reslock, reqlock or etplock */	209	/* locked by reslock, reqlock or wrklock */
120	eio_req req; / currently processed request */	210	ETP_REQ req; / currently processed request */
121	void *dbuf;	211
122	DIR *dirp;	212	ETP_WORKER_COMMON
123	} worker;	213	} etp_worker;
124		214
125	static worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	215	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
		216
		217	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
		218	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
126		219
127	/* worker threads management */	220	/* worker threads management */
128		221
129	static void worker_clear (worker *wrk)	222	static void etp_worker_clear (etp_worker *wrk)
130	{	223	{
131	if (wrk->dirp)	224	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	}	225	}
143		226
144	static void worker_free (worker *wrk)	227	static void etp_worker_free (etp_worker *wrk)
145	{	228	{
146	wrk->next->prev = wrk->prev;	229	wrk->next->prev = wrk->prev;
147	wrk->prev->next = wrk->next;	230	wrk->prev->next = wrk->next;
148		231
149	free (wrk);	232	free (wrk);
150	}	233	}
151		234
152	unsigned int eio_nreqs (void)	235	static unsigned int etp_nreqs (void)
153	{	236	{
		237	int retval;
		238	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
		239	retval = nreqs;
		240	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
154	return nreqs;	241	return retval;
155	}	242	}
156		243
157	unsigned int eio_nready (void)	244	static unsigned int etp_nready (void)
158	{	245	{
159	unsigned int retval;	246	unsigned int retval;
160		247
161	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	248	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
162	retval = nready;	249	retval = nready;
163	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	250	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
164		251
165	return retval;	252	return retval;
166	}	253	}
167		254
168	unsigned int eio_npending (void)	255	static unsigned int etp_npending (void)
169	{	256	{
170	unsigned int retval;	257	unsigned int retval;
171		258
172	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	259	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
173	retval = npending;	260	retval = npending;
174	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	261	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
175		262
176	return retval;	263	return retval;
177	}	264	}
178		265
179	unsigned int eio_nthreads (void)	266	static unsigned int etp_nthreads (void)
180	{	267	{
181	unsigned int retval;	268	unsigned int retval;
182		269
183	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	270	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
184	retval = started;	271	retval = started;
…		…
191	* a somewhat faster data structure might be nice, but	278	* a somewhat faster data structure might be nice, but
192	* with 8 priorities this actually needs <20 insns	279	* with 8 priorities this actually needs <20 insns
193	* per shift, the most expensive operation.	280	* per shift, the most expensive operation.
194	*/	281	*/
195	typedef struct {	282	typedef struct {
196	eio_req qs[EIO_NUM_PRI], qe[EIO_NUM_PRI]; /* qstart, qend */	283	ETP_REQ qs[ETP_NUM_PRI], qe[ETP_NUM_PRI]; /* qstart, qend */
197	int size;	284	int size;
198	} reqq;	285	} etp_reqq;
199		286
200	static reqq req_queue;	287	static etp_reqq req_queue;
201	static reqq res_queue;	288	static etp_reqq res_queue;
202		289
203	static int reqq_push (reqq q, eio_req req)	290	static int reqq_push (etp_reqq q, ETP_REQ req)
204	{	291	{
205	int pri = req->pri;	292	int pri = req->pri;
206	req->next = 0;	293	req->next = 0;
207		294
208	if (q->qe[pri])	295	if (q->qe[pri])
…		…
214	q->qe[pri] = q->qs[pri] = req;	301	q->qe[pri] = q->qs[pri] = req;
215		302
216	return q->size++;	303	return q->size++;
217	}	304	}
218		305
219	static eio_req reqq_shift (reqq q)	306	static ETP_REQ reqq_shift (etp_reqq q)
220	{	307	{
221	int pri;	308	int pri;
222		309
223	if (!q->size)	310	if (!q->size)
224	return 0;	311	return 0;
225		312
226	--q->size;	313	--q->size;
227		314
228	for (pri = EIO_NUM_PRI; pri--; )	315	for (pri = ETP_NUM_PRI; pri--; )
229	{	316	{
230	eio_req *req = q->qs[pri];	317	eio_req *req = q->qs[pri];
231		318
232	if (req)	319	if (req)
233	{	320	{
…		…
241	abort ();	328	abort ();
242	}	329	}
243		330
244	static void etp_atfork_prepare (void)	331	static void etp_atfork_prepare (void)
245	{	332	{
246	X_LOCK (etplock);	333	X_LOCK (wrklock);
247	X_LOCK (reqlock);	334	X_LOCK (reqlock);
248	X_LOCK (reslock);	335	X_LOCK (reslock);
249	#if !HAVE_PREADWRITE	336	#if !HAVE_PREADWRITE
250	X_LOCK (preadwritelock);	337	X_LOCK (preadwritelock);
251	#endif	338	#endif
252	#if !HAVE_READDIR_R
253	X_LOCK (readdirlock);
254	#endif
255	}	339	}
256		340
257	static void etp_atfork_parent (void)	341	static void etp_atfork_parent (void)
258	{	342	{
259	#if !HAVE_READDIR_R
260	X_UNLOCK (readdirlock);
261	#endif
262	#if !HAVE_PREADWRITE	343	#if !HAVE_PREADWRITE
263	X_UNLOCK (preadwritelock);	344	X_UNLOCK (preadwritelock);
264	#endif	345	#endif
265	X_UNLOCK (reslock);	346	X_UNLOCK (reslock);
266	X_UNLOCK (reqlock);	347	X_UNLOCK (reqlock);
267	X_UNLOCK (etplock);	348	X_UNLOCK (wrklock);
268	}	349	}
269		350
270	static void etp_atfork_child (void)	351	static void etp_atfork_child (void)
271	{	352	{
272	eio_req *prv;	353	ETP_REQ *prv;
273		354
274	while (prv = reqq_shift (&req_queue))	355	while ((prv = reqq_shift (&req_queue)))
275	eio_destroy (prv);	356	ETP_DESTROY (prv);
276		357
277	while (prv = reqq_shift (&res_queue))	358	while ((prv = reqq_shift (&res_queue)))
278	eio_destroy (prv);	359	ETP_DESTROY (prv);
279		360
280	while (wrk_first.next != &wrk_first)	361	while (wrk_first.next != &wrk_first)
281	{	362	{
282	worker *wrk = wrk_first.next;	363	etp_worker *wrk = wrk_first.next;
283		364
284	if (wrk->req)	365	if (wrk->req)
285	eio_destroy (wrk->req);	366	ETP_DESTROY (wrk->req);
286		367
287	worker_clear (wrk);	368	etp_worker_clear (wrk);
288	worker_free (wrk);	369	etp_worker_free (wrk);
289	}	370	}
290		371
291	started = 0;	372	started = 0;
292	idle = 0;	373	idle = 0;
293	nreqs = 0;	374	nreqs = 0;
…		…
302	{	383	{
303	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);	384	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
304	}	385	}
305		386
306	static int	387	static int
307	etp_init (etp_pool etp, void (want_poll)(void), void (*done_poll)(void))	388	etp_init (void (want_poll)(void), void (done_poll)(void))
308	{	389	{
309	static pthread_once_t doinit = PTHREAD_ONCE_INIT;	390	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
310		391
311	pthread_once (&doinit, etp_once_init);	392	pthread_once (&doinit, etp_once_init);
312		393
313	memset (etp, 0, sizeof *etp);
314
315	etp->want_poll_cb = want_poll;	394	want_poll_cb = want_poll;
316	etp->done_poll_cb = done_poll;	395	done_poll_cb = done_poll;
317	}
318		396
319	static etp_pool etp;	397	return 0;
		398	}
		399
		400	X_THREAD_PROC (etp_proc);
		401
		402	static void etp_start_thread (void)
		403	{
		404	etp_worker *wrk = calloc (1, sizeof (etp_worker));
		405
		406	/TODO/
		407	assert (("unable to allocate worker thread data", wrk));
		408
		409	X_LOCK (wrklock);
		410
		411	if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
		412	{
		413	wrk->prev = &wrk_first;
		414	wrk->next = wrk_first.next;
		415	wrk_first.next->prev = wrk;
		416	wrk_first.next = wrk;
		417	++started;
		418	}
		419	else
		420	free (wrk);
		421
		422	X_UNLOCK (wrklock);
		423	}
		424
		425	static void etp_maybe_start_thread (void)
		426	{
		427	if (expect_true (etp_nthreads () >= wanted))
		428	return;
		429
		430	/* todo: maybe use idle here, but might be less exact */
		431	if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
		432	return;
		433
		434	etp_start_thread ();
		435	}
		436
		437	static void etp_end_thread (void)
		438	{
		439	eio_req *req = calloc (1, sizeof (eio_req));
		440
		441	req->type = -1;
		442	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
		443
		444	X_LOCK (reqlock);
		445	reqq_push (&req_queue, req);
		446	X_COND_SIGNAL (reqwait);
		447	X_UNLOCK (reqlock);
		448
		449	X_LOCK (wrklock);
		450	--started;
		451	X_UNLOCK (wrklock);
		452	}
		453
		454	static int etp_poll (void)
		455	{
		456	unsigned int maxreqs;
		457	unsigned int maxtime;
		458	struct timeval tv_start, tv_now;
		459
		460	X_LOCK (reslock);
		461	maxreqs = max_poll_reqs;
		462	maxtime = max_poll_time;
		463	X_UNLOCK (reslock);
		464
		465	if (maxtime)
		466	gettimeofday (&tv_start, 0);
		467
		468	for (;;)
		469	{
		470	ETP_REQ *req;
		471
		472	etp_maybe_start_thread ();
		473
		474	X_LOCK (reslock);
		475	req = reqq_shift (&res_queue);
		476
		477	if (req)
		478	{
		479	--npending;
		480
		481	if (!res_queue.size && done_poll_cb)
		482	done_poll_cb ();
		483	}
		484
		485	X_UNLOCK (reslock);
		486
		487	if (!req)
		488	return 0;
		489
		490	X_LOCK (reqlock);
		491	--nreqs;
		492	X_UNLOCK (reqlock);
		493
		494	if (expect_false (req->type == EIO_GROUP && req->size))
		495	{
		496	req->int1 = 1; /* mark request as delayed */
		497	continue;
		498	}
		499	else
		500	{
		501	int res = ETP_FINISH (req);
		502	if (expect_false (res))
		503	return res;
		504	}
		505
		506	if (expect_false (maxreqs && !--maxreqs))
		507	break;
		508
		509	if (maxtime)
		510	{
		511	gettimeofday (&tv_now, 0);
		512
		513	if (tvdiff (&tv_start, &tv_now) >= maxtime)
		514	break;
		515	}
		516	}
		517
		518	errno = EAGAIN;
		519	return -1;
		520	}
		521
		522	static void etp_cancel (ETP_REQ *req)
		523	{
		524	X_LOCK (wrklock);
		525	req->flags \|= EIO_FLAG_CANCELLED;
		526	X_UNLOCK (wrklock);
		527
		528	eio_grp_cancel (req);
		529	}
		530
		531	static void etp_submit (ETP_REQ *req)
		532	{
		533	req->pri -= ETP_PRI_MIN;
		534
		535	if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
		536	if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
		537
		538	if (expect_false (req->type == EIO_GROUP))
		539	{
		540	/* I hope this is worth it :/ */
		541	X_LOCK (reqlock);
		542	++nreqs;
		543	X_UNLOCK (reqlock);
		544
		545	X_LOCK (reslock);
		546
		547	++npending;
		548
		549	if (!reqq_push (&res_queue, req) && want_poll_cb)
		550	want_poll_cb ();
		551
		552	X_UNLOCK (reslock);
		553	}
		554	else
		555	{
		556	X_LOCK (reqlock);
		557	++nreqs;
		558	++nready;
		559	reqq_push (&req_queue, req);
		560	X_COND_SIGNAL (reqwait);
		561	X_UNLOCK (reqlock);
		562
		563	etp_maybe_start_thread ();
		564	}
		565	}
		566
		567	static void etp_set_max_poll_time (double nseconds)
		568	{
		569	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
		570	max_poll_time = nseconds;
		571	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
		572	}
		573
		574	static void etp_set_max_poll_reqs (unsigned int maxreqs)
		575	{
		576	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
		577	max_poll_reqs = maxreqs;
		578	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
		579	}
		580
		581	static void etp_set_max_idle (unsigned int nthreads)
		582	{
		583	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
		584	max_idle = nthreads <= 0 ? 1 : nthreads;
		585	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
		586	}
		587
		588	static void etp_set_min_parallel (unsigned int nthreads)
		589	{
		590	if (wanted < nthreads)
		591	wanted = nthreads;
		592	}
		593
		594	static void etp_set_max_parallel (unsigned int nthreads)
		595	{
		596	if (wanted > nthreads)
		597	wanted = nthreads;
		598
		599	while (started > wanted)
		600	etp_end_thread ();
		601	}
320		602
321	/*****************************************************************************/	603	/*****************************************************************************/
322		604
323	static void grp_try_feed (eio_req *grp)	605	static void grp_try_feed (eio_req *grp)
324	{	606	{
…		…
335	break;	617	break;
336	}	618	}
337	}	619	}
338	}	620	}
339		621
340	static int eio_finish (eio_req *req);
341
342	static int grp_dec (eio_req *grp)	622	static int grp_dec (eio_req *grp)
343	{	623	{
344	--grp->size;	624	--grp->size;
345		625
346	/* call feeder, if applicable */	626	/* call feeder, if applicable */
…		…
394	eio_cancel (grp);	674	eio_cancel (grp);
395	}	675	}
396		676
397	void eio_cancel (eio_req *req)	677	void eio_cancel (eio_req *req)
398	{	678	{
399	X_LOCK (etplock);
400	req->flags \|= EIO_FLAG_CANCELLED;
401	X_UNLOCK (etplock);
402
403	eio_grp_cancel (req);	679	etp_cancel (req);
404	}
405
406	X_THREAD_PROC (eio_proc);
407
408	static void start_thread (void)
409	{
410	worker *wrk = calloc (1, sizeof (worker));
411
412	/TODO/
413	assert (("unable to allocate worker thread data", wrk));
414
415	X_LOCK (etplock);
416
417	if (thread_create (&wrk->tid, eio_proc, (void *)wrk))
418	{
419	wrk->prev = &wrk_first;
420	wrk->next = wrk_first.next;
421	wrk_first.next->prev = wrk;
422	wrk_first.next = wrk;
423	++started;
424	}
425	else
426	free (wrk);
427
428	X_UNLOCK (etplock);
429	}
430
431	static void maybe_start_thread (void)
432	{
433	if (eio_nthreads () >= wanted)
434	return;
435
436	/* todo: maybe use idle here, but might be less exact */
437	if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ())
438	return;
439
440	start_thread ();
441	}	680	}
442		681
443	void eio_submit (eio_req *req)	682	void eio_submit (eio_req *req)
444	{	683	{
445	req->pri += EIO_PRI_BIAS;	684	etp_submit (req);
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	}	685	}
460		686
461	static void end_thread (void)	687	unsigned int eio_nreqs (void)
462	{	688	{
463	eio_req *req = calloc (1, sizeof (eio_req));	689	return etp_nreqs ();
		690	}
464		691
465	req->type = EIO_QUIT;	692	unsigned int eio_nready (void)
466	req->pri = EIO_PRI_MAX + EIO_PRI_BIAS;	693	{
		694	return etp_nready ();
		695	}
467		696
468	X_LOCK (reqlock);	697	unsigned int eio_npending (void)
469	reqq_push (&req_queue, req);	698	{
470	X_COND_SIGNAL (reqwait);	699	return etp_npending ();
471	X_UNLOCK (reqlock);	700	}
472		701
473	X_LOCK (etplock);	702	unsigned int eio_nthreads (void)
474	--started;	703	{
475	X_UNLOCK (etplock);	704	return etp_nthreads ();
476	}	705	}
477		706
478	void eio_set_max_poll_time (double nseconds)	707	void eio_set_max_poll_time (double nseconds)
479	{	708	{
480	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
481	etp.max_poll_time = nseconds;	709	etp_set_max_poll_time (nseconds);
482	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
483	}	710	}
484		711
485	void eio_set_max_poll_reqs (unsigned int maxreqs)	712	void eio_set_max_poll_reqs (unsigned int maxreqs)
486	{	713	{
487	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
488	etp.max_poll_reqs = maxreqs;	714	etp_set_max_poll_reqs (maxreqs);
489	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
490	}	715	}
491		716
492	void eio_set_max_idle (unsigned int nthreads)	717	void eio_set_max_idle (unsigned int nthreads)
493	{	718	{
494	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	719	etp_set_max_idle (nthreads);
495	max_idle = nthreads <= 0 ? 1 : nthreads;
496	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
497	}	720	}
498		721
499	void eio_set_min_parallel (unsigned int nthreads)	722	void eio_set_min_parallel (unsigned int nthreads)
500	{	723	{
501	if (wanted < nthreads)	724	etp_set_min_parallel (nthreads);
502	wanted = nthreads;
503	}	725	}
504		726
505	void eio_set_max_parallel (unsigned int nthreads)	727	void eio_set_max_parallel (unsigned int nthreads)
506	{	728	{
507	if (wanted > nthreads)	729	etp_set_max_parallel (nthreads);
508	wanted = nthreads;
509
510	while (started > wanted)
511	end_thread ();
512	}	730	}
513		731
514	int eio_poll (void)	732	int eio_poll (void)
515	{	733	{
516	int maxreqs = etp.max_poll_reqs;	734	return etp_poll ();
517	struct timeval tv_start, tv_now;
518	eio_req *req;
519
520	if (etp.max_poll_time)
521	gettimeofday (&tv_start, 0);
522
523	for (;;)
524	{
525	maybe_start_thread ();
526
527	X_LOCK (reslock);
528	req = reqq_shift (&res_queue);
529
530	if (req)
531	{
532	--npending;
533
534	if (!res_queue.size && etp.done_poll_cb)
535	etp.done_poll_cb ();
536	}
537
538	X_UNLOCK (reslock);
539
540	if (!req)
541	return 0;
542
543	--nreqs;
544
545	if (req->type == EIO_GROUP && req->size)
546	{
547	req->int1 = 1; /* mark request as delayed */
548	continue;
549	}
550	else
551	{
552	int res = eio_finish (req);
553	if (res)
554	return res;
555	}
556
557	if (maxreqs && !--maxreqs)
558	break;
559
560	if (etp.max_poll_time)
561	{
562	gettimeofday (&tv_now, 0);
563
564	if (tvdiff (&tv_start, &tv_now) >= etp.max_poll_time)
565	break;
566	}
567	}
568
569	errno = EAGAIN;
570	return -1;
571	}	735	}
572		736
573	/*****************************************************************************/	737	/*****************************************************************************/
574	/* work around various missing functions */	738	/* work around various missing functions */
575		739
576	#if !HAVE_PREADWRITE	740	#if !HAVE_PREADWRITE
577	# define pread eio__pread	741	# define pread eio__pread
578	# define pwrite eio__pwrite	742	# define pwrite eio__pwrite
579
580	/*
581	* make our pread/pwrite safe against themselves, but not against
582	* normal read/write by using a mutex. slows down execution a lot,
583	* but that's your problem, not mine.
584	*/
585	static mutex_t preadwritelock = X_MUTEX_INIT;
586		743
587	static ssize_t	744	static ssize_t
588	eio__pread (int fd, void *buf, size_t count, off_t offset)	745	eio__pread (int fd, void *buf, size_t count, off_t offset)
589	{	746	{
590	ssize_t res;	747	ssize_t res;
…		…
652		809
653	#if !HAVE_READAHEAD	810	#if !HAVE_READAHEAD
654	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	811	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
655		812
656	static ssize_t	813	static ssize_t
657	eio__readahead (int fd, off_t offset, size_t count, worker *self)	814	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
658	{	815	{
659	size_t todo = count;	816	size_t todo = count;
660	dBUF;	817	dBUF;
661		818
662	while (todo > 0)	819	while (todo > 0)
…		…
672	return count;	829	return count;
673	}	830	}
674		831
675	#endif	832	#endif
676		833
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 */	834	/* sendfile always needs emulation */
709	static ssize_t	835	static ssize_t
710	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self)	836	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
711	{	837	{
712	ssize_t res;	838	ssize_t res;
713		839
714	if (!count)	840	if (!count)
715	return 0;	841	return 0;
…		…
799	return res;	925	return res;
800	}	926	}
801		927
802	/* read a full directory */	928	/* read a full directory */
803	static void	929	static void
804	eio__scandir (eio_req req, worker self)	930	eio__scandir (eio_req req, etp_worker self)
805	{	931	{
806	DIR *dirp;	932	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;	933	EIO_STRUCT_DIRENT *entp;
813	char name, names;	934	char name, names;
814	int memlen = 4096;	935	int memlen = 4096;
815	int memofs = 0;	936	int memofs = 0;
816	int res = 0;	937	int res = 0;
817		938
818	X_LOCK (etplock);	939	X_LOCK (wrklock);
		940	/* the corresponding closedir is in ETP_WORKER_CLEAR */
819	self->dirp = dirp = opendir (req->ptr1);	941	self->dirp = dirp = opendir (req->ptr1);
820	self->dbuf = u = malloc (sizeof (*u));
821	req->flags \|= EIO_FLAG_PTR2_FREE;	942	req->flags \|= EIO_FLAG_PTR2_FREE;
822	req->ptr2 = names = malloc (memlen);	943	req->ptr2 = names = malloc (memlen);
823	X_UNLOCK (etplock);	944	X_UNLOCK (wrklock);
824		945
825	if (dirp && u && names)	946	if (dirp && names)
826	for (;;)	947	for (;;)
827	{	948	{
828	errno = 0;	949	errno = 0;
829	readdir_r (dirp, &u->d, &entp);	950	entp = readdir (dirp);
830		951
831	if (!entp)	952	if (!entp)
832	break;	953	break;
833		954
834	name = entp->d_name;	955	name = entp->d_name;
…		…
840	res++;	961	res++;
841		962
842	while (memofs + len > memlen)	963	while (memofs + len > memlen)
843	{	964	{
844	memlen *= 2;	965	memlen *= 2;
845	X_LOCK (etplock);	966	X_LOCK (wrklock);
846	req->ptr2 = names = realloc (names, memlen);	967	req->ptr2 = names = realloc (names, memlen);
847	X_UNLOCK (etplock);	968	X_UNLOCK (wrklock);
848		969
849	if (!names)	970	if (!names)
850	break;	971	break;
851	}	972	}
852		973
…		…
859	res = -1;	980	res = -1;
860		981
861	req->result = res;	982	req->result = res;
862	}	983	}
863		984
		985	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		986	# define msync(a,b,c) ENOSYS
		987	#endif
		988
		989	int
		990	eio__mtouch (void *mem, size_t len, int flags)
		991	{
		992	intptr_t addr = (intptr_t)mem;
		993	intptr_t end = addr + len;
		994	#ifdef PAGESIZE
		995	const intptr_t page = PAGESIZE;
		996	#else
		997	static intptr_t page;
		998
		999	if (!page)
		1000	page = sysconf (_SC_PAGESIZE);
		1001	#endif
		1002
		1003	addr &= ~(page - 1); /* assume page size is always a power of two */
		1004
		1005	if (addr < end)
		1006	if (flags) /* modify */
		1007	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);
		1008	else
		1009	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);
		1010
		1011	return 0;
		1012	}
		1013
864	/*****************************************************************************/	1014	/*****************************************************************************/
865		1015
866	#define ALLOC(len) \	1016	#define ALLOC(len) \
867	if (!req->ptr2) \	1017	if (!req->ptr2) \
868	{ \	1018	{ \
869	X_LOCK (etplock); \	1019	X_LOCK (wrklock); \
870	req->flags \|= EIO_FLAG_PTR2_FREE; \	1020	req->flags \|= EIO_FLAG_PTR2_FREE; \
871	X_UNLOCK (etplock); \	1021	X_UNLOCK (wrklock); \
872	req->ptr2 = malloc (len); \	1022	req->ptr2 = malloc (len); \
873	if (!req->ptr2) \	1023	if (!req->ptr2) \
874	{ \	1024	{ \
875	errno = ENOMEM; \	1025	errno = ENOMEM; \
876	req->result = -1; \	1026	req->result = -1; \
877	break; \	1027	break; \
878	} \	1028	} \
879	}	1029	}
880		1030
881	X_THREAD_PROC (eio_proc)	1031	X_THREAD_PROC (etp_proc)
882	{	1032	{
883	eio_req *req;	1033	ETP_REQ *req;
884	struct timespec ts;	1034	struct timespec ts;
885	worker self = (worker )thr_arg;	1035	etp_worker self = (etp_worker )thr_arg;
886		1036
887	/* try to distribute timeouts somewhat randomly */	1037	/* try to distribute timeouts somewhat randomly */
888	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	1038	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
889		1039
890	for (;;)	1040	for (;;)
891	{	1041	{
892	ts.tv_sec = time (0) + IDLE_TIMEOUT;
893
894	X_LOCK (reqlock);	1042	X_LOCK (reqlock);
895		1043
896	for (;;)	1044	for (;;)
897	{	1045	{
898	self->req = req = reqq_shift (&req_queue);	1046	self->req = req = reqq_shift (&req_queue);
…		…
900	if (req)	1048	if (req)
901	break;	1049	break;
902		1050
903	++idle;	1051	++idle;
904		1052
		1053	ts.tv_sec = time (0) + IDLE_TIMEOUT;
905	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)	1054	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
906	{	1055	{
907	if (idle > max_idle)	1056	if (idle > max_idle)
908	{	1057	{
909	--idle;	1058	--idle;
910	X_UNLOCK (reqlock);	1059	X_UNLOCK (reqlock);
911	X_LOCK (etplock);	1060	X_LOCK (wrklock);
912	--started;	1061	--started;
913	X_UNLOCK (etplock);	1062	X_UNLOCK (wrklock);
914	goto quit;	1063	goto quit;
915	}	1064	}
916		1065
917	/* we are allowed to idle, so do so without any timeout */	1066	/* we are allowed to idle, so do so without any timeout */
918	X_COND_WAIT (reqwait, reqlock);	1067	X_COND_WAIT (reqwait, reqlock);
919	ts.tv_sec = time (0) + IDLE_TIMEOUT;
920	}	1068	}
921		1069
922	--idle;	1070	--idle;
923	}	1071	}
924		1072
925	--nready;	1073	--nready;
926		1074
927	X_UNLOCK (reqlock);	1075	X_UNLOCK (reqlock);
928		1076
929	errno = 0; /* strictly unnecessary */	1077	if (req->type < 0)
		1078	goto quit;
930		1079
931	if (!EIO_CANCELLED (req))	1080	if (!EIO_CANCELLED (req))
932	switch (req->type)	1081	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		1082
1033	X_LOCK (reslock);	1083	X_LOCK (reslock);
1034		1084
1035	++npending;	1085	++npending;
1036		1086
1037	if (!reqq_push (&res_queue, req) && etp.want_poll_cb)	1087	if (!reqq_push (&res_queue, req) && want_poll_cb)
1038	etp.want_poll_cb ();	1088	want_poll_cb ();
1039		1089
1040	self->req = 0;	1090	self->req = 0;
1041	worker_clear (self);	1091	etp_worker_clear (self);
1042		1092
1043	X_UNLOCK (reslock);	1093	X_UNLOCK (reslock);
1044	}	1094	}
1045		1095
1046	quit:	1096	quit:
1047	X_LOCK (etplock);	1097	X_LOCK (wrklock);
1048	worker_free (self);	1098	etp_worker_free (self);
1049	X_UNLOCK (etplock);	1099	X_UNLOCK (wrklock);
1050		1100
1051	return 0;	1101	return 0;
1052	}	1102	}
1053		1103
1054	/*****************************************************************************/	1104	/*****************************************************************************/
1055		1105
1056	int eio_init (void (want_poll)(void), void (done_poll)(void))	1106	int eio_init (void (want_poll)(void), void (done_poll)(void))
1057	{	1107	{
1058	etp_init (&etp, want_poll, done_poll);	1108	return etp_init (want_poll, done_poll);
1059	}	1109	}
1060		1110
1061	static void eio_api_destroy (eio_req *req)	1111	static void eio_api_destroy (eio_req *req)
1062	{	1112	{
1063	free (req);	1113	free (req);
…		…
1085	{ \	1135	{ \
1086	eio_api_destroy (req); \	1136	eio_api_destroy (req); \
1087	return 0; \	1137	return 0; \
1088	}	1138	}
1089		1139
		1140	static void eio_execute (etp_worker self, eio_req req)
		1141	{
		1142	errno = 0;
		1143
		1144	switch (req->type)
		1145	{
		1146	case EIO_READ: ALLOC (req->size);
		1147	req->result = req->offs >= 0
		1148	? pread (req->int1, req->ptr2, req->size, req->offs)
		1149	: read (req->int1, req->ptr2, req->size); break;
		1150	case EIO_WRITE: req->result = req->offs >= 0
		1151	? pwrite (req->int1, req->ptr2, req->size, req->offs)
		1152	: write (req->int1, req->ptr2, req->size); break;
		1153
		1154	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
		1155	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
		1156
		1157	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		1158	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
		1159	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		1160	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
		1161	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		1162	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
		1163
		1164	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
		1165	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
		1166	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
		1167	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
		1168	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
		1169	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
		1170
		1171	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
		1172	case EIO_CLOSE: req->result = close (req->int1); break;
		1173	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
		1174	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
		1175	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
		1176	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
		1177	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
		1178	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
		1179	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
		1180	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
		1181
		1182	case EIO_READLINK: ALLOC (NAME_MAX);
		1183	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
		1184
		1185	case EIO_SYNC: req->result = 0; sync (); break;
		1186	case EIO_FSYNC: req->result = fsync (req->int1); break;
		1187	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		1188	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
		1189	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1190
		1191	case EIO_READDIR: eio__scandir (req, self); break;
		1192
		1193	case EIO_BUSY:
		1194	#ifdef _WIN32
		1195	Sleep (req->nv1 * 1000.);
		1196	#else
		1197	{
		1198	struct timeval tv;
		1199
		1200	tv.tv_sec = req->nv1;
		1201	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
		1202
		1203	req->result = select (0, 0, 0, 0, &tv);
		1204	}
		1205	#endif
		1206	break;
		1207
		1208	case EIO_UTIME:
		1209	case EIO_FUTIME:
		1210	{
		1211	struct timeval tv[2];
		1212	struct timeval *times;
		1213
		1214	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		1215	{
		1216	tv[0].tv_sec = req->nv1;
		1217	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
		1218	tv[1].tv_sec = req->nv2;
		1219	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
		1220
		1221	times = tv;
		1222	}
		1223	else
		1224	times = 0;
		1225
		1226
		1227	req->result = req->type == EIO_FUTIME
		1228	? futimes (req->int1, times)
		1229	: utimes (req->ptr1, times);
		1230	}
		1231	break;
		1232
		1233	case EIO_GROUP:
		1234	abort (); /* handled in eio_request */
		1235
		1236	case EIO_NOP:
		1237	req->result = 0;
		1238	break;
		1239
		1240	case EIO_CUSTOM:
		1241	((void ()(eio_req ))req->feed) (req);
		1242	break;
		1243
		1244	default:
		1245	req->result = -1;
		1246	break;
		1247	}
		1248
		1249	req->errorno = errno;
		1250	}
		1251
1090	#ifndef EIO_NO_WRAPPERS	1252	#ifndef EIO_NO_WRAPPERS
1091		1253
1092	eio_req eio_nop (int pri, eio_cb cb, void data)	1254	eio_req eio_nop (int pri, eio_cb cb, void data)
1093	{	1255	{
1094	REQ (EIO_NOP); SEND;	1256	REQ (EIO_NOP); SEND;
…		…
1105	}	1267	}
1106		1268
1107	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)	1269	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)
1108	{	1270	{
1109	REQ (EIO_FSYNC); req->int1 = fd; SEND;	1271	REQ (EIO_FSYNC); req->int1 = fd; SEND;
		1272	}
		1273
		1274	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1275	{
		1276	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1277	}
		1278
		1279	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1280	{
		1281	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1110	}	1282	}
1111		1283
1112	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1284	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1113	{	1285	{
1114	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1286	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
…		…
1235	return eio__1path (EIO_READDIR, path, pri, cb, data);	1407	return eio__1path (EIO_READDIR, path, pri, cb, data);
1236	}	1408	}
1237		1409
1238	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1410	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1239	{	1411	{
1240	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND;	1412	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1241	}	1413	}
1242		1414
1243	static eio_req *	1415	static eio_req *
1244	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)	1416	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1245	{	1417	{
…		…
1269	eio_req eio_rename (const char path, const char new_path, int pri, eio_cb cb, void data)	1441	eio_req eio_rename (const char path, const char new_path, int pri, eio_cb cb, void data)
1270	{	1442	{
1271	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	1443	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1272	}	1444	}
1273		1445
		1446	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)
		1447	{
		1448	REQ (EIO_CUSTOM); req->feed = (void ()(eio_req ))execute; SEND;
		1449	}
		1450
1274	#endif	1451	#endif
1275		1452
1276	eio_req eio_grp (eio_cb cb, void data)	1453	eio_req eio_grp (eio_cb cb, void data)
1277	{	1454	{
1278	const int pri = EIO_PRI_MAX;	1455	const int pri = EIO_PRI_MAX;
…		…
1321	/*****************************************************************************/	1498	/*****************************************************************************/
1322	/* misc garbage */	1499	/* misc garbage */
1323		1500
1324	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	1501	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1325	{	1502	{
1326	worker wrk;	1503	etp_worker wrk;
1327		1504
1328	wrk.dbuf = 0;	1505	wrk.dbuf = 0;
1329		1506
1330	eio__sendfile (ofd, ifd, offset, count, &wrk);	1507	eio__sendfile (ofd, ifd, offset, count, &wrk);
1331		1508

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.25 by root, Tue Sep 30 17:23:24 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.25 by root, Tue Sep 30 17:23:24 2008 UTC