ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/libeio/eio.c

Comparing libeio/eio.c (file contents):
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC vs.
Revision 1.115 by root, Tue Mar 27 18:54:45 2012 UTC

…		…
43		43
44	#include "eio.h"	44	#include "eio.h"
45	#include "ecb.h"	45	#include "ecb.h"
46		46
47	#ifdef EIO_STACKSIZE	47	#ifdef EIO_STACKSIZE
48	# define XTHREAD_STACKSIZE EIO_STACKSIZE	48	# define X_STACKSIZE EIO_STACKSIZE
49	#endif	49	#endif
50	#include "xthread.h"	50	#include "xthread.h"
51		51
52	#include <errno.h>	52	#include <errno.h>
53	#include <stddef.h>	53	#include <stddef.h>
…		…
67	#endif	67	#endif
68		68
69	#ifndef ECANCELED	69	#ifndef ECANCELED
70	# define ECANCELED EDOM	70	# define ECANCELED EDOM
71	#endif	71	#endif
		72	#ifndef ELOOP
		73	# define ELOOP EDOM
		74	#endif
		75
		76	#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
		77	# define ENOTSOCK WSAENOTSOCK
		78	#endif
72		79
73	static void eio_destroy (eio_req *req);	80	static void eio_destroy (eio_req *req);
74		81
75	#ifndef EIO_FINISH	82	#ifndef EIO_FINISH
76	# 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
…		…
95		102
96	#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)	103	#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
97		104
98	#ifdef _WIN32	105	#ifdef _WIN32
99		106
		107	#undef PAGESIZE
100	#define PAGESIZE 4096 /* GetSystemInfo? */	108	#define PAGESIZE 4096 /* GetSystemInfo? */
101		109
		110	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		111
102	#ifdef EIO_STRUCT_STATI64	112	#ifdef EIO_STRUCT_STATI64
		113	/* look at perl's non-sloppy stat */
103	#define stat(path,buf) _stati64 (path,buf)	114	#define stat(path,buf) _stati64 (path,buf)
104	#define fstat(fd,buf) _fstati64 (path,buf)	115	#define fstat(fd,buf) _fstati64 (fd,buf)
105	#endif	116	#endif
106	#define lstat(path,buf) stat (path,buf)	117	#define lstat(path,buf) stat (path,buf)
107	#define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))	118	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
108	#define mkdir(path,mode) _mkdir (path)	119	#define mkdir(path,mode) _mkdir (path)
109	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))	120	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
110		121
		122	#define chmod(path,mode) _chmod (path, mode)
		123	#define dup(fd) _dup (fd)
		124	#define dup2(fd1,fd2) _dup2 (fd1, fd2)
		125
		126	#define fchmod(fd,mode) EIO_ENOSYS ()
111	#define chown(path,uid,gid) EIO_ENOSYS ()	127	#define chown(path,uid,gid) EIO_ENOSYS ()
112	#define fchown(fd,uid,gid) EIO_ENOSYS ()	128	#define fchown(fd,uid,gid) EIO_ENOSYS ()
113	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */	129	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
114	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */	130	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
115	#define mknod(path,mode,dev) EIO_ENOSYS ()	131	#define mknod(path,mode,dev) EIO_ENOSYS ()
116	#define sync() EIO_ENOSYS ()	132	#define sync() EIO_ENOSYS ()
		133	#define readlink(path,buf,s) EIO_ENOSYS ()
		134	#define statvfs(path,buf) EIO_ENOSYS ()
		135	#define fstatvfs(fd,buf) EIO_ENOSYS ()
		136
		137	/* rename() uses MoveFile, which fails to overwrite */
		138	#define rename(old,neu) eio__rename (old, neu)
		139
		140	static int
		141	eio__rename (const char *old, const char *neu)
		142	{
		143	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		144	return 0;
		145
		146	/* should steal _dosmaperr */
		147	switch (GetLastError ())
		148	{
		149	case ERROR_FILE_NOT_FOUND:
		150	case ERROR_PATH_NOT_FOUND:
		151	case ERROR_INVALID_DRIVE:
		152	case ERROR_NO_MORE_FILES:
		153	case ERROR_BAD_NETPATH:
		154	case ERROR_BAD_NET_NAME:
		155	case ERROR_BAD_PATHNAME:
		156	case ERROR_FILENAME_EXCED_RANGE:
		157	errno = ENOENT;
		158	break;
		159
		160	default:
		161	errno = EACCES;
		162	break;
		163	}
		164
		165	return -1;
		166	}
117		167
118	/* we could even stat and see if it exists */	168	/* we could even stat and see if it exists */
119	static int	169	static int
120	symlink (const char *old, const char *neu)	170	symlink (const char *old, const char *neu)
121	{	171	{
		172	#if WINVER >= 0x0600
122	if (CreateSymbolicLink (neu, old, 1))	173	if (CreateSymbolicLink (neu, old, 1))
123	return 0;	174	return 0;
124		175
125	if (CreateSymbolicLink (neu, old, 0))	176	if (CreateSymbolicLink (neu, old, 0))
126	return 0;	177	return 0;
		178	#endif
127		179
128	return EIO_ERRNO (ENOENT, -1);	180	return EIO_ERRNO (ENOENT, -1);
129	}	181	}
		182
		183	/* POSIX API only */
		184	#define CreateHardLink(neu,old,flags) 0
		185	#define CreateSymbolicLink(neu,old,flags) 0
		186
		187	struct statvfs
		188	{
		189	int dummy;
		190	};
		191
		192	#define DT_DIR EIO_DT_DIR
		193	#define DT_REG EIO_DT_REG
		194	#define D_NAME(entp) entp.cFileName
		195	#define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
130		196
131	#else	197	#else
132		198
133	#include <sys/time.h>	199	#include <sys/time.h>
134	#include <sys/select.h>	200	#include <sys/select.h>
135	#include <sys/statvfs.h>	201	#include <sys/statvfs.h>
136	#include <unistd.h>	202	#include <unistd.h>
137	#include <utime.h>
138	#include <signal.h>	203	#include <signal.h>
139	#include <dirent.h>	204	#include <dirent.h>
140		205
141	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES	206	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
142	#include <sys/mman.h>	207	#include <sys/mman.h>
143	#endif	208	#endif
		209
		210	#define D_NAME(entp) entp->d_name
144		211
145	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	212	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
146	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__	213	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
147	#define _DIRENT_HAVE_D_TYPE /* sigh */	214	#define _DIRENT_HAVE_D_TYPE /* sigh */
148	#define D_INO(de) (de)->d_fileno	215	#define D_INO(de) (de)->d_fileno
…		…
162		229
163	#ifndef EIO_STRUCT_DIRENT	230	#ifndef EIO_STRUCT_DIRENT
164	#define EIO_STRUCT_DIRENT struct dirent	231	#define EIO_STRUCT_DIRENT struct dirent
165	#endif	232	#endif
166		233
		234	#endif
		235
		236	#if HAVE_UTIMES
		237	# include <utime.h>
		238	#endif
		239
		240	#if HAVE_SYS_SYSCALL_H
		241	# include <sys/syscall.h>
		242	#endif
		243
		244	#if HAVE_SYS_PRCTL_H
		245	# include <sys/prctl.h>
167	#endif	246	#endif
168		247
169	#if HAVE_SENDFILE	248	#if HAVE_SENDFILE
170	# if __linux	249	# if __linux
171	# include <sys/sendfile.h>	250	# include <sys/sendfile.h>
…		…
186	#endif	265	#endif
187	#ifndef D_INO	266	#ifndef D_INO
188	# define D_INO(de) 0	267	# define D_INO(de) 0
189	#endif	268	#endif
190	#ifndef D_NAMLEN	269	#ifndef D_NAMLEN
191	# define D_NAMLEN(de) strlen ((de)->d_name)	270	# define D_NAMLEN(entp) strlen (D_NAME (entp))
192	#endif	271	#endif
193		272
194	/* used for struct dirent, AIX doesn't provide it */	273	/* used for struct dirent, AIX doesn't provide it */
195	#ifndef NAME_MAX	274	#ifndef NAME_MAX
196	# define NAME_MAX 4096	275	# define NAME_MAX 4096
…		…
203		282
204	/* buffer size for various temporary buffers */	283	/* buffer size for various temporary buffers */
205	#define EIO_BUFSIZE 65536	284	#define EIO_BUFSIZE 65536
206		285
207	#define dBUF \	286	#define dBUF \
208	char *eio_buf; \
209	ETP_WORKER_LOCK (self); \
210	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	287	char *eio_buf = malloc (EIO_BUFSIZE); \
211	ETP_WORKER_UNLOCK (self); \
212	errno = ENOMEM; \	288	errno = ENOMEM; \
213	if (!eio_buf) \	289	if (!eio_buf) \
214	return -1;	290	return -1
		291
		292	#define FUBd \
		293	free (eio_buf)
215		294
216	#define EIO_TICKS ((1000000 + 1023) >> 10)	295	#define EIO_TICKS ((1000000 + 1023) >> 10)
		296
		297	/*****************************************************************************/
		298
		299	struct tmpbuf
		300	{
		301	void *ptr;
		302	int len;
		303	};
		304
		305	static void *
		306	tmpbuf_get (struct tmpbuf *buf, int len)
		307	{
		308	if (buf->len < len)
		309	{
		310	free (buf->ptr);
		311	buf->ptr = malloc (buf->len = len);
		312	}
		313
		314	return buf->ptr;
		315	}
		316
		317	struct tmpbuf;
		318
		319	#if _POSIX_VERSION >= 200809L
		320	#define HAVE_AT 1
		321	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		322	#ifndef O_SEARCH
		323	#define O_SEARCH O_RDONLY
		324	#endif
		325	#else
		326	#define HAVE_AT 0
		327	static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
		328	#endif
		329
		330	struct eio_pwd
		331	{
		332	#if HAVE_AT
		333	int fd;
		334	#endif
		335	int len;
		336	char str[1]; /* actually, a 0-terminated canonical path */
		337	};
		338
		339	/*****************************************************************************/
217		340
218	#define ETP_PRI_MIN EIO_PRI_MIN	341	#define ETP_PRI_MIN EIO_PRI_MIN
219	#define ETP_PRI_MAX EIO_PRI_MAX	342	#define ETP_PRI_MAX EIO_PRI_MAX
220		343
221	struct etp_worker;	344	struct etp_worker;
…		…
225	static int eio_finish (eio_req *req);	348	static int eio_finish (eio_req *req);
226	#define ETP_FINISH(req) eio_finish (req)	349	#define ETP_FINISH(req) eio_finish (req)
227	static void eio_execute (struct etp_worker *self, eio_req *req);	350	static void eio_execute (struct etp_worker *self, eio_req *req);
228	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	351	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
229		352
230	#define ETP_WORKER_CLEAR(req) \
231	if (wrk->dbuf) \
232	{ \
233	free (wrk->dbuf); \
234	wrk->dbuf = 0; \
235	} \
236	\
237	if (wrk->dirp) \
238	{ \
239	closedir (wrk->dirp); \
240	wrk->dirp = 0; \
241	}
242
243	#define ETP_WORKER_COMMON \
244	void *dbuf; \
245	DIR *dirp;
246
247	/*****************************************************************************/	353	/*****************************************************************************/
248		354
249	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	355	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250		356
251	/* calculate time difference in ~1/EIO_TICKS of a second */	357	/* calculate time difference in ~1/EIO_TICKS of a second */
…		…
262	static void (*done_poll_cb) (void);	368	static void (*done_poll_cb) (void);
263		369
264	static unsigned int max_poll_time; /* reslock */	370	static unsigned int max_poll_time; /* reslock */
265	static unsigned int max_poll_reqs; /* reslock */	371	static unsigned int max_poll_reqs; /* reslock */
266		372
267	static volatile unsigned int nreqs; /* reqlock */	373	static unsigned int nreqs; /* reqlock */
268	static volatile unsigned int nready; /* reqlock */	374	static unsigned int nready; /* reqlock */
269	static volatile unsigned int npending; /* reqlock */	375	static unsigned int npending; /* reqlock */
270	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	376	static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
271	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */	377	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
272		378
273	static xmutex_t wrklock;	379	static xmutex_t wrklock;
274	static xmutex_t reslock;	380	static xmutex_t reslock;
275	static xmutex_t reqlock;	381	static xmutex_t reqlock;
276	static xcond_t reqwait;	382	static xcond_t reqwait;
…		…
279	/*	385	/*
280	* make our pread/pwrite emulation safe against themselves, but not against	386	* make our pread/pwrite emulation safe against themselves, but not against
281	* normal read/write by using a mutex. slows down execution a lot,	387	* normal read/write by using a mutex. slows down execution a lot,
282	* but that's your problem, not mine.	388	* but that's your problem, not mine.
283	*/	389	*/
284	static xmutex_t preadwritelock = X_MUTEX_INIT;	390	static xmutex_t preadwritelock;
285	#endif	391	#endif
286		392
287	typedef struct etp_worker	393	typedef struct etp_worker
288	{	394	{
		395	struct tmpbuf tmpbuf;
		396
289	/* locked by wrklock */	397	/* locked by wrklock */
290	struct etp_worker *prev, *next;	398	struct etp_worker *prev, *next;
291		399
292	xthread_t tid;	400	xthread_t tid;
293		401
294	/* locked by reslock, reqlock or wrklock */	402	#ifdef ETP_WORKER_COMMON
295	ETP_REQ *req; /* currently processed request */
296
297	ETP_WORKER_COMMON	403	ETP_WORKER_COMMON
		404	#endif
298	} etp_worker;	405	} etp_worker;
299		406
300	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	407	static etp_worker wrk_first; /* NOT etp */
301		408
302	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	409	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	410	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304		411
305	/* worker threads management */	412	/* worker threads management */
306		413
307	static void ecb_cold	414	static void
308	etp_worker_clear (etp_worker *wrk)	415	etp_worker_clear (etp_worker *wrk)
309	{	416	{
310	ETP_WORKER_CLEAR (wrk);
311	}	417	}
312		418
313	static void ecb_cold	419	static void ecb_cold
314	etp_worker_free (etp_worker *wrk)	420	etp_worker_free (etp_worker *wrk)
315	{	421	{
		422	free (wrk->tmpbuf.ptr);
		423
316	wrk->next->prev = wrk->prev;	424	wrk->next->prev = wrk->prev;
317	wrk->prev->next = wrk->next;	425	wrk->prev->next = wrk->next;
318		426
319	free (wrk);	427	free (wrk);
320	}	428	}
…		…
376	} etp_reqq;	484	} etp_reqq;
377		485
378	static etp_reqq req_queue;	486	static etp_reqq req_queue;
379	static etp_reqq res_queue;	487	static etp_reqq res_queue;
380		488
		489	static void ecb_noinline ecb_cold
		490	reqq_init (etp_reqq *q)
		491	{
		492	int pri;
		493
		494	for (pri = 0; pri < ETP_NUM_PRI; ++pri)
		495	q->qs[pri] = q->qe[pri] = 0;
		496
		497	q->size = 0;
		498	}
		499
381	static int ecb_noinline	500	static int ecb_noinline
382	reqq_push (etp_reqq *q, ETP_REQ *req)	501	reqq_push (etp_reqq *q, ETP_REQ *req)
383	{	502	{
384	int pri = req->pri;	503	int pri = req->pri;
385	req->next = 0;	504	req->next = 0;
…		…
419	}	538	}
420		539
421	abort ();	540	abort ();
422	}	541	}
423		542
424	static void ecb_cold	543	static int ecb_cold
425	etp_thread_init (void)	544	etp_init (void (*want_poll)(void), void (*done_poll)(void))
426	{	545	{
427	#if !HAVE_PREADWRITE
428	X_MUTEX_CREATE (preadwritelock);
429	#endif
430	X_MUTEX_CREATE (wrklock);	546	X_MUTEX_CREATE (wrklock);
431	X_MUTEX_CREATE (reslock);	547	X_MUTEX_CREATE (reslock);
432	X_MUTEX_CREATE (reqlock);	548	X_MUTEX_CREATE (reqlock);
433	X_COND_CREATE (reqwait);	549	X_COND_CREATE (reqwait);
434	}
435		550
436	static void ecb_cold	551	reqq_init (&req_queue);
437	etp_atfork_prepare (void)	552	reqq_init (&res_queue);
438	{
439	}
440		553
441	static void ecb_cold	554	wrk_first.next =
442	etp_atfork_parent (void)	555	wrk_first.prev = &wrk_first;
443	{
444	}
445
446	static void ecb_cold
447	etp_atfork_child (void)
448	{
449	ETP_REQ *prv;
450
451	while ((prv = reqq_shift (&req_queue)))
452	ETP_DESTROY (prv);
453
454	while ((prv = reqq_shift (&res_queue)))
455	ETP_DESTROY (prv);
456
457	while (wrk_first.next != &wrk_first)
458	{
459	etp_worker *wrk = wrk_first.next;
460
461	if (wrk->req)
462	ETP_DESTROY (wrk->req);
463
464	etp_worker_clear (wrk);
465	etp_worker_free (wrk);
466	}
467		556
468	started = 0;	557	started = 0;
469	idle = 0;	558	idle = 0;
470	nreqs = 0;	559	nreqs = 0;
471	nready = 0;	560	nready = 0;
472	npending = 0;	561	npending = 0;
473
474	etp_thread_init ();
475	}
476
477	static void ecb_cold
478	etp_once_init (void)
479	{
480	etp_thread_init ();
481	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
482	}
483
484	static int ecb_cold
485	etp_init (void (*want_poll)(void), void (*done_poll)(void))
486	{
487	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
488
489	pthread_once (&doinit, etp_once_init);
490		562
491	want_poll_cb = want_poll;	563	want_poll_cb = want_poll;
492	done_poll_cb = done_poll;	564	done_poll_cb = done_poll;
493		565
494	return 0;	566	return 0;
…		…
534	}	606	}
535		607
536	static void ecb_cold	608	static void ecb_cold
537	etp_end_thread (void)	609	etp_end_thread (void)
538	{	610	{
539	eio_req *req = calloc (1, sizeof (eio_req));	611	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
540		612
541	req->type = -1;	613	req->type = -1;
542	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	614	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
543		615
544	X_LOCK (reqlock);	616	X_LOCK (reqlock);
…		…
952	#if !HAVE_FDATASYNC	1024	#if !HAVE_FDATASYNC
953	# undef fdatasync	1025	# undef fdatasync
954	# define fdatasync(fd) fsync (fd)	1026	# define fdatasync(fd) fsync (fd)
955	#endif	1027	#endif
956		1028
		1029	static int
		1030	eio__syncfs (int fd)
		1031	{
		1032	int res;
		1033
		1034	#if HAVE_SYS_SYNCFS
		1035	res = (int)syscall (__NR_syncfs, (int)(fd));
		1036	#else
		1037	res = -1;
		1038	errno = ENOSYS;
		1039	#endif
		1040
		1041	if (res < 0 && errno == ENOSYS && fd >= 0)
		1042	sync ();
		1043
		1044	return res;
		1045	}
		1046
957	/* sync_file_range always needs emulation */	1047	/* sync_file_range always needs emulation */
958	static int	1048	static int
959	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1049	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
960	{	1050	{
961	#if HAVE_SYNC_FILE_RANGE	1051	#if HAVE_SYNC_FILE_RANGE
…		…
1004	dBUF;	1094	dBUF;
1005		1095
1006	while (todo > 0)	1096	while (todo > 0)
1007	{	1097	{
1008	size_t len = todo < EIO_BUFSIZE ? todo : EIO_BUFSIZE;	1098	size_t len = todo < EIO_BUFSIZE ? todo : EIO_BUFSIZE;
1009
1010	pread (fd, eio_buf, len, offset);
1011	offset += len;	1099	offset += len;
1012	todo -= len;	1100	todo -= len;
1013	}	1101	}
1014		1102
1015	errno = 0;	1103	FUBd;
		1104
		1105	/* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
		1106	/* but not for e.g. EIO or eof, so we also never fail */
1016	return count;	1107	return 0;
1017	}	1108	}
1018		1109
1019	#endif	1110	#endif
1020		1111
1021	/* sendfile always needs emulation */	1112	/* sendfile always needs emulation */
1022	static eio_ssize_t	1113	static eio_ssize_t
1023	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1114	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024	{	1115	{
1025	eio_ssize_t written = 0;	1116	eio_ssize_t written = 0;
1026	eio_ssize_t res;	1117	eio_ssize_t res;
1027		1118
1028	if (!count)	1119	if (!count)
…		…
1126	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK	1217	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1127	/* BSDs */	1218	/* BSDs */
1128	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */	1219	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129	|| errno == ENOTSUP	1220	|| errno == ENOTSUP
1130	#endif	1221	#endif
		1222	#ifdef EOPNOTSUPP /* windows */
1131	|| errno == EOPNOTSUPP /* BSDs */	1223	|| errno == EOPNOTSUPP /* BSDs */
		1224	#endif
1132	#if __solaris	1225	#if __solaris
1133	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE	1226	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE
1134	#endif	1227	#endif
1135	)	1228	)
1136	)	1229	)
…		…
1162		1255
1163	offset += cnt;	1256	offset += cnt;
1164	res += cnt;	1257	res += cnt;
1165	count -= cnt;	1258	count -= cnt;
1166	}	1259	}
		1260
		1261	FUBd;
1167	}	1262	}
1168		1263
1169	return res;	1264	return res;
1170	}	1265	}
1171		1266
…		…
1286	}	1381	}
1287		1382
1288	/*****************************************************************************/	1383	/*****************************************************************************/
1289	/* requests implemented outside eio_execute, because they are so large */	1384	/* requests implemented outside eio_execute, because they are so large */
1290		1385
		1386	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1291	static void	1387	static int
1292	eio__realpath (eio_req *req, etp_worker *self)	1388	eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1293	{	1389	{
1294	char *rel = req->ptr1;	1390	const char *rel = path;
1295	char *res;	1391	char *res;
1296	char *tmp1, *tmp2;	1392	char *tmp1, *tmp2;
1297	#if SYMLOOP_MAX > 32	1393	#if SYMLOOP_MAX > 32
1298	int symlinks = SYMLOOP_MAX;	1394	int symlinks = SYMLOOP_MAX;
1299	#else	1395	#else
1300	int symlinks = 32;	1396	int symlinks = 32;
1301	#endif	1397	#endif
1302		1398
1303	req->result = -1;
1304
1305	errno = EINVAL;	1399	errno = EINVAL;
1306	if (!rel)	1400	if (!rel)
1307	return;	1401	return -1;
1308		1402
1309	errno = ENOENT;	1403	errno = ENOENT;
1310	if (!*rel)	1404	if (!*rel)
1311	return;	1405	return -1;
1312		1406
1313	if (!req->ptr2)	1407	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1314	{
1315	X_LOCK (wrklock);
1316	req->flags |= EIO_FLAG_PTR2_FREE;
1317	X_UNLOCK (wrklock);
1318	req->ptr2 = malloc (PATH_MAX * 3);
1319
1320	errno = ENOMEM;
1321	if (!req->ptr2)
1322	return;
1323	}
1324
1325	res = req->ptr2;
1326	tmp1 = res + PATH_MAX;	1408	tmp1 = res + PATH_MAX;
1327	tmp2 = tmp1 + PATH_MAX;	1409	tmp2 = tmp1 + PATH_MAX;
1328		1410
1329	#if 0 /* disabled, the musl way to do things is just too racy */	1411	#if 0 /* disabled, the musl way to do things is just too racy */
1330	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1412	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1349	#endif	1431	#endif
1350	#endif	1432	#endif
1351		1433
1352	if (*rel != '/')	1434	if (*rel != '/')
1353	{	1435	{
		1436	int len;
		1437
		1438	errno = ENOENT;
		1439	if (wd == EIO_INVALID_WD)
		1440	return -1;
		1441
		1442	if (wd == EIO_CWD)
		1443	{
1354	if (!getcwd (res, PATH_MAX))	1444	if (!getcwd (res, PATH_MAX))
1355	return;	1445	return -1;
		1446
		1447	len = strlen (res);
		1448	}
		1449	else
		1450	memcpy (res, wd->str, len = wd->len);
1356		1451
1357	if (res [1]) /* only use if not / */	1452	if (res [1]) /* only use if not / */
1358	res += strlen (res);	1453	res += len;
1359	}	1454	}
1360		1455
1361	while (*rel)	1456	while (*rel)
1362	{	1457	{
1363	eio_ssize_t len, linklen;	1458	eio_ssize_t len, linklen;
1364	char *beg = rel;	1459	const char *beg = rel;
1365		1460
1366	while (*rel && *rel != '/')	1461	while (*rel && *rel != '/')
1367	++rel;	1462	++rel;
1368		1463
1369	len = rel - beg;	1464	len = rel - beg;
…		…
1381		1476
1382	if (beg [1] == '.' && len == 2)	1477	if (beg [1] == '.' && len == 2)
1383	{	1478	{
1384	/* .. - back up one component, if possible */	1479	/* .. - back up one component, if possible */
1385		1480
1386	while (res != req->ptr2)	1481	while (res != tmpbuf->ptr)
1387	if (*--res == '/')	1482	if (*--res == '/')
1388	break;	1483	break;
1389		1484
1390	continue;	1485	continue;
1391	}	1486	}
1392	}	1487	}
1393		1488
1394	errno = ENAMETOOLONG;	1489	errno = ENAMETOOLONG;
1395	if (res + 1 + len + 1 >= tmp1)	1490	if (res + 1 + len + 1 >= tmp1)
1396	return;	1491	return -1;
1397		1492
1398	/* copy one component */	1493	/* copy one component */
1399	*res = '/';	1494	*res = '/';
1400	memcpy (res + 1, beg, len);	1495	memcpy (res + 1, beg, len);
1401		1496
1402	/* zero-terminate, for readlink */	1497	/* zero-terminate, for readlink */
1403	res [len + 1] = 0;	1498	res [len + 1] = 0;
1404		1499
1405	/* now check if it's a symlink */	1500	/* now check if it's a symlink */
1406	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1501	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1407		1502
1408	if (linklen < 0)	1503	if (linklen < 0)
1409	{	1504	{
1410	if (errno != EINVAL)	1505	if (errno != EINVAL)
1411	return;	1506	return -1;
1412		1507
1413	/* it's a normal directory. hopefully */	1508	/* it's a normal directory. hopefully */
1414	res += len + 1;	1509	res += len + 1;
1415	}	1510	}
1416	else	1511	else
…		…
1418	/* yay, it was a symlink - build new path in tmp2 */	1513	/* yay, it was a symlink - build new path in tmp2 */
1419	int rellen = strlen (rel);	1514	int rellen = strlen (rel);
1420		1515
1421	errno = ENAMETOOLONG;	1516	errno = ENAMETOOLONG;
1422	if (linklen + 1 + rellen >= PATH_MAX)	1517	if (linklen + 1 + rellen >= PATH_MAX)
1423	return;	1518	return -1;
1424		1519
1425	errno = ELOOP;	1520	errno = ELOOP;
1426	if (!--symlinks)	1521	if (!--symlinks)
1427	return;	1522	return -1;
1428		1523
1429	if (*tmp1 == '/')	1524	if (*tmp1 == '/')
1430	res = req->ptr2; /* symlink resolves to an absolute path */	1525	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1431		1526
1432	/* we need to be careful, as rel might point into tmp2 already */	1527	/* we need to be careful, as rel might point into tmp2 already */
1433	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1528	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1434	tmp2 [linklen] = '/';	1529	tmp2 [linklen] = '/';
1435	memcpy (tmp2, tmp1, linklen);	1530	memcpy (tmp2, tmp1, linklen);
…		…
1437	rel = tmp2;	1532	rel = tmp2;
1438	}	1533	}
1439	}	1534	}
1440		1535
1441	/* special case for the lone root path */	1536	/* special case for the lone root path */
1442	if (res == req->ptr2)	1537	if (res == tmpbuf->ptr)
1443	*res++ = '/';	1538	*res++ = '/';
1444		1539
1445	req->result = res - (char *)req->ptr2;	1540	return res - (char *)tmpbuf->ptr;
1446
1447	done:
1448	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1449	}	1541	}
1450		1542
1451	static signed char	1543	static signed char
1452	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1544	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1453	{	1545	{
…		…
1461		1553
1462	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */	1554	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1463	#define EIO_SORT_FAST 60 /* when to only use insertion sort */	1555	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464		1556
1465	static void	1557	static void
1466	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1558	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467	{	1559	{
1468	unsigned char bits [9 + sizeof (ino_t) * 8];	1560	unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469	unsigned char *bit = bits;	1561	unsigned char *bit = bits;
1470		1562
1471	assert (CHAR_BIT == 8);	1563	assert (CHAR_BIT == 8);
1472	assert (sizeof (eio_dirent) * 8 < 256);	1564	assert (sizeof (eio_dirent) * 8 < 256);
1473	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */	1565	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
…		…
1475		1567
1476	if (size <= EIO_SORT_FAST)	1568	if (size <= EIO_SORT_FAST)
1477	return;	1569	return;
1478		1570
1479	/* first prepare an array of bits to test in our radix sort */	1571	/* first prepare an array of bits to test in our radix sort */
1480	/* try to take endianness into account, as well as differences in ino_t sizes */	1572	/* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481	/* inode_bits must contain all inodes ORed together */	1573	/* inode_bits must contain all inodes ORed together */
1482	/* which is used to skip bits that are 0 everywhere, which is very common */	1574	/* which is used to skip bits that are 0 everywhere, which is very common */
1483	{	1575	{
1484	ino_t endianness;	1576	eio_ino_t endianness;
1485	int i, j;	1577	int i, j;
1486		1578
1487	/* we store the byte offset of byte n into byte n of "endianness" */	1579	/* we store the byte offset of byte n into byte n of "endianness" */
1488	for (i = 0; i < sizeof (ino_t); ++i)	1580	for (i = 0; i < sizeof (eio_ino_t); ++i)
1489	((unsigned char *)&endianness)[i] = i;	1581	((unsigned char *)&endianness)[i] = i;
1490		1582
1491	*bit++ = 0;	1583	*bit++ = 0;
1492		1584
1493	for (i = 0; i < sizeof (ino_t); ++i)	1585	for (i = 0; i < sizeof (eio_ino_t); ++i)
1494	{	1586	{
1495	/* shifting off the byte offsets out of "endianness" */	1587	/* shifting off the byte offsets out of "endianness" */
1496	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;	1588	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497	endianness >>= 8;	1589	endianness >>= 8;
1498		1590
1499	for (j = 0; j < 8; ++j)	1591	for (j = 0; j < 8; ++j)
1500	if (inode_bits & (((ino_t)1) << (i * 8 + j)))	1592	if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501	*bit++ = offs + j;	1593	*bit++ = offs + j;
1502	}	1594	}
1503		1595
1504	for (j = 0; j < 8; ++j)	1596	for (j = 0; j < 8; ++j)
1505	if (score_bits & (1 << j))	1597	if (score_bits & (1 << j))
1506	*bit++ = offsetof (eio_dirent, score) * 8 + j;	1598	*bit++ = offsetof (eio_dirent, score) * 8 + j;
1507	}	1599	}
1508		1600
1509	/* now actually do the sorting (a variant of MSD radix sort) */	1601	/* now actually do the sorting (a variant of MSD radix sort) */
1510	{	1602	{
1511	eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;	1603	eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512	eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;	1604	eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513	unsigned char *bit_stk [9 + sizeof (ino_t) * 8];	1605	unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514	int stk_idx = 0;	1606	int stk_idx = 0;
1515		1607
1516	base_stk [stk_idx] = dents;	1608	base_stk [stk_idx] = dents;
1517	end_stk [stk_idx] = dents + size;	1609	end_stk [stk_idx] = dents + size;
1518	bit_stk [stk_idx] = bit - 1;	1610	bit_stk [stk_idx] = bit - 1;
…		…
1597	}	1689	}
1598	}	1690	}
1599	}	1691	}
1600		1692
1601	static void	1693	static void
1602	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1694	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603	{	1695	{
1604	if (size <= 1)	1696	if (size <= 1)
1605	return; /* our insertion sort relies on size > 0 */	1697	return; /* our insertion sort relies on size > 0 */
1606		1698
1607	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */	1699	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
…		…
1615		1707
1616	/* read a full directory */	1708	/* read a full directory */
1617	static void	1709	static void
1618	eio__scandir (eio_req *req, etp_worker *self)	1710	eio__scandir (eio_req *req, etp_worker *self)
1619	{	1711	{
1620	DIR *dirp;
1621	EIO_STRUCT_DIRENT *entp;
1622	char *name, *names;	1712	char *name, *names;
1623	int namesalloc = 4096;	1713	int namesalloc = 4096 - sizeof (void *) * 4;
1624	int namesoffs = 0;	1714	int namesoffs = 0;
1625	int flags = req->int1;	1715	int flags = req->int1;
1626	eio_dirent *dents = 0;	1716	eio_dirent *dents = 0;
1627	int dentalloc = 128;	1717	int dentalloc = 128;
1628	int dentoffs = 0;	1718	int dentoffs = 0;
1629	ino_t inode_bits = 0;	1719	eio_ino_t inode_bits = 0;
		1720	#ifdef _WIN32
		1721	HANDLE dirp;
		1722	WIN32_FIND_DATA entp;
		1723	#else
		1724	DIR *dirp;
		1725	EIO_STRUCT_DIRENT *entp;
		1726	#endif
1630		1727
1631	req->result = -1;	1728	req->result = -1;
1632		1729
1633	if (!(flags & EIO_READDIR_DENTS))	1730	if (!(flags & EIO_READDIR_DENTS))
1634	flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);	1731	flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635		1732
1636	X_LOCK (wrklock);	1733	#ifdef _WIN32
1637	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1734	{
		1735	int len = strlen ((const char *)req->ptr1);
		1736	char *path = malloc (MAX_PATH);
		1737	const char *fmt;
		1738	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		1739
		1740	if (!len)
		1741	fmt = "./*";
		1742	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
		1743	fmt = "%s*";
		1744	else
		1745	fmt = "%s/*";
		1746
		1747	_snprintf (path, MAX_PATH, fmt, reqpath);
		1748	dirp = FindFirstFile (path, &entp);
		1749	free (path);
		1750
		1751	if (dirp == INVALID_HANDLE_VALUE)
		1752	{
		1753	/* should steal _dosmaperr */
		1754	switch (GetLastError ())
		1755	{
		1756	case ERROR_FILE_NOT_FOUND:
		1757	req->result = 0;
		1758	break;
		1759
		1760	case ERROR_INVALID_NAME:
		1761	case ERROR_PATH_NOT_FOUND:
		1762	case ERROR_NO_MORE_FILES:
		1763	errno = ENOENT;
		1764	break;
		1765
		1766	case ERROR_NOT_ENOUGH_MEMORY:
		1767	errno = ENOMEM;
		1768	break;
		1769
		1770	default:
		1771	errno = EINVAL;
		1772	break;
		1773	}
		1774
		1775	return;
		1776	}
		1777	}
		1778	#else
		1779	#if HAVE_AT
		1780	if (req->wd)
		1781	{
		1782	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		1783
		1784	if (fd < 0)
		1785	return;
		1786
		1787	dirp = fdopendir (fd);
		1788
		1789	if (!dirp)
		1790	close (fd);
		1791	}
		1792	else
1638	self->dirp = dirp = opendir (req->ptr1);	1793	dirp = opendir (req->ptr1);
		1794	#else
		1795	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1796	#endif
		1797
		1798	if (!dirp)
		1799	return;
		1800	#endif
1639		1801
1640	if (req->flags & EIO_FLAG_PTR1_FREE)	1802	if (req->flags & EIO_FLAG_PTR1_FREE)
1641	free (req->ptr1);	1803	free (req->ptr1);
1642		1804
1643	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1805	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1806	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645	req->ptr2 = names = malloc (namesalloc);	1807	req->ptr2 = names = malloc (namesalloc);
1646	X_UNLOCK (wrklock);
1647		1808
1648	if (dirp && names && (!flags || dents))	1809	if (!names || (flags && !dents))
		1810	return;
		1811
1649	for (;;)	1812	for (;;)
1650	{	1813	{
		1814	int done;
		1815
		1816	#ifdef _WIN32
		1817	done = !dirp;
		1818	#else
1651	errno = 0;	1819	errno = 0;
1652	entp = readdir (dirp);	1820	entp = readdir (dirp);
		1821	done = !entp;
		1822	#endif
1653		1823
1654	if (!entp)	1824	if (done)
1655	{	1825	{
		1826	#ifndef _WIN32
		1827	int old_errno = errno;
		1828	closedir (dirp);
		1829	errno = old_errno;
		1830
1656	if (errno)	1831	if (errno)
1657	break;	1832	break;
		1833	#endif
1658		1834
1659	/* sort etc. */	1835	/* sort etc. */
1660	req->int1 = flags;	1836	req->int1 = flags;
1661	req->result = dentoffs;	1837	req->result = dentoffs;
1662		1838
1663	if (flags & EIO_READDIR_STAT_ORDER)	1839	if (flags & EIO_READDIR_STAT_ORDER)
1664	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1840	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1665	else if (flags & EIO_READDIR_DIRS_FIRST)	1841	else if (flags & EIO_READDIR_DIRS_FIRST)
1666	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1842	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1667	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1843	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1668	else	1844	else
		1845	{
		1846	/* in this case, all is known, and we just put dirs first and sort them */
		1847	eio_dirent *oth = dents + dentoffs;
		1848	eio_dirent *dir = dents;
		1849
		1850	/* now partition dirs to the front, and non-dirs to the back */
		1851	/* by walking from both sides and swapping if necessary */
		1852	while (oth > dir)
		1853	{
		1854	if (dir->type == EIO_DT_DIR)
		1855	++dir;
		1856	else if ((--oth)->type == EIO_DT_DIR)
		1857	{
		1858	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
		1859
		1860	++dir;
		1861	}
		1862	}
		1863
		1864	/* now sort the dirs only (dirs all have the same score) */
		1865	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1866	}
		1867
		1868	break;
		1869	}
		1870
		1871	/* now add the entry to our list(s) */
		1872	name = D_NAME (entp);
		1873
		1874	/* skip . and .. entries */
		1875	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		1876	{
		1877	int len = D_NAMLEN (entp) + 1;
		1878
		1879	while (ecb_expect_false (namesoffs + len > namesalloc))
		1880	{
		1881	namesalloc *= 2;
		1882	req->ptr2 = names = realloc (names, namesalloc);
		1883
		1884	if (!names)
		1885	break;
		1886	}
		1887
		1888	memcpy (names + namesoffs, name, len);
		1889
		1890	if (dents)
		1891	{
		1892	struct eio_dirent *ent;
		1893
		1894	if (ecb_expect_false (dentoffs == dentalloc))
1669	{	1895	{
1670	/* in this case, all is known, and we just put dirs first and sort them */	1896	dentalloc *= 2;
		1897	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1898
		1899	if (!dents)
		1900	break;
		1901	}
		1902
1671	eio_dirent *oth = dents + dentoffs;	1903	ent = dents + dentoffs;
1672	eio_dirent *dir = dents;
1673		1904
1674	/* now partition dirs to the front, and non-dirs to the back */	1905	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1675	/* by walking from both sides and swapping if necessary */	1906	ent->namelen = len - 1;
1676	while (oth > dir)	1907	ent->inode = D_INO (entp);
		1908
		1909	inode_bits |= ent->inode;
		1910
		1911	switch (D_TYPE (entp))
		1912	{
		1913	default:
		1914	ent->type = EIO_DT_UNKNOWN;
		1915	flags |= EIO_READDIR_FOUND_UNKNOWN;
		1916	break;
		1917
		1918	#ifdef DT_FIFO
		1919	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1920	#endif
		1921	#ifdef DT_CHR
		1922	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1923	#endif
		1924	#ifdef DT_MPC
		1925	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1926	#endif
		1927	#ifdef DT_DIR
		1928	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1929	#endif
		1930	#ifdef DT_NAM
		1931	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1932	#endif
		1933	#ifdef DT_BLK
		1934	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1935	#endif
		1936	#ifdef DT_MPB
		1937	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1938	#endif
		1939	#ifdef DT_REG
		1940	case DT_REG: ent->type = EIO_DT_REG; break;
		1941	#endif
		1942	#ifdef DT_NWK
		1943	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1944	#endif
		1945	#ifdef DT_CMP
		1946	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1947	#endif
		1948	#ifdef DT_LNK
		1949	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1950	#endif
		1951	#ifdef DT_SOCK
		1952	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1953	#endif
		1954	#ifdef DT_DOOR
		1955	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1956	#endif
		1957	#ifdef DT_WHT
		1958	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1959	#endif
		1960	}
		1961
		1962	ent->score = 7;
		1963
		1964	if (flags & EIO_READDIR_DIRS_FIRST)
		1965	{
		1966	if (ent->type == EIO_DT_UNKNOWN)
1677	{	1967	{
1678	if (dir->type == EIO_DT_DIR)	1968	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1679	++dir;	1969	ent->score = 1;
1680	else if ((--oth)->type == EIO_DT_DIR)	1970	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1681	{	1971	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1682	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1683
1684	++dir;
1685	}
1686	}	1972	}
1687		1973	else if (ent->type == EIO_DT_DIR)
1688	/* now sort the dirs only (dirs all have the same score) */	1974	ent->score = 0;
1689	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1690	}	1975	}
1691
1692	break;
1693	}
1694
1695	/* now add the entry to our list(s) */
1696	name = entp->d_name;
1697
1698	/* skip . and .. entries */
1699	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1700	{
1701	int len = D_NAMLEN (entp) + 1;
1702
1703	while (ecb_expect_false (namesoffs + len > namesalloc))
1704	{
1705	namesalloc *= 2;
1706	X_LOCK (wrklock);
1707	req->ptr2 = names = realloc (names, namesalloc);
1708	X_UNLOCK (wrklock);
1709
1710	if (!names)
1711	break;
1712	}	1976	}
1713		1977
1714	memcpy (names + namesoffs, name, len);
1715
1716	if (dents)
1717	{
1718	struct eio_dirent *ent;
1719
1720	if (ecb_expect_false (dentoffs == dentalloc))
1721	{
1722	dentalloc *= 2;
1723	X_LOCK (wrklock);
1724	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725	X_UNLOCK (wrklock);
1726
1727	if (!dents)
1728	break;
1729	}
1730
1731	ent = dents + dentoffs;
1732
1733	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1734	ent->namelen = len - 1;
1735	ent->inode = D_INO (entp);
1736
1737	inode_bits |= ent->inode;
1738
1739	switch (D_TYPE (entp))
1740	{
1741	default:
1742	ent->type = EIO_DT_UNKNOWN;
1743	flags |= EIO_READDIR_FOUND_UNKNOWN;
1744	break;
1745
1746	#ifdef DT_FIFO
1747	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1748	#endif
1749	#ifdef DT_CHR
1750	case DT_CHR: ent->type = EIO_DT_CHR; break;
1751	#endif
1752	#ifdef DT_MPC
1753	case DT_MPC: ent->type = EIO_DT_MPC; break;
1754	#endif
1755	#ifdef DT_DIR
1756	case DT_DIR: ent->type = EIO_DT_DIR; break;
1757	#endif
1758	#ifdef DT_NAM
1759	case DT_NAM: ent->type = EIO_DT_NAM; break;
1760	#endif
1761	#ifdef DT_BLK
1762	case DT_BLK: ent->type = EIO_DT_BLK; break;
1763	#endif
1764	#ifdef DT_MPB
1765	case DT_MPB: ent->type = EIO_DT_MPB; break;
1766	#endif
1767	#ifdef DT_REG
1768	case DT_REG: ent->type = EIO_DT_REG; break;
1769	#endif
1770	#ifdef DT_NWK
1771	case DT_NWK: ent->type = EIO_DT_NWK; break;
1772	#endif
1773	#ifdef DT_CMP
1774	case DT_CMP: ent->type = EIO_DT_CMP; break;
1775	#endif
1776	#ifdef DT_LNK
1777	case DT_LNK: ent->type = EIO_DT_LNK; break;
1778	#endif
1779	#ifdef DT_SOCK
1780	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1781	#endif
1782	#ifdef DT_DOOR
1783	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1784	#endif
1785	#ifdef DT_WHT
1786	case DT_WHT: ent->type = EIO_DT_WHT; break;
1787	#endif
1788	}
1789
1790	ent->score = 7;
1791
1792	if (flags & EIO_READDIR_DIRS_FIRST)
1793	{
1794	if (ent->type == EIO_DT_UNKNOWN)
1795	{
1796	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1797	ent->score = 1;
1798	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1799	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1800	}
1801	else if (ent->type == EIO_DT_DIR)
1802	ent->score = 0;
1803	}
1804	}
1805
1806	namesoffs += len;	1978	namesoffs += len;
1807	++dentoffs;	1979	++dentoffs;
1808	}	1980	}
1809		1981
1810	if (EIO_CANCELLED (req))	1982	if (EIO_CANCELLED (req))
1811	{	1983	{
1812	errno = ECANCELED;	1984	errno = ECANCELED;
1813	break;	1985	break;
1814	}	1986	}
		1987
		1988	#ifdef _WIN32
		1989	if (!FindNextFile (dirp, &entp))
		1990	{
		1991	FindClose (dirp);
		1992	dirp = 0;
1815	}	1993	}
		1994	#endif
		1995	}
1816	}	1996	}
		1997
		1998	/*****************************************************************************/
		1999	/* working directory stuff */
		2000	/* various deficiencies in the posix 2008 api force us to */
		2001	/* keep the absolute path in string form at all times */
		2002	/* fuck yeah. */
		2003
		2004	#if !HAVE_AT
		2005
		2006	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2007	/* an absolute or canonical path */
		2008	static const char *
		2009	wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2010	{
		2011	if (!wd || *path == '/')
		2012	return path;
		2013
		2014	if (path [0] == '.' && !path [1])
		2015	return wd->str;
		2016
		2017	{
		2018	int l1 = wd->len;
		2019	int l2 = strlen (path);
		2020
		2021	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2022
		2023	memcpy (res, wd->str, l1);
		2024	res [l1] = '/';
		2025	memcpy (res + l1 + 1, path, l2 + 1);
		2026
		2027	return res;
		2028	}
		2029	}
		2030
		2031	#endif
		2032
		2033	static eio_wd
		2034	eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2035	{
		2036	int fd;
		2037	eio_wd res;
		2038	int len = eio__realpath (tmpbuf, wd, path);
		2039
		2040	if (len < 0)
		2041	return EIO_INVALID_WD;
		2042
		2043	#if HAVE_AT
		2044	fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		2045
		2046	if (fd < 0)
		2047	return EIO_INVALID_WD;
		2048	#endif
		2049
		2050	res = malloc (sizeof (*res) + len); /* one extra 0-byte */
		2051
		2052	#if HAVE_AT
		2053	res->fd = fd;
		2054	#endif
		2055
		2056	res->len = len;
		2057	memcpy (res->str, tmpbuf->ptr, len);
		2058	res->str [len] = 0;
		2059
		2060	return res;
		2061	}
		2062
		2063	eio_wd
		2064	eio_wd_open_sync (eio_wd wd, const char *path)
		2065	{
		2066	struct tmpbuf tmpbuf = { 0 };
		2067	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2068	free (tmpbuf.ptr);
		2069
		2070	return wd;
		2071	}
		2072
		2073	void
		2074	eio_wd_close_sync (eio_wd wd)
		2075	{
		2076	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2077	{
		2078	#if HAVE_AT
		2079	close (wd->fd);
		2080	#endif
		2081	free (wd);
		2082	}
		2083	}
		2084
		2085	#if HAVE_AT
		2086
		2087	/* they forgot these */
		2088
		2089	static int
		2090	eio__truncateat (int dirfd, const char *path, off_t length)
		2091	{
		2092	int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
		2093	int res;
		2094
		2095	if (fd < 0)
		2096	return fd;
		2097
		2098	res = ftruncate (fd, length);
		2099	close (fd);
		2100	return res;
		2101	}
		2102
		2103	static int
		2104	eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
		2105	{
		2106	int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
		2107	int res;
		2108
		2109	if (fd < 0)
		2110	return fd;
		2111
		2112	res = fstatvfs (fd, buf);
		2113	close (fd);
		2114	return res;
		2115
		2116	}
		2117
		2118	#endif
1817		2119
1818	/*****************************************************************************/	2120	/*****************************************************************************/
1819		2121
1820	#define ALLOC(len) \	2122	#define ALLOC(len) \
1821	if (!req->ptr2) \	2123	if (!req->ptr2) \
…		…
1830	req->result = -1; \	2132	req->result = -1; \
1831	break; \	2133	break; \
1832	} \	2134	} \
1833	}	2135	}
1834		2136
		2137	static void ecb_noinline ecb_cold
		2138	etp_proc_init (void)
		2139	{
		2140	#if HAVE_PRCTL_SET_NAME
		2141	/* provide a more sensible "thread name" */
		2142	char name[16 + 1];
		2143	const int namelen = sizeof (name) - 1;
		2144	int len;
		2145
		2146	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2147	name [namelen] = 0;
		2148	len = strlen (name);
		2149	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2150	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2151	#endif
		2152	}
		2153
1835	X_THREAD_PROC (etp_proc)	2154	X_THREAD_PROC (etp_proc)
1836	{	2155	{
1837	ETP_REQ *req;	2156	ETP_REQ *req;
1838	struct timespec ts;	2157	struct timespec ts;
1839	etp_worker *self = (etp_worker *)thr_arg;	2158	etp_worker *self = (etp_worker *)thr_arg;
1840	int timeout;	2159
		2160	etp_proc_init ();
1841		2161
1842	/* try to distribute timeouts somewhat evenly */	2162	/* try to distribute timeouts somewhat evenly */
1843	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2163	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844		2164
1845	for (;;)	2165	for (;;)
…		…
1848		2168
1849	X_LOCK (reqlock);	2169	X_LOCK (reqlock);
1850		2170
1851	for (;;)	2171	for (;;)
1852	{	2172	{
1853	self->req = req = reqq_shift (&req_queue);	2173	req = reqq_shift (&req_queue);
1854		2174
1855	if (req)	2175	if (req)
1856	break;	2176	break;
1857		2177
1858	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2178	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1896	++npending;	2216	++npending;
1897		2217
1898	if (!reqq_push (&res_queue, req) && want_poll_cb)	2218	if (!reqq_push (&res_queue, req) && want_poll_cb)
1899	want_poll_cb ();	2219	want_poll_cb ();
1900		2220
1901	self->req = 0;
1902	etp_worker_clear (self);	2221	etp_worker_clear (self);
1903		2222
1904	X_UNLOCK (reslock);	2223	X_UNLOCK (reslock);
1905	}	2224	}
1906		2225
1907	quit:	2226	quit:
		2227	free (req);
		2228
1908	X_LOCK (wrklock);	2229	X_LOCK (wrklock);
1909	etp_worker_free (self);	2230	etp_worker_free (self);
1910	X_UNLOCK (wrklock);	2231	X_UNLOCK (wrklock);
1911		2232
1912	return 0;	2233	return 0;
…		…
1915	/*****************************************************************************/	2236	/*****************************************************************************/
1916		2237
1917	int ecb_cold	2238	int ecb_cold
1918	eio_init (void (*want_poll)(void), void (*done_poll)(void))	2239	eio_init (void (*want_poll)(void), void (*done_poll)(void))
1919	{	2240	{
		2241	#if !HAVE_PREADWRITE
		2242	X_MUTEX_CREATE (preadwritelock);
		2243	#endif
		2244
1920	return etp_init (want_poll, done_poll);	2245	return etp_init (want_poll, done_poll);
1921	}	2246	}
1922		2247
1923	ecb_inline void	2248	ecb_inline void
1924	eio_api_destroy (eio_req *req)	2249	eio_api_destroy (eio_req *req)
…		…
1951	}	2276	}
1952		2277
1953	static void	2278	static void
1954	eio_execute (etp_worker *self, eio_req *req)	2279	eio_execute (etp_worker *self, eio_req *req)
1955	{	2280	{
		2281	#if HAVE_AT
		2282	int dirfd;
		2283	#else
		2284	const char *path;
		2285	#endif
		2286
1956	if (ecb_expect_false (EIO_CANCELLED (req)))	2287	if (ecb_expect_false (EIO_CANCELLED (req)))
1957	{	2288	{
1958	req->result = -1;	2289	req->result = -1;
1959	req->errorno = ECANCELED;	2290	req->errorno = ECANCELED;
1960	return;	2291	return;
1961	}	2292	}
1962		2293
		2294	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2295	{
		2296	req->result = -1;
		2297	req->errorno = ENOENT;
		2298	return;
		2299	}
		2300
		2301	if (req->type >= EIO_OPEN)
		2302	{
		2303	#if HAVE_AT
		2304	dirfd = WD2FD (req->wd);
		2305	#else
		2306	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2307	#endif
		2308	}
		2309
1963	switch (req->type)	2310	switch (req->type)
1964	{	2311	{
		2312	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2313	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2314	break;
		2315	case EIO_WD_CLOSE: req->result = 0;
		2316	eio_wd_close_sync (req->wd); break;
		2317
1965	case EIO_READ: ALLOC (req->size);	2318	case EIO_READ: ALLOC (req->size);
1966	req->result = req->offs >= 0	2319	req->result = req->offs >= 0
1967	? pread (req->int1, req->ptr2, req->size, req->offs)	2320	? pread (req->int1, req->ptr2, req->size, req->offs)
1968	: read (req->int1, req->ptr2, req->size); break;	2321	: read (req->int1, req->ptr2, req->size); break;
1969	case EIO_WRITE: req->result = req->offs >= 0	2322	case EIO_WRITE: req->result = req->offs >= 0
1970	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2323	? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971	: write (req->int1, req->ptr2, req->size); break;	2324	: write (req->int1, req->ptr2, req->size); break;
1972		2325
1973	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2326	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1974	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;	2327	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
		2328
		2329	#if HAVE_AT
1975		2330
1976	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2331	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2332	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1978	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2333	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2334	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2335	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2336	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2337	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2338	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2339
		2340	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2341	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2342	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2343	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2344	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2345	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2346	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2347	case EIO_READLINK: ALLOC (PATH_MAX);
		2348	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2349	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2350	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2351	case EIO_UTIME:
		2352	case EIO_FUTIME:
		2353	{
		2354	struct timespec ts[2];
		2355	struct timespec *times;
		2356
		2357	if (req->nv1 != -1. || req->nv2 != -1.)
		2358	{
		2359	ts[0].tv_sec = req->nv1;
		2360	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2361	ts[1].tv_sec = req->nv2;
		2362	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2363
		2364	times = ts;
		2365	}
		2366	else
		2367	times = 0;
		2368
		2369	req->result = req->type == EIO_FUTIME
		2370	? futimens (req->int1, times)
		2371	: utimensat (dirfd, req->ptr1, times, 0);
		2372	}
		2373	break;
		2374
		2375	#else
		2376
		2377	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2378	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2379	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2380	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2381	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2382	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2383	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2384	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2385
		2386	case EIO_UNLINK: req->result = unlink (path ); break;
		2387	case EIO_RMDIR: req->result = rmdir (path ); break;
		2388	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2389	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2390	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2391	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2392	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2393	case EIO_READLINK: ALLOC (PATH_MAX);
		2394	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2395	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2396	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2397
		2398	case EIO_UTIME:
		2399	case EIO_FUTIME:
		2400	{
		2401	struct timeval tv[2];
		2402	struct timeval *times;
		2403
		2404	if (req->nv1 != -1. || req->nv2 != -1.)
		2405	{
		2406	tv[0].tv_sec = req->nv1;
		2407	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2408	tv[1].tv_sec = req->nv2;
		2409	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2410
		2411	times = tv;
		2412	}
		2413	else
		2414	times = 0;
		2415
		2416	req->result = req->type == EIO_FUTIME
		2417	? futimes (req->int1, times)
		2418	: utimes (req->ptr1, times);
		2419	}
		2420	break;
		2421
		2422	#endif
		2423
		2424	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2425	{
		2426	ALLOC (req->result);
		2427	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2428	}
		2429	break;
		2430
1980	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2431	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1981	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2432	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1982		2433
1983	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1984	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1985	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2434	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1986	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2435	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1987		2436
1988	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1989	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2437	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1990	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1991	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2438	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1992	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1993	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2439	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1994		2440
1995	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1996	case EIO_CLOSE: req->result = close (req->int1); break;	2441	case EIO_CLOSE: req->result = close (req->int1); break;
1997	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2442	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1998	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1999	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2000	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2001	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2002	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2003	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2004	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2005
2006	case EIO_REALPATH: eio__realpath (req, self); break;
2007
2008	case EIO_READLINK: ALLOC (PATH_MAX);
2009	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2010
2011	case EIO_SYNC: req->result = 0; sync (); break;	2443	case EIO_SYNC: req->result = 0; sync (); break;
2012	case EIO_FSYNC: req->result = fsync (req->int1); break;	2444	case EIO_FSYNC: req->result = fsync (req->int1); break;
2013	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2445	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2446	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2447	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2014	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	2448	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2015	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2449	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2016	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2450	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2017	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2451	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2018	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2019	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	2452	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2020		2453
2021	case EIO_READDIR: eio__scandir (req, self); break;	2454	case EIO_READDIR: eio__scandir (req, self); break;
2022		2455
2023	case EIO_BUSY:	2456	case EIO_BUSY:
…		…
2033	req->result = select (0, 0, 0, 0, &tv);	2466	req->result = select (0, 0, 0, 0, &tv);
2034	}	2467	}
2035	#endif	2468	#endif
2036	break;	2469	break;
2037		2470
2038	case EIO_UTIME:
2039	case EIO_FUTIME:
2040	{
2041	struct timeval tv[2];
2042	struct timeval *times;
2043
2044	if (req->nv1 != -1. || req->nv2 != -1.)
2045	{
2046	tv[0].tv_sec = req->nv1;
2047	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2048	tv[1].tv_sec = req->nv2;
2049	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2050
2051	times = tv;
2052	}
2053	else
2054	times = 0;
2055
2056	req->result = req->type == EIO_FUTIME
2057	? futimes (req->int1, times)
2058	: utimes (req->ptr1, times);
2059	}
2060	break;
2061
2062	case EIO_GROUP:	2471	case EIO_GROUP:
2063	abort (); /* handled in eio_request */	2472	abort (); /* handled in eio_request */
2064		2473
2065	case EIO_NOP:	2474	case EIO_NOP:
2066	req->result = 0;	2475	req->result = 0;
…		…
2079	req->errorno = errno;	2488	req->errorno = errno;
2080	}	2489	}
2081		2490
2082	#ifndef EIO_NO_WRAPPERS	2491	#ifndef EIO_NO_WRAPPERS
2083		2492
		2493	eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
		2494	{
		2495	REQ (EIO_WD_OPEN); PATH; SEND;
		2496	}
		2497
		2498	eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
		2499	{
		2500	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2501	}
		2502
2084	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2503	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2085	{	2504	{
2086	REQ (EIO_NOP); SEND;	2505	REQ (EIO_NOP); SEND;
2087	}	2506	}
2088		2507
…		…
2104	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2523	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2105	{	2524	{
2106	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2525	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2107	}	2526	}
2108		2527
		2528	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
		2529	{
		2530	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2531	}
		2532
		2533	eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
		2534	{
		2535	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2536	}
		2537
		2538	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
		2539	{
		2540	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2541	}
		2542
2109	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2543	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2110	{	2544	{
2111	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2545	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2112	}	2546	}
2113		2547
…		…
2119	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)	2553	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2120	{	2554	{
2121	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2555	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2122	}	2556	}
2123		2557
2124	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2125	{
2126	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2127	}
2128
2129	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)	2558	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2130	{	2559	{
2131	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2560	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2132	}
2133
2134	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2135	{
2136	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2137	}	2561	}
2138		2562
2139	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)	2563	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2140	{	2564	{
2141	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2565	REQ (EIO_CLOSE); req->int1 = fd; SEND;
…		…
2369	/* misc garbage */	2793	/* misc garbage */
2370		2794
2371	eio_ssize_t	2795	eio_ssize_t
2372	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2796	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373	{	2797	{
2374	etp_worker wrk;
2375	eio_ssize_t ret;
2376
2377	wrk.dbuf = 0;
2378
2379	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2798	return eio__sendfile (ofd, ifd, offset, count);
2380
2381	if (wrk.dbuf)
2382	free (wrk.dbuf);
2383
2384	return ret;
2385	}	2799	}
2386		2800

Diff Legend

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