ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/libeio/eio.c

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.94 by root, Mon Jul 18 02:59:58 2011 UTC vs.
Revision 1.123 by root, Tue Oct 9 04:53:53 2012 UTC

1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010,2011,2012 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	*
…		…
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>
…		…
71	#endif	71	#endif
72	#ifndef ELOOP	72	#ifndef ELOOP
73	# define ELOOP EDOM	73	# define ELOOP EDOM
74	#endif	74	#endif
75		75
		76	#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
		77	# define ENOTSOCK WSAENOTSOCK
		78	#endif
		79
76	static void eio_destroy (eio_req *req);	80	static void eio_destroy (eio_req *req);
77		81
78	#ifndef EIO_FINISH	82	#ifndef EIO_FINISH
79	# 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
80	#endif	84	#endif
…		…
101	#ifdef _WIN32	105	#ifdef _WIN32
102		106
103	#undef PAGESIZE	107	#undef PAGESIZE
104	#define PAGESIZE 4096 /* GetSystemInfo? */	108	#define PAGESIZE 4096 /* GetSystemInfo? */
105		109
		110	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		111
106	#ifdef EIO_STRUCT_STATI64	112	#ifdef EIO_STRUCT_STATI64
		113	/* look at perl's non-sloppy stat */
107	#define stat(path,buf) _stati64 (path,buf)	114	#define stat(path,buf) _stati64 (path,buf)
108	#define fstat(fd,buf) _fstati64 (path,buf)	115	#define fstat(fd,buf) _fstati64 (fd,buf)
109	#endif	116	#endif
110	#define lstat(path,buf) stat (path,buf)	117	#define lstat(path,buf) stat (path,buf)
111	#define fsync(fd) (FlushFileBuffers ((HANDLE)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))
112	#define mkdir(path,mode) _mkdir (path)	119	#define mkdir(path,mode) _mkdir (path)
113	#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))
…		…
125	#define sync() EIO_ENOSYS ()	132	#define sync() EIO_ENOSYS ()
126	#define readlink(path,buf,s) EIO_ENOSYS ()	133	#define readlink(path,buf,s) EIO_ENOSYS ()
127	#define statvfs(path,buf) EIO_ENOSYS ()	134	#define statvfs(path,buf) EIO_ENOSYS ()
128	#define fstatvfs(fd,buf) EIO_ENOSYS ()	135	#define fstatvfs(fd,buf) EIO_ENOSYS ()
129		136
		137	#define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
		138	#define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
		139
		140	#if __GNUC__
		141	typedef long long eio_off_t; /* signed for compatibility to msvc */
		142	#else
		143	typedef __int64 eio_off_t; /* unsigned not supported by msvc */
		144	#endif
		145
		146	static eio_ssize_t
		147	eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
		148	{
		149	OVERLAPPED o = { 0 };
		150	DWORD got;
		151
		152	o.Offset = offset;
		153	o.OffsetHigh = offset >> 32;
		154
		155	return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
		156	? got : -1;
		157	}
		158
		159	static eio_ssize_t
		160	eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
		161	{
		162	OVERLAPPED o = { 0 };
		163	DWORD got;
		164
		165	o.Offset = offset;
		166	o.OffsetHigh = offset >> 32;
		167
		168	return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
		169	? got : -1;
		170	}
		171
		172	/* rename() uses MoveFile, which fails to overwrite */
		173	#define rename(old,neu) eio__rename (old, neu)
		174
		175	static int
		176	eio__rename (const char *old, const char *neu)
		177	{
		178	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		179	return 0;
		180
		181	/* should steal _dosmaperr */
		182	switch (GetLastError ())
		183	{
		184	case ERROR_FILE_NOT_FOUND:
		185	case ERROR_PATH_NOT_FOUND:
		186	case ERROR_INVALID_DRIVE:
		187	case ERROR_NO_MORE_FILES:
		188	case ERROR_BAD_NETPATH:
		189	case ERROR_BAD_NET_NAME:
		190	case ERROR_BAD_PATHNAME:
		191	case ERROR_FILENAME_EXCED_RANGE:
		192	errno = ENOENT;
		193	break;
		194
		195	default:
		196	errno = EACCES;
		197	break;
		198	}
		199
		200	return -1;
		201	}
		202
130	/* we could even stat and see if it exists */	203	/* we could even stat and see if it exists */
131	static int	204	static int
132	symlink (const char *old, const char *neu)	205	symlink (const char *old, const char *neu)
133	{	206	{
134	#if WINVER >= 0x0600	207	#if WINVER >= 0x0600
…		…
160		233
161	#include <sys/time.h>	234	#include <sys/time.h>
162	#include <sys/select.h>	235	#include <sys/select.h>
163	#include <sys/statvfs.h>	236	#include <sys/statvfs.h>
164	#include <unistd.h>	237	#include <unistd.h>
165	#include <utime.h>
166	#include <signal.h>	238	#include <signal.h>
167	#include <dirent.h>	239	#include <dirent.h>
168		240
169	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES	241	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
170	#include <sys/mman.h>	242	#include <sys/mman.h>
171	#endif	243	#endif
172		244
173	#define D_NAME(entp) entp->d_name	245	#define D_NAME(entp) entp->d_name
174		246
175	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	247	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
176	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__	248	#if __FreeBSD__ || __NetBSD__ || __OpenBSD__
177	#define _DIRENT_HAVE_D_TYPE /* sigh */	249	#define _DIRENT_HAVE_D_TYPE /* sigh */
178	#define D_INO(de) (de)->d_fileno	250	#define D_INO(de) (de)->d_fileno
179	#define D_NAMLEN(de) (de)->d_namlen	251	#define D_NAMLEN(de) (de)->d_namlen
180	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600	252	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
181	#define D_INO(de) (de)->d_ino	253	#define D_INO(de) (de)->d_ino
…		…
192		264
193	#ifndef EIO_STRUCT_DIRENT	265	#ifndef EIO_STRUCT_DIRENT
194	#define EIO_STRUCT_DIRENT struct dirent	266	#define EIO_STRUCT_DIRENT struct dirent
195	#endif	267	#endif
196		268
		269	#endif
		270
		271	#if HAVE_UTIMES
		272	# include <utime.h>
		273	#endif
		274
		275	#if HAVE_SYS_SYSCALL_H
		276	# include <sys/syscall.h>
		277	#endif
		278
		279	#if HAVE_SYS_PRCTL_H
		280	# include <sys/prctl.h>
197	#endif	281	#endif
198		282
199	#if HAVE_SENDFILE	283	#if HAVE_SENDFILE
200	# if __linux	284	# if __linux
201	# include <sys/sendfile.h>	285	# include <sys/sendfile.h>
…		…
243	#define FUBd \	327	#define FUBd \
244	free (eio_buf)	328	free (eio_buf)
245		329
246	#define EIO_TICKS ((1000000 + 1023) >> 10)	330	#define EIO_TICKS ((1000000 + 1023) >> 10)
247		331
		332	/*****************************************************************************/
		333
		334	struct tmpbuf
		335	{
		336	void *ptr;
		337	int len;
		338	};
		339
		340	static void *
		341	tmpbuf_get (struct tmpbuf *buf, int len)
		342	{
		343	if (buf->len < len)
		344	{
		345	free (buf->ptr);
		346	buf->ptr = malloc (buf->len = len);
		347	}
		348
		349	return buf->ptr;
		350	}
		351
		352	struct tmpbuf;
		353
		354	#if _POSIX_VERSION >= 200809L
		355	#define HAVE_AT 1
		356	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		357	#ifndef O_SEARCH
		358	#define O_SEARCH O_RDONLY
		359	#endif
		360	#else
		361	#define HAVE_AT 0
		362	static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
		363	#endif
		364
		365	struct eio_pwd
		366	{
		367	#if HAVE_AT
		368	int fd;
		369	#endif
		370	int len;
		371	char str[1]; /* actually, a 0-terminated canonical path */
		372	};
		373
		374	/*****************************************************************************/
		375
248	#define ETP_PRI_MIN EIO_PRI_MIN	376	#define ETP_PRI_MIN EIO_PRI_MIN
249	#define ETP_PRI_MAX EIO_PRI_MAX	377	#define ETP_PRI_MAX EIO_PRI_MAX
250		378
251	struct etp_worker;	379	struct etp_worker;
252		380
…		…
275	static void (*done_poll_cb) (void);	403	static void (*done_poll_cb) (void);
276		404
277	static unsigned int max_poll_time; /* reslock */	405	static unsigned int max_poll_time; /* reslock */
278	static unsigned int max_poll_reqs; /* reslock */	406	static unsigned int max_poll_reqs; /* reslock */
279		407
280	static volatile unsigned int nreqs; /* reqlock */	408	static unsigned int nreqs; /* reqlock */
281	static volatile unsigned int nready; /* reqlock */	409	static unsigned int nready; /* reqlock */
282	static volatile unsigned int npending; /* reqlock */	410	static unsigned int npending; /* reqlock */
283	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	411	static 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 */	412	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
285		413
286	static xmutex_t wrklock;	414	static xmutex_t wrklock;
287	static xmutex_t reslock;	415	static xmutex_t reslock;
288	static xmutex_t reqlock;	416	static xmutex_t reqlock;
289	static xcond_t reqwait;	417	static xcond_t reqwait;
290		418
291	#if !HAVE_PREADWRITE
292	/*
293	* make our pread/pwrite emulation safe against themselves, but not against
294	* normal read/write by using a mutex. slows down execution a lot,
295	* but that's your problem, not mine.
296	*/
297	static xmutex_t preadwritelock;
298	#endif
299
300	typedef struct etp_worker	419	typedef struct etp_worker
301	{	420	{
		421	struct tmpbuf tmpbuf;
		422
302	/* locked by wrklock */	423	/* locked by wrklock */
303	struct etp_worker *prev, *next;	424	struct etp_worker *prev, *next;
304		425
305	xthread_t tid;	426	xthread_t tid;
306		427
307	/* locked by reslock, reqlock or wrklock */
308	ETP_REQ *req; /* currently processed request */
309
310	#ifdef ETP_WORKER_COMMON	428	#ifdef ETP_WORKER_COMMON
311	ETP_WORKER_COMMON	429	ETP_WORKER_COMMON
312	#endif	430	#endif
313	} etp_worker;	431	} etp_worker;
314		432
…		…
317	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	435	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
318	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	436	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
319		437
320	/* worker threads management */	438	/* worker threads management */
321		439
322	static void ecb_cold	440	static void
323	etp_worker_clear (etp_worker *wrk)	441	etp_worker_clear (etp_worker *wrk)
324	{	442	{
325	}	443	}
326		444
327	static void ecb_cold	445	static void ecb_cold
328	etp_worker_free (etp_worker *wrk)	446	etp_worker_free (etp_worker *wrk)
329	{	447	{
		448	free (wrk->tmpbuf.ptr);
		449
330	wrk->next->prev = wrk->prev;	450	wrk->next->prev = wrk->prev;
331	wrk->prev->next = wrk->next;	451	wrk->prev->next = wrk->next;
332		452
333	free (wrk);	453	free (wrk);
334	}	454	}
…		…
512	}	632	}
513		633
514	static void ecb_cold	634	static void ecb_cold
515	etp_end_thread (void)	635	etp_end_thread (void)
516	{	636	{
517	eio_req *req = calloc (1, sizeof (eio_req));	637	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
518		638
519	req->type = -1;	639	req->type = -1;
520	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	640	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
521		641
522	X_LOCK (reqlock);	642	X_LOCK (reqlock);
…		…
849	}	969	}
850		970
851	/*****************************************************************************/	971	/*****************************************************************************/
852	/* work around various missing functions */	972	/* work around various missing functions */
853		973
854	#if !HAVE_PREADWRITE
855	# undef pread
856	# undef pwrite
857	# define pread eio__pread
858	# define pwrite eio__pwrite
859
860	static eio_ssize_t
861	eio__pread (int fd, void *buf, size_t count, off_t offset)
862	{
863	eio_ssize_t res;
864	off_t ooffset;
865
866	X_LOCK (preadwritelock);
867	ooffset = lseek (fd, 0, SEEK_CUR);
868	lseek (fd, offset, SEEK_SET);
869	res = read (fd, buf, count);
870	lseek (fd, ooffset, SEEK_SET);
871	X_UNLOCK (preadwritelock);
872
873	return res;
874	}
875
876	static eio_ssize_t
877	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
878	{
879	eio_ssize_t res;
880	off_t ooffset;
881
882	X_LOCK (preadwritelock);
883	ooffset = lseek (fd, 0, SEEK_CUR);
884	lseek (fd, offset, SEEK_SET);
885	res = write (fd, buf, count);
886	lseek (fd, ooffset, SEEK_SET);
887	X_UNLOCK (preadwritelock);
888
889	return res;
890	}
891	#endif
892
893	#ifndef HAVE_UTIMES	974	#ifndef HAVE_UTIMES
894		975
895	# undef utimes	976	# undef utimes
896	# define utimes(path,times) eio__utimes (path, times)	977	# define utimes(path,times) eio__utimes (path, times)
897		978
…		…
929		1010
930	#if !HAVE_FDATASYNC	1011	#if !HAVE_FDATASYNC
931	# undef fdatasync	1012	# undef fdatasync
932	# define fdatasync(fd) fsync (fd)	1013	# define fdatasync(fd) fsync (fd)
933	#endif	1014	#endif
		1015
		1016	static int
		1017	eio__syncfs (int fd)
		1018	{
		1019	int res;
		1020
		1021	#if HAVE_SYS_SYNCFS
		1022	res = (int)syscall (__NR_syncfs, (int)(fd));
		1023	#else
		1024	res = EIO_ENOSYS ();
		1025	#endif
		1026
		1027	if (res < 0 && errno == ENOSYS && fd >= 0)
		1028	sync ();
		1029
		1030	return res;
		1031	}
934		1032
935	/* sync_file_range always needs emulation */	1033	/* sync_file_range always needs emulation */
936	static int	1034	static int
937	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1035	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
938	{	1036	{
…		…
961	}	1059	}
962		1060
963	static int	1061	static int
964	eio__fallocate (int fd, int mode, off_t offset, size_t len)	1062	eio__fallocate (int fd, int mode, off_t offset, size_t len)
965	{	1063	{
966	#if HAVE_FALLOCATE	1064	#if HAVE_LINUX_FALLOCATE
967	return fallocate (fd, mode, offset, len);	1065	return fallocate (fd, mode, offset, len);
968	#else	1066	#else
969	errno = ENOSYS;	1067	return EIO_ENOSYS ();
970	return -1;
971	#endif	1068	#endif
972	}	1069	}
973		1070
974	#if !HAVE_READAHEAD	1071	#if !HAVE_READAHEAD
975	# undef readahead	1072	# undef readahead
…		…
990	todo -= len;	1087	todo -= len;
991	}	1088	}
992		1089
993	FUBd;	1090	FUBd;
994		1091
995	errno = 0;	1092	/* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
		1093	/* but not for e.g. EIO or eof, so we also never fail */
996	return count;	1094	return 0;
997	}	1095	}
998		1096
999	#endif	1097	#endif
1000		1098
1001	/* sendfile always needs emulation */	1099	/* sendfile always needs emulation */
…		…
1036		1134
1037	/* according to source inspection, this is correct, and useful behaviour */	1135	/* according to source inspection, this is correct, and useful behaviour */
1038	if (sbytes)	1136	if (sbytes)
1039	res = sbytes;	1137	res = sbytes;
1040		1138
1041	# elif defined (__APPLE__)	1139	# elif defined __APPLE__
1042	off_t sbytes = count;	1140	off_t sbytes = count;
1043	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1141	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1044		1142
1045	/* according to the manpage, sbytes is always valid */	1143	/* according to the manpage, sbytes is always valid */
1046	if (sbytes)	1144	if (sbytes)
…		…
1073	HANDLE h = TO_SOCKET (ifd);	1171	HANDLE h = TO_SOCKET (ifd);
1074	SetFilePointer (h, offset, 0, FILE_BEGIN);	1172	SetFilePointer (h, offset, 0, FILE_BEGIN);
1075	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);	1173	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1076		1174
1077	#else	1175	#else
1078	res = -1;	1176	res = EIO_ENOSYS ();
1079	errno = ENOSYS;
1080	#endif	1177	#endif
1081		1178
1082	/* we assume sendfile can copy at least 128mb in one go */	1179	/* we assume sendfile can copy at least 128mb in one go */
1083	if (res <= 128 * 1024 * 1024)	1180	if (res <= 128 * 1024 * 1024)
1084	{	1181	{
…		…
1271		1368
1272	/*****************************************************************************/	1369	/*****************************************************************************/
1273	/* requests implemented outside eio_execute, because they are so large */	1370	/* requests implemented outside eio_execute, because they are so large */
1274		1371
1275	static void	1372	static void
1276	eio__realpath (eio_req *req, etp_worker *self)	1373	eio__lseek (eio_req *req)
1277	{	1374	{
1278	char *rel = req->ptr1;	1375	/* this usually gets optimised away completely, or your compiler sucks, */
		1376	/* or the whence constants really are not 0, 1, 2 */
		1377	int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
		1378	: req->int2 == EIO_SEEK_CUR ? SEEK_CUR
		1379	: req->int2 == EIO_SEEK_END ? SEEK_END
		1380	: req->int2;
		1381
		1382	req->offs = lseek (req->int1, req->offs, whence);
		1383	req->result = req->offs == (off_t)-1 ? -1 : 0;
		1384	}
		1385
		1386	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
		1387	static int
		1388	eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		1389	{
		1390	const char *rel = path;
1279	char *res;	1391	char *res;
1280	char *tmp1, *tmp2;	1392	char *tmp1, *tmp2;
1281	#if SYMLOOP_MAX > 32	1393	#if SYMLOOP_MAX > 32
1282	int symlinks = SYMLOOP_MAX;	1394	int symlinks = SYMLOOP_MAX;
1283	#else	1395	#else
1284	int symlinks = 32;	1396	int symlinks = 32;
1285	#endif	1397	#endif
1286		1398
1287	req->result = -1;
1288
1289	errno = EINVAL;	1399	errno = EINVAL;
1290	if (!rel)	1400	if (!rel)
1291	return;	1401	return -1;
1292		1402
1293	errno = ENOENT;	1403	errno = ENOENT;
1294	if (!*rel)	1404	if (!*rel)
1295	return;	1405	return -1;
1296		1406
1297	if (!req->ptr2)	1407	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
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;	1408	tmp1 = res + PATH_MAX;
1311	tmp2 = tmp1 + PATH_MAX;	1409	tmp2 = tmp1 + PATH_MAX;
1312		1410
1313	#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 */
1314	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1412	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1333	#endif	1431	#endif
1334	#endif	1432	#endif
1335		1433
1336	if (*rel != '/')	1434	if (*rel != '/')
1337	{	1435	{
		1436	int len;
		1437
		1438	errno = ENOENT;
		1439	if (wd == EIO_INVALID_WD)
		1440	return -1;
		1441
		1442	if (wd == EIO_CWD)
		1443	{
1338	if (!getcwd (res, PATH_MAX))	1444	if (!getcwd (res, PATH_MAX))
1339	return;	1445	return -1;
		1446
		1447	len = strlen (res);
		1448	}
		1449	else
		1450	memcpy (res, wd->str, len = wd->len);
1340		1451
1341	if (res [1]) /* only use if not / */	1452	if (res [1]) /* only use if not / */
1342	res += strlen (res);	1453	res += len;
1343	}	1454	}
1344		1455
1345	while (*rel)	1456	while (*rel)
1346	{	1457	{
1347	eio_ssize_t len, linklen;	1458	eio_ssize_t len, linklen;
1348	char *beg = rel;	1459	const char *beg = rel;
1349		1460
1350	while (*rel && *rel != '/')	1461	while (*rel && *rel != '/')
1351	++rel;	1462	++rel;
1352		1463
1353	len = rel - beg;	1464	len = rel - beg;
…		…
1365		1476
1366	if (beg [1] == '.' && len == 2)	1477	if (beg [1] == '.' && len == 2)
1367	{	1478	{
1368	/* .. - back up one component, if possible */	1479	/* .. - back up one component, if possible */
1369		1480
1370	while (res != req->ptr2)	1481	while (res != tmpbuf->ptr)
1371	if (*--res == '/')	1482	if (*--res == '/')
1372	break;	1483	break;
1373		1484
1374	continue;	1485	continue;
1375	}	1486	}
1376	}	1487	}
1377		1488
1378	errno = ENAMETOOLONG;	1489	errno = ENAMETOOLONG;
1379	if (res + 1 + len + 1 >= tmp1)	1490	if (res + 1 + len + 1 >= tmp1)
1380	return;	1491	return -1;
1381		1492
1382	/* copy one component */	1493	/* copy one component */
1383	*res = '/';	1494	*res = '/';
1384	memcpy (res + 1, beg, len);	1495	memcpy (res + 1, beg, len);
1385		1496
1386	/* zero-terminate, for readlink */	1497	/* zero-terminate, for readlink */
1387	res [len + 1] = 0;	1498	res [len + 1] = 0;
1388		1499
1389	/* now check if it's a symlink */	1500	/* now check if it's a symlink */
1390	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1501	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1391		1502
1392	if (linklen < 0)	1503	if (linklen < 0)
1393	{	1504	{
1394	if (errno != EINVAL)	1505	if (errno != EINVAL)
1395	return;	1506	return -1;
1396		1507
1397	/* it's a normal directory. hopefully */	1508	/* it's a normal directory. hopefully */
1398	res += len + 1;	1509	res += len + 1;
1399	}	1510	}
1400	else	1511	else
…		…
1402	/* yay, it was a symlink - build new path in tmp2 */	1513	/* yay, it was a symlink - build new path in tmp2 */
1403	int rellen = strlen (rel);	1514	int rellen = strlen (rel);
1404		1515
1405	errno = ENAMETOOLONG;	1516	errno = ENAMETOOLONG;
1406	if (linklen + 1 + rellen >= PATH_MAX)	1517	if (linklen + 1 + rellen >= PATH_MAX)
1407	return;	1518	return -1;
1408		1519
1409	errno = ELOOP;	1520	errno = ELOOP;
1410	if (!--symlinks)	1521	if (!--symlinks)
1411	return;	1522	return -1;
1412		1523
1413	if (*tmp1 == '/')	1524	if (*tmp1 == '/')
1414	res = req->ptr2; /* symlink resolves to an absolute path */	1525	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1415		1526
1416	/* 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 */
1417	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1528	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1418	tmp2 [linklen] = '/';	1529	tmp2 [linklen] = '/';
1419	memcpy (tmp2, tmp1, linklen);	1530	memcpy (tmp2, tmp1, linklen);
…		…
1421	rel = tmp2;	1532	rel = tmp2;
1422	}	1533	}
1423	}	1534	}
1424		1535
1425	/* special case for the lone root path */	1536	/* special case for the lone root path */
1426	if (res == req->ptr2)	1537	if (res == tmpbuf->ptr)
1427	*res++ = '/';	1538	*res++ = '/';
1428		1539
1429	req->result = res - (char *)req->ptr2;	1540	return res - (char *)tmpbuf->ptr;
1430
1431	done:
1432	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1433	}	1541	}
1434		1542
1435	static signed char	1543	static signed char
1436	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1544	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1437	{	1545	{
…		…
1625	#ifdef _WIN32	1733	#ifdef _WIN32
1626	{	1734	{
1627	int len = strlen ((const char *)req->ptr1);	1735	int len = strlen ((const char *)req->ptr1);
1628	char *path = malloc (MAX_PATH);	1736	char *path = malloc (MAX_PATH);
1629	const char *fmt;	1737	const char *fmt;
		1738	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1630		1739
1631	if (!len)	1740	if (!len)
1632	fmt = "./*";	1741	fmt = "./*";
1633	else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')	1742	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1634	fmt = "%s*";	1743	fmt = "%s*";
1635	else	1744	else
1636	fmt = "%s/*";	1745	fmt = "%s/*";
1637		1746
1638	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1747	_snprintf (path, MAX_PATH, fmt, reqpath);
1639	dirp = FindFirstFile (path, &entp);	1748	dirp = FindFirstFile (path, &entp);
1640	free (path);	1749	free (path);
1641		1750
1642	if (dirp == INVALID_HANDLE_VALUE)	1751	if (dirp == INVALID_HANDLE_VALUE)
1643	{	1752	{
1644	dirp = 0;	1753	/* should steal _dosmaperr */
1645
1646	switch (GetLastError ())	1754	switch (GetLastError ())
1647	{	1755	{
1648	case ERROR_FILE_NOT_FOUND:	1756	case ERROR_FILE_NOT_FOUND:
1649	req->result = 0;	1757	req->result = 0;
1650	break;	1758	break;
1651		1759
1652	case ERROR_INVALID_NAME:	1760	case ERROR_INVALID_NAME:
1653	case ERROR_PATH_NOT_FOUND:	1761	case ERROR_PATH_NOT_FOUND:
1654	case ERROR_NO_MORE_FILES:	1762	case ERROR_NO_MORE_FILES:
1655	errno = ENOENT;	1763	errno = ENOENT;
1656	break;	1764	break;
1657		1765
1658	case ERROR_NOT_ENOUGH_MEMORY:	1766	case ERROR_NOT_ENOUGH_MEMORY:
1659	errno = ENOMEM;	1767	errno = ENOMEM;
1660	break;	1768	break;
1661		1769
1662	default:	1770	default:
1663	errno = EINVAL;	1771	errno = EINVAL;
1664	break;	1772	break;
1665	}	1773	}
		1774
		1775	return;
1666	}	1776	}
1667	}	1777	}
1668	#else	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
1669	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;
1670	#endif	1800	#endif
1671		1801
1672	if (req->flags & EIO_FLAG_PTR1_FREE)	1802	if (req->flags & EIO_FLAG_PTR1_FREE)
1673	free (req->ptr1);	1803	free (req->ptr1);
1674		1804
1675	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1805	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1676	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1806	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1677	req->ptr2 = names = malloc (namesalloc);	1807	req->ptr2 = names = malloc (namesalloc);
1678		1808
1679	if (dirp && names && (!flags || dents))	1809	if (!names || (flags && !dents))
		1810	return;
		1811
1680	for (;;)	1812	for (;;)
1681	{	1813	{
1682	int done;	1814	int done;
1683		1815
1684	#ifdef _WIN32	1816	#ifdef _WIN32
1685	done = !dirp;	1817	done = !dirp;
1686	#else	1818	#else
1687	errno = 0;	1819	errno = 0;
1688	entp = readdir (dirp);	1820	entp = readdir (dirp);
1689	done = !entp;	1821	done = !entp;
1690	#endif	1822	#endif
1691		1823
1692	if (done)	1824	if (done)
1693	{	1825	{
1694	#ifndef _WIN32	1826	#ifndef _WIN32
1695	int old_errno = errno;	1827	int old_errno = errno;
1696	closedir (dirp);	1828	closedir (dirp);
1697	errno = old_errno;	1829	errno = old_errno;
1698		1830
1699	if (errno)	1831	if (errno)
1700	break;	1832	break;
1701	#endif	1833	#endif
1702		1834
1703	/* sort etc. */	1835	/* sort etc. */
1704	req->int1 = flags;	1836	req->int1 = flags;
1705	req->result = dentoffs;	1837	req->result = dentoffs;
1706		1838
1707	if (flags & EIO_READDIR_STAT_ORDER)	1839	if (flags & EIO_READDIR_STAT_ORDER)
1708	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);
1709	else if (flags & EIO_READDIR_DIRS_FIRST)	1841	else if (flags & EIO_READDIR_DIRS_FIRST)
1710	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1842	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1711	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 */
1712	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))
1713	{	1895	{
1714	/* 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
1715	eio_dirent *oth = dents + dentoffs;	1903	ent = dents + dentoffs;
1716	eio_dirent *dir = dents;
1717		1904
1718	/* 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 */
1719	/* by walking from both sides and swapping if necessary */	1906	ent->namelen = len - 1;
1720	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)
1721	{	1967	{
1722	if (dir->type == EIO_DT_DIR)	1968	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1723	++dir;	1969	ent->score = 1;
1724	else if ((--oth)->type == EIO_DT_DIR)	1970	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1725	{	1971	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1726	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1727
1728	++dir;
1729	}
1730	}	1972	}
1731		1973	else if (ent->type == EIO_DT_DIR)
1732	/* now sort the dirs only (dirs all have the same score) */	1974	ent->score = 0;
1733	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1734	}	1975	}
1735
1736	break;
1737	}
1738
1739	/* now add the entry to our list(s) */
1740	name = D_NAME (entp);
1741
1742	/* skip . and .. entries */
1743	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1744	{
1745	int len = D_NAMLEN (entp) + 1;
1746
1747	while (ecb_expect_false (namesoffs + len > namesalloc))
1748	{
1749	namesalloc *= 2;
1750	req->ptr2 = names = realloc (names, namesalloc);
1751
1752	if (!names)
1753	break;
1754	}	1976	}
1755		1977
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
1846	namesoffs += len;	1978	namesoffs += len;
1847	++dentoffs;	1979	++dentoffs;
1848	}	1980	}
1849		1981
1850	if (EIO_CANCELLED (req))	1982	if (EIO_CANCELLED (req))
1851	{	1983	{
1852	errno = ECANCELED;	1984	errno = ECANCELED;
1853	break;	1985	break;
1854	}	1986	}
1855		1987
1856	#ifdef _WIN32	1988	#ifdef _WIN32
1857	if (!FindNextFile (dirp, &entp))	1989	if (!FindNextFile (dirp, &entp))
1858	{	1990	{
1859	FindClose (dirp);	1991	FindClose (dirp);
1860	dirp = 0;	1992	dirp = 0;
1861	}	1993	}
1862	#endif	1994	#endif
1863	}	1995	}
1864	}	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
1865		2119
1866	/*****************************************************************************/	2120	/*****************************************************************************/
1867		2121
1868	#define ALLOC(len) \	2122	#define ALLOC(len) \
1869	if (!req->ptr2) \	2123	if (!req->ptr2) \
…		…
1878	req->result = -1; \	2132	req->result = -1; \
1879	break; \	2133	break; \
1880	} \	2134	} \
1881	}	2135	}
1882		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
1883	X_THREAD_PROC (etp_proc)	2154	X_THREAD_PROC (etp_proc)
1884	{	2155	{
1885	ETP_REQ *req;	2156	ETP_REQ *req;
1886	struct timespec ts;	2157	struct timespec ts;
1887	etp_worker *self = (etp_worker *)thr_arg;	2158	etp_worker *self = (etp_worker *)thr_arg;
1888		2159
		2160	etp_proc_init ();
		2161
1889	/* try to distribute timeouts somewhat evenly */	2162	/* try to distribute timeouts somewhat evenly */
1890	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2163	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1891		2164
1892	for (;;)	2165	for (;;)
1893	{	2166	{
…		…
1895		2168
1896	X_LOCK (reqlock);	2169	X_LOCK (reqlock);
1897		2170
1898	for (;;)	2171	for (;;)
1899	{	2172	{
1900	self->req = req = reqq_shift (&req_queue);	2173	req = reqq_shift (&req_queue);
1901		2174
1902	if (req)	2175	if (req)
1903	break;	2176	break;
1904		2177
1905	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 */
…		…
1943	++npending;	2216	++npending;
1944		2217
1945	if (!reqq_push (&res_queue, req) && want_poll_cb)	2218	if (!reqq_push (&res_queue, req) && want_poll_cb)
1946	want_poll_cb ();	2219	want_poll_cb ();
1947		2220
1948	self->req = 0;
1949	etp_worker_clear (self);	2221	etp_worker_clear (self);
1950		2222
1951	X_UNLOCK (reslock);	2223	X_UNLOCK (reslock);
1952	}	2224	}
1953		2225
1954	quit:	2226	quit:
		2227	free (req);
		2228
1955	X_LOCK (wrklock);	2229	X_LOCK (wrklock);
1956	etp_worker_free (self);	2230	etp_worker_free (self);
1957	X_UNLOCK (wrklock);	2231	X_UNLOCK (wrklock);
1958		2232
1959	return 0;	2233	return 0;
…		…
1962	/*****************************************************************************/	2236	/*****************************************************************************/
1963		2237
1964	int ecb_cold	2238	int ecb_cold
1965	eio_init (void (*want_poll)(void), void (*done_poll)(void))	2239	eio_init (void (*want_poll)(void), void (*done_poll)(void))
1966	{	2240	{
1967	#if !HAVE_PREADWRITE
1968	X_MUTEX_CREATE (preadwritelock);
1969	#endif
1970
1971	return etp_init (want_poll, done_poll);	2241	return etp_init (want_poll, done_poll);
1972	}	2242	}
1973		2243
1974	ecb_inline void	2244	ecb_inline void
1975	eio_api_destroy (eio_req *req)	2245	eio_api_destroy (eio_req *req)
1976	{	2246	{
1977	free (req);	2247	free (req);
1978	}	2248	}
1979		2249
1980	#define REQ(rtype) \	2250	#define REQ(rtype) \
1981	eio_req *req; \	2251	eio_req *req; \
1982	\	2252	\
1983	req = (eio_req *)calloc (1, sizeof *req); \	2253	req = (eio_req *)calloc (1, sizeof *req); \
1984	if (!req) \	2254	if (!req) \
1985	return 0; \	2255	return 0; \
…		…
2002	}	2272	}
2003		2273
2004	static void	2274	static void
2005	eio_execute (etp_worker *self, eio_req *req)	2275	eio_execute (etp_worker *self, eio_req *req)
2006	{	2276	{
		2277	#if HAVE_AT
		2278	int dirfd;
		2279	#else
		2280	const char *path;
		2281	#endif
		2282
2007	if (ecb_expect_false (EIO_CANCELLED (req)))	2283	if (ecb_expect_false (EIO_CANCELLED (req)))
2008	{	2284	{
2009	req->result = -1;	2285	req->result = -1;
2010	req->errorno = ECANCELED;	2286	req->errorno = ECANCELED;
2011	return;	2287	return;
2012	}	2288	}
2013		2289
		2290	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2291	{
		2292	req->result = -1;
		2293	req->errorno = ENOENT;
		2294	return;
		2295	}
		2296
		2297	if (req->type >= EIO_OPEN)
		2298	{
		2299	#if HAVE_AT
		2300	dirfd = WD2FD (req->wd);
		2301	#else
		2302	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2303	#endif
		2304	}
		2305
2014	switch (req->type)	2306	switch (req->type)
2015	{	2307	{
		2308	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2309	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2310	break;
		2311	case EIO_WD_CLOSE: req->result = 0;
		2312	eio_wd_close_sync (req->wd); break;
		2313
		2314	case EIO_SEEK: eio__lseek (req); break;
2016	case EIO_READ: ALLOC (req->size);	2315	case EIO_READ: ALLOC (req->size);
2017	req->result = req->offs >= 0	2316	req->result = req->offs >= 0
2018	? pread (req->int1, req->ptr2, req->size, req->offs)	2317	? pread (req->int1, req->ptr2, req->size, req->offs)
2019	: read (req->int1, req->ptr2, req->size); break;	2318	: read (req->int1, req->ptr2, req->size); break;
2020	case EIO_WRITE: req->result = req->offs >= 0	2319	case EIO_WRITE: req->result = req->offs >= 0
…		…
2022	: write (req->int1, req->ptr2, req->size); break;	2321	: write (req->int1, req->ptr2, req->size); break;
2023		2322
2024	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2323	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2025	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;	2324	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2026		2325
		2326	#if HAVE_AT
		2327
2027	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2328	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2028	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2329	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2029	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2330	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2331	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2332	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2333	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2334	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2335	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2336
		2337	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2338	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2339	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2340	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2341	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2342	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2343	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2344	case EIO_READLINK: ALLOC (PATH_MAX);
		2345	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2346	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2347	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2348	case EIO_UTIME:
		2349	case EIO_FUTIME:
		2350	{
		2351	struct timespec ts[2];
		2352	struct timespec *times;
		2353
		2354	if (req->nv1 != -1. || req->nv2 != -1.)
		2355	{
		2356	ts[0].tv_sec = req->nv1;
		2357	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2358	ts[1].tv_sec = req->nv2;
		2359	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2360
		2361	times = ts;
		2362	}
		2363	else
		2364	times = 0;
		2365
		2366	req->result = req->type == EIO_FUTIME
		2367	? futimens (req->int1, times)
		2368	: utimensat (dirfd, req->ptr1, times, 0);
		2369	}
		2370	break;
		2371
		2372	#else
		2373
		2374	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2375	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2376	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2030	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2377	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2378	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2379	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2380	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2381	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2382
		2383	case EIO_UNLINK: req->result = unlink (path ); break;
		2384	case EIO_RMDIR: req->result = rmdir (path ); break;
		2385	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2386	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2387	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2388	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2389	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2390	case EIO_READLINK: ALLOC (PATH_MAX);
		2391	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2392	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2393	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2394
		2395	case EIO_UTIME:
		2396	case EIO_FUTIME:
		2397	{
		2398	struct timeval tv[2];
		2399	struct timeval *times;
		2400
		2401	if (req->nv1 != -1. || req->nv2 != -1.)
		2402	{
		2403	tv[0].tv_sec = req->nv1;
		2404	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2405	tv[1].tv_sec = req->nv2;
		2406	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2407
		2408	times = tv;
		2409	}
		2410	else
		2411	times = 0;
		2412
		2413	req->result = req->type == EIO_FUTIME
		2414	? futimes (req->int1, times)
		2415	: utimes (req->ptr1, times);
		2416	}
		2417	break;
		2418
		2419	#endif
		2420
		2421	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2422	{
		2423	ALLOC (req->result);
		2424	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2425	}
		2426	break;
		2427
2031	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2428	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2032	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2429	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2033		2430
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));	2431	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2037	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2432	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2038		2433
2039	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2040	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2434	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2041	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2042	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2435	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2043	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2044	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2436	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2045		2437
2046	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2047	case EIO_CLOSE: req->result = close (req->int1); break;	2438	case EIO_CLOSE: req->result = close (req->int1); break;
2048	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2439	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2049	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2050	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2051	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2052	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2053	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2054	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2055	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2056
2057	case EIO_REALPATH: eio__realpath (req, self); break;
2058
2059	case EIO_READLINK: ALLOC (PATH_MAX);
2060	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2061
2062	case EIO_SYNC: req->result = 0; sync (); break;	2440	case EIO_SYNC: req->result = 0; sync (); break;
2063	case EIO_FSYNC: req->result = fsync (req->int1); break;	2441	case EIO_FSYNC: req->result = fsync (req->int1); break;
2064	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2442	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2443	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2444	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2065	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	2445	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2066	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2446	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2067	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2447	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2068	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2448	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;	2449	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2071		2450
2072	case EIO_READDIR: eio__scandir (req, self); break;	2451	case EIO_READDIR: eio__scandir (req, self); break;
2073		2452
2074	case EIO_BUSY:	2453	case EIO_BUSY:
…		…
2084	req->result = select (0, 0, 0, 0, &tv);	2463	req->result = select (0, 0, 0, 0, &tv);
2085	}	2464	}
2086	#endif	2465	#endif
2087	break;	2466	break;
2088		2467
2089	case EIO_UTIME:
2090	case EIO_FUTIME:
2091	{
2092	struct timeval tv[2];
2093	struct timeval *times;
2094
2095	if (req->nv1 != -1. || req->nv2 != -1.)
2096	{
2097	tv[0].tv_sec = req->nv1;
2098	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2099	tv[1].tv_sec = req->nv2;
2100	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2101
2102	times = tv;
2103	}
2104	else
2105	times = 0;
2106
2107	req->result = req->type == EIO_FUTIME
2108	? futimes (req->int1, times)
2109	: utimes (req->ptr1, times);
2110	}
2111	break;
2112
2113	case EIO_GROUP:	2468	case EIO_GROUP:
2114	abort (); /* handled in eio_request */	2469	abort (); /* handled in eio_request */
2115		2470
2116	case EIO_NOP:	2471	case EIO_NOP:
2117	req->result = 0;	2472	req->result = 0;
…		…
2120	case EIO_CUSTOM:	2475	case EIO_CUSTOM:
2121	req->feed (req);	2476	req->feed (req);
2122	break;	2477	break;
2123		2478
2124	default:	2479	default:
2125	errno = ENOSYS;
2126	req->result = -1;	2480	req->result = EIO_ENOSYS ();
2127	break;	2481	break;
2128	}	2482	}
2129		2483
2130	req->errorno = errno;	2484	req->errorno = errno;
2131	}	2485	}
2132		2486
2133	#ifndef EIO_NO_WRAPPERS	2487	#ifndef EIO_NO_WRAPPERS
2134		2488
		2489	eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
		2490	{
		2491	REQ (EIO_WD_OPEN); PATH; SEND;
		2492	}
		2493
		2494	eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
		2495	{
		2496	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2497	}
		2498
2135	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2499	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2136	{	2500	{
2137	REQ (EIO_NOP); SEND;	2501	REQ (EIO_NOP); SEND;
2138	}	2502	}
2139		2503
…		…
2155	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2519	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2156	{	2520	{
2157	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2521	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2158	}	2522	}
2159		2523
		2524	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
		2525	{
		2526	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2527	}
		2528
		2529	eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
		2530	{
		2531	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2532	}
		2533
		2534	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
		2535	{
		2536	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2537	}
		2538
2160	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2539	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2161	{	2540	{
2162	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2541	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2163	}	2542	}
2164		2543
…		…
2170	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)	2549	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2171	{	2550	{
2172	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2551	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2173	}	2552	}
2174		2553
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)	2554	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2181	{	2555	{
2182	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2556	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2183	}	2557	}
2184		2558
2185	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2186	{
2187	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2188	}
2189
2190	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)	2559	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2191	{	2560	{
2192	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2561	REQ (EIO_CLOSE); req->int1 = fd; SEND;
2193	}	2562	}
2194		2563
2195	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)	2564	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2196	{	2565	{
2197	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;	2566	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
		2567	}
		2568
		2569	eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
		2570	{
		2571	REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2198	}	2572	}
2199		2573
2200	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)	2574	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2201	{	2575	{
2202	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;	2576	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;

Diff Legend

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