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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.19 by root, Tue Jun 17 23:34:20 2008 UTC vs.
Revision 1.96 by root, Tue Jul 19 05:20:36 2011 UTC

…		…
1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008 Marc Alexander Lehmann <libeio@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without modifica-	7	* Redistribution and use in source and binary forms, with or without modifica-
8	* tion, are permitted provided that the following conditions are met:	8	* tion, are permitted provided that the following conditions are met:
9	*	9	*
35	* and other provisions required by the GPL. If you do not delete the	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	36	* provisions above, a recipient may use your version of this file under
37	* either the BSD or the GPL.	37	* either the BSD or the GPL.
38	*/	38	*/
39		39
		40	#ifndef _WIN32
		41	# include "config.h"
		42	#endif
		43
40	#include "eio.h"	44	#include "eio.h"
		45	#include "ecb.h"
		46
		47	#ifdef EIO_STACKSIZE
		48	# define XTHREAD_STACKSIZE EIO_STACKSIZE
		49	#endif
41	#include "xthread.h"	50	#include "xthread.h"
42		51
43	#include <errno.h>	52	#include <errno.h>
44	#include <stddef.h>	53	#include <stddef.h>
45	#include <stdlib.h>	54	#include <stdlib.h>
…		…
49	#include <sys/stat.h>	58	#include <sys/stat.h>
50	#include <limits.h>	59	#include <limits.h>
51	#include <fcntl.h>	60	#include <fcntl.h>
52	#include <assert.h>	61	#include <assert.h>
53		62
		63	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
		64	/* intptr_t only comes from stdint.h, says idiot openbsd coder */
		65	#if HAVE_STDINT_H
		66	# include <stdint.h>
		67	#endif
		68
		69	#ifndef ECANCELED
		70	# define ECANCELED EDOM
		71	#endif
		72	#ifndef ELOOP
		73	# define ELOOP EDOM
		74	#endif
		75
		76	#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
		77	# define ENOTSOCK WSAENOTSOCK
		78	#endif
		79
		80	static void eio_destroy (eio_req *req);
		81
54	#ifndef EIO_FINISH	82	#ifndef EIO_FINISH
55	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0	83	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
56	#endif	84	#endif
57		85
58	#ifndef EIO_DESTROY	86	#ifndef EIO_DESTROY
…		…
61		89
62	#ifndef EIO_FEED	90	#ifndef EIO_FEED
63	# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)	91	# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
64	#endif	92	#endif
65		93
		94	#ifndef EIO_FD_TO_WIN32_HANDLE
		95	# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
		96	#endif
		97	#ifndef EIO_WIN32_HANDLE_TO_FD
		98	# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
		99	#endif
		100
		101	#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
		102
		103	#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
		104
66	#ifdef _WIN32	105	#ifdef _WIN32
67		106
68	/doh/	107	#undef PAGESIZE
		108	#define PAGESIZE 4096 /* GetSystemInfo? */
		109
		110	#ifdef EIO_STRUCT_STATI64
		111	#define stat(path,buf) _stati64 (path,buf)
		112	#define fstat(fd,buf) _fstati64 (fd,buf)
		113	#endif
		114	#define lstat(path,buf) stat (path,buf)
		115	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
		116	#define mkdir(path,mode) _mkdir (path)
		117	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
		118
		119	#define chmod(path,mode) _chmod (path, mode)
		120	#define dup(fd) _dup (fd)
		121	#define dup2(fd1,fd2) _dup2 (fd1, fd2)
		122
		123	#define fchmod(fd,mode) EIO_ENOSYS ()
		124	#define chown(path,uid,gid) EIO_ENOSYS ()
		125	#define fchown(fd,uid,gid) EIO_ENOSYS ()
		126	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
		127	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
		128	#define mknod(path,mode,dev) EIO_ENOSYS ()
		129	#define sync() EIO_ENOSYS ()
		130	#define readlink(path,buf,s) EIO_ENOSYS ()
		131	#define statvfs(path,buf) EIO_ENOSYS ()
		132	#define fstatvfs(fd,buf) EIO_ENOSYS ()
		133
		134	/* we could even stat and see if it exists */
		135	static int
		136	symlink (const char old, const char neu)
		137	{
		138	#if WINVER >= 0x0600
		139	if (CreateSymbolicLink (neu, old, 1))
		140	return 0;
		141
		142	if (CreateSymbolicLink (neu, old, 0))
		143	return 0;
		144	#endif
		145
		146	return EIO_ERRNO (ENOENT, -1);
		147	}
		148
		149	/* POSIX API only */
		150	#define CreateHardLink(neu,old,flags) 0
		151	#define CreateSymbolicLink(neu,old,flags) 0
		152
		153	struct statvfs
		154	{
		155	int dummy;
		156	};
		157
		158	#define DT_DIR EIO_DT_DIR
		159	#define DT_REG EIO_DT_REG
		160	#define D_NAME(entp) entp.cFileName
		161	#define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
69		162
70	#else	163	#else
71		164
72	# include "config.h"
73	# include <sys/time.h>	165	#include <sys/time.h>
74	# include <sys/select.h>	166	#include <sys/select.h>
		167	#include <sys/statvfs.h>
75	# include <unistd.h>	168	#include <unistd.h>
		169	#include <signal.h>
		170	#include <dirent.h>
		171
		172	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
		173	#include <sys/mman.h>
		174	#endif
		175
		176	#define D_NAME(entp) entp->d_name
		177
		178	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		179	#if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__
		180	#define _DIRENT_HAVE_D_TYPE /* sigh */
		181	#define D_INO(de) (de)->d_fileno
		182	#define D_NAMLEN(de) (de)->d_namlen
		183	#elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600
		184	#define D_INO(de) (de)->d_ino
		185	#endif
		186
		187	#ifdef _D_EXACT_NAMLEN
		188	#undef D_NAMLEN
		189	#define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
		190	#endif
		191
		192	#ifdef _DIRENT_HAVE_D_TYPE
		193	#define D_TYPE(de) (de)->d_type
		194	#endif
		195
		196	#ifndef EIO_STRUCT_DIRENT
		197	#define EIO_STRUCT_DIRENT struct dirent
		198	#endif
		199
		200	#endif
		201
		202	#if HAVE_UTIMES
76	# include <utime.h>	203	# include <utime.h>
77	# include <signal.h>
78	# include <dirent.h>
79
80	# ifndef EIO_STRUCT_DIRENT
81	# define EIO_STRUCT_DIRENT struct dirent
82	# endif
83
84	#endif	204	#endif
85		205
86	#if HAVE_SENDFILE	206	#if HAVE_SENDFILE
87	# if __linux	207	# if __linux
88	# include <sys/sendfile.h>	208	# include <sys/sendfile.h>
89	# elif __freebsd	209	# elif __FreeBSD__ \|\| defined __APPLE__
90	# include <sys/socket.h>	210	# include <sys/socket.h>
91	# include <sys/uio.h>	211	# include <sys/uio.h>
92	# elif __hpux	212	# elif __hpux
93	# include <sys/socket.h>	213	# include <sys/socket.h>
94	# elif __solaris /* not yet */	214	# elif __solaris
95	# include <sys/sendfile.h>	215	# include <sys/sendfile.h>
96	# else	216	# else
97	# error sendfile support requested but not available	217	# error sendfile support requested but not available
98	# endif	218	# endif
99	#endif	219	#endif
100		220
101	/* number of seconds after which an idle threads exit */	221	#ifndef D_TYPE
102	#define IDLE_TIMEOUT 10	222	# define D_TYPE(de) 0
		223	#endif
		224	#ifndef D_INO
		225	# define D_INO(de) 0
		226	#endif
		227	#ifndef D_NAMLEN
		228	# define D_NAMLEN(entp) strlen (D_NAME (entp))
		229	#endif
103		230
104	/* used for struct dirent, AIX doesn't provide it */	231	/* used for struct dirent, AIX doesn't provide it */
105	#ifndef NAME_MAX	232	#ifndef NAME_MAX
106	# define NAME_MAX 4096	233	# define NAME_MAX 4096
107	#endif	234	#endif
108		235
		236	/* used for readlink etc. */
		237	#ifndef PATH_MAX
		238	# define PATH_MAX 4096
		239	#endif
		240
109	/* buffer size for various temporary buffers */	241	/* buffer size for various temporary buffers */
110	#define EIO_BUFSIZE 65536	242	#define EIO_BUFSIZE 65536
111		243
112	#define dBUF \	244	#define dBUF \
113	char *eio_buf; \
114	ETP_WORKER_LOCK (self); \
115	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	245	char *eio_buf = malloc (EIO_BUFSIZE); \
116	ETP_WORKER_UNLOCK (self); \
117	errno = ENOMEM; \	246	errno = ENOMEM; \
118	if (!eio_buf) \	247	if (!eio_buf) \
119	return -1;	248	return -1
		249
		250	#define FUBd \
		251	free (eio_buf)
120		252
121	#define EIO_TICKS ((1000000 + 1023) >> 10)	253	#define EIO_TICKS ((1000000 + 1023) >> 10)
122
123	/*****************************************************************************/
124		254
125	#define ETP_PRI_MIN EIO_PRI_MIN	255	#define ETP_PRI_MIN EIO_PRI_MIN
126	#define ETP_PRI_MAX EIO_PRI_MAX	256	#define ETP_PRI_MAX EIO_PRI_MAX
127		257
128	struct etp_worker;	258	struct etp_worker;
…		…
132	static int eio_finish (eio_req *req);	262	static int eio_finish (eio_req *req);
133	#define ETP_FINISH(req) eio_finish (req)	263	#define ETP_FINISH(req) eio_finish (req)
134	static void eio_execute (struct etp_worker self, eio_req req);	264	static void eio_execute (struct etp_worker self, eio_req req);
135	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	265	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
136		266
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	/*****************************************************************************/	267	/*****************************************************************************/
154		268
155	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	269	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
156		270
157	/* calculcate time difference in ~1/EIO_TICKS of a second */	271	/* calculate time difference in ~1/EIO_TICKS of a second */
		272	ecb_inline int
158	static int tvdiff (struct timeval tv1, struct timeval tv2)	273	tvdiff (struct timeval tv1, struct timeval tv2)
159	{	274	{
160	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	275	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
161	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	276	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
162	}	277	}
163		278
…		…
170	static unsigned int max_poll_reqs; /* reslock */	285	static unsigned int max_poll_reqs; /* reslock */
171		286
172	static volatile unsigned int nreqs; /* reqlock */	287	static volatile unsigned int nreqs; /* reqlock */
173	static volatile unsigned int nready; /* reqlock */	288	static volatile unsigned int nready; /* reqlock */
174	static volatile unsigned int npending; /* reqlock */	289	static volatile unsigned int npending; /* reqlock */
175	static volatile unsigned int max_idle = 4;	290	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
		291	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
176		292
177	static mutex_t wrklock = X_MUTEX_INIT;	293	static xmutex_t wrklock;
178	static mutex_t reslock = X_MUTEX_INIT;	294	static xmutex_t reslock;
179	static mutex_t reqlock = X_MUTEX_INIT;	295	static xmutex_t reqlock;
180	static cond_t reqwait = X_COND_INIT;	296	static xcond_t reqwait;
		297
		298	#if !HAVE_PREADWRITE
		299	/*
		300	* make our pread/pwrite emulation safe against themselves, but not against
		301	* normal read/write by using a mutex. slows down execution a lot,
		302	* but that's your problem, not mine.
		303	*/
		304	static xmutex_t preadwritelock;
		305	#endif
181		306
182	typedef struct etp_worker	307	typedef struct etp_worker
183	{	308	{
184	/* locked by wrklock */	309	/* locked by wrklock */
185	struct etp_worker prev, next;	310	struct etp_worker prev, next;
186		311
187	thread_t tid;	312	xthread_t tid;
188		313
189	/* locked by reslock, reqlock or wrklock */	314	/* locked by reslock, reqlock or wrklock */
190	ETP_REQ req; / currently processed request */	315	ETP_REQ req; / currently processed request */
191		316
		317	#ifdef ETP_WORKER_COMMON
192	ETP_WORKER_COMMON	318	ETP_WORKER_COMMON
		319	#endif
193	} etp_worker;	320	} etp_worker;
194		321
195	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	322	static etp_worker wrk_first; /* NOT etp */
196		323
197	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	324	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
198	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	325	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
199		326
200	/* worker threads management */	327	/* worker threads management */
201		328
		329	static void ecb_cold
202	static void etp_worker_clear (etp_worker *wrk)	330	etp_worker_clear (etp_worker *wrk)
203	{	331	{
204	ETP_WORKER_CLEAR (wrk);
205	}	332	}
206		333
		334	static void ecb_cold
207	static void etp_worker_free (etp_worker *wrk)	335	etp_worker_free (etp_worker *wrk)
208	{	336	{
209	wrk->next->prev = wrk->prev;	337	wrk->next->prev = wrk->prev;
210	wrk->prev->next = wrk->next;	338	wrk->prev->next = wrk->next;
211		339
212	free (wrk);	340	free (wrk);
213	}	341	}
214		342
215	static unsigned int etp_nreqs (void)	343	static unsigned int
		344	etp_nreqs (void)
216	{	345	{
217	int retval;	346	int retval;
218	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	347	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
219	retval = nreqs;	348	retval = nreqs;
220	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	349	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
221	return retval;	350	return retval;
222	}	351	}
223		352
224	static unsigned int etp_nready (void)	353	static unsigned int
		354	etp_nready (void)
225	{	355	{
226	unsigned int retval;	356	unsigned int retval;
227		357
228	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	358	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
229	retval = nready;	359	retval = nready;
230	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	360	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
231		361
232	return retval;	362	return retval;
233	}	363	}
234		364
235	static unsigned int etp_npending (void)	365	static unsigned int
		366	etp_npending (void)
236	{	367	{
237	unsigned int retval;	368	unsigned int retval;
238		369
239	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	370	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
240	retval = npending;	371	retval = npending;
241	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	372	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
242		373
243	return retval;	374	return retval;
244	}	375	}
245		376
246	static unsigned int etp_nthreads (void)	377	static unsigned int
		378	etp_nthreads (void)
247	{	379	{
248	unsigned int retval;	380	unsigned int retval;
249		381
250	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	382	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
251	retval = started;	383	retval = started;
…		…
265	} etp_reqq;	397	} etp_reqq;
266		398
267	static etp_reqq req_queue;	399	static etp_reqq req_queue;
268	static etp_reqq res_queue;	400	static etp_reqq res_queue;
269		401
		402	static void ecb_noinline ecb_cold
		403	reqq_init (etp_reqq *q)
		404	{
		405	int pri;
		406
		407	for (pri = 0; pri < ETP_NUM_PRI; ++pri)
		408	q->qs[pri] = q->qe[pri] = 0;
		409
		410	q->size = 0;
		411	}
		412
		413	static int ecb_noinline
270	static int reqq_push (etp_reqq q, ETP_REQ req)	414	reqq_push (etp_reqq q, ETP_REQ req)
271	{	415	{
272	int pri = req->pri;	416	int pri = req->pri;
273	req->next = 0;	417	req->next = 0;
274		418
275	if (q->qe[pri])	419	if (q->qe[pri])
…		…
281	q->qe[pri] = q->qs[pri] = req;	425	q->qe[pri] = q->qs[pri] = req;
282		426
283	return q->size++;	427	return q->size++;
284	}	428	}
285		429
		430	static ETP_REQ * ecb_noinline
286	static ETP_REQ reqq_shift (etp_reqq q)	431	reqq_shift (etp_reqq *q)
287	{	432	{
288	int pri;	433	int pri;
289		434
290	if (!q->size)	435	if (!q->size)
291	return 0;	436	return 0;
…		…
306	}	451	}
307		452
308	abort ();	453	abort ();
309	}	454	}
310		455
311	static void etp_atfork_prepare (void)	456	static int ecb_cold
		457	etp_init (void (want_poll)(void), void (done_poll)(void))
312	{	458	{
313	X_LOCK (wrklock);	459	X_MUTEX_CREATE (wrklock);
314	X_LOCK (reqlock);	460	X_MUTEX_CREATE (reslock);
315	X_LOCK (reslock);	461	X_MUTEX_CREATE (reqlock);
316	#if !HAVE_PREADWRITE	462	X_COND_CREATE (reqwait);
317	X_LOCK (preadwritelock);
318	#endif
319	}
320		463
321	static void etp_atfork_parent (void)	464	reqq_init (&req_queue);
322	{	465	reqq_init (&res_queue);
323	#if !HAVE_PREADWRITE
324	X_UNLOCK (preadwritelock);
325	#endif
326	X_UNLOCK (reslock);
327	X_UNLOCK (reqlock);
328	X_UNLOCK (wrklock);
329	}
330		466
331	static void etp_atfork_child (void)	467	wrk_first.next =
332	{	468	wrk_first.prev = &wrk_first;
333	ETP_REQ *prv;
334
335	while (prv = reqq_shift (&req_queue))
336	ETP_DESTROY (prv);
337
338	while (prv = reqq_shift (&res_queue))
339	ETP_DESTROY (prv);
340
341	while (wrk_first.next != &wrk_first)
342	{
343	etp_worker *wrk = wrk_first.next;
344
345	if (wrk->req)
346	ETP_DESTROY (wrk->req);
347
348	etp_worker_clear (wrk);
349	etp_worker_free (wrk);
350	}
351		469
352	started = 0;	470	started = 0;
353	idle = 0;	471	idle = 0;
354	nreqs = 0;	472	nreqs = 0;
355	nready = 0;	473	nready = 0;
356	npending = 0;	474	npending = 0;
357		475
358	etp_atfork_parent ();
359	}
360
361	static void
362	etp_once_init (void)
363	{
364	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
365	}
366
367	static int
368	etp_init (void (want_poll)(void), void (done_poll)(void))
369	{
370	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
371
372	pthread_once (&doinit, etp_once_init);
373
374	want_poll_cb = want_poll;	476	want_poll_cb = want_poll;
375	done_poll_cb = done_poll;	477	done_poll_cb = done_poll;
376		478
377	return 0;	479	return 0;
378	}	480	}
379		481
380	X_THREAD_PROC (etp_proc);	482	X_THREAD_PROC (etp_proc);
381		483
		484	static void ecb_cold
382	static void etp_start_thread (void)	485	etp_start_thread (void)
383	{	486	{
384	etp_worker *wrk = calloc (1, sizeof (etp_worker));	487	etp_worker *wrk = calloc (1, sizeof (etp_worker));
385		488
386	/TODO/	489	/TODO/
387	assert (("unable to allocate worker thread data", wrk));	490	assert (("unable to allocate worker thread data", wrk));
…		…
400	free (wrk);	503	free (wrk);
401		504
402	X_UNLOCK (wrklock);	505	X_UNLOCK (wrklock);
403	}	506	}
404		507
		508	static void
405	static void etp_maybe_start_thread (void)	509	etp_maybe_start_thread (void)
406	{	510	{
407	if (etp_nthreads () >= wanted)	511	if (ecb_expect_true (etp_nthreads () >= wanted))
408	return;	512	return;
409		513
410	/* todo: maybe use idle here, but might be less exact */	514	/* todo: maybe use idle here, but might be less exact */
411	if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())	515	if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
412	return;	516	return;
413		517
414	etp_start_thread ();	518	etp_start_thread ();
415	}	519	}
416		520
		521	static void ecb_cold
417	static void etp_end_thread (void)	522	etp_end_thread (void)
418	{	523	{
419	eio_req *req = calloc (1, sizeof (eio_req));	524	eio_req *req = calloc (1, sizeof (eio_req));
420		525
421	req->type = -1;	526	req->type = -1;
422	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	527	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
…		…
429	X_LOCK (wrklock);	534	X_LOCK (wrklock);
430	--started;	535	--started;
431	X_UNLOCK (wrklock);	536	X_UNLOCK (wrklock);
432	}	537	}
433		538
434	static int etp_poll (void)	539	static int
		540	etp_poll (void)
435	{	541	{
436	unsigned int maxreqs;	542	unsigned int maxreqs;
437	unsigned int maxtime;	543	unsigned int maxtime;
438	struct timeval tv_start, tv_now;	544	struct timeval tv_start, tv_now;
439		545
…		…
469		575
470	X_LOCK (reqlock);	576	X_LOCK (reqlock);
471	--nreqs;	577	--nreqs;
472	X_UNLOCK (reqlock);	578	X_UNLOCK (reqlock);
473		579
474	if (req->type == EIO_GROUP && req->size)	580	if (ecb_expect_false (req->type == EIO_GROUP && req->size))
475	{	581	{
476	req->int1 = 1; /* mark request as delayed */	582	req->int1 = 1; /* mark request as delayed */
477	continue;	583	continue;
478	}	584	}
479	else	585	else
480	{	586	{
481	int res = ETP_FINISH (req);	587	int res = ETP_FINISH (req);
482	if (res)	588	if (ecb_expect_false (res))
483	return res;	589	return res;
484	}	590	}
485		591
486	if (maxreqs && !--maxreqs)	592	if (ecb_expect_false (maxreqs && !--maxreqs))
487	break;	593	break;
488		594
489	if (maxtime)	595	if (maxtime)
490	{	596	{
491	gettimeofday (&tv_now, 0);	597	gettimeofday (&tv_now, 0);
…		…
497		603
498	errno = EAGAIN;	604	errno = EAGAIN;
499	return -1;	605	return -1;
500	}	606	}
501		607
		608	static void
502	static void etp_cancel (ETP_REQ *req)	609	etp_cancel (ETP_REQ *req)
503	{	610	{
504	X_LOCK (wrklock);	611	req->cancelled = 1;
505	req->flags \|= EIO_FLAG_CANCELLED;
506	X_UNLOCK (wrklock);
507		612
508	eio_grp_cancel (req);	613	eio_grp_cancel (req);
509	}	614	}
510		615
		616	static void
511	static void etp_submit (ETP_REQ *req)	617	etp_submit (ETP_REQ *req)
512	{	618	{
513	req->pri -= ETP_PRI_MIN;	619	req->pri -= ETP_PRI_MIN;
514		620
515	if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;	621	if (ecb_expect_false (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;	622	if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
517		623
		624	if (ecb_expect_false (req->type == EIO_GROUP))
		625	{
		626	/* I hope this is worth it :/ */
518	X_LOCK (reqlock);	627	X_LOCK (reqlock);
519	++nreqs;	628	++nreqs;
		629	X_UNLOCK (reqlock);
		630
		631	X_LOCK (reslock);
		632
		633	++npending;
		634
		635	if (!reqq_push (&res_queue, req) && want_poll_cb)
		636	want_poll_cb ();
		637
		638	X_UNLOCK (reslock);
		639	}
		640	else
		641	{
		642	X_LOCK (reqlock);
		643	++nreqs;
520	++nready;	644	++nready;
521	reqq_push (&req_queue, req);	645	reqq_push (&req_queue, req);
522	X_COND_SIGNAL (reqwait);	646	X_COND_SIGNAL (reqwait);
523	X_UNLOCK (reqlock);	647	X_UNLOCK (reqlock);
524		648
525	etp_maybe_start_thread ();	649	etp_maybe_start_thread ();
		650	}
526	}	651	}
527		652
		653	static void ecb_cold
528	static void etp_set_max_poll_time (double nseconds)	654	etp_set_max_poll_time (double nseconds)
529	{	655	{
530	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	656	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
531	max_poll_time = nseconds;	657	max_poll_time = nseconds * EIO_TICKS;
532	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);	658	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
533	}	659	}
534		660
		661	static void ecb_cold
535	static void etp_set_max_poll_reqs (unsigned int maxreqs)	662	etp_set_max_poll_reqs (unsigned int maxreqs)
536	{	663	{
537	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	664	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
538	max_poll_reqs = maxreqs;	665	max_poll_reqs = maxreqs;
539	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);	666	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
540	}	667	}
541		668
		669	static void ecb_cold
542	static void etp_set_max_idle (unsigned int nthreads)	670	etp_set_max_idle (unsigned int nthreads)
543	{	671	{
544	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	672	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
545	max_idle = nthreads <= 0 ? 1 : nthreads;	673	max_idle = nthreads;
546	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	674	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
547	}	675	}
548		676
		677	static void ecb_cold
		678	etp_set_idle_timeout (unsigned int seconds)
		679	{
		680	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
		681	idle_timeout = seconds;
		682	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
		683	}
		684
		685	static void ecb_cold
549	static void etp_set_min_parallel (unsigned int nthreads)	686	etp_set_min_parallel (unsigned int nthreads)
550	{	687	{
551	if (wanted < nthreads)	688	if (wanted < nthreads)
552	wanted = nthreads;	689	wanted = nthreads;
553	}	690	}
554		691
		692	static void ecb_cold
555	static void etp_set_max_parallel (unsigned int nthreads)	693	etp_set_max_parallel (unsigned int nthreads)
556	{	694	{
557	if (wanted > nthreads)	695	if (wanted > nthreads)
558	wanted = nthreads;	696	wanted = nthreads;
559		697
560	while (started > wanted)	698	while (started > wanted)
561	etp_end_thread ();	699	etp_end_thread ();
562	}	700	}
563		701
564	/*****************************************************************************/	702	/*****************************************************************************/
565		703
		704	static void
566	static void grp_try_feed (eio_req *grp)	705	grp_try_feed (eio_req *grp)
567	{	706	{
568	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	707	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
569	{	708	{
570	int old_len = grp->size;	709	grp->flags &= ~EIO_FLAG_GROUPADD;
571		710
572	EIO_FEED (grp);	711	EIO_FEED (grp);
573		712
574	/* stop if no progress has been made */	713	/* stop if no progress has been made */
575	if (old_len == grp->size)	714	if (!(grp->flags & EIO_FLAG_GROUPADD))
576	{	715	{
577	grp->feed = 0;	716	grp->feed = 0;
578	break;	717	break;
579	}	718	}
580	}	719	}
581	}	720	}
582		721
		722	static int
583	static int grp_dec (eio_req *grp)	723	grp_dec (eio_req *grp)
584	{	724	{
585	--grp->size;	725	--grp->size;
586		726
587	/* call feeder, if applicable */	727	/* call feeder, if applicable */
588	grp_try_feed (grp);	728	grp_try_feed (grp);
…		…
592	return eio_finish (grp);	732	return eio_finish (grp);
593	else	733	else
594	return 0;	734	return 0;
595	}	735	}
596		736
		737	static void
597	void eio_destroy (eio_req *req)	738	eio_destroy (eio_req *req)
598	{	739	{
599	if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);	740	if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
600	if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);	741	if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
601		742
602	EIO_DESTROY (req);	743	EIO_DESTROY (req);
603	}	744	}
604		745
		746	static int
605	static int eio_finish (eio_req *req)	747	eio_finish (eio_req *req)
606	{	748	{
607	int res = EIO_FINISH (req);	749	int res = EIO_FINISH (req);
608		750
609	if (req->grp)	751	if (req->grp)
610	{	752	{
…		…
618	if (grp->grp_first == req)	760	if (grp->grp_first == req)
619	grp->grp_first = req->grp_next;	761	grp->grp_first = req->grp_next;
620		762
621	res2 = grp_dec (grp);	763	res2 = grp_dec (grp);
622		764
623	if (!res && res2)	765	if (!res)
624	res = res2;	766	res = res2;
625	}	767	}
626		768
627	eio_destroy (req);	769	eio_destroy (req);
628		770
629	return res;	771	return res;
630	}	772	}
631		773
		774	void
632	void eio_grp_cancel (eio_req *grp)	775	eio_grp_cancel (eio_req *grp)
633	{	776	{
634	for (grp = grp->grp_first; grp; grp = grp->grp_next)	777	for (grp = grp->grp_first; grp; grp = grp->grp_next)
635	eio_cancel (grp);	778	eio_cancel (grp);
636	}	779	}
637		780
		781	void
638	void eio_cancel (eio_req *req)	782	eio_cancel (eio_req *req)
639	{	783	{
640	etp_cancel (req);	784	etp_cancel (req);
641	}	785	}
642		786
		787	void
643	void eio_submit (eio_req *req)	788	eio_submit (eio_req *req)
644	{	789	{
645	etp_submit (req);	790	etp_submit (req);
646	}	791	}
647		792
648	unsigned int eio_nreqs (void)	793	unsigned int
		794	eio_nreqs (void)
649	{	795	{
650	return etp_nreqs ();	796	return etp_nreqs ();
651	}	797	}
652		798
653	unsigned int eio_nready (void)	799	unsigned int
		800	eio_nready (void)
654	{	801	{
655	return etp_nready ();	802	return etp_nready ();
656	}	803	}
657		804
658	unsigned int eio_npending (void)	805	unsigned int
		806	eio_npending (void)
659	{	807	{
660	return etp_npending ();	808	return etp_npending ();
661	}	809	}
662		810
663	unsigned int eio_nthreads (void)	811	unsigned int ecb_cold
		812	eio_nthreads (void)
664	{	813	{
665	return etp_nthreads ();	814	return etp_nthreads ();
666	}	815	}
667		816
		817	void ecb_cold
668	void eio_set_max_poll_time (double nseconds)	818	eio_set_max_poll_time (double nseconds)
669	{	819	{
670	etp_set_max_poll_time (nseconds);	820	etp_set_max_poll_time (nseconds);
671	}	821	}
672		822
		823	void ecb_cold
673	void eio_set_max_poll_reqs (unsigned int maxreqs)	824	eio_set_max_poll_reqs (unsigned int maxreqs)
674	{	825	{
675	etp_set_max_poll_reqs (maxreqs);	826	etp_set_max_poll_reqs (maxreqs);
676	}	827	}
677		828
		829	void ecb_cold
678	void eio_set_max_idle (unsigned int nthreads)	830	eio_set_max_idle (unsigned int nthreads)
679	{	831	{
680	etp_set_max_idle (nthreads);	832	etp_set_max_idle (nthreads);
681	}	833	}
682		834
		835	void ecb_cold
		836	eio_set_idle_timeout (unsigned int seconds)
		837	{
		838	etp_set_idle_timeout (seconds);
		839	}
		840
		841	void ecb_cold
683	void eio_set_min_parallel (unsigned int nthreads)	842	eio_set_min_parallel (unsigned int nthreads)
684	{	843	{
685	etp_set_min_parallel (nthreads);	844	etp_set_min_parallel (nthreads);
686	}	845	}
687		846
		847	void ecb_cold
688	void eio_set_max_parallel (unsigned int nthreads)	848	eio_set_max_parallel (unsigned int nthreads)
689	{	849	{
690	etp_set_max_parallel (nthreads);	850	etp_set_max_parallel (nthreads);
691	}	851	}
692		852
693	int eio_poll (void)	853	int eio_poll (void)
…		…
697		857
698	/*****************************************************************************/	858	/*****************************************************************************/
699	/* work around various missing functions */	859	/* work around various missing functions */
700		860
701	#if !HAVE_PREADWRITE	861	#if !HAVE_PREADWRITE
		862	# undef pread
		863	# undef pwrite
702	# define pread eio__pread	864	# define pread eio__pread
703	# define pwrite eio__pwrite	865	# define pwrite eio__pwrite
704		866
705	/*
706	* make our pread/pwrite safe against themselves, but not against
707	* normal read/write by using a mutex. slows down execution a lot,
708	* but that's your problem, not mine.
709	*/
710	static mutex_t preadwritelock = X_MUTEX_INIT;
711
712	static ssize_t	867	static eio_ssize_t
713	eio__pread (int fd, void *buf, size_t count, off_t offset)	868	eio__pread (int fd, void *buf, size_t count, off_t offset)
714	{	869	{
715	ssize_t res;	870	eio_ssize_t res;
716	off_t ooffset;	871	off_t ooffset;
717		872
718	X_LOCK (preadwritelock);	873	X_LOCK (preadwritelock);
719	ooffset = lseek (fd, 0, SEEK_CUR);	874	ooffset = lseek (fd, 0, SEEK_CUR);
720	lseek (fd, offset, SEEK_SET);	875	lseek (fd, offset, SEEK_SET);
…		…
723	X_UNLOCK (preadwritelock);	878	X_UNLOCK (preadwritelock);
724		879
725	return res;	880	return res;
726	}	881	}
727		882
728	static ssize_t	883	static eio_ssize_t
729	eio__pwrite (int fd, void *buf, size_t count, off_t offset)	884	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
730	{	885	{
731	ssize_t res;	886	eio_ssize_t res;
732	off_t ooffset;	887	off_t ooffset;
733		888
734	X_LOCK (preadwritelock);	889	X_LOCK (preadwritelock);
735	ooffset = lseek (fd, 0, SEEK_CUR);	890	ooffset = lseek (fd, 0, SEEK_CUR);
736	lseek (fd, offset, SEEK_SET);	891	lseek (fd, offset, SEEK_SET);
737	res = write (fd, buf, count);	892	res = write (fd, buf, count);
738	lseek (fd, offset, SEEK_SET);	893	lseek (fd, ooffset, SEEK_SET);
739	X_UNLOCK (preadwritelock);	894	X_UNLOCK (preadwritelock);
740		895
741	return res;	896	return res;
742	}	897	}
743	#endif	898	#endif
744		899
745	#ifndef HAVE_FUTIMES	900	#ifndef HAVE_UTIMES
746		901
		902	# undef utimes
747	# define utimes(path,times) eio__utimes (path, times)	903	# define utimes(path,times) eio__utimes (path, times)
748	# define futimes(fd,times) eio__futimes (fd, times)
749		904
750	static int	905	static int
751	eio__utimes (const char *filename, const struct timeval times[2])	906	eio__utimes (const char *filename, const struct timeval times[2])
752	{	907	{
753	if (times)	908	if (times)
…		…
761	}	916	}
762	else	917	else
763	return utime (filename, 0);	918	return utime (filename, 0);
764	}	919	}
765		920
		921	#endif
		922
		923	#ifndef HAVE_FUTIMES
		924
		925	# undef futimes
		926	# define futimes(fd,times) eio__futimes (fd, times)
		927
		928	static int
766	static int eio__futimes (int fd, const struct timeval tv[2])	929	eio__futimes (int fd, const struct timeval tv[2])
767	{	930	{
768	errno = ENOSYS;	931	errno = ENOSYS;
769	return -1;	932	return -1;
770	}	933	}
771		934
772	#endif	935	#endif
773		936
774	#if !HAVE_FDATASYNC	937	#if !HAVE_FDATASYNC
		938	# undef fdatasync
775	# define fdatasync fsync	939	# define fdatasync(fd) fsync (fd)
776	#endif	940	#endif
		941
		942	/* sync_file_range always needs emulation */
		943	static int
		944	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
		945	{
		946	#if HAVE_SYNC_FILE_RANGE
		947	int res;
		948
		949	if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
		950	\|\| EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
		951	\|\| EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
		952	{
		953	flags = 0
		954	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
		955	\| (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
		956	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
		957	}
		958
		959	res = sync_file_range (fd, offset, nbytes, flags);
		960
		961	if (!res \|\| errno != ENOSYS)
		962	return res;
		963	#endif
		964
		965	/* even though we could play tricks with the flags, it's better to always
		966	* call fdatasync, as that matches the expectation of its users best */
		967	return fdatasync (fd);
		968	}
		969
		970	static int
		971	eio__fallocate (int fd, int mode, off_t offset, size_t len)
		972	{
		973	#if HAVE_FALLOCATE
		974	return fallocate (fd, mode, offset, len);
		975	#else
		976	errno = ENOSYS;
		977	return -1;
		978	#endif
		979	}
777		980
778	#if !HAVE_READAHEAD	981	#if !HAVE_READAHEAD
		982	# undef readahead
779	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	983	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
780		984
781	static ssize_t	985	static eio_ssize_t
782	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)	986	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
783	{	987	{
784	size_t todo = count;	988	size_t todo = count;
785	dBUF;	989	dBUF;
786		990
…		…
791	pread (fd, eio_buf, len, offset);	995	pread (fd, eio_buf, len, offset);
792	offset += len;	996	offset += len;
793	todo -= len;	997	todo -= len;
794	}	998	}
795		999
		1000	FUBd;
		1001
796	errno = 0;	1002	errno = 0;
797	return count;	1003	return count;
798	}	1004	}
799		1005
800	#endif	1006	#endif
801		1007
802	/* sendfile always needs emulation */	1008	/* sendfile always needs emulation */
803	static ssize_t	1009	static eio_ssize_t
804	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1010	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
805	{	1011	{
		1012	eio_ssize_t written = 0;
806	ssize_t res;	1013	eio_ssize_t res;
807		1014
808	if (!count)	1015	if (!count)
809	return 0;	1016	return 0;
810		1017
		1018	for (;;)
		1019	{
		1020	#ifdef __APPLE__
		1021	# undef HAVE_SENDFILE /* broken, as everything on os x */
		1022	#endif
811	#if HAVE_SENDFILE	1023	#if HAVE_SENDFILE
812	# if __linux	1024	# if __linux
		1025	off_t soffset = offset;
813	res = sendfile (ofd, ifd, &offset, count);	1026	res = sendfile (ofd, ifd, &soffset, count);
814		1027
815	# elif __freebsd	1028	# elif __FreeBSD__
816	/*	1029	/*
817	* Of course, the freebsd sendfile is a dire hack with no thoughts	1030	* Of course, the freebsd sendfile is a dire hack with no thoughts
818	* wasted on making it similar to other I/O functions.	1031	* wasted on making it similar to other I/O functions.
819	*/	1032	*/
820	{
821	off_t sbytes;	1033	off_t sbytes;
822	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);	1034	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
823		1035
824	if (res < 0 && sbytes)	1036	#if 0 /* according to the manpage, this is correct, but broken behaviour */
825	/* maybe only on EAGAIN: as usual, the manpage leaves you guessing */	1037	/* freebsd' sendfile will return 0 on success */
		1038	/* freebsd 8 documents it as only setting sbytes on EINTR and EAGAIN, but /
		1039	/* not on e.g. EIO or EPIPE - sounds broken */
		1040	if ((res < 0 && (errno == EAGAIN \|\| errno == EINTR) && sbytes) \|\| res == 0)
826	res = sbytes;	1041	res = sbytes;
827	}	1042	#endif
		1043
		1044	/* according to source inspection, this is correct, and useful behaviour */
		1045	if (sbytes)
		1046	res = sbytes;
		1047
		1048	# elif defined (__APPLE__)
		1049	off_t sbytes = count;
		1050	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
		1051
		1052	/* according to the manpage, sbytes is always valid */
		1053	if (sbytes)
		1054	res = sbytes;
828		1055
829	# elif __hpux	1056	# elif __hpux
830	res = sendfile (ofd, ifd, offset, count, 0, 0);	1057	res = sendfile (ofd, ifd, offset, count, 0, 0);
831		1058
832	# elif __solaris	1059	# elif __solaris
833	{
834	struct sendfilevec vec;	1060	struct sendfilevec vec;
835	size_t sbytes;	1061	size_t sbytes;
836		1062
837	vec.sfv_fd = ifd;	1063	vec.sfv_fd = ifd;
838	vec.sfv_flag = 0;	1064	vec.sfv_flag = 0;
839	vec.sfv_off = offset;	1065	vec.sfv_off = offset;
840	vec.sfv_len = count;	1066	vec.sfv_len = count;
841		1067
842	res = sendfilev (ofd, &vec, 1, &sbytes);	1068	res = sendfilev (ofd, &vec, 1, &sbytes);
843		1069
844	if (res < 0 && sbytes)	1070	if (res < 0 && sbytes)
845	res = sbytes;	1071	res = sbytes;
846	}
847		1072
848	# endif	1073	# endif
		1074
		1075	#elif defined (_WIN32) && 0
		1076	/* does not work, just for documentation of what would need to be done */
		1077	/* actually, cannot be done like this, as TransmitFile changes the file offset, */
		1078	/* libeio guarantees that the file offset does not change, and windows */
		1079	/* has no way to get an independent handle to the same file description */
		1080	HANDLE h = TO_SOCKET (ifd);
		1081	SetFilePointer (h, offset, 0, FILE_BEGIN);
		1082	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
		1083
849	#else	1084	#else
850	res = -1;	1085	res = -1;
851	errno = ENOSYS;	1086	errno = ENOSYS;
852	#endif	1087	#endif
853		1088
		1089	/* we assume sendfile can copy at least 128mb in one go */
		1090	if (res <= 128 * 1024 * 1024)
		1091	{
		1092	if (res > 0)
		1093	written += res;
		1094
		1095	if (written)
		1096	return written;
		1097
		1098	break;
		1099	}
		1100	else
		1101	{
		1102	/* if we requested more, then probably the kernel was lazy */
		1103	written += res;
		1104	offset += res;
		1105	count -= res;
		1106
		1107	if (!count)
		1108	return written;
		1109	}
		1110	}
		1111
854	if (res < 0	1112	if (res < 0
855	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK	1113	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK
		1114	/* BSDs */
		1115	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
		1116	\|\| errno == ENOTSUP
		1117	#endif
		1118	#ifdef EOPNOTSUPP /* windows */
		1119	\|\| errno == EOPNOTSUPP /* BSDs */
		1120	#endif
856	#if __solaris	1121	#if __solaris
857	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE	1122	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE
858	#endif	1123	#endif
859	)	1124	)
860	)	1125	)
…		…
864		1129
865	res = 0;	1130	res = 0;
866		1131
867	while (count)	1132	while (count)
868	{	1133	{
869	ssize_t cnt;	1134	eio_ssize_t cnt;
870		1135
871	cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);	1136	cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
872		1137
873	if (cnt <= 0)	1138	if (cnt <= 0)
874	{	1139	{
…		…
886		1151
887	offset += cnt;	1152	offset += cnt;
888	res += cnt;	1153	res += cnt;
889	count -= cnt;	1154	count -= cnt;
890	}	1155	}
		1156
		1157	FUBd;
891	}	1158	}
892		1159
893	return res;	1160	return res;
		1161	}
		1162
		1163	#ifdef PAGESIZE
		1164	# define eio_pagesize() PAGESIZE
		1165	#else
		1166	static intptr_t
		1167	eio_pagesize (void)
		1168	{
		1169	static intptr_t page;
		1170
		1171	if (!page)
		1172	page = sysconf (_SC_PAGESIZE);
		1173
		1174	return page;
		1175	}
		1176	#endif
		1177
		1178	static void
		1179	eio_page_align (void *addr, size_t length)
		1180	{
		1181	intptr_t mask = eio_pagesize () - 1;
		1182
		1183	/* round down addr */
		1184	intptr_t adj = mask & (intptr_t)*addr;
		1185
		1186	addr = (void )((intptr_t)*addr - adj);
		1187	*length += adj;
		1188
		1189	/* round up length */
		1190	length = (length + mask) & ~mask;
		1191	}
		1192
		1193	#if !_POSIX_MEMLOCK
		1194	# define eio__mlockall(a) EIO_ENOSYS ()
		1195	#else
		1196
		1197	static int
		1198	eio__mlockall (int flags)
		1199	{
		1200	#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
		1201	extern int mallopt (int, int);
		1202	mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
		1203	#endif
		1204
		1205	if (EIO_MCL_CURRENT != MCL_CURRENT
		1206	\|\| EIO_MCL_FUTURE != MCL_FUTURE)
		1207	{
		1208	flags = 0
		1209	\| (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
		1210	\| (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
		1211	}
		1212
		1213	return mlockall (flags);
		1214	}
		1215	#endif
		1216
		1217	#if !_POSIX_MEMLOCK_RANGE
		1218	# define eio__mlock(a,b) EIO_ENOSYS ()
		1219	#else
		1220
		1221	static int
		1222	eio__mlock (void *addr, size_t length)
		1223	{
		1224	eio_page_align (&addr, &length);
		1225
		1226	return mlock (addr, length);
		1227	}
		1228
		1229	#endif
		1230
		1231	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		1232	# define eio__msync(a,b,c) EIO_ENOSYS ()
		1233	#else
		1234
		1235	static int
		1236	eio__msync (void *mem, size_t len, int flags)
		1237	{
		1238	eio_page_align (&mem, &len);
		1239
		1240	if (EIO_MS_ASYNC != MS_SYNC
		1241	\|\| EIO_MS_INVALIDATE != MS_INVALIDATE
		1242	\|\| EIO_MS_SYNC != MS_SYNC)
		1243	{
		1244	flags = 0
		1245	\| (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
		1246	\| (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
		1247	\| (flags & EIO_MS_SYNC ? MS_SYNC : 0);
		1248	}
		1249
		1250	return msync (mem, len, flags);
		1251	}
		1252
		1253	#endif
		1254
		1255	static int
		1256	eio__mtouch (eio_req *req)
		1257	{
		1258	void *mem = req->ptr2;
		1259	size_t len = req->size;
		1260	int flags = req->int1;
		1261
		1262	eio_page_align (&mem, &len);
		1263
		1264	{
		1265	intptr_t addr = (intptr_t)mem;
		1266	intptr_t end = addr + len;
		1267	intptr_t page = eio_pagesize ();
		1268
		1269	if (addr < end)
		1270	if (flags & EIO_MT_MODIFY) /* modify */
		1271	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
		1272	else
		1273	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
		1274	}
		1275
		1276	return 0;
		1277	}
		1278
		1279	/*****************************************************************************/
		1280	/* requests implemented outside eio_execute, because they are so large */
		1281
		1282	static void
		1283	eio__realpath (eio_req req, etp_worker self)
		1284	{
		1285	char *rel = req->ptr1;
		1286	char *res;
		1287	char tmp1, tmp2;
		1288	#if SYMLOOP_MAX > 32
		1289	int symlinks = SYMLOOP_MAX;
		1290	#else
		1291	int symlinks = 32;
		1292	#endif
		1293
		1294	req->result = -1;
		1295
		1296	errno = EINVAL;
		1297	if (!rel)
		1298	return;
		1299
		1300	errno = ENOENT;
		1301	if (!*rel)
		1302	return;
		1303
		1304	if (!req->ptr2)
		1305	{
		1306	X_LOCK (wrklock);
		1307	req->flags \|= EIO_FLAG_PTR2_FREE;
		1308	X_UNLOCK (wrklock);
		1309	req->ptr2 = malloc (PATH_MAX * 3);
		1310
		1311	errno = ENOMEM;
		1312	if (!req->ptr2)
		1313	return;
		1314	}
		1315
		1316	res = req->ptr2;
		1317	tmp1 = res + PATH_MAX;
		1318	tmp2 = tmp1 + PATH_MAX;
		1319
		1320	#if 0 /* disabled, the musl way to do things is just too racy */
		1321	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
		1322	/* on linux we may be able to ask the kernel */
		1323	{
		1324	int fd = open (rel, O_RDONLY \| O_NONBLOCK \| O_NOCTTY \| O_NOATIME);
		1325
		1326	if (fd >= 0)
		1327	{
		1328	sprintf (tmp1, "/proc/self/fd/%d", fd);
		1329	req->result = readlink (tmp1, res, PATH_MAX);
		1330	close (fd);
		1331
		1332	/* here we should probably stat the open file and the disk file, to make sure they still match */
		1333
		1334	if (req->result > 0)
		1335	goto done;
		1336	}
		1337	else if (errno == ELOOP \|\| errno == ENAMETOOLONG \|\| errno == ENOENT \|\| errno == ENOTDIR \|\| errno == EIO)
		1338	return;
		1339	}
		1340	#endif
		1341	#endif
		1342
		1343	if (*rel != '/')
		1344	{
		1345	if (!getcwd (res, PATH_MAX))
		1346	return;
		1347
		1348	if (res [1]) /* only use if not / */
		1349	res += strlen (res);
		1350	}
		1351
		1352	while (*rel)
		1353	{
		1354	eio_ssize_t len, linklen;
		1355	char *beg = rel;
		1356
		1357	while (rel && rel != '/')
		1358	++rel;
		1359
		1360	len = rel - beg;
		1361
		1362	if (!len) /* skip slashes */
		1363	{
		1364	++rel;
		1365	continue;
		1366	}
		1367
		1368	if (beg [0] == '.')
		1369	{
		1370	if (len == 1)
		1371	continue; /* . - nop */
		1372
		1373	if (beg [1] == '.' && len == 2)
		1374	{
		1375	/* .. - back up one component, if possible */
		1376
		1377	while (res != req->ptr2)
		1378	if (*--res == '/')
		1379	break;
		1380
		1381	continue;
		1382	}
		1383	}
		1384
		1385	errno = ENAMETOOLONG;
		1386	if (res + 1 + len + 1 >= tmp1)
		1387	return;
		1388
		1389	/* copy one component */
		1390	*res = '/';
		1391	memcpy (res + 1, beg, len);
		1392
		1393	/* zero-terminate, for readlink */
		1394	res [len + 1] = 0;
		1395
		1396	/* now check if it's a symlink */
		1397	linklen = readlink (req->ptr2, tmp1, PATH_MAX);
		1398
		1399	if (linklen < 0)
		1400	{
		1401	if (errno != EINVAL)
		1402	return;
		1403
		1404	/* it's a normal directory. hopefully */
		1405	res += len + 1;
		1406	}
		1407	else
		1408	{
		1409	/* yay, it was a symlink - build new path in tmp2 */
		1410	int rellen = strlen (rel);
		1411
		1412	errno = ENAMETOOLONG;
		1413	if (linklen + 1 + rellen >= PATH_MAX)
		1414	return;
		1415
		1416	errno = ELOOP;
		1417	if (!--symlinks)
		1418	return;
		1419
		1420	if (*tmp1 == '/')
		1421	res = req->ptr2; /* symlink resolves to an absolute path */
		1422
		1423	/* we need to be careful, as rel might point into tmp2 already */
		1424	memmove (tmp2 + linklen + 1, rel, rellen + 1);
		1425	tmp2 [linklen] = '/';
		1426	memcpy (tmp2, tmp1, linklen);
		1427
		1428	rel = tmp2;
		1429	}
		1430	}
		1431
		1432	/* special case for the lone root path */
		1433	if (res == req->ptr2)
		1434	*res++ = '/';
		1435
		1436	req->result = res - (char *)req->ptr2;
		1437
		1438	done:
		1439	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
		1440	}
		1441
		1442	static signed char
		1443	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
		1444	{
		1445	return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
		1446	: a->inode < b->inode ? -1
		1447	: a->inode > b->inode ? 1
		1448	: 0;
		1449	}
		1450
		1451	#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
		1452
		1453	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
		1454	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
		1455
		1456	static void
		1457	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
		1458	{
		1459	unsigned char bits [9 + sizeof (eio_ino_t) * 8];
		1460	unsigned char *bit = bits;
		1461
		1462	assert (CHAR_BIT == 8);
		1463	assert (sizeof (eio_dirent) * 8 < 256);
		1464	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
		1465	assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
		1466
		1467	if (size <= EIO_SORT_FAST)
		1468	return;
		1469
		1470	/* first prepare an array of bits to test in our radix sort */
		1471	/* try to take endianness into account, as well as differences in eio_ino_t sizes */
		1472	/* inode_bits must contain all inodes ORed together */
		1473	/* which is used to skip bits that are 0 everywhere, which is very common */
		1474	{
		1475	eio_ino_t endianness;
		1476	int i, j;
		1477
		1478	/* we store the byte offset of byte n into byte n of "endianness" */
		1479	for (i = 0; i < sizeof (eio_ino_t); ++i)
		1480	((unsigned char *)&endianness)[i] = i;
		1481
		1482	*bit++ = 0;
		1483
		1484	for (i = 0; i < sizeof (eio_ino_t); ++i)
		1485	{
		1486	/* shifting off the byte offsets out of "endianness" */
		1487	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
		1488	endianness >>= 8;
		1489
		1490	for (j = 0; j < 8; ++j)
		1491	if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
		1492	*bit++ = offs + j;
		1493	}
		1494
		1495	for (j = 0; j < 8; ++j)
		1496	if (score_bits & (1 << j))
		1497	bit++ = offsetof (eio_dirent, score) 8 + j;
		1498	}
		1499
		1500	/* now actually do the sorting (a variant of MSD radix sort) */
		1501	{
		1502	eio_dirent base_stk [9 + sizeof (eio_ino_t) 8], *base;
		1503	eio_dirent end_stk [9 + sizeof (eio_ino_t) 8], *end;
		1504	unsigned char bit_stk [9 + sizeof (eio_ino_t) 8];
		1505	int stk_idx = 0;
		1506
		1507	base_stk [stk_idx] = dents;
		1508	end_stk [stk_idx] = dents + size;
		1509	bit_stk [stk_idx] = bit - 1;
		1510
		1511	do
		1512	{
		1513	base = base_stk [stk_idx];
		1514	end = end_stk [stk_idx];
		1515	bit = bit_stk [stk_idx];
		1516
		1517	for (;;)
		1518	{
		1519	unsigned char O = *bit >> 3;
		1520	unsigned char M = 1 << (*bit & 7);
		1521
		1522	eio_dirent *a = base;
		1523	eio_dirent *b = end;
		1524
		1525	if (b - a < EIO_SORT_CUTOFF)
		1526	break;
		1527
		1528	/* now bit-partition the array on the bit */
		1529	/* this ugly asymmetric loop seems to perform much better than typical */
		1530	/* partition algos found in the literature */
		1531	do
		1532	if (!(((unsigned char *)a)[O] & M))
		1533	++a;
		1534	else if (!(((unsigned char *)--b)[O] & M))
		1535	{
		1536	eio_dirent tmp = a; a = b; b = tmp;
		1537	++a;
		1538	}
		1539	while (b > a);
		1540
		1541	/* next bit, or stop, if no bits left in this path */
		1542	if (!*--bit)
		1543	break;
		1544
		1545	base_stk [stk_idx] = a;
		1546	end_stk [stk_idx] = end;
		1547	bit_stk [stk_idx] = bit;
		1548	++stk_idx;
		1549
		1550	end = a;
		1551	}
		1552	}
		1553	while (stk_idx--);
		1554	}
		1555	}
		1556
		1557	static void
		1558	eio_dent_insertion_sort (eio_dirent *dents, int size)
		1559	{
		1560	/* first move the smallest element to the front, to act as a sentinel */
		1561	{
		1562	int i;
		1563	eio_dirent *min = dents;
		1564
		1565	/* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
		1566	for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
		1567	if (EIO_DENT_CMP (dents [i], <, *min))
		1568	min = &dents [i];
		1569
		1570	/* swap elements 0 and j (minimum) */
		1571	{
		1572	eio_dirent tmp = dents; dents = min; min = tmp;
		1573	}
		1574	}
		1575
		1576	/* then do standard insertion sort, assuming that all elements are >= dents [0] */
		1577	{
		1578	eio_dirent i, j;
		1579
		1580	for (i = dents + 1; i < dents + size; ++i)
		1581	{
		1582	eio_dirent value = *i;
		1583
		1584	for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
		1585	j [1] = j [0];
		1586
		1587	j [1] = value;
		1588	}
		1589	}
		1590	}
		1591
		1592	static void
		1593	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
		1594	{
		1595	if (size <= 1)
		1596	return; /* our insertion sort relies on size > 0 */
		1597
		1598	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
		1599	/* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
		1600	eio_dent_radix_sort (dents, size, score_bits, inode_bits);
		1601
		1602	/* use an insertion sort at the end, or for small arrays, */
		1603	/* as insertion sort is more efficient for small partitions */
		1604	eio_dent_insertion_sort (dents, size);
894	}	1605	}
895		1606
896	/* read a full directory */	1607	/* read a full directory */
897	static void	1608	static void
898	eio__scandir (eio_req req, etp_worker self)	1609	eio__scandir (eio_req req, etp_worker self)
899	{	1610	{
		1611	char name, names;
		1612	int namesalloc = 4096 - sizeof (void ) 4;
		1613	int namesoffs = 0;
		1614	int flags = req->int1;
		1615	eio_dirent *dents = 0;
		1616	int dentalloc = 128;
		1617	int dentoffs = 0;
		1618	eio_ino_t inode_bits = 0;
		1619	#ifdef _WIN32
		1620	HANDLE dirp;
		1621	WIN32_FIND_DATA entp;
		1622	#else
900	DIR *dirp;	1623	DIR *dirp;
901	EIO_STRUCT_DIRENT *entp;	1624	EIO_STRUCT_DIRENT *entp;
902	char name, names;	1625	#endif
903	int memlen = 4096;
904	int memofs = 0;
905	int res = 0;
906		1626
907	X_LOCK (wrklock);	1627	req->result = -1;
		1628
		1629	if (!(flags & EIO_READDIR_DENTS))
		1630	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
		1631
		1632	#ifdef _WIN32
		1633	{
		1634	int len = strlen ((const char *)req->ptr1);
		1635	char *path = malloc (MAX_PATH);
		1636	const char *fmt;
		1637
		1638	if (!len)
		1639	fmt = "./*";
		1640	else if (((const char )req->ptr1)[len - 1] == '/' \|\| ((const char )req->ptr1)[len - 1] == '\\')
		1641	fmt = "%s*";
		1642	else
		1643	fmt = "%s/*";
		1644
		1645	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
		1646	dirp = FindFirstFile (path, &entp);
		1647	free (path);
		1648
		1649	if (dirp == INVALID_HANDLE_VALUE)
		1650	{
		1651	dirp = 0;
		1652
		1653	switch (GetLastError ())
		1654	{
		1655	case ERROR_FILE_NOT_FOUND:
		1656	req->result = 0;
		1657	break;
		1658
		1659	case ERROR_INVALID_NAME:
		1660	case ERROR_PATH_NOT_FOUND:
		1661	case ERROR_NO_MORE_FILES:
		1662	errno = ENOENT;
		1663	break;
		1664
		1665	case ERROR_NOT_ENOUGH_MEMORY:
		1666	errno = ENOMEM;
		1667	break;
		1668
		1669	default:
		1670	errno = EINVAL;
		1671	break;
		1672	}
		1673	}
		1674	}
		1675	#else
908	self->dirp = dirp = opendir (req->ptr1);	1676	dirp = opendir (req->ptr1);
		1677	#endif
		1678
909	req->flags \|= EIO_FLAG_PTR2_FREE;	1679	if (req->flags & EIO_FLAG_PTR1_FREE)
		1680	free (req->ptr1);
		1681
		1682	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
		1683	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
910	req->ptr2 = names = malloc (memlen);	1684	req->ptr2 = names = malloc (namesalloc);
911	X_UNLOCK (wrklock);
912		1685
913	if (dirp && names)	1686	if (dirp && names && (!flags \|\| dents))
914	for (;;)	1687	for (;;)
915	{	1688	{
		1689	int done;
		1690
		1691	#ifdef _WIN32
		1692	done = !dirp;
		1693	#else
916	errno = 0;	1694	errno = 0;
917	entp = readdir (dirp);	1695	entp = readdir (dirp);
		1696	done = !entp;
		1697	#endif
918		1698
919	if (!entp)	1699	if (done)
		1700	{
		1701	#ifndef _WIN32
		1702	int old_errno = errno;
		1703	closedir (dirp);
		1704	errno = old_errno;
		1705
		1706	if (errno)
		1707	break;
		1708	#endif
		1709
		1710	/* sort etc. */
		1711	req->int1 = flags;
		1712	req->result = dentoffs;
		1713
		1714	if (flags & EIO_READDIR_STAT_ORDER)
		1715	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
		1716	else if (flags & EIO_READDIR_DIRS_FIRST)
		1717	if (flags & EIO_READDIR_FOUND_UNKNOWN)
		1718	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
		1719	else
		1720	{
		1721	/* in this case, all is known, and we just put dirs first and sort them */
		1722	eio_dirent *oth = dents + dentoffs;
		1723	eio_dirent *dir = dents;
		1724
		1725	/* now partition dirs to the front, and non-dirs to the back */
		1726	/* by walking from both sides and swapping if necessary */
		1727	while (oth > dir)
		1728	{
		1729	if (dir->type == EIO_DT_DIR)
		1730	++dir;
		1731	else if ((--oth)->type == EIO_DT_DIR)
		1732	{
		1733	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1734
		1735	++dir;
		1736	}
		1737	}
		1738
		1739	/* now sort the dirs only (dirs all have the same score) */
		1740	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1741	}
		1742
920	break;	1743	break;
		1744	}
921		1745
922	name = entp->d_name;	1746	/* now add the entry to our list(s) */
		1747	name = D_NAME (entp);
923		1748
		1749	/* skip . and .. entries */
924	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1750	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
925	{	1751	{
926	int len = strlen (name) + 1;	1752	int len = D_NAMLEN (entp) + 1;
927		1753
928	res++;	1754	while (ecb_expect_false (namesoffs + len > namesalloc))
929
930	while (memofs + len > memlen)
931	{	1755	{
932	memlen *= 2;	1756	namesalloc *= 2;
933	X_LOCK (wrklock);
934	req->ptr2 = names = realloc (names, memlen);	1757	req->ptr2 = names = realloc (names, namesalloc);
935	X_UNLOCK (wrklock);
936		1758
937	if (!names)	1759	if (!names)
938	break;	1760	break;
939	}	1761	}
940		1762
941	memcpy (names + memofs, name, len);	1763	memcpy (names + namesoffs, name, len);
		1764
		1765	if (dents)
		1766	{
		1767	struct eio_dirent *ent;
		1768
		1769	if (ecb_expect_false (dentoffs == dentalloc))
		1770	{
		1771	dentalloc *= 2;
		1772	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1773
		1774	if (!dents)
		1775	break;
		1776	}
		1777
		1778	ent = dents + dentoffs;
		1779
		1780	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
		1781	ent->namelen = len - 1;
		1782	ent->inode = D_INO (entp);
		1783
		1784	inode_bits \|= ent->inode;
		1785
		1786	switch (D_TYPE (entp))
		1787	{
		1788	default:
		1789	ent->type = EIO_DT_UNKNOWN;
		1790	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1791	break;
		1792
		1793	#ifdef DT_FIFO
		1794	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1795	#endif
		1796	#ifdef DT_CHR
		1797	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1798	#endif
		1799	#ifdef DT_MPC
		1800	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1801	#endif
		1802	#ifdef DT_DIR
		1803	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1804	#endif
		1805	#ifdef DT_NAM
		1806	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1807	#endif
		1808	#ifdef DT_BLK
		1809	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1810	#endif
		1811	#ifdef DT_MPB
		1812	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1813	#endif
		1814	#ifdef DT_REG
		1815	case DT_REG: ent->type = EIO_DT_REG; break;
		1816	#endif
		1817	#ifdef DT_NWK
		1818	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1819	#endif
		1820	#ifdef DT_CMP
		1821	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1822	#endif
		1823	#ifdef DT_LNK
		1824	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1825	#endif
		1826	#ifdef DT_SOCK
		1827	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1828	#endif
		1829	#ifdef DT_DOOR
		1830	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1831	#endif
		1832	#ifdef DT_WHT
		1833	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1834	#endif
		1835	}
		1836
		1837	ent->score = 7;
		1838
		1839	if (flags & EIO_READDIR_DIRS_FIRST)
		1840	{
		1841	if (ent->type == EIO_DT_UNKNOWN)
		1842	{
		1843	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1844	ent->score = 1;
		1845	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1846	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
		1847	}
		1848	else if (ent->type == EIO_DT_DIR)
		1849	ent->score = 0;
		1850	}
		1851	}
		1852
942	memofs += len;	1853	namesoffs += len;
		1854	++dentoffs;
943	}	1855	}
		1856
		1857	if (EIO_CANCELLED (req))
		1858	{
		1859	errno = ECANCELED;
		1860	break;
		1861	}
		1862
		1863	#ifdef _WIN32
		1864	if (!FindNextFile (dirp, &entp))
		1865	{
		1866	FindClose (dirp);
		1867	dirp = 0;
		1868	}
		1869	#endif
944	}	1870	}
945
946	if (errno)
947	res = -1;
948
949	req->result = res;
950	}	1871	}
951		1872
952	/*****************************************************************************/	1873	/*****************************************************************************/
953		1874
954	#define ALLOC(len) \	1875	#define ALLOC(len) \
…		…
970	{	1891	{
971	ETP_REQ *req;	1892	ETP_REQ *req;
972	struct timespec ts;	1893	struct timespec ts;
973	etp_worker self = (etp_worker )thr_arg;	1894	etp_worker self = (etp_worker )thr_arg;
974		1895
975	/* try to distribute timeouts somewhat randomly */	1896	/* try to distribute timeouts somewhat evenly */
976	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	1897	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
977		1898
978	for (;;)	1899	for (;;)
979	{	1900	{
		1901	ts.tv_sec = 0;
		1902
980	X_LOCK (reqlock);	1903	X_LOCK (reqlock);
981		1904
982	for (;;)	1905	for (;;)
983	{	1906	{
984	self->req = req = reqq_shift (&req_queue);	1907	self->req = req = reqq_shift (&req_queue);
985		1908
986	if (req)	1909	if (req)
987	break;	1910	break;
988		1911
		1912	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
		1913	{
		1914	X_UNLOCK (reqlock);
		1915	X_LOCK (wrklock);
		1916	--started;
		1917	X_UNLOCK (wrklock);
		1918	goto quit;
		1919	}
		1920
989	++idle;	1921	++idle;
990		1922
991	ts.tv_sec = time (0) + IDLE_TIMEOUT;	1923	if (idle <= max_idle)
992	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)	1924	/* we are allowed to idle, so do so without any timeout */
		1925	X_COND_WAIT (reqwait, reqlock);
		1926	else
993	{	1927	{
994	if (idle > max_idle)	1928	/* initialise timeout once */
995	{	1929	if (!ts.tv_sec)
996	--idle;	1930	ts.tv_sec = time (0) + idle_timeout;
997	X_UNLOCK (reqlock);
998	X_LOCK (wrklock);
999	--started;
1000	X_UNLOCK (wrklock);
1001	goto quit;
1002	}
1003		1931
1004	/* we are allowed to idle, so do so without any timeout */
1005	X_COND_WAIT (reqwait, reqlock);	1932	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
		1933	ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1006	}	1934	}
1007		1935
1008	--idle;	1936	--idle;
1009	}	1937	}
1010		1938
…		…
1013	X_UNLOCK (reqlock);	1941	X_UNLOCK (reqlock);
1014		1942
1015	if (req->type < 0)	1943	if (req->type < 0)
1016	goto quit;	1944	goto quit;
1017		1945
1018	if (!EIO_CANCELLED (req))
1019	ETP_EXECUTE (self, req);	1946	ETP_EXECUTE (self, req);
1020		1947
1021	X_LOCK (reslock);	1948	X_LOCK (reslock);
1022		1949
1023	++npending;	1950	++npending;
1024		1951
…		…
1039	return 0;	1966	return 0;
1040	}	1967	}
1041		1968
1042	/*****************************************************************************/	1969	/*****************************************************************************/
1043		1970
		1971	int ecb_cold
1044	int eio_init (void (want_poll)(void), void (done_poll)(void))	1972	eio_init (void (want_poll)(void), void (done_poll)(void))
1045	{	1973	{
		1974	#if !HAVE_PREADWRITE
		1975	X_MUTEX_CREATE (preadwritelock);
		1976	#endif
		1977
1046	return etp_init (want_poll, done_poll);	1978	return etp_init (want_poll, done_poll);
1047	}	1979	}
1048		1980
		1981	ecb_inline void
1049	static void eio_api_destroy (eio_req *req)	1982	eio_api_destroy (eio_req *req)
1050	{	1983	{
1051	free (req);	1984	free (req);
1052	}	1985	}
1053		1986
1054	#define REQ(rtype) \	1987	#define REQ(rtype) \
…		…
1073	{ \	2006	{ \
1074	eio_api_destroy (req); \	2007	eio_api_destroy (req); \
1075	return 0; \	2008	return 0; \
1076	}	2009	}
1077		2010
		2011	static void
1078	static void eio_execute (etp_worker self, eio_req req)	2012	eio_execute (etp_worker self, eio_req req)
1079	{	2013	{
1080	errno = 0;	2014	if (ecb_expect_false (EIO_CANCELLED (req)))
		2015	{
		2016	req->result = -1;
		2017	req->errorno = ECANCELED;
		2018	return;
		2019	}
1081		2020
1082	switch (req->type)	2021	switch (req->type)
1083	{	2022	{
1084	case EIO_READ: ALLOC (req->size);	2023	case EIO_READ: ALLOC (req->size);
1085	req->result = req->offs >= 0	2024	req->result = req->offs >= 0
…		…
1088	case EIO_WRITE: req->result = req->offs >= 0	2027	case EIO_WRITE: req->result = req->offs >= 0
1089	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2028	? pwrite (req->int1, req->ptr2, req->size, req->offs)
1090	: write (req->int1, req->ptr2, req->size); break;	2029	: write (req->int1, req->ptr2, req->size); break;
1091		2030
1092	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2031	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1093	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;	2032	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1094		2033
1095	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2034	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1096	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2035	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1097	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2036	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1098	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2037	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1099	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2038	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1100	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2039	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
		2040
		2041	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2042	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2043	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2044	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1101		2045
1102	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;	2046	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1103	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2047	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1104	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;	2048	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1105	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2049	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
…		…
1113	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;	2057	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1114	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;	2058	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1115	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;	2059	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1116	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;	2060	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1117	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;	2061	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1118	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;	2062	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1119		2063
		2064	case EIO_REALPATH: eio__realpath (req, self); break;
		2065
1120	case EIO_READLINK: ALLOC (NAME_MAX);	2066	case EIO_READLINK: ALLOC (PATH_MAX);
1121	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	2067	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1122		2068
1123	case EIO_SYNC: req->result = 0; sync (); break;	2069	case EIO_SYNC: req->result = 0; sync (); break;
1124	case EIO_FSYNC: req->result = fsync (req->int1); break;	2070	case EIO_FSYNC: req->result = fsync (req->int1); break;
1125	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2071	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2072	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
		2073	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
		2074	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
		2075	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
		2076	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
		2077	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1126		2078
1127	case EIO_READDIR: eio__scandir (req, self); break;	2079	case EIO_READDIR: eio__scandir (req, self); break;
1128		2080
1129	case EIO_BUSY:	2081	case EIO_BUSY:
1130	#ifdef _WIN32	2082	#ifdef _WIN32
1131	Sleep (req->nv1 * 1000.);	2083	Sleep (req->nv1 * 1e3);
1132	#else	2084	#else
1133	{	2085	{
1134	struct timeval tv;	2086	struct timeval tv;
1135		2087
1136	tv.tv_sec = req->nv1;	2088	tv.tv_sec = req->nv1;
1137	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;	2089	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1138		2090
1139	req->result = select (0, 0, 0, 0, &tv);	2091	req->result = select (0, 0, 0, 0, &tv);
1140	}	2092	}
1141	#endif	2093	#endif
1142	break;	2094	break;
…		…
1157	times = tv;	2109	times = tv;
1158	}	2110	}
1159	else	2111	else
1160	times = 0;	2112	times = 0;
1161		2113
1162
1163	req->result = req->type == EIO_FUTIME	2114	req->result = req->type == EIO_FUTIME
1164	? futimes (req->int1, times)	2115	? futimes (req->int1, times)
1165	: utimes (req->ptr1, times);	2116	: utimes (req->ptr1, times);
1166	}	2117	}
		2118	break;
1167		2119
1168	case EIO_GROUP:	2120	case EIO_GROUP:
		2121	abort (); /* handled in eio_request */
		2122
1169	case EIO_NOP:	2123	case EIO_NOP:
1170	req->result = 0;	2124	req->result = 0;
1171	break;	2125	break;
1172		2126
1173	case EIO_CUSTOM:	2127	case EIO_CUSTOM:
1174	req->feed (req);	2128	req->feed (req);
1175	break;	2129	break;
1176		2130
1177	default:	2131	default:
		2132	errno = ENOSYS;
1178	req->result = -1;	2133	req->result = -1;
1179	break;	2134	break;
1180	}	2135	}
1181		2136
1182	req->errorno = errno;	2137	req->errorno = errno;
…		…
1202	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)	2157	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)
1203	{	2158	{
1204	REQ (EIO_FSYNC); req->int1 = fd; SEND;	2159	REQ (EIO_FSYNC); req->int1 = fd; SEND;
1205	}	2160	}
1206		2161
		2162	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		2163	{
		2164	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		2165	}
		2166
		2167	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		2168	{
		2169	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		2170	}
		2171
		2172	eio_req eio_mlock (void addr, size_t length, int pri, eio_cb cb, void *data)
		2173	{
		2174	REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
		2175	}
		2176
		2177	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
		2178	{
		2179	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
		2180	}
		2181
		2182	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		2183	{
		2184	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2185	}
		2186
		2187	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)
		2188	{
		2189	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
		2190	}
		2191
1207	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	2192	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1208	{	2193	{
1209	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	2194	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1210	}	2195	}
1211		2196
…		…
1232	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)	2217	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)
1233	{	2218	{
1234	REQ (EIO_FSTAT); req->int1 = fd; SEND;	2219	REQ (EIO_FSTAT); req->int1 = fd; SEND;
1235	}	2220	}
1236		2221
		2222	eio_req eio_fstatvfs (int fd, int pri, eio_cb cb, void data)
		2223	{
		2224	REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
		2225	}
		2226
1237	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)	2227	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)
1238	{	2228	{
1239	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;	2229	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1240	}	2230	}
1241		2231
…		…
1247	eio_req eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void data)	2237	eio_req eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void data)
1248	{	2238	{
1249	REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;	2239	REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1250	}	2240	}
1251		2241
1252	eio_req eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void data)	2242	eio_req eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void data)
1253	{	2243	{
1254	REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;	2244	REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1255	}	2245	}
1256		2246
1257	eio_req eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void data)	2247	eio_req eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void data)
…		…
1277	eio_req eio_truncate (const char path, off_t offset, int pri, eio_cb cb, void *data)	2267	eio_req eio_truncate (const char path, off_t offset, int pri, eio_cb cb, void *data)
1278	{	2268	{
1279	REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;	2269	REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1280	}	2270	}
1281		2271
1282	eio_req eio_chown (const char path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data)	2272	eio_req eio_chown (const char path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1283	{	2273	{
1284	REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;	2274	REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1285	}	2275	}
1286		2276
1287	eio_req eio_chmod (const char path, mode_t mode, int pri, eio_cb cb, void *data)	2277	eio_req eio_chmod (const char path, mode_t mode, int pri, eio_cb cb, void *data)
…		…
1303	eio_req eio_readlink (const char path, int pri, eio_cb cb, void *data)	2293	eio_req eio_readlink (const char path, int pri, eio_cb cb, void *data)
1304	{	2294	{
1305	return eio__1path (EIO_READLINK, path, pri, cb, data);	2295	return eio__1path (EIO_READLINK, path, pri, cb, data);
1306	}	2296	}
1307		2297
		2298	eio_req eio_realpath (const char path, int pri, eio_cb cb, void *data)
		2299	{
		2300	return eio__1path (EIO_REALPATH, path, pri, cb, data);
		2301	}
		2302
1308	eio_req eio_stat (const char path, int pri, eio_cb cb, void *data)	2303	eio_req eio_stat (const char path, int pri, eio_cb cb, void *data)
1309	{	2304	{
1310	return eio__1path (EIO_STAT, path, pri, cb, data);	2305	return eio__1path (EIO_STAT, path, pri, cb, data);
1311	}	2306	}
1312		2307
1313	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)	2308	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)
1314	{	2309	{
1315	return eio__1path (EIO_LSTAT, path, pri, cb, data);	2310	return eio__1path (EIO_LSTAT, path, pri, cb, data);
1316	}	2311	}
1317		2312
		2313	eio_req eio_statvfs (const char path, int pri, eio_cb cb, void *data)
		2314	{
		2315	return eio__1path (EIO_STATVFS, path, pri, cb, data);
		2316	}
		2317
1318	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)	2318	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)
1319	{	2319	{
1320	return eio__1path (EIO_UNLINK, path, pri, cb, data);	2320	return eio__1path (EIO_UNLINK, path, pri, cb, data);
1321	}	2321	}
1322		2322
1323	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	2323	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1324	{	2324	{
1325	return eio__1path (EIO_RMDIR, path, pri, cb, data);	2325	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1326	}	2326	}
1327		2327
1328	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	2328	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1329	{	2329	{
1330	return eio__1path (EIO_READDIR, path, pri, cb, data);	2330	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1331	}	2331	}
1332		2332
1333	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	2333	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1334	{	2334	{
1335	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	2335	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1336	}	2336	}
1337		2337
1338	static eio_req *	2338	static eio_req *
1339	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)	2339	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1340	{	2340	{
…		…
1364	eio_req eio_rename (const char path, const char new_path, int pri, eio_cb cb, void data)	2364	eio_req eio_rename (const char path, const char new_path, int pri, eio_cb cb, void data)
1365	{	2365	{
1366	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	2366	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1367	}	2367	}
1368		2368
1369	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)	2369	eio_req eio_custom (void (execute)(eio_req ), int pri, eio_cb cb, void data)
1370	{	2370	{
1371	REQ (EIO_CUSTOM); req->feed = execute; SEND;	2371	REQ (EIO_CUSTOM); req->feed = execute; SEND;
1372	}	2372	}
1373		2373
1374	#endif	2374	#endif
…		…
1385	#undef SEND	2385	#undef SEND
1386		2386
1387	/*****************************************************************************/	2387	/*****************************************************************************/
1388	/* grp functions */	2388	/* grp functions */
1389		2389
		2390	void
1390	void eio_grp_feed (eio_req grp, void (feed)(eio_req *req), int limit)	2391	eio_grp_feed (eio_req grp, void (feed)(eio_req *req), int limit)
1391	{	2392	{
1392	grp->int2 = limit;	2393	grp->int2 = limit;
1393	grp->feed = feed;	2394	grp->feed = feed;
1394		2395
1395	grp_try_feed (grp);	2396	grp_try_feed (grp);
1396	}	2397	}
1397		2398
		2399	void
1398	void eio_grp_limit (eio_req *grp, int limit)	2400	eio_grp_limit (eio_req *grp, int limit)
1399	{	2401	{
1400	grp->int2 = limit;	2402	grp->int2 = limit;
1401		2403
1402	grp_try_feed (grp);	2404	grp_try_feed (grp);
1403	}	2405	}
1404		2406
		2407	void
1405	void eio_grp_add (eio_req grp, eio_req req)	2408	eio_grp_add (eio_req grp, eio_req req)
1406	{	2409	{
1407	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	2410	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
		2411
		2412	grp->flags \|= EIO_FLAG_GROUPADD;
1408		2413
1409	++grp->size;	2414	++grp->size;
1410	req->grp = grp;	2415	req->grp = grp;
1411		2416
1412	req->grp_prev = 0;	2417	req->grp_prev = 0;
…		…
1419	}	2424	}
1420		2425
1421	/*****************************************************************************/	2426	/*****************************************************************************/
1422	/* misc garbage */	2427	/* misc garbage */
1423		2428
		2429	eio_ssize_t
1424	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2430	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1425	{	2431	{
1426	etp_worker wrk;
1427
1428	wrk.dbuf = 0;
1429
1430	eio__sendfile (ofd, ifd, offset, count, &wrk);	2432	return eio__sendfile (ofd, ifd, offset, count);
1431
1432	if (wrk.dbuf)
1433	free (wrk.dbuf);
1434	}	2433	}
1435		2434

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.19 by root, Tue Jun 17 23:34:20 2008 UTC vs. Revision 1.96 by root, Tue Jul 19 05:20:36 2011 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.19 by root, Tue Jun 17 23:34:20 2008 UTC vs.
Revision 1.96 by root, Tue Jul 19 05:20:36 2011 UTC