ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/libeio/eio.c

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.95 by root, Tue Jul 19 04:56:43 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>
…		…
105	#ifdef _WIN32	105	#ifdef _WIN32
106		106
107	#undef PAGESIZE	107	#undef PAGESIZE
108	#define PAGESIZE 4096 /* GetSystemInfo? */	108	#define PAGESIZE 4096 /* GetSystemInfo? */
109		109
		110	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		111
110	#ifdef EIO_STRUCT_STATI64	112	#ifdef EIO_STRUCT_STATI64
		113	/* look at perl's non-sloppy stat */
111	#define stat(path,buf) _stati64 (path,buf)	114	#define stat(path,buf) _stati64 (path,buf)
112	#define fstat(fd,buf) _fstati64 (fd,buf)	115	#define fstat(fd,buf) _fstati64 (fd,buf)
113	#endif	116	#endif
114	#define lstat(path,buf) stat (path,buf)	117	#define lstat(path,buf) stat (path,buf)
115	#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))
…		…
129	#define sync() EIO_ENOSYS ()	132	#define sync() EIO_ENOSYS ()
130	#define readlink(path,buf,s) EIO_ENOSYS ()	133	#define readlink(path,buf,s) EIO_ENOSYS ()
131	#define statvfs(path,buf) EIO_ENOSYS ()	134	#define statvfs(path,buf) EIO_ENOSYS ()
132	#define fstatvfs(fd,buf) EIO_ENOSYS ()	135	#define fstatvfs(fd,buf) EIO_ENOSYS ()
133		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
134	/* we could even stat and see if it exists */	203	/* we could even stat and see if it exists */
135	static int	204	static int
136	symlink (const char *old, const char *neu)	205	symlink (const char *old, const char *neu)
137	{	206	{
138	#if WINVER >= 0x0600	207	#if WINVER >= 0x0600
…		…
164		233
165	#include <sys/time.h>	234	#include <sys/time.h>
166	#include <sys/select.h>	235	#include <sys/select.h>
167	#include <sys/statvfs.h>	236	#include <sys/statvfs.h>
168	#include <unistd.h>	237	#include <unistd.h>
169	#include <utime.h>
170	#include <signal.h>	238	#include <signal.h>
171	#include <dirent.h>	239	#include <dirent.h>
172		240
173	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES	241	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
174	#include <sys/mman.h>	242	#include <sys/mman.h>
175	#endif	243	#endif
176		244
177	#define D_NAME(entp) entp->d_name	245	#define D_NAME(entp) entp->d_name
178		246
179	/* 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 */
180	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__	248	#if __FreeBSD__ || __NetBSD__ || __OpenBSD__
181	#define _DIRENT_HAVE_D_TYPE /* sigh */	249	#define _DIRENT_HAVE_D_TYPE /* sigh */
182	#define D_INO(de) (de)->d_fileno	250	#define D_INO(de) (de)->d_fileno
183	#define D_NAMLEN(de) (de)->d_namlen	251	#define D_NAMLEN(de) (de)->d_namlen
184	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600	252	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
185	#define D_INO(de) (de)->d_ino	253	#define D_INO(de) (de)->d_ino
…		…
196		264
197	#ifndef EIO_STRUCT_DIRENT	265	#ifndef EIO_STRUCT_DIRENT
198	#define EIO_STRUCT_DIRENT struct dirent	266	#define EIO_STRUCT_DIRENT struct dirent
199	#endif	267	#endif
200		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>
201	#endif	281	#endif
202		282
203	#if HAVE_SENDFILE	283	#if HAVE_SENDFILE
204	# if __linux	284	# if __linux
205	# include <sys/sendfile.h>	285	# include <sys/sendfile.h>
…		…
247	#define FUBd \	327	#define FUBd \
248	free (eio_buf)	328	free (eio_buf)
249		329
250	#define EIO_TICKS ((1000000 + 1023) >> 10)	330	#define EIO_TICKS ((1000000 + 1023) >> 10)
251		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
252	#define ETP_PRI_MIN EIO_PRI_MIN	376	#define ETP_PRI_MIN EIO_PRI_MIN
253	#define ETP_PRI_MAX EIO_PRI_MAX	377	#define ETP_PRI_MAX EIO_PRI_MAX
254		378
255	struct etp_worker;	379	struct etp_worker;
256		380
…		…
279	static void (*done_poll_cb) (void);	403	static void (*done_poll_cb) (void);
280		404
281	static unsigned int max_poll_time; /* reslock */	405	static unsigned int max_poll_time; /* reslock */
282	static unsigned int max_poll_reqs; /* reslock */	406	static unsigned int max_poll_reqs; /* reslock */
283		407
284	static volatile unsigned int nreqs; /* reqlock */	408	static unsigned int nreqs; /* reqlock */
285	static volatile unsigned int nready; /* reqlock */	409	static unsigned int nready; /* reqlock */
286	static volatile unsigned int npending; /* reqlock */	410	static unsigned int npending; /* reqlock */
287	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 */
288	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 */
289		413
290	static xmutex_t wrklock;	414	static xmutex_t wrklock;
291	static xmutex_t reslock;	415	static xmutex_t reslock;
292	static xmutex_t reqlock;	416	static xmutex_t reqlock;
293	static xcond_t reqwait;	417	static xcond_t reqwait;
294		418
295	#if !HAVE_PREADWRITE
296	/*
297	* make our pread/pwrite emulation safe against themselves, but not against
298	* normal read/write by using a mutex. slows down execution a lot,
299	* but that's your problem, not mine.
300	*/
301	static xmutex_t preadwritelock;
302	#endif
303
304	typedef struct etp_worker	419	typedef struct etp_worker
305	{	420	{
		421	struct tmpbuf tmpbuf;
		422
306	/* locked by wrklock */	423	/* locked by wrklock */
307	struct etp_worker *prev, *next;	424	struct etp_worker *prev, *next;
308		425
309	xthread_t tid;	426	xthread_t tid;
310		427
311	/* locked by reslock, reqlock or wrklock */
312	ETP_REQ *req; /* currently processed request */
313
314	#ifdef ETP_WORKER_COMMON	428	#ifdef ETP_WORKER_COMMON
315	ETP_WORKER_COMMON	429	ETP_WORKER_COMMON
316	#endif	430	#endif
317	} etp_worker;	431	} etp_worker;
318		432
…		…
321	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	435	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
322	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	436	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
323		437
324	/* worker threads management */	438	/* worker threads management */
325		439
326	static void ecb_cold	440	static void
327	etp_worker_clear (etp_worker *wrk)	441	etp_worker_clear (etp_worker *wrk)
328	{	442	{
329	}	443	}
330		444
331	static void ecb_cold	445	static void ecb_cold
332	etp_worker_free (etp_worker *wrk)	446	etp_worker_free (etp_worker *wrk)
333	{	447	{
		448	free (wrk->tmpbuf.ptr);
		449
334	wrk->next->prev = wrk->prev;	450	wrk->next->prev = wrk->prev;
335	wrk->prev->next = wrk->next;	451	wrk->prev->next = wrk->next;
336		452
337	free (wrk);	453	free (wrk);
338	}	454	}
…		…
516	}	632	}
517		633
518	static void ecb_cold	634	static void ecb_cold
519	etp_end_thread (void)	635	etp_end_thread (void)
520	{	636	{
521	eio_req *req = calloc (1, sizeof (eio_req));	637	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
522		638
523	req->type = -1;	639	req->type = -1;
524	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	640	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
525		641
526	X_LOCK (reqlock);	642	X_LOCK (reqlock);
…		…
853	}	969	}
854		970
855	/*****************************************************************************/	971	/*****************************************************************************/
856	/* work around various missing functions */	972	/* work around various missing functions */
857		973
858	#if !HAVE_PREADWRITE
859	# undef pread
860	# undef pwrite
861	# define pread eio__pread
862	# define pwrite eio__pwrite
863
864	static eio_ssize_t
865	eio__pread (int fd, void *buf, size_t count, off_t offset)
866	{
867	eio_ssize_t res;
868	off_t ooffset;
869
870	X_LOCK (preadwritelock);
871	ooffset = lseek (fd, 0, SEEK_CUR);
872	lseek (fd, offset, SEEK_SET);
873	res = read (fd, buf, count);
874	lseek (fd, ooffset, SEEK_SET);
875	X_UNLOCK (preadwritelock);
876
877	return res;
878	}
879
880	static eio_ssize_t
881	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
882	{
883	eio_ssize_t res;
884	off_t ooffset;
885
886	X_LOCK (preadwritelock);
887	ooffset = lseek (fd, 0, SEEK_CUR);
888	lseek (fd, offset, SEEK_SET);
889	res = write (fd, buf, count);
890	lseek (fd, ooffset, SEEK_SET);
891	X_UNLOCK (preadwritelock);
892
893	return res;
894	}
895	#endif
896
897	#ifndef HAVE_UTIMES	974	#ifndef HAVE_UTIMES
898		975
899	# undef utimes	976	# undef utimes
900	# define utimes(path,times) eio__utimes (path, times)	977	# define utimes(path,times) eio__utimes (path, times)
901		978
…		…
933		1010
934	#if !HAVE_FDATASYNC	1011	#if !HAVE_FDATASYNC
935	# undef fdatasync	1012	# undef fdatasync
936	# define fdatasync(fd) fsync (fd)	1013	# define fdatasync(fd) fsync (fd)
937	#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	}
938		1032
939	/* sync_file_range always needs emulation */	1033	/* sync_file_range always needs emulation */
940	static int	1034	static int
941	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)
942	{	1036	{
…		…
965	}	1059	}
966		1060
967	static int	1061	static int
968	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)
969	{	1063	{
970	#if HAVE_FALLOCATE	1064	#if HAVE_LINUX_FALLOCATE
971	return fallocate (fd, mode, offset, len);	1065	return fallocate (fd, mode, offset, len);
972	#else	1066	#else
973	errno = ENOSYS;	1067	return EIO_ENOSYS ();
974	return -1;
975	#endif	1068	#endif
976	}	1069	}
977		1070
978	#if !HAVE_READAHEAD	1071	#if !HAVE_READAHEAD
979	# undef readahead	1072	# undef readahead
…		…
994	todo -= len;	1087	todo -= len;
995	}	1088	}
996		1089
997	FUBd;	1090	FUBd;
998		1091
999	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 */
1000	return count;	1094	return 0;
1001	}	1095	}
1002		1096
1003	#endif	1097	#endif
1004		1098
1005	/* sendfile always needs emulation */	1099	/* sendfile always needs emulation */
…		…
1040		1134
1041	/* according to source inspection, this is correct, and useful behaviour */	1135	/* according to source inspection, this is correct, and useful behaviour */
1042	if (sbytes)	1136	if (sbytes)
1043	res = sbytes;	1137	res = sbytes;
1044		1138
1045	# elif defined (__APPLE__)	1139	# elif defined __APPLE__
1046	off_t sbytes = count;	1140	off_t sbytes = count;
1047	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1141	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1048		1142
1049	/* according to the manpage, sbytes is always valid */	1143	/* according to the manpage, sbytes is always valid */
1050	if (sbytes)	1144	if (sbytes)
…		…
1077	HANDLE h = TO_SOCKET (ifd);	1171	HANDLE h = TO_SOCKET (ifd);
1078	SetFilePointer (h, offset, 0, FILE_BEGIN);	1172	SetFilePointer (h, offset, 0, FILE_BEGIN);
1079	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);	1173	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1080		1174
1081	#else	1175	#else
1082	res = -1;	1176	res = EIO_ENOSYS ();
1083	errno = ENOSYS;
1084	#endif	1177	#endif
1085		1178
1086	/* we assume sendfile can copy at least 128mb in one go */	1179	/* we assume sendfile can copy at least 128mb in one go */
1087	if (res <= 128 * 1024 * 1024)	1180	if (res <= 128 * 1024 * 1024)
1088	{	1181	{
…		…
1275		1368
1276	/*****************************************************************************/	1369	/*****************************************************************************/
1277	/* requests implemented outside eio_execute, because they are so large */	1370	/* requests implemented outside eio_execute, because they are so large */
1278		1371
1279	static void	1372	static void
1280	eio__realpath (eio_req *req, etp_worker *self)	1373	eio__lseek (eio_req *req)
1281	{	1374	{
1282	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;
1283	char *res;	1391	char *res;
1284	char *tmp1, *tmp2;	1392	char *tmp1, *tmp2;
1285	#if SYMLOOP_MAX > 32	1393	#if SYMLOOP_MAX > 32
1286	int symlinks = SYMLOOP_MAX;	1394	int symlinks = SYMLOOP_MAX;
1287	#else	1395	#else
1288	int symlinks = 32;	1396	int symlinks = 32;
1289	#endif	1397	#endif
1290		1398
1291	req->result = -1;
1292
1293	errno = EINVAL;	1399	errno = EINVAL;
1294	if (!rel)	1400	if (!rel)
1295	return;	1401	return -1;
1296		1402
1297	errno = ENOENT;	1403	errno = ENOENT;
1298	if (!*rel)	1404	if (!*rel)
1299	return;	1405	return -1;
1300		1406
1301	if (!req->ptr2)	1407	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1302	{
1303	X_LOCK (wrklock);
1304	req->flags |= EIO_FLAG_PTR2_FREE;
1305	X_UNLOCK (wrklock);
1306	req->ptr2 = malloc (PATH_MAX * 3);
1307
1308	errno = ENOMEM;
1309	if (!req->ptr2)
1310	return;
1311	}
1312
1313	res = req->ptr2;
1314	tmp1 = res + PATH_MAX;	1408	tmp1 = res + PATH_MAX;
1315	tmp2 = tmp1 + PATH_MAX;	1409	tmp2 = tmp1 + PATH_MAX;
1316		1410
1317	#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 */
1318	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1412	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1337	#endif	1431	#endif
1338	#endif	1432	#endif
1339		1433
1340	if (*rel != '/')	1434	if (*rel != '/')
1341	{	1435	{
		1436	int len;
		1437
		1438	errno = ENOENT;
		1439	if (wd == EIO_INVALID_WD)
		1440	return -1;
		1441
		1442	if (wd == EIO_CWD)
		1443	{
1342	if (!getcwd (res, PATH_MAX))	1444	if (!getcwd (res, PATH_MAX))
1343	return;	1445	return -1;
		1446
		1447	len = strlen (res);
		1448	}
		1449	else
		1450	memcpy (res, wd->str, len = wd->len);
1344		1451
1345	if (res [1]) /* only use if not / */	1452	if (res [1]) /* only use if not / */
1346	res += strlen (res);	1453	res += len;
1347	}	1454	}
1348		1455
1349	while (*rel)	1456	while (*rel)
1350	{	1457	{
1351	eio_ssize_t len, linklen;	1458	eio_ssize_t len, linklen;
1352	char *beg = rel;	1459	const char *beg = rel;
1353		1460
1354	while (*rel && *rel != '/')	1461	while (*rel && *rel != '/')
1355	++rel;	1462	++rel;
1356		1463
1357	len = rel - beg;	1464	len = rel - beg;
…		…
1369		1476
1370	if (beg [1] == '.' && len == 2)	1477	if (beg [1] == '.' && len == 2)
1371	{	1478	{
1372	/* .. - back up one component, if possible */	1479	/* .. - back up one component, if possible */
1373		1480
1374	while (res != req->ptr2)	1481	while (res != tmpbuf->ptr)
1375	if (*--res == '/')	1482	if (*--res == '/')
1376	break;	1483	break;
1377		1484
1378	continue;	1485	continue;
1379	}	1486	}
1380	}	1487	}
1381		1488
1382	errno = ENAMETOOLONG;	1489	errno = ENAMETOOLONG;
1383	if (res + 1 + len + 1 >= tmp1)	1490	if (res + 1 + len + 1 >= tmp1)
1384	return;	1491	return -1;
1385		1492
1386	/* copy one component */	1493	/* copy one component */
1387	*res = '/';	1494	*res = '/';
1388	memcpy (res + 1, beg, len);	1495	memcpy (res + 1, beg, len);
1389		1496
1390	/* zero-terminate, for readlink */	1497	/* zero-terminate, for readlink */
1391	res [len + 1] = 0;	1498	res [len + 1] = 0;
1392		1499
1393	/* now check if it's a symlink */	1500	/* now check if it's a symlink */
1394	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1501	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1395		1502
1396	if (linklen < 0)	1503	if (linklen < 0)
1397	{	1504	{
1398	if (errno != EINVAL)	1505	if (errno != EINVAL)
1399	return;	1506	return -1;
1400		1507
1401	/* it's a normal directory. hopefully */	1508	/* it's a normal directory. hopefully */
1402	res += len + 1;	1509	res += len + 1;
1403	}	1510	}
1404	else	1511	else
…		…
1406	/* yay, it was a symlink - build new path in tmp2 */	1513	/* yay, it was a symlink - build new path in tmp2 */
1407	int rellen = strlen (rel);	1514	int rellen = strlen (rel);
1408		1515
1409	errno = ENAMETOOLONG;	1516	errno = ENAMETOOLONG;
1410	if (linklen + 1 + rellen >= PATH_MAX)	1517	if (linklen + 1 + rellen >= PATH_MAX)
1411	return;	1518	return -1;
1412		1519
1413	errno = ELOOP;	1520	errno = ELOOP;
1414	if (!--symlinks)	1521	if (!--symlinks)
1415	return;	1522	return -1;
1416		1523
1417	if (*tmp1 == '/')	1524	if (*tmp1 == '/')
1418	res = req->ptr2; /* symlink resolves to an absolute path */	1525	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1419		1526
1420	/* 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 */
1421	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1528	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1422	tmp2 [linklen] = '/';	1529	tmp2 [linklen] = '/';
1423	memcpy (tmp2, tmp1, linklen);	1530	memcpy (tmp2, tmp1, linklen);
…		…
1425	rel = tmp2;	1532	rel = tmp2;
1426	}	1533	}
1427	}	1534	}
1428		1535
1429	/* special case for the lone root path */	1536	/* special case for the lone root path */
1430	if (res == req->ptr2)	1537	if (res == tmpbuf->ptr)
1431	*res++ = '/';	1538	*res++ = '/';
1432		1539
1433	req->result = res - (char *)req->ptr2;	1540	return res - (char *)tmpbuf->ptr;
1434
1435	done:
1436	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1437	}	1541	}
1438		1542
1439	static signed char	1543	static signed char
1440	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1544	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1441	{	1545	{
…		…
1629	#ifdef _WIN32	1733	#ifdef _WIN32
1630	{	1734	{
1631	int len = strlen ((const char *)req->ptr1);	1735	int len = strlen ((const char *)req->ptr1);
1632	char *path = malloc (MAX_PATH);	1736	char *path = malloc (MAX_PATH);
1633	const char *fmt;	1737	const char *fmt;
		1738	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1634		1739
1635	if (!len)	1740	if (!len)
1636	fmt = "./*";	1741	fmt = "./*";
1637	else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')	1742	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1638	fmt = "%s*";	1743	fmt = "%s*";
1639	else	1744	else
1640	fmt = "%s/*";	1745	fmt = "%s/*";
1641		1746
1642	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1747	_snprintf (path, MAX_PATH, fmt, reqpath);
1643	dirp = FindFirstFile (path, &entp);	1748	dirp = FindFirstFile (path, &entp);
1644	free (path);	1749	free (path);
1645		1750
1646	if (dirp == INVALID_HANDLE_VALUE)	1751	if (dirp == INVALID_HANDLE_VALUE)
1647	{	1752	{
1648	dirp = 0;	1753	/* should steal _dosmaperr */
1649
1650	switch (GetLastError ())	1754	switch (GetLastError ())
1651	{	1755	{
1652	case ERROR_FILE_NOT_FOUND:	1756	case ERROR_FILE_NOT_FOUND:
1653	req->result = 0;	1757	req->result = 0;
1654	break;	1758	break;
1655		1759
1656	case ERROR_INVALID_NAME:	1760	case ERROR_INVALID_NAME:
1657	case ERROR_PATH_NOT_FOUND:	1761	case ERROR_PATH_NOT_FOUND:
1658	case ERROR_NO_MORE_FILES:	1762	case ERROR_NO_MORE_FILES:
1659	errno = ENOENT;	1763	errno = ENOENT;
1660	break;	1764	break;
1661		1765
1662	case ERROR_NOT_ENOUGH_MEMORY:	1766	case ERROR_NOT_ENOUGH_MEMORY:
1663	errno = ENOMEM;	1767	errno = ENOMEM;
1664	break;	1768	break;
1665		1769
1666	default:	1770	default:
1667	errno = EINVAL;	1771	errno = EINVAL;
1668	break;	1772	break;
1669	}	1773	}
		1774
		1775	return;
1670	}	1776	}
1671	}	1777	}
1672	#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
1673	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;
1674	#endif	1800	#endif
1675		1801
1676	if (req->flags & EIO_FLAG_PTR1_FREE)	1802	if (req->flags & EIO_FLAG_PTR1_FREE)
1677	free (req->ptr1);	1803	free (req->ptr1);
1678		1804
1679	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1805	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1680	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1806	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1681	req->ptr2 = names = malloc (namesalloc);	1807	req->ptr2 = names = malloc (namesalloc);
1682		1808
1683	if (dirp && names && (!flags || dents))	1809	if (!names || (flags && !dents))
		1810	return;
		1811
1684	for (;;)	1812	for (;;)
1685	{	1813	{
1686	int done;	1814	int done;
1687		1815
1688	#ifdef _WIN32	1816	#ifdef _WIN32
1689	done = !dirp;	1817	done = !dirp;
1690	#else	1818	#else
1691	errno = 0;	1819	errno = 0;
1692	entp = readdir (dirp);	1820	entp = readdir (dirp);
1693	done = !entp;	1821	done = !entp;
1694	#endif	1822	#endif
1695		1823
1696	if (done)	1824	if (done)
1697	{	1825	{
1698	#ifndef _WIN32	1826	#ifndef _WIN32
1699	int old_errno = errno;	1827	int old_errno = errno;
1700	closedir (dirp);	1828	closedir (dirp);
1701	errno = old_errno;	1829	errno = old_errno;
1702		1830
1703	if (errno)	1831	if (errno)
1704	break;	1832	break;
1705	#endif	1833	#endif
1706		1834
1707	/* sort etc. */	1835	/* sort etc. */
1708	req->int1 = flags;	1836	req->int1 = flags;
1709	req->result = dentoffs;	1837	req->result = dentoffs;
1710		1838
1711	if (flags & EIO_READDIR_STAT_ORDER)	1839	if (flags & EIO_READDIR_STAT_ORDER)
1712	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);
1713	else if (flags & EIO_READDIR_DIRS_FIRST)	1841	else if (flags & EIO_READDIR_DIRS_FIRST)
1714	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1842	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1715	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 */
1716	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))
1717	{	1895	{
1718	/* 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
1719	eio_dirent *oth = dents + dentoffs;	1903	ent = dents + dentoffs;
1720	eio_dirent *dir = dents;
1721		1904
1722	/* 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 */
1723	/* by walking from both sides and swapping if necessary */	1906	ent->namelen = len - 1;
1724	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)
1725	{	1967	{
1726	if (dir->type == EIO_DT_DIR)	1968	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1727	++dir;	1969	ent->score = 1;
1728	else if ((--oth)->type == EIO_DT_DIR)	1970	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1729	{	1971	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1730	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1731
1732	++dir;
1733	}
1734	}	1972	}
1735		1973	else if (ent->type == EIO_DT_DIR)
1736	/* now sort the dirs only (dirs all have the same score) */	1974	ent->score = 0;
1737	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1738	}	1975	}
1739
1740	break;
1741	}
1742
1743	/* now add the entry to our list(s) */
1744	name = D_NAME (entp);
1745
1746	/* skip . and .. entries */
1747	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1748	{
1749	int len = D_NAMLEN (entp) + 1;
1750
1751	while (ecb_expect_false (namesoffs + len > namesalloc))
1752	{
1753	namesalloc *= 2;
1754	req->ptr2 = names = realloc (names, namesalloc);
1755
1756	if (!names)
1757	break;
1758	}	1976	}
1759		1977
1760	memcpy (names + namesoffs, name, len);
1761
1762	if (dents)
1763	{
1764	struct eio_dirent *ent;
1765
1766	if (ecb_expect_false (dentoffs == dentalloc))
1767	{
1768	dentalloc *= 2;
1769	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1770
1771	if (!dents)
1772	break;
1773	}
1774
1775	ent = dents + dentoffs;
1776
1777	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1778	ent->namelen = len - 1;
1779	ent->inode = D_INO (entp);
1780
1781	inode_bits |= ent->inode;
1782
1783	switch (D_TYPE (entp))
1784	{
1785	default:
1786	ent->type = EIO_DT_UNKNOWN;
1787	flags |= EIO_READDIR_FOUND_UNKNOWN;
1788	break;
1789
1790	#ifdef DT_FIFO
1791	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1792	#endif
1793	#ifdef DT_CHR
1794	case DT_CHR: ent->type = EIO_DT_CHR; break;
1795	#endif
1796	#ifdef DT_MPC
1797	case DT_MPC: ent->type = EIO_DT_MPC; break;
1798	#endif
1799	#ifdef DT_DIR
1800	case DT_DIR: ent->type = EIO_DT_DIR; break;
1801	#endif
1802	#ifdef DT_NAM
1803	case DT_NAM: ent->type = EIO_DT_NAM; break;
1804	#endif
1805	#ifdef DT_BLK
1806	case DT_BLK: ent->type = EIO_DT_BLK; break;
1807	#endif
1808	#ifdef DT_MPB
1809	case DT_MPB: ent->type = EIO_DT_MPB; break;
1810	#endif
1811	#ifdef DT_REG
1812	case DT_REG: ent->type = EIO_DT_REG; break;
1813	#endif
1814	#ifdef DT_NWK
1815	case DT_NWK: ent->type = EIO_DT_NWK; break;
1816	#endif
1817	#ifdef DT_CMP
1818	case DT_CMP: ent->type = EIO_DT_CMP; break;
1819	#endif
1820	#ifdef DT_LNK
1821	case DT_LNK: ent->type = EIO_DT_LNK; break;
1822	#endif
1823	#ifdef DT_SOCK
1824	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1825	#endif
1826	#ifdef DT_DOOR
1827	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1828	#endif
1829	#ifdef DT_WHT
1830	case DT_WHT: ent->type = EIO_DT_WHT; break;
1831	#endif
1832	}
1833
1834	ent->score = 7;
1835
1836	if (flags & EIO_READDIR_DIRS_FIRST)
1837	{
1838	if (ent->type == EIO_DT_UNKNOWN)
1839	{
1840	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1841	ent->score = 1;
1842	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1843	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1844	}
1845	else if (ent->type == EIO_DT_DIR)
1846	ent->score = 0;
1847	}
1848	}
1849
1850	namesoffs += len;	1978	namesoffs += len;
1851	++dentoffs;	1979	++dentoffs;
1852	}	1980	}
1853		1981
1854	if (EIO_CANCELLED (req))	1982	if (EIO_CANCELLED (req))
1855	{	1983	{
1856	errno = ECANCELED;	1984	errno = ECANCELED;
1857	break;	1985	break;
1858	}	1986	}
1859		1987
1860	#ifdef _WIN32	1988	#ifdef _WIN32
1861	if (!FindNextFile (dirp, &entp))	1989	if (!FindNextFile (dirp, &entp))
1862	{	1990	{
1863	FindClose (dirp);	1991	FindClose (dirp);
1864	dirp = 0;	1992	dirp = 0;
1865	}	1993	}
1866	#endif	1994	#endif
1867	}	1995	}
1868	}	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
1869		2119
1870	/*****************************************************************************/	2120	/*****************************************************************************/
1871		2121
1872	#define ALLOC(len) \	2122	#define ALLOC(len) \
1873	if (!req->ptr2) \	2123	if (!req->ptr2) \
…		…
1882	req->result = -1; \	2132	req->result = -1; \
1883	break; \	2133	break; \
1884	} \	2134	} \
1885	}	2135	}
1886		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
1887	X_THREAD_PROC (etp_proc)	2154	X_THREAD_PROC (etp_proc)
1888	{	2155	{
1889	ETP_REQ *req;	2156	ETP_REQ *req;
1890	struct timespec ts;	2157	struct timespec ts;
1891	etp_worker *self = (etp_worker *)thr_arg;	2158	etp_worker *self = (etp_worker *)thr_arg;
1892		2159
		2160	etp_proc_init ();
		2161
1893	/* try to distribute timeouts somewhat evenly */	2162	/* try to distribute timeouts somewhat evenly */
1894	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2163	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1895		2164
1896	for (;;)	2165	for (;;)
1897	{	2166	{
…		…
1899		2168
1900	X_LOCK (reqlock);	2169	X_LOCK (reqlock);
1901		2170
1902	for (;;)	2171	for (;;)
1903	{	2172	{
1904	self->req = req = reqq_shift (&req_queue);	2173	req = reqq_shift (&req_queue);
1905		2174
1906	if (req)	2175	if (req)
1907	break;	2176	break;
1908		2177
1909	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 */
…		…
1947	++npending;	2216	++npending;
1948		2217
1949	if (!reqq_push (&res_queue, req) && want_poll_cb)	2218	if (!reqq_push (&res_queue, req) && want_poll_cb)
1950	want_poll_cb ();	2219	want_poll_cb ();
1951		2220
1952	self->req = 0;
1953	etp_worker_clear (self);	2221	etp_worker_clear (self);
1954		2222
1955	X_UNLOCK (reslock);	2223	X_UNLOCK (reslock);
1956	}	2224	}
1957		2225
1958	quit:	2226	quit:
		2227	free (req);
		2228
1959	X_LOCK (wrklock);	2229	X_LOCK (wrklock);
1960	etp_worker_free (self);	2230	etp_worker_free (self);
1961	X_UNLOCK (wrklock);	2231	X_UNLOCK (wrklock);
1962		2232
1963	return 0;	2233	return 0;
…		…
1966	/*****************************************************************************/	2236	/*****************************************************************************/
1967		2237
1968	int ecb_cold	2238	int ecb_cold
1969	eio_init (void (*want_poll)(void), void (*done_poll)(void))	2239	eio_init (void (*want_poll)(void), void (*done_poll)(void))
1970	{	2240	{
1971	#if !HAVE_PREADWRITE
1972	X_MUTEX_CREATE (preadwritelock);
1973	#endif
1974
1975	return etp_init (want_poll, done_poll);	2241	return etp_init (want_poll, done_poll);
1976	}	2242	}
1977		2243
1978	ecb_inline void	2244	ecb_inline void
1979	eio_api_destroy (eio_req *req)	2245	eio_api_destroy (eio_req *req)
1980	{	2246	{
1981	free (req);	2247	free (req);
1982	}	2248	}
1983		2249
1984	#define REQ(rtype) \	2250	#define REQ(rtype) \
1985	eio_req *req; \	2251	eio_req *req; \
1986	\	2252	\
1987	req = (eio_req *)calloc (1, sizeof *req); \	2253	req = (eio_req *)calloc (1, sizeof *req); \
1988	if (!req) \	2254	if (!req) \
1989	return 0; \	2255	return 0; \
…		…
2006	}	2272	}
2007		2273
2008	static void	2274	static void
2009	eio_execute (etp_worker *self, eio_req *req)	2275	eio_execute (etp_worker *self, eio_req *req)
2010	{	2276	{
		2277	#if HAVE_AT
		2278	int dirfd;
		2279	#else
		2280	const char *path;
		2281	#endif
		2282
2011	if (ecb_expect_false (EIO_CANCELLED (req)))	2283	if (ecb_expect_false (EIO_CANCELLED (req)))
2012	{	2284	{
2013	req->result = -1;	2285	req->result = -1;
2014	req->errorno = ECANCELED;	2286	req->errorno = ECANCELED;
2015	return;	2287	return;
2016	}	2288	}
2017		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
2018	switch (req->type)	2306	switch (req->type)
2019	{	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;
2020	case EIO_READ: ALLOC (req->size);	2315	case EIO_READ: ALLOC (req->size);
2021	req->result = req->offs >= 0	2316	req->result = req->offs >= 0
2022	? pread (req->int1, req->ptr2, req->size, req->offs)	2317	? pread (req->int1, req->ptr2, req->size, req->offs)
2023	: read (req->int1, req->ptr2, req->size); break;	2318	: read (req->int1, req->ptr2, req->size); break;
2024	case EIO_WRITE: req->result = req->offs >= 0	2319	case EIO_WRITE: req->result = req->offs >= 0
…		…
2026	: write (req->int1, req->ptr2, req->size); break;	2321	: write (req->int1, req->ptr2, req->size); break;
2027		2322
2028	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;
2029	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;
2030		2325
		2326	#if HAVE_AT
		2327
2031	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2328	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2032	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;
2033	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));
2034	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
2035	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2428	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2036	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2429	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2037		2430
2038	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2039	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2040	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2431	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2041	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2432	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2042		2433
2043	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2044	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;
2045	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2046	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;
2047	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2048	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2436	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2049		2437
2050	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2051	case EIO_CLOSE: req->result = close (req->int1); break;	2438	case EIO_CLOSE: req->result = close (req->int1); break;
2052	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2439	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2053	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2054	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2055	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2056	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2057	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2058	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2059	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2060
2061	case EIO_REALPATH: eio__realpath (req, self); break;
2062
2063	case EIO_READLINK: ALLOC (PATH_MAX);
2064	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2065
2066	case EIO_SYNC: req->result = 0; sync (); break;	2440	case EIO_SYNC: req->result = 0; sync (); break;
2067	case EIO_FSYNC: req->result = fsync (req->int1); break;	2441	case EIO_FSYNC: req->result = fsync (req->int1); break;
2068	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;
2069	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;
2070	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2446	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2071	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;
2072	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2448	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2073	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2074	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;
2075		2450
2076	case EIO_READDIR: eio__scandir (req, self); break;	2451	case EIO_READDIR: eio__scandir (req, self); break;
2077		2452
2078	case EIO_BUSY:	2453	case EIO_BUSY:
…		…
2088	req->result = select (0, 0, 0, 0, &tv);	2463	req->result = select (0, 0, 0, 0, &tv);
2089	}	2464	}
2090	#endif	2465	#endif
2091	break;	2466	break;
2092		2467
2093	case EIO_UTIME:
2094	case EIO_FUTIME:
2095	{
2096	struct timeval tv[2];
2097	struct timeval *times;
2098
2099	if (req->nv1 != -1. || req->nv2 != -1.)
2100	{
2101	tv[0].tv_sec = req->nv1;
2102	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2103	tv[1].tv_sec = req->nv2;
2104	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2105
2106	times = tv;
2107	}
2108	else
2109	times = 0;
2110
2111	req->result = req->type == EIO_FUTIME
2112	? futimes (req->int1, times)
2113	: utimes (req->ptr1, times);
2114	}
2115	break;
2116
2117	case EIO_GROUP:	2468	case EIO_GROUP:
2118	abort (); /* handled in eio_request */	2469	abort (); /* handled in eio_request */
2119		2470
2120	case EIO_NOP:	2471	case EIO_NOP:
2121	req->result = 0;	2472	req->result = 0;
…		…
2124	case EIO_CUSTOM:	2475	case EIO_CUSTOM:
2125	req->feed (req);	2476	req->feed (req);
2126	break;	2477	break;
2127		2478
2128	default:	2479	default:
2129	errno = ENOSYS;
2130	req->result = -1;	2480	req->result = EIO_ENOSYS ();
2131	break;	2481	break;
2132	}	2482	}
2133		2483
2134	req->errorno = errno;	2484	req->errorno = errno;
2135	}	2485	}
2136		2486
2137	#ifndef EIO_NO_WRAPPERS	2487	#ifndef EIO_NO_WRAPPERS
2138		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
2139	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2499	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2140	{	2500	{
2141	REQ (EIO_NOP); SEND;	2501	REQ (EIO_NOP); SEND;
2142	}	2502	}
2143		2503
…		…
2159	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)
2160	{	2520	{
2161	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;
2162	}	2522	}
2163		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
2164	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)
2165	{	2540	{
2166	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;
2167	}	2542	}
2168		2543
…		…
2174	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)
2175	{	2550	{
2176	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2551	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2177	}	2552	}
2178		2553
2179	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2180	{
2181	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2182	}
2183
2184	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)
2185	{	2555	{
2186	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;
2187	}	2557	}
2188		2558
2189	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2190	{
2191	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2192	}
2193
2194	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)
2195	{	2560	{
2196	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2561	REQ (EIO_CLOSE); req->int1 = fd; SEND;
2197	}	2562	}
2198		2563
2199	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)
2200	{	2565	{
2201	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;
2202	}	2572	}
2203		2573
2204	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)
2205	{	2575	{
2206	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