ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/libeio/eio.c

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

Diff Legend

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