ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/libeio/eio.c

Comparing libeio/eio.c (file contents):
Revision 1.94 by root, Mon Jul 18 02:59:58 2011 UTC vs.
Revision 1.120 by root, Tue Apr 24 18:47:50 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	/* rename() uses MoveFile, which fails to overwrite */
		138	#define rename(old,neu) eio__rename (old, neu)
		139
		140	static int
		141	eio__rename (const char *old, const char *neu)
		142	{
		143	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		144	return 0;
		145
		146	/* should steal _dosmaperr */
		147	switch (GetLastError ())
		148	{
		149	case ERROR_FILE_NOT_FOUND:
		150	case ERROR_PATH_NOT_FOUND:
		151	case ERROR_INVALID_DRIVE:
		152	case ERROR_NO_MORE_FILES:
		153	case ERROR_BAD_NETPATH:
		154	case ERROR_BAD_NET_NAME:
		155	case ERROR_BAD_PATHNAME:
		156	case ERROR_FILENAME_EXCED_RANGE:
		157	errno = ENOENT;
		158	break;
		159
		160	default:
		161	errno = EACCES;
		162	break;
		163	}
		164
		165	return -1;
		166	}
		167
130	/* we could even stat and see if it exists */	168	/* we could even stat and see if it exists */
131	static int	169	static int
132	symlink (const char *old, const char *neu)	170	symlink (const char *old, const char *neu)
133	{	171	{
134	#if WINVER >= 0x0600	172	#if WINVER >= 0x0600
…		…
160		198
161	#include <sys/time.h>	199	#include <sys/time.h>
162	#include <sys/select.h>	200	#include <sys/select.h>
163	#include <sys/statvfs.h>	201	#include <sys/statvfs.h>
164	#include <unistd.h>	202	#include <unistd.h>
165	#include <utime.h>
166	#include <signal.h>	203	#include <signal.h>
167	#include <dirent.h>	204	#include <dirent.h>
168		205
169	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES	206	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
170	#include <sys/mman.h>	207	#include <sys/mman.h>
171	#endif	208	#endif
172		209
173	#define D_NAME(entp) entp->d_name	210	#define D_NAME(entp) entp->d_name
174		211
175	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	212	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
176	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__	213	#if __FreeBSD__ || __NetBSD__ || __OpenBSD__
177	#define _DIRENT_HAVE_D_TYPE /* sigh */	214	#define _DIRENT_HAVE_D_TYPE /* sigh */
178	#define D_INO(de) (de)->d_fileno	215	#define D_INO(de) (de)->d_fileno
179	#define D_NAMLEN(de) (de)->d_namlen	216	#define D_NAMLEN(de) (de)->d_namlen
180	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600	217	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
181	#define D_INO(de) (de)->d_ino	218	#define D_INO(de) (de)->d_ino
…		…
192		229
193	#ifndef EIO_STRUCT_DIRENT	230	#ifndef EIO_STRUCT_DIRENT
194	#define EIO_STRUCT_DIRENT struct dirent	231	#define EIO_STRUCT_DIRENT struct dirent
195	#endif	232	#endif
196		233
		234	#endif
		235
		236	#if HAVE_UTIMES
		237	# include <utime.h>
		238	#endif
		239
		240	#if HAVE_SYS_SYSCALL_H
		241	# include <sys/syscall.h>
		242	#endif
		243
		244	#if HAVE_SYS_PRCTL_H
		245	# include <sys/prctl.h>
197	#endif	246	#endif
198		247
199	#if HAVE_SENDFILE	248	#if HAVE_SENDFILE
200	# if __linux	249	# if __linux
201	# include <sys/sendfile.h>	250	# include <sys/sendfile.h>
…		…
243	#define FUBd \	292	#define FUBd \
244	free (eio_buf)	293	free (eio_buf)
245		294
246	#define EIO_TICKS ((1000000 + 1023) >> 10)	295	#define EIO_TICKS ((1000000 + 1023) >> 10)
247		296
		297	/*****************************************************************************/
		298
		299	struct tmpbuf
		300	{
		301	void *ptr;
		302	int len;
		303	};
		304
		305	static void *
		306	tmpbuf_get (struct tmpbuf *buf, int len)
		307	{
		308	if (buf->len < len)
		309	{
		310	free (buf->ptr);
		311	buf->ptr = malloc (buf->len = len);
		312	}
		313
		314	return buf->ptr;
		315	}
		316
		317	struct tmpbuf;
		318
		319	#if _POSIX_VERSION >= 200809L
		320	#define HAVE_AT 1
		321	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		322	#ifndef O_SEARCH
		323	#define O_SEARCH O_RDONLY
		324	#endif
		325	#else
		326	#define HAVE_AT 0
		327	static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
		328	#endif
		329
		330	struct eio_pwd
		331	{
		332	#if HAVE_AT
		333	int fd;
		334	#endif
		335	int len;
		336	char str[1]; /* actually, a 0-terminated canonical path */
		337	};
		338
		339	/*****************************************************************************/
		340
248	#define ETP_PRI_MIN EIO_PRI_MIN	341	#define ETP_PRI_MIN EIO_PRI_MIN
249	#define ETP_PRI_MAX EIO_PRI_MAX	342	#define ETP_PRI_MAX EIO_PRI_MAX
250		343
251	struct etp_worker;	344	struct etp_worker;
252		345
…		…
275	static void (*done_poll_cb) (void);	368	static void (*done_poll_cb) (void);
276		369
277	static unsigned int max_poll_time; /* reslock */	370	static unsigned int max_poll_time; /* reslock */
278	static unsigned int max_poll_reqs; /* reslock */	371	static unsigned int max_poll_reqs; /* reslock */
279		372
280	static volatile unsigned int nreqs; /* reqlock */	373	static unsigned int nreqs; /* reqlock */
281	static volatile unsigned int nready; /* reqlock */	374	static unsigned int nready; /* reqlock */
282	static volatile unsigned int npending; /* reqlock */	375	static unsigned int npending; /* reqlock */
283	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	376	static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
284	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */	377	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
285		378
286	static xmutex_t wrklock;	379	static xmutex_t wrklock;
287	static xmutex_t reslock;	380	static xmutex_t reslock;
288	static xmutex_t reqlock;	381	static xmutex_t reqlock;
289	static xcond_t reqwait;	382	static xcond_t reqwait;
…		…
297	static xmutex_t preadwritelock;	390	static xmutex_t preadwritelock;
298	#endif	391	#endif
299		392
300	typedef struct etp_worker	393	typedef struct etp_worker
301	{	394	{
		395	struct tmpbuf tmpbuf;
		396
302	/* locked by wrklock */	397	/* locked by wrklock */
303	struct etp_worker *prev, *next;	398	struct etp_worker *prev, *next;
304		399
305	xthread_t tid;	400	xthread_t tid;
306		401
307	/* locked by reslock, reqlock or wrklock */
308	ETP_REQ *req; /* currently processed request */
309
310	#ifdef ETP_WORKER_COMMON	402	#ifdef ETP_WORKER_COMMON
311	ETP_WORKER_COMMON	403	ETP_WORKER_COMMON
312	#endif	404	#endif
313	} etp_worker;	405	} etp_worker;
314		406
…		…
317	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	409	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
318	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	410	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
319		411
320	/* worker threads management */	412	/* worker threads management */
321		413
322	static void ecb_cold	414	static void
323	etp_worker_clear (etp_worker *wrk)	415	etp_worker_clear (etp_worker *wrk)
324	{	416	{
325	}	417	}
326		418
327	static void ecb_cold	419	static void ecb_cold
328	etp_worker_free (etp_worker *wrk)	420	etp_worker_free (etp_worker *wrk)
329	{	421	{
		422	free (wrk->tmpbuf.ptr);
		423
330	wrk->next->prev = wrk->prev;	424	wrk->next->prev = wrk->prev;
331	wrk->prev->next = wrk->next;	425	wrk->prev->next = wrk->next;
332		426
333	free (wrk);	427	free (wrk);
334	}	428	}
…		…
512	}	606	}
513		607
514	static void ecb_cold	608	static void ecb_cold
515	etp_end_thread (void)	609	etp_end_thread (void)
516	{	610	{
517	eio_req *req = calloc (1, sizeof (eio_req));	611	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
518		612
519	req->type = -1;	613	req->type = -1;
520	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	614	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
521		615
522	X_LOCK (reqlock);	616	X_LOCK (reqlock);
…		…
930	#if !HAVE_FDATASYNC	1024	#if !HAVE_FDATASYNC
931	# undef fdatasync	1025	# undef fdatasync
932	# define fdatasync(fd) fsync (fd)	1026	# define fdatasync(fd) fsync (fd)
933	#endif	1027	#endif
934		1028
		1029	static int
		1030	eio__syncfs (int fd)
		1031	{
		1032	int res;
		1033
		1034	#if HAVE_SYS_SYNCFS
		1035	res = (int)syscall (__NR_syncfs, (int)(fd));
		1036	#else
		1037	res = EIO_ENOSYS ();
		1038	#endif
		1039
		1040	if (res < 0 && errno == ENOSYS && fd >= 0)
		1041	sync ();
		1042
		1043	return res;
		1044	}
		1045
935	/* sync_file_range always needs emulation */	1046	/* sync_file_range always needs emulation */
936	static int	1047	static int
937	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1048	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
938	{	1049	{
939	#if HAVE_SYNC_FILE_RANGE	1050	#if HAVE_SYNC_FILE_RANGE
…		…
961	}	1072	}
962		1073
963	static int	1074	static int
964	eio__fallocate (int fd, int mode, off_t offset, size_t len)	1075	eio__fallocate (int fd, int mode, off_t offset, size_t len)
965	{	1076	{
966	#if HAVE_FALLOCATE	1077	#if HAVE_LINUX_FALLOCATE
967	return fallocate (fd, mode, offset, len);	1078	return fallocate (fd, mode, offset, len);
968	#else	1079	#else
969	errno = ENOSYS;	1080	return EIO_ENOSYS ();
970	return -1;
971	#endif	1081	#endif
972	}	1082	}
973		1083
974	#if !HAVE_READAHEAD	1084	#if !HAVE_READAHEAD
975	# undef readahead	1085	# undef readahead
…		…
990	todo -= len;	1100	todo -= len;
991	}	1101	}
992		1102
993	FUBd;	1103	FUBd;
994		1104
995	errno = 0;	1105	/* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
		1106	/* but not for e.g. EIO or eof, so we also never fail */
996	return count;	1107	return 0;
997	}	1108	}
998		1109
999	#endif	1110	#endif
1000		1111
1001	/* sendfile always needs emulation */	1112	/* sendfile always needs emulation */
…		…
1036		1147
1037	/* according to source inspection, this is correct, and useful behaviour */	1148	/* according to source inspection, this is correct, and useful behaviour */
1038	if (sbytes)	1149	if (sbytes)
1039	res = sbytes;	1150	res = sbytes;
1040		1151
1041	# elif defined (__APPLE__)	1152	# elif defined __APPLE__
1042	off_t sbytes = count;	1153	off_t sbytes = count;
1043	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1154	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1044		1155
1045	/* according to the manpage, sbytes is always valid */	1156	/* according to the manpage, sbytes is always valid */
1046	if (sbytes)	1157	if (sbytes)
…		…
1073	HANDLE h = TO_SOCKET (ifd);	1184	HANDLE h = TO_SOCKET (ifd);
1074	SetFilePointer (h, offset, 0, FILE_BEGIN);	1185	SetFilePointer (h, offset, 0, FILE_BEGIN);
1075	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);	1186	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1076		1187
1077	#else	1188	#else
1078	res = -1;	1189	res = EIO_ENOSYS ();
1079	errno = ENOSYS;
1080	#endif	1190	#endif
1081		1191
1082	/* we assume sendfile can copy at least 128mb in one go */	1192	/* we assume sendfile can copy at least 128mb in one go */
1083	if (res <= 128 * 1024 * 1024)	1193	if (res <= 128 * 1024 * 1024)
1084	{	1194	{
…		…
1271		1381
1272	/*****************************************************************************/	1382	/*****************************************************************************/
1273	/* requests implemented outside eio_execute, because they are so large */	1383	/* requests implemented outside eio_execute, because they are so large */
1274		1384
1275	static void	1385	static void
1276	eio__realpath (eio_req *req, etp_worker *self)	1386	eio__lseek (eio_req *req)
1277	{	1387	{
1278	char *rel = req->ptr1;	1388	/* this usually gets optimised away completely, or your compiler sucks, */
		1389	/* or the whence constants really are not 0, 1, 2 */
		1390	int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
		1391	: req->int2 == EIO_SEEK_CUR ? SEEK_CUR
		1392	: req->int2 == EIO_SEEK_END ? SEEK_END
		1393	: req->int2;
		1394
		1395	req->offs = lseek (req->int1, req->offs, whence);
		1396	req->result = req->offs == (off_t)-1 ? -1 : 0;
		1397	}
		1398
		1399	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
		1400	static int
		1401	eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		1402	{
		1403	const char *rel = path;
1279	char *res;	1404	char *res;
1280	char *tmp1, *tmp2;	1405	char *tmp1, *tmp2;
1281	#if SYMLOOP_MAX > 32	1406	#if SYMLOOP_MAX > 32
1282	int symlinks = SYMLOOP_MAX;	1407	int symlinks = SYMLOOP_MAX;
1283	#else	1408	#else
1284	int symlinks = 32;	1409	int symlinks = 32;
1285	#endif	1410	#endif
1286		1411
1287	req->result = -1;
1288
1289	errno = EINVAL;	1412	errno = EINVAL;
1290	if (!rel)	1413	if (!rel)
1291	return;	1414	return -1;
1292		1415
1293	errno = ENOENT;	1416	errno = ENOENT;
1294	if (!*rel)	1417	if (!*rel)
1295	return;	1418	return -1;
1296		1419
1297	if (!req->ptr2)	1420	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;	1421	tmp1 = res + PATH_MAX;
1311	tmp2 = tmp1 + PATH_MAX;	1422	tmp2 = tmp1 + PATH_MAX;
1312		1423
1313	#if 0 /* disabled, the musl way to do things is just too racy */	1424	#if 0 /* disabled, the musl way to do things is just too racy */
1314	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1425	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1333	#endif	1444	#endif
1334	#endif	1445	#endif
1335		1446
1336	if (*rel != '/')	1447	if (*rel != '/')
1337	{	1448	{
		1449	int len;
		1450
		1451	errno = ENOENT;
		1452	if (wd == EIO_INVALID_WD)
		1453	return -1;
		1454
		1455	if (wd == EIO_CWD)
		1456	{
1338	if (!getcwd (res, PATH_MAX))	1457	if (!getcwd (res, PATH_MAX))
1339	return;	1458	return -1;
		1459
		1460	len = strlen (res);
		1461	}
		1462	else
		1463	memcpy (res, wd->str, len = wd->len);
1340		1464
1341	if (res [1]) /* only use if not / */	1465	if (res [1]) /* only use if not / */
1342	res += strlen (res);	1466	res += len;
1343	}	1467	}
1344		1468
1345	while (*rel)	1469	while (*rel)
1346	{	1470	{
1347	eio_ssize_t len, linklen;	1471	eio_ssize_t len, linklen;
1348	char *beg = rel;	1472	const char *beg = rel;
1349		1473
1350	while (*rel && *rel != '/')	1474	while (*rel && *rel != '/')
1351	++rel;	1475	++rel;
1352		1476
1353	len = rel - beg;	1477	len = rel - beg;
…		…
1365		1489
1366	if (beg [1] == '.' && len == 2)	1490	if (beg [1] == '.' && len == 2)
1367	{	1491	{
1368	/* .. - back up one component, if possible */	1492	/* .. - back up one component, if possible */
1369		1493
1370	while (res != req->ptr2)	1494	while (res != tmpbuf->ptr)
1371	if (*--res == '/')	1495	if (*--res == '/')
1372	break;	1496	break;
1373		1497
1374	continue;	1498	continue;
1375	}	1499	}
1376	}	1500	}
1377		1501
1378	errno = ENAMETOOLONG;	1502	errno = ENAMETOOLONG;
1379	if (res + 1 + len + 1 >= tmp1)	1503	if (res + 1 + len + 1 >= tmp1)
1380	return;	1504	return -1;
1381		1505
1382	/* copy one component */	1506	/* copy one component */
1383	*res = '/';	1507	*res = '/';
1384	memcpy (res + 1, beg, len);	1508	memcpy (res + 1, beg, len);
1385		1509
1386	/* zero-terminate, for readlink */	1510	/* zero-terminate, for readlink */
1387	res [len + 1] = 0;	1511	res [len + 1] = 0;
1388		1512
1389	/* now check if it's a symlink */	1513	/* now check if it's a symlink */
1390	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1514	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1391		1515
1392	if (linklen < 0)	1516	if (linklen < 0)
1393	{	1517	{
1394	if (errno != EINVAL)	1518	if (errno != EINVAL)
1395	return;	1519	return -1;
1396		1520
1397	/* it's a normal directory. hopefully */	1521	/* it's a normal directory. hopefully */
1398	res += len + 1;	1522	res += len + 1;
1399	}	1523	}
1400	else	1524	else
…		…
1402	/* yay, it was a symlink - build new path in tmp2 */	1526	/* yay, it was a symlink - build new path in tmp2 */
1403	int rellen = strlen (rel);	1527	int rellen = strlen (rel);
1404		1528
1405	errno = ENAMETOOLONG;	1529	errno = ENAMETOOLONG;
1406	if (linklen + 1 + rellen >= PATH_MAX)	1530	if (linklen + 1 + rellen >= PATH_MAX)
1407	return;	1531	return -1;
1408		1532
1409	errno = ELOOP;	1533	errno = ELOOP;
1410	if (!--symlinks)	1534	if (!--symlinks)
1411	return;	1535	return -1;
1412		1536
1413	if (*tmp1 == '/')	1537	if (*tmp1 == '/')
1414	res = req->ptr2; /* symlink resolves to an absolute path */	1538	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1415		1539
1416	/* we need to be careful, as rel might point into tmp2 already */	1540	/* we need to be careful, as rel might point into tmp2 already */
1417	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1541	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1418	tmp2 [linklen] = '/';	1542	tmp2 [linklen] = '/';
1419	memcpy (tmp2, tmp1, linklen);	1543	memcpy (tmp2, tmp1, linklen);
…		…
1421	rel = tmp2;	1545	rel = tmp2;
1422	}	1546	}
1423	}	1547	}
1424		1548
1425	/* special case for the lone root path */	1549	/* special case for the lone root path */
1426	if (res == req->ptr2)	1550	if (res == tmpbuf->ptr)
1427	*res++ = '/';	1551	*res++ = '/';
1428		1552
1429	req->result = res - (char *)req->ptr2;	1553	return res - (char *)tmpbuf->ptr;
1430
1431	done:
1432	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1433	}	1554	}
1434		1555
1435	static signed char	1556	static signed char
1436	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1557	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1437	{	1558	{
…		…
1625	#ifdef _WIN32	1746	#ifdef _WIN32
1626	{	1747	{
1627	int len = strlen ((const char *)req->ptr1);	1748	int len = strlen ((const char *)req->ptr1);
1628	char *path = malloc (MAX_PATH);	1749	char *path = malloc (MAX_PATH);
1629	const char *fmt;	1750	const char *fmt;
		1751	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1630		1752
1631	if (!len)	1753	if (!len)
1632	fmt = "./*";	1754	fmt = "./*";
1633	else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')	1755	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1634	fmt = "%s*";	1756	fmt = "%s*";
1635	else	1757	else
1636	fmt = "%s/*";	1758	fmt = "%s/*";
1637		1759
1638	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1760	_snprintf (path, MAX_PATH, fmt, reqpath);
1639	dirp = FindFirstFile (path, &entp);	1761	dirp = FindFirstFile (path, &entp);
1640	free (path);	1762	free (path);
1641		1763
1642	if (dirp == INVALID_HANDLE_VALUE)	1764	if (dirp == INVALID_HANDLE_VALUE)
1643	{	1765	{
1644	dirp = 0;	1766	/* should steal _dosmaperr */
1645
1646	switch (GetLastError ())	1767	switch (GetLastError ())
1647	{	1768	{
1648	case ERROR_FILE_NOT_FOUND:	1769	case ERROR_FILE_NOT_FOUND:
1649	req->result = 0;	1770	req->result = 0;
1650	break;	1771	break;
1651		1772
1652	case ERROR_INVALID_NAME:	1773	case ERROR_INVALID_NAME:
1653	case ERROR_PATH_NOT_FOUND:	1774	case ERROR_PATH_NOT_FOUND:
1654	case ERROR_NO_MORE_FILES:	1775	case ERROR_NO_MORE_FILES:
1655	errno = ENOENT;	1776	errno = ENOENT;
1656	break;	1777	break;
1657		1778
1658	case ERROR_NOT_ENOUGH_MEMORY:	1779	case ERROR_NOT_ENOUGH_MEMORY:
1659	errno = ENOMEM;	1780	errno = ENOMEM;
1660	break;	1781	break;
1661		1782
1662	default:	1783	default:
1663	errno = EINVAL;	1784	errno = EINVAL;
1664	break;	1785	break;
1665	}	1786	}
		1787
		1788	return;
1666	}	1789	}
1667	}	1790	}
1668	#else	1791	#else
		1792	#if HAVE_AT
		1793	if (req->wd)
		1794	{
		1795	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		1796
		1797	if (fd < 0)
		1798	return;
		1799
		1800	dirp = fdopendir (fd);
		1801
		1802	if (!dirp)
		1803	close (fd);
		1804	}
		1805	else
1669	dirp = opendir (req->ptr1);	1806	dirp = opendir (req->ptr1);
		1807	#else
		1808	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1809	#endif
		1810
		1811	if (!dirp)
		1812	return;
1670	#endif	1813	#endif
1671		1814
1672	if (req->flags & EIO_FLAG_PTR1_FREE)	1815	if (req->flags & EIO_FLAG_PTR1_FREE)
1673	free (req->ptr1);	1816	free (req->ptr1);
1674		1817
1675	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1818	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1676	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1819	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1677	req->ptr2 = names = malloc (namesalloc);	1820	req->ptr2 = names = malloc (namesalloc);
1678		1821
1679	if (dirp && names && (!flags || dents))	1822	if (!names || (flags && !dents))
		1823	return;
		1824
1680	for (;;)	1825	for (;;)
1681	{	1826	{
1682	int done;	1827	int done;
1683		1828
1684	#ifdef _WIN32	1829	#ifdef _WIN32
1685	done = !dirp;	1830	done = !dirp;
1686	#else	1831	#else
1687	errno = 0;	1832	errno = 0;
1688	entp = readdir (dirp);	1833	entp = readdir (dirp);
1689	done = !entp;	1834	done = !entp;
1690	#endif	1835	#endif
1691		1836
1692	if (done)	1837	if (done)
1693	{	1838	{
1694	#ifndef _WIN32	1839	#ifndef _WIN32
1695	int old_errno = errno;	1840	int old_errno = errno;
1696	closedir (dirp);	1841	closedir (dirp);
1697	errno = old_errno;	1842	errno = old_errno;
1698		1843
1699	if (errno)	1844	if (errno)
1700	break;	1845	break;
1701	#endif	1846	#endif
1702		1847
1703	/* sort etc. */	1848	/* sort etc. */
1704	req->int1 = flags;	1849	req->int1 = flags;
1705	req->result = dentoffs;	1850	req->result = dentoffs;
1706		1851
1707	if (flags & EIO_READDIR_STAT_ORDER)	1852	if (flags & EIO_READDIR_STAT_ORDER)
1708	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1853	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1709	else if (flags & EIO_READDIR_DIRS_FIRST)	1854	else if (flags & EIO_READDIR_DIRS_FIRST)
1710	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1855	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1711	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1856	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1712	else	1857	else
		1858	{
		1859	/* in this case, all is known, and we just put dirs first and sort them */
		1860	eio_dirent *oth = dents + dentoffs;
		1861	eio_dirent *dir = dents;
		1862
		1863	/* now partition dirs to the front, and non-dirs to the back */
		1864	/* by walking from both sides and swapping if necessary */
		1865	while (oth > dir)
		1866	{
		1867	if (dir->type == EIO_DT_DIR)
		1868	++dir;
		1869	else if ((--oth)->type == EIO_DT_DIR)
		1870	{
		1871	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
		1872
		1873	++dir;
		1874	}
		1875	}
		1876
		1877	/* now sort the dirs only (dirs all have the same score) */
		1878	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1879	}
		1880
		1881	break;
		1882	}
		1883
		1884	/* now add the entry to our list(s) */
		1885	name = D_NAME (entp);
		1886
		1887	/* skip . and .. entries */
		1888	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		1889	{
		1890	int len = D_NAMLEN (entp) + 1;
		1891
		1892	while (ecb_expect_false (namesoffs + len > namesalloc))
		1893	{
		1894	namesalloc *= 2;
		1895	req->ptr2 = names = realloc (names, namesalloc);
		1896
		1897	if (!names)
		1898	break;
		1899	}
		1900
		1901	memcpy (names + namesoffs, name, len);
		1902
		1903	if (dents)
		1904	{
		1905	struct eio_dirent *ent;
		1906
		1907	if (ecb_expect_false (dentoffs == dentalloc))
1713	{	1908	{
1714	/* in this case, all is known, and we just put dirs first and sort them */	1909	dentalloc *= 2;
		1910	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1911
		1912	if (!dents)
		1913	break;
		1914	}
		1915
1715	eio_dirent *oth = dents + dentoffs;	1916	ent = dents + dentoffs;
1716	eio_dirent *dir = dents;
1717		1917
1718	/* now partition dirs to the front, and non-dirs to the back */	1918	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1719	/* by walking from both sides and swapping if necessary */	1919	ent->namelen = len - 1;
1720	while (oth > dir)	1920	ent->inode = D_INO (entp);
		1921
		1922	inode_bits |= ent->inode;
		1923
		1924	switch (D_TYPE (entp))
		1925	{
		1926	default:
		1927	ent->type = EIO_DT_UNKNOWN;
		1928	flags |= EIO_READDIR_FOUND_UNKNOWN;
		1929	break;
		1930
		1931	#ifdef DT_FIFO
		1932	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1933	#endif
		1934	#ifdef DT_CHR
		1935	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1936	#endif
		1937	#ifdef DT_MPC
		1938	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1939	#endif
		1940	#ifdef DT_DIR
		1941	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1942	#endif
		1943	#ifdef DT_NAM
		1944	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1945	#endif
		1946	#ifdef DT_BLK
		1947	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1948	#endif
		1949	#ifdef DT_MPB
		1950	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1951	#endif
		1952	#ifdef DT_REG
		1953	case DT_REG: ent->type = EIO_DT_REG; break;
		1954	#endif
		1955	#ifdef DT_NWK
		1956	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1957	#endif
		1958	#ifdef DT_CMP
		1959	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1960	#endif
		1961	#ifdef DT_LNK
		1962	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1963	#endif
		1964	#ifdef DT_SOCK
		1965	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1966	#endif
		1967	#ifdef DT_DOOR
		1968	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1969	#endif
		1970	#ifdef DT_WHT
		1971	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1972	#endif
		1973	}
		1974
		1975	ent->score = 7;
		1976
		1977	if (flags & EIO_READDIR_DIRS_FIRST)
		1978	{
		1979	if (ent->type == EIO_DT_UNKNOWN)
1721	{	1980	{
1722	if (dir->type == EIO_DT_DIR)	1981	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1723	++dir;	1982	ent->score = 1;
1724	else if ((--oth)->type == EIO_DT_DIR)	1983	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1725	{	1984	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	}	1985	}
1731		1986	else if (ent->type == EIO_DT_DIR)
1732	/* now sort the dirs only (dirs all have the same score) */	1987	ent->score = 0;
1733	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1734	}	1988	}
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	}	1989	}
1755		1990
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;	1991	namesoffs += len;
1847	++dentoffs;	1992	++dentoffs;
1848	}	1993	}
1849		1994
1850	if (EIO_CANCELLED (req))	1995	if (EIO_CANCELLED (req))
1851	{	1996	{
1852	errno = ECANCELED;	1997	errno = ECANCELED;
1853	break;	1998	break;
1854	}	1999	}
1855		2000
1856	#ifdef _WIN32	2001	#ifdef _WIN32
1857	if (!FindNextFile (dirp, &entp))	2002	if (!FindNextFile (dirp, &entp))
1858	{	2003	{
1859	FindClose (dirp);	2004	FindClose (dirp);
1860	dirp = 0;	2005	dirp = 0;
1861	}	2006	}
1862	#endif	2007	#endif
1863	}	2008	}
1864	}	2009	}
		2010
		2011	/*****************************************************************************/
		2012	/* working directory stuff */
		2013	/* various deficiencies in the posix 2008 api force us to */
		2014	/* keep the absolute path in string form at all times */
		2015	/* fuck yeah. */
		2016
		2017	#if !HAVE_AT
		2018
		2019	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2020	/* an absolute or canonical path */
		2021	static const char *
		2022	wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2023	{
		2024	if (!wd || *path == '/')
		2025	return path;
		2026
		2027	if (path [0] == '.' && !path [1])
		2028	return wd->str;
		2029
		2030	{
		2031	int l1 = wd->len;
		2032	int l2 = strlen (path);
		2033
		2034	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2035
		2036	memcpy (res, wd->str, l1);
		2037	res [l1] = '/';
		2038	memcpy (res + l1 + 1, path, l2 + 1);
		2039
		2040	return res;
		2041	}
		2042	}
		2043
		2044	#endif
		2045
		2046	static eio_wd
		2047	eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2048	{
		2049	int fd;
		2050	eio_wd res;
		2051	int len = eio__realpath (tmpbuf, wd, path);
		2052
		2053	if (len < 0)
		2054	return EIO_INVALID_WD;
		2055
		2056	#if HAVE_AT
		2057	fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		2058
		2059	if (fd < 0)
		2060	return EIO_INVALID_WD;
		2061	#endif
		2062
		2063	res = malloc (sizeof (*res) + len); /* one extra 0-byte */
		2064
		2065	#if HAVE_AT
		2066	res->fd = fd;
		2067	#endif
		2068
		2069	res->len = len;
		2070	memcpy (res->str, tmpbuf->ptr, len);
		2071	res->str [len] = 0;
		2072
		2073	return res;
		2074	}
		2075
		2076	eio_wd
		2077	eio_wd_open_sync (eio_wd wd, const char *path)
		2078	{
		2079	struct tmpbuf tmpbuf = { 0 };
		2080	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2081	free (tmpbuf.ptr);
		2082
		2083	return wd;
		2084	}
		2085
		2086	void
		2087	eio_wd_close_sync (eio_wd wd)
		2088	{
		2089	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2090	{
		2091	#if HAVE_AT
		2092	close (wd->fd);
		2093	#endif
		2094	free (wd);
		2095	}
		2096	}
		2097
		2098	#if HAVE_AT
		2099
		2100	/* they forgot these */
		2101
		2102	static int
		2103	eio__truncateat (int dirfd, const char *path, off_t length)
		2104	{
		2105	int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
		2106	int res;
		2107
		2108	if (fd < 0)
		2109	return fd;
		2110
		2111	res = ftruncate (fd, length);
		2112	close (fd);
		2113	return res;
		2114	}
		2115
		2116	static int
		2117	eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
		2118	{
		2119	int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
		2120	int res;
		2121
		2122	if (fd < 0)
		2123	return fd;
		2124
		2125	res = fstatvfs (fd, buf);
		2126	close (fd);
		2127	return res;
		2128
		2129	}
		2130
		2131	#endif
1865		2132
1866	/*****************************************************************************/	2133	/*****************************************************************************/
1867		2134
1868	#define ALLOC(len) \	2135	#define ALLOC(len) \
1869	if (!req->ptr2) \	2136	if (!req->ptr2) \
…		…
1878	req->result = -1; \	2145	req->result = -1; \
1879	break; \	2146	break; \
1880	} \	2147	} \
1881	}	2148	}
1882		2149
		2150	static void ecb_noinline ecb_cold
		2151	etp_proc_init (void)
		2152	{
		2153	#if HAVE_PRCTL_SET_NAME
		2154	/* provide a more sensible "thread name" */
		2155	char name[16 + 1];
		2156	const int namelen = sizeof (name) - 1;
		2157	int len;
		2158
		2159	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2160	name [namelen] = 0;
		2161	len = strlen (name);
		2162	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2163	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2164	#endif
		2165	}
		2166
1883	X_THREAD_PROC (etp_proc)	2167	X_THREAD_PROC (etp_proc)
1884	{	2168	{
1885	ETP_REQ *req;	2169	ETP_REQ *req;
1886	struct timespec ts;	2170	struct timespec ts;
1887	etp_worker *self = (etp_worker *)thr_arg;	2171	etp_worker *self = (etp_worker *)thr_arg;
1888		2172
		2173	etp_proc_init ();
		2174
1889	/* try to distribute timeouts somewhat evenly */	2175	/* try to distribute timeouts somewhat evenly */
1890	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2176	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1891		2177
1892	for (;;)	2178	for (;;)
1893	{	2179	{
…		…
1895		2181
1896	X_LOCK (reqlock);	2182	X_LOCK (reqlock);
1897		2183
1898	for (;;)	2184	for (;;)
1899	{	2185	{
1900	self->req = req = reqq_shift (&req_queue);	2186	req = reqq_shift (&req_queue);
1901		2187
1902	if (req)	2188	if (req)
1903	break;	2189	break;
1904		2190
1905	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2191	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1943	++npending;	2229	++npending;
1944		2230
1945	if (!reqq_push (&res_queue, req) && want_poll_cb)	2231	if (!reqq_push (&res_queue, req) && want_poll_cb)
1946	want_poll_cb ();	2232	want_poll_cb ();
1947		2233
1948	self->req = 0;
1949	etp_worker_clear (self);	2234	etp_worker_clear (self);
1950		2235
1951	X_UNLOCK (reslock);	2236	X_UNLOCK (reslock);
1952	}	2237	}
1953		2238
1954	quit:	2239	quit:
		2240	free (req);
		2241
1955	X_LOCK (wrklock);	2242	X_LOCK (wrklock);
1956	etp_worker_free (self);	2243	etp_worker_free (self);
1957	X_UNLOCK (wrklock);	2244	X_UNLOCK (wrklock);
1958
1959	return 0;
1960	}	2245	}
1961		2246
1962	/*****************************************************************************/	2247	/*****************************************************************************/
1963		2248
1964	int ecb_cold	2249	int ecb_cold
…		…
2002	}	2287	}
2003		2288
2004	static void	2289	static void
2005	eio_execute (etp_worker *self, eio_req *req)	2290	eio_execute (etp_worker *self, eio_req *req)
2006	{	2291	{
		2292	#if HAVE_AT
		2293	int dirfd;
		2294	#else
		2295	const char *path;
		2296	#endif
		2297
2007	if (ecb_expect_false (EIO_CANCELLED (req)))	2298	if (ecb_expect_false (EIO_CANCELLED (req)))
2008	{	2299	{
2009	req->result = -1;	2300	req->result = -1;
2010	req->errorno = ECANCELED;	2301	req->errorno = ECANCELED;
2011	return;	2302	return;
2012	}	2303	}
2013		2304
		2305	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2306	{
		2307	req->result = -1;
		2308	req->errorno = ENOENT;
		2309	return;
		2310	}
		2311
		2312	if (req->type >= EIO_OPEN)
		2313	{
		2314	#if HAVE_AT
		2315	dirfd = WD2FD (req->wd);
		2316	#else
		2317	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2318	#endif
		2319	}
		2320
2014	switch (req->type)	2321	switch (req->type)
2015	{	2322	{
		2323	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2324	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2325	break;
		2326	case EIO_WD_CLOSE: req->result = 0;
		2327	eio_wd_close_sync (req->wd); break;
		2328
		2329	case EIO_SEEK: eio__lseek (req); break;
2016	case EIO_READ: ALLOC (req->size);	2330	case EIO_READ: ALLOC (req->size);
2017	req->result = req->offs >= 0	2331	req->result = req->offs >= 0
2018	? pread (req->int1, req->ptr2, req->size, req->offs)	2332	? pread (req->int1, req->ptr2, req->size, req->offs)
2019	: read (req->int1, req->ptr2, req->size); break;	2333	: read (req->int1, req->ptr2, req->size); break;
2020	case EIO_WRITE: req->result = req->offs >= 0	2334	case EIO_WRITE: req->result = req->offs >= 0
…		…
2022	: write (req->int1, req->ptr2, req->size); break;	2336	: write (req->int1, req->ptr2, req->size); break;
2023		2337
2024	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2338	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;	2339	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2026		2340
		2341	#if HAVE_AT
		2342
2027	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2343	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2028	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2344	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2029	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2345	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2346	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2347	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2348	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2349	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2350	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2351
		2352	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2353	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2354	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2355	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2356	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2357	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2358	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2359	case EIO_READLINK: ALLOC (PATH_MAX);
		2360	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2361	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2362	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2363	case EIO_UTIME:
		2364	case EIO_FUTIME:
		2365	{
		2366	struct timespec ts[2];
		2367	struct timespec *times;
		2368
		2369	if (req->nv1 != -1. || req->nv2 != -1.)
		2370	{
		2371	ts[0].tv_sec = req->nv1;
		2372	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2373	ts[1].tv_sec = req->nv2;
		2374	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2375
		2376	times = ts;
		2377	}
		2378	else
		2379	times = 0;
		2380
		2381	req->result = req->type == EIO_FUTIME
		2382	? futimens (req->int1, times)
		2383	: utimensat (dirfd, req->ptr1, times, 0);
		2384	}
		2385	break;
		2386
		2387	#else
		2388
		2389	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2390	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2391	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2030	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2392	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2393	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2394	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2395	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2396	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2397
		2398	case EIO_UNLINK: req->result = unlink (path ); break;
		2399	case EIO_RMDIR: req->result = rmdir (path ); break;
		2400	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2401	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2402	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2403	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2404	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2405	case EIO_READLINK: ALLOC (PATH_MAX);
		2406	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2407	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2408	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2409
		2410	case EIO_UTIME:
		2411	case EIO_FUTIME:
		2412	{
		2413	struct timeval tv[2];
		2414	struct timeval *times;
		2415
		2416	if (req->nv1 != -1. || req->nv2 != -1.)
		2417	{
		2418	tv[0].tv_sec = req->nv1;
		2419	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2420	tv[1].tv_sec = req->nv2;
		2421	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2422
		2423	times = tv;
		2424	}
		2425	else
		2426	times = 0;
		2427
		2428	req->result = req->type == EIO_FUTIME
		2429	? futimes (req->int1, times)
		2430	: utimes (req->ptr1, times);
		2431	}
		2432	break;
		2433
		2434	#endif
		2435
		2436	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2437	{
		2438	ALLOC (req->result);
		2439	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2440	}
		2441	break;
		2442
2031	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2443	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2032	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2444	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2033		2445
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));	2446	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2037	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2447	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2038		2448
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;	2449	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;	2450	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;	2451	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2045		2452
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;	2453	case EIO_CLOSE: req->result = close (req->int1); break;
2048	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2454	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;	2455	case EIO_SYNC: req->result = 0; sync (); break;
2063	case EIO_FSYNC: req->result = fsync (req->int1); break;	2456	case EIO_FSYNC: req->result = fsync (req->int1); break;
2064	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2457	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2458	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2459	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;	2460	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2066	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2461	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2067	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2462	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2068	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2463	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;	2464	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2071		2465
2072	case EIO_READDIR: eio__scandir (req, self); break;	2466	case EIO_READDIR: eio__scandir (req, self); break;
2073		2467
2074	case EIO_BUSY:	2468	case EIO_BUSY:
…		…
2084	req->result = select (0, 0, 0, 0, &tv);	2478	req->result = select (0, 0, 0, 0, &tv);
2085	}	2479	}
2086	#endif	2480	#endif
2087	break;	2481	break;
2088		2482
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:	2483	case EIO_GROUP:
2114	abort (); /* handled in eio_request */	2484	abort (); /* handled in eio_request */
2115		2485
2116	case EIO_NOP:	2486	case EIO_NOP:
2117	req->result = 0;	2487	req->result = 0;
…		…
2120	case EIO_CUSTOM:	2490	case EIO_CUSTOM:
2121	req->feed (req);	2491	req->feed (req);
2122	break;	2492	break;
2123		2493
2124	default:	2494	default:
2125	errno = ENOSYS;
2126	req->result = -1;	2495	req->result = EIO_ENOSYS ();
2127	break;	2496	break;
2128	}	2497	}
2129		2498
2130	req->errorno = errno;	2499	req->errorno = errno;
2131	}	2500	}
2132		2501
2133	#ifndef EIO_NO_WRAPPERS	2502	#ifndef EIO_NO_WRAPPERS
2134		2503
		2504	eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
		2505	{
		2506	REQ (EIO_WD_OPEN); PATH; SEND;
		2507	}
		2508
		2509	eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
		2510	{
		2511	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2512	}
		2513
2135	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2514	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2136	{	2515	{
2137	REQ (EIO_NOP); SEND;	2516	REQ (EIO_NOP); SEND;
2138	}	2517	}
2139		2518
…		…
2155	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2534	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2156	{	2535	{
2157	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2536	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2158	}	2537	}
2159		2538
		2539	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
		2540	{
		2541	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2542	}
		2543
		2544	eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
		2545	{
		2546	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2547	}
		2548
		2549	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
		2550	{
		2551	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2552	}
		2553
2160	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2554	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2161	{	2555	{
2162	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2556	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2163	}	2557	}
2164		2558
…		…
2170	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)	2564	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2171	{	2565	{
2172	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2566	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2173	}	2567	}
2174		2568
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)	2569	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2181	{	2570	{
2182	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2571	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2183	}	2572	}
2184		2573
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)	2574	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2191	{	2575	{
2192	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2576	REQ (EIO_CLOSE); req->int1 = fd; SEND;
2193	}	2577	}
2194		2578
2195	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)	2579	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2196	{	2580	{
2197	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;	2581	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
		2582	}
		2583
		2584	eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
		2585	{
		2586	REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2198	}	2587	}
2199		2588
2200	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)	2589	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2201	{	2590	{
2202	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;	2591	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