[ViewVC] Diff of: cvs/libeio/eio.c

Comparing libeio/eio.c (file contents):
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC vs.
Revision 1.110 by root, Tue Sep 27 12:36:19 2011 UTC

…		…
43		43
44	#include "eio.h"	44	#include "eio.h"
45	#include "ecb.h"	45	#include "ecb.h"
46		46
47	#ifdef EIO_STACKSIZE	47	#ifdef EIO_STACKSIZE
48	# define XTHREAD_STACKSIZE EIO_STACKSIZE	48	# define X_STACKSIZE EIO_STACKSIZE
49	#endif	49	#endif
50	#include "xthread.h"	50	#include "xthread.h"
51		51
52	#include <errno.h>	52	#include <errno.h>
53	#include <stddef.h>	53	#include <stddef.h>
…		…
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>
…		…
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>
…		…
233		282
234	/* buffer size for various temporary buffers */	283	/* buffer size for various temporary buffers */
235	#define EIO_BUFSIZE 65536	284	#define EIO_BUFSIZE 65536
236		285
237	#define dBUF \	286	#define dBUF \
238	char *eio_buf; \
239	ETP_WORKER_LOCK (self); \
240	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	287	char *eio_buf = malloc (EIO_BUFSIZE); \
241	ETP_WORKER_UNLOCK (self); \
242	errno = ENOMEM; \	288	errno = ENOMEM; \
243	if (!eio_buf) \	289	if (!eio_buf) \
244	return -1;	290	return -1
		291
		292	#define FUBd \
		293	free (eio_buf)
245		294
246	#define EIO_TICKS ((1000000 + 1023) >> 10)	295	#define EIO_TICKS ((1000000 + 1023) >> 10)
		296
		297	/*****************************************************************************/
		298
		299	struct tmpbuf
		300	{
		301	void *ptr;
		302	int len;
		303	};
		304
		305	static void *
		306	tmpbuf_get (struct tmpbuf *buf, int len)
		307	{
		308	if (buf->len < len)
		309	{
		310	free (buf->ptr);
		311	buf->ptr = malloc (buf->len = len);
		312	}
		313
		314	return buf->ptr;
		315	}
		316
		317	struct tmpbuf;
		318
		319	#if _POSIX_VERSION >= 200809L
		320	#define HAVE_AT 1
		321	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		322	#ifndef O_SEARCH
		323	#define O_SEARCH O_RDONLY
		324	#endif
		325	#else
		326	#define HAVE_AT 0
		327	static const char wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char *path);
		328	#endif
		329
		330	struct eio_pwd
		331	{
		332	#if HAVE_AT
		333	int fd;
		334	#endif
		335	int len;
		336	char str[1]; /* actually, a 0-terminated canonical path */
		337	};
		338
		339	/*****************************************************************************/
247		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;
…		…
255	static int eio_finish (eio_req *req);	348	static int eio_finish (eio_req *req);
256	#define ETP_FINISH(req) eio_finish (req)	349	#define ETP_FINISH(req) eio_finish (req)
257	static void eio_execute (struct etp_worker self, eio_req req);	350	static void eio_execute (struct etp_worker self, eio_req req);
258	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	351	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
259		352
260	#define ETP_WORKER_CLEAR(req) \
261	if (wrk->dbuf) \
262	{ \
263	free (wrk->dbuf); \
264	wrk->dbuf = 0; \
265	}
266
267	#define ETP_WORKER_COMMON \
268	void *dbuf;
269
270	/*****************************************************************************/	353	/*****************************************************************************/
271		354
272	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	355	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273		356
274	/* calculate time difference in ~1/EIO_TICKS of a second */	357	/* calculate time difference in ~1/EIO_TICKS of a second */
…		…
285	static void (*done_poll_cb) (void);	368	static void (*done_poll_cb) (void);
286		369
287	static unsigned int max_poll_time; /* reslock */	370	static unsigned int max_poll_time; /* reslock */
288	static unsigned int max_poll_reqs; /* reslock */	371	static unsigned int max_poll_reqs; /* reslock */
289		372
290	static volatile unsigned int nreqs; /* reqlock */	373	static unsigned int nreqs; /* reqlock */
291	static volatile unsigned int nready; /* reqlock */	374	static unsigned int nready; /* reqlock */
292	static volatile unsigned int npending; /* reqlock */	375	static unsigned int npending; /* reqlock */
293	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 */
294	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 */
295		378
296	static xmutex_t wrklock;	379	static xmutex_t wrklock;
297	static xmutex_t reslock;	380	static xmutex_t reslock;
298	static xmutex_t reqlock;	381	static xmutex_t reqlock;
299	static xcond_t reqwait;	382	static xcond_t reqwait;
…		…
307	static xmutex_t preadwritelock;	390	static xmutex_t preadwritelock;
308	#endif	391	#endif
309		392
310	typedef struct etp_worker	393	typedef struct etp_worker
311	{	394	{
		395	struct tmpbuf tmpbuf;
		396
312	/* locked by wrklock */	397	/* locked by wrklock */
313	struct etp_worker prev, next;	398	struct etp_worker prev, next;
314		399
315	xthread_t tid;	400	xthread_t tid;
316		401
317	/* locked by reslock, reqlock or wrklock */	402	#ifdef ETP_WORKER_COMMON
318	ETP_REQ req; / currently processed request */
319
320	ETP_WORKER_COMMON	403	ETP_WORKER_COMMON
		404	#endif
321	} etp_worker;	405	} etp_worker;
322		406
323	static etp_worker wrk_first; /* NOT etp */	407	static etp_worker wrk_first; /* NOT etp */
324		408
325	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	409	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
326	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	410	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
327		411
328	/* worker threads management */	412	/* worker threads management */
329		413
330	static void ecb_cold	414	static void
331	etp_worker_clear (etp_worker *wrk)	415	etp_worker_clear (etp_worker *wrk)
332	{	416	{
333	ETP_WORKER_CLEAR (wrk);
334	}	417	}
335		418
336	static void ecb_cold	419	static void ecb_cold
337	etp_worker_free (etp_worker *wrk)	420	etp_worker_free (etp_worker *wrk)
338	{	421	{
		422	free (wrk->tmpbuf.ptr);
		423
339	wrk->next->prev = wrk->prev;	424	wrk->next->prev = wrk->prev;
340	wrk->prev->next = wrk->next;	425	wrk->prev->next = wrk->next;
341		426
342	free (wrk);	427	free (wrk);
343	}	428	}
…		…
521	}	606	}
522		607
523	static void ecb_cold	608	static void ecb_cold
524	etp_end_thread (void)	609	etp_end_thread (void)
525	{	610	{
526	eio_req *req = calloc (1, sizeof (eio_req));	611	eio_req req = calloc (1, sizeof (eio_req)); / will be freed by worker */
527		612
528	req->type = -1;	613	req->type = -1;
529	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	614	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
530		615
531	X_LOCK (reqlock);	616	X_LOCK (reqlock);
…		…
939	#if !HAVE_FDATASYNC	1024	#if !HAVE_FDATASYNC
940	# undef fdatasync	1025	# undef fdatasync
941	# define fdatasync(fd) fsync (fd)	1026	# define fdatasync(fd) fsync (fd)
942	#endif	1027	#endif
943		1028
		1029	static int
		1030	eio__syncfs (int fd)
		1031	{
		1032	int res;
		1033
		1034	#if HAVE_SYS_SYNCFS
		1035	res = (int)syscall (__NR_syncfs, (int)(fd));
		1036	#else
		1037	res = -1;
		1038	errno = ENOSYS;
		1039	#endif
		1040
		1041	if (res < 0 && errno == ENOSYS && fd >= 0)
		1042	sync ();
		1043
		1044	return res;
		1045	}
		1046
944	/* sync_file_range always needs emulation */	1047	/* sync_file_range always needs emulation */
945	static int	1048	static int
946	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1049	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
947	{	1050	{
948	#if HAVE_SYNC_FILE_RANGE	1051	#if HAVE_SYNC_FILE_RANGE
…		…
997	pread (fd, eio_buf, len, offset);	1100	pread (fd, eio_buf, len, offset);
998	offset += len;	1101	offset += len;
999	todo -= len;	1102	todo -= len;
1000	}	1103	}
1001		1104
		1105	FUBd;
		1106
1002	errno = 0;	1107	errno = 0;
1003	return count;	1108	return count;
1004	}	1109	}
1005		1110
1006	#endif	1111	#endif
1007		1112
1008	/* sendfile always needs emulation */	1113	/* sendfile always needs emulation */
1009	static eio_ssize_t	1114	static eio_ssize_t
1010	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1115	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1011	{	1116	{
1012	eio_ssize_t written = 0;	1117	eio_ssize_t written = 0;
1013	eio_ssize_t res;	1118	eio_ssize_t res;
1014		1119
1015	if (!count)	1120	if (!count)
…		…
1151		1256
1152	offset += cnt;	1257	offset += cnt;
1153	res += cnt;	1258	res += cnt;
1154	count -= cnt;	1259	count -= cnt;
1155	}	1260	}
		1261
		1262	FUBd;
1156	}	1263	}
1157		1264
1158	return res;	1265	return res;
1159	}	1266	}
1160		1267
…		…
1275	}	1382	}
1276		1383
1277	/*****************************************************************************/	1384	/*****************************************************************************/
1278	/* requests implemented outside eio_execute, because they are so large */	1385	/* requests implemented outside eio_execute, because they are so large */
1279		1386
		1387	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1280	static void	1388	static int
1281	eio__realpath (eio_req req, etp_worker self)	1389	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
1282	{	1390	{
1283	char *rel = req->ptr1;	1391	const char *rel = path;
1284	char *res;	1392	char *res;
1285	char tmp1, tmp2;	1393	char tmp1, tmp2;
1286	#if SYMLOOP_MAX > 32	1394	#if SYMLOOP_MAX > 32
1287	int symlinks = SYMLOOP_MAX;	1395	int symlinks = SYMLOOP_MAX;
1288	#else	1396	#else
1289	int symlinks = 32;	1397	int symlinks = 32;
1290	#endif	1398	#endif
1291		1399
1292	req->result = -1;
1293
1294	errno = EINVAL;	1400	errno = EINVAL;
1295	if (!rel)	1401	if (!rel)
1296	return;	1402	return -1;
1297		1403
1298	errno = ENOENT;	1404	errno = ENOENT;
1299	if (!*rel)	1405	if (!*rel)
1300	return;	1406	return -1;
1301		1407
1302	if (!req->ptr2)	1408	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1303	{
1304	X_LOCK (wrklock);
1305	req->flags \|= EIO_FLAG_PTR2_FREE;
1306	X_UNLOCK (wrklock);
1307	req->ptr2 = malloc (PATH_MAX * 3);
1308
1309	errno = ENOMEM;
1310	if (!req->ptr2)
1311	return;
1312	}
1313
1314	res = req->ptr2;
1315	tmp1 = res + PATH_MAX;	1409	tmp1 = res + PATH_MAX;
1316	tmp2 = tmp1 + PATH_MAX;	1410	tmp2 = tmp1 + PATH_MAX;
1317		1411
1318	#if 0 /* disabled, the musl way to do things is just too racy */	1412	#if 0 /* disabled, the musl way to do things is just too racy */
1319	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1413	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1338	#endif	1432	#endif
1339	#endif	1433	#endif
1340		1434
1341	if (*rel != '/')	1435	if (*rel != '/')
1342	{	1436	{
		1437	int len;
		1438
		1439	errno = ENOENT;
		1440	if (wd == EIO_INVALID_WD)
		1441	return -1;
		1442
		1443	if (wd == EIO_CWD)
		1444	{
1343	if (!getcwd (res, PATH_MAX))	1445	if (!getcwd (res, PATH_MAX))
1344	return;	1446	return -1;
		1447
		1448	len = strlen (res);
		1449	}
		1450	else
		1451	memcpy (res, wd->str, len = wd->len);
1345		1452
1346	if (res [1]) /* only use if not / */	1453	if (res [1]) /* only use if not / */
1347	res += strlen (res);	1454	res += len;
1348	}	1455	}
1349		1456
1350	while (*rel)	1457	while (*rel)
1351	{	1458	{
1352	eio_ssize_t len, linklen;	1459	eio_ssize_t len, linklen;
1353	char *beg = rel;	1460	const char *beg = rel;
1354		1461
1355	while (rel && rel != '/')	1462	while (rel && rel != '/')
1356	++rel;	1463	++rel;
1357		1464
1358	len = rel - beg;	1465	len = rel - beg;
…		…
1370		1477
1371	if (beg [1] == '.' && len == 2)	1478	if (beg [1] == '.' && len == 2)
1372	{	1479	{
1373	/* .. - back up one component, if possible */	1480	/* .. - back up one component, if possible */
1374		1481
1375	while (res != req->ptr2)	1482	while (res != tmpbuf->ptr)
1376	if (*--res == '/')	1483	if (*--res == '/')
1377	break;	1484	break;
1378		1485
1379	continue;	1486	continue;
1380	}	1487	}
…		…
1390		1497
1391	/* zero-terminate, for readlink */	1498	/* zero-terminate, for readlink */
1392	res [len + 1] = 0;	1499	res [len + 1] = 0;
1393		1500
1394	/* now check if it's a symlink */	1501	/* now check if it's a symlink */
1395	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1502	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1396		1503
1397	if (linklen < 0)	1504	if (linklen < 0)
1398	{	1505	{
1399	if (errno != EINVAL)	1506	if (errno != EINVAL)
1400	return;	1507	return -1;
1401		1508
1402	/* it's a normal directory. hopefully */	1509	/* it's a normal directory. hopefully */
1403	res += len + 1;	1510	res += len + 1;
1404	}	1511	}
1405	else	1512	else
…		…
1407	/* yay, it was a symlink - build new path in tmp2 */	1514	/* yay, it was a symlink - build new path in tmp2 */
1408	int rellen = strlen (rel);	1515	int rellen = strlen (rel);
1409		1516
1410	errno = ENAMETOOLONG;	1517	errno = ENAMETOOLONG;
1411	if (linklen + 1 + rellen >= PATH_MAX)	1518	if (linklen + 1 + rellen >= PATH_MAX)
1412	return;	1519	return -1;
1413		1520
1414	errno = ELOOP;	1521	errno = ELOOP;
1415	if (!--symlinks)	1522	if (!--symlinks)
1416	return;	1523	return -1;
1417		1524
1418	if (*tmp1 == '/')	1525	if (*tmp1 == '/')
1419	res = req->ptr2; /* symlink resolves to an absolute path */	1526	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1420		1527
1421	/* we need to be careful, as rel might point into tmp2 already */	1528	/* we need to be careful, as rel might point into tmp2 already */
1422	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1529	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1423	tmp2 [linklen] = '/';	1530	tmp2 [linklen] = '/';
1424	memcpy (tmp2, tmp1, linklen);	1531	memcpy (tmp2, tmp1, linklen);
…		…
1426	rel = tmp2;	1533	rel = tmp2;
1427	}	1534	}
1428	}	1535	}
1429		1536
1430	/* special case for the lone root path */	1537	/* special case for the lone root path */
1431	if (res == req->ptr2)	1538	if (res == tmpbuf->ptr)
1432	*res++ = '/';	1539	*res++ = '/';
1433		1540
1434	req->result = res - (char *)req->ptr2;	1541	return res - (char *)tmpbuf->ptr;
1435
1436	done:
1437	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1438	}	1542	}
1439		1543
1440	static signed char	1544	static signed char
1441	eio_dent_cmp (const eio_dirent a, const eio_dirent b)	1545	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
1442	{	1546	{
…		…
1630	#ifdef _WIN32	1734	#ifdef _WIN32
1631	{	1735	{
1632	int len = strlen ((const char *)req->ptr1);	1736	int len = strlen ((const char *)req->ptr1);
1633	char *path = malloc (MAX_PATH);	1737	char *path = malloc (MAX_PATH);
1634	const char *fmt;	1738	const char *fmt;
		1739	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1635		1740
1636	if (!len)	1741	if (!len)
1637	fmt = "./*";	1742	fmt = "./*";
1638	else if (((const char )req->ptr1)[len - 1] == '/' \|\| ((const char )req->ptr1)[len - 1] == '\\')	1743	else if (reqpath[len - 1] == '/' \|\| reqpath[len - 1] == '\\')
1639	fmt = "%s*";	1744	fmt = "%s*";
1640	else	1745	else
1641	fmt = "%s/*";	1746	fmt = "%s/*";
1642		1747
1643	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1748	_snprintf (path, MAX_PATH, fmt, reqpath);
1644	dirp = FindFirstFile (path, &entp);	1749	dirp = FindFirstFile (path, &entp);
1645	free (path);	1750	free (path);
1646		1751
1647	if (dirp == INVALID_HANDLE_VALUE)	1752	if (dirp == INVALID_HANDLE_VALUE)
1648	{	1753	{
1649	dirp = 0;	1754	/* should steal _dosmaperr */
1650
1651	switch (GetLastError ())	1755	switch (GetLastError ())
1652	{	1756	{
1653	case ERROR_FILE_NOT_FOUND:	1757	case ERROR_FILE_NOT_FOUND:
1654	req->result = 0;	1758	req->result = 0;
1655	break;	1759	break;
1656		1760
1657	case ERROR_INVALID_NAME:	1761	case ERROR_INVALID_NAME:
1658	case ERROR_PATH_NOT_FOUND:	1762	case ERROR_PATH_NOT_FOUND:
1659	case ERROR_NO_MORE_FILES:	1763	case ERROR_NO_MORE_FILES:
1660	errno = ENOENT;	1764	errno = ENOENT;
1661	break;	1765	break;
1662		1766
1663	case ERROR_NOT_ENOUGH_MEMORY:	1767	case ERROR_NOT_ENOUGH_MEMORY:
1664	errno = ENOMEM;	1768	errno = ENOMEM;
1665	break;	1769	break;
1666		1770
1667	default:	1771	default:
1668	errno = EINVAL;	1772	errno = EINVAL;
1669	break;	1773	break;
1670	}	1774	}
		1775
		1776	return;
1671	}	1777	}
1672	}	1778	}
1673	#else	1779	#else
		1780	#if HAVE_AT
		1781	if (req->wd)
		1782	{
		1783	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
		1784
		1785	if (fd < 0)
		1786	return;
		1787
		1788	dirp = fdopendir (fd);
		1789
		1790	if (!dirp)
		1791	close (fd);
		1792	}
		1793	else
1674	dirp = opendir (req->ptr1);	1794	dirp = opendir (req->ptr1);
		1795	#else
		1796	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1797	#endif
		1798
		1799	if (!dirp)
		1800	return;
1675	#endif	1801	#endif
1676		1802
1677	if (req->flags & EIO_FLAG_PTR1_FREE)	1803	if (req->flags & EIO_FLAG_PTR1_FREE)
1678	free (req->ptr1);	1804	free (req->ptr1);
1679		1805
1680	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1806	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1681	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1807	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1682	req->ptr2 = names = malloc (namesalloc);	1808	req->ptr2 = names = malloc (namesalloc);
1683		1809
1684	if (dirp && names && (!flags \|\| dents))	1810	if (!names \|\| (flags && !dents))
		1811	return;
		1812
1685	for (;;)	1813	for (;;)
1686	{	1814	{
1687	int done;	1815	int done;
1688		1816
1689	#ifdef _WIN32	1817	#ifdef _WIN32
1690	done = !dirp;	1818	done = !dirp;
1691	#else	1819	#else
1692	errno = 0;	1820	errno = 0;
1693	entp = readdir (dirp);	1821	entp = readdir (dirp);
1694	done = !entp;	1822	done = !entp;
1695	#endif	1823	#endif
1696		1824
1697	if (done)	1825	if (done)
1698	{	1826	{
1699	#ifndef _WIN32	1827	#ifndef _WIN32
1700	int old_errno = errno;	1828	int old_errno = errno;
1701	closedir (dirp);	1829	closedir (dirp);
1702	errno = old_errno;	1830	errno = old_errno;
1703		1831
1704	if (errno)	1832	if (errno)
1705	break;	1833	break;
1706	#endif	1834	#endif
1707		1835
1708	/* sort etc. */	1836	/* sort etc. */
1709	req->int1 = flags;	1837	req->int1 = flags;
1710	req->result = dentoffs;	1838	req->result = dentoffs;
1711		1839
1712	if (flags & EIO_READDIR_STAT_ORDER)	1840	if (flags & EIO_READDIR_STAT_ORDER)
1713	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1841	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1714	else if (flags & EIO_READDIR_DIRS_FIRST)	1842	else if (flags & EIO_READDIR_DIRS_FIRST)
1715	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1843	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1716	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1844	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1717	else	1845	else
		1846	{
		1847	/* in this case, all is known, and we just put dirs first and sort them */
		1848	eio_dirent *oth = dents + dentoffs;
		1849	eio_dirent *dir = dents;
		1850
		1851	/* now partition dirs to the front, and non-dirs to the back */
		1852	/* by walking from both sides and swapping if necessary */
		1853	while (oth > dir)
		1854	{
		1855	if (dir->type == EIO_DT_DIR)
		1856	++dir;
		1857	else if ((--oth)->type == EIO_DT_DIR)
		1858	{
		1859	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1860
		1861	++dir;
		1862	}
		1863	}
		1864
		1865	/* now sort the dirs only (dirs all have the same score) */
		1866	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1867	}
		1868
		1869	break;
		1870	}
		1871
		1872	/* now add the entry to our list(s) */
		1873	name = D_NAME (entp);
		1874
		1875	/* skip . and .. entries */
		1876	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
		1877	{
		1878	int len = D_NAMLEN (entp) + 1;
		1879
		1880	while (ecb_expect_false (namesoffs + len > namesalloc))
		1881	{
		1882	namesalloc *= 2;
		1883	req->ptr2 = names = realloc (names, namesalloc);
		1884
		1885	if (!names)
		1886	break;
		1887	}
		1888
		1889	memcpy (names + namesoffs, name, len);
		1890
		1891	if (dents)
		1892	{
		1893	struct eio_dirent *ent;
		1894
		1895	if (ecb_expect_false (dentoffs == dentalloc))
1718	{	1896	{
1719	/* in this case, all is known, and we just put dirs first and sort them */	1897	dentalloc *= 2;
		1898	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1899
		1900	if (!dents)
		1901	break;
		1902	}
		1903
1720	eio_dirent *oth = dents + dentoffs;	1904	ent = dents + dentoffs;
1721	eio_dirent *dir = dents;
1722		1905
1723	/* now partition dirs to the front, and non-dirs to the back */	1906	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1724	/* by walking from both sides and swapping if necessary */	1907	ent->namelen = len - 1;
1725	while (oth > dir)	1908	ent->inode = D_INO (entp);
		1909
		1910	inode_bits \|= ent->inode;
		1911
		1912	switch (D_TYPE (entp))
		1913	{
		1914	default:
		1915	ent->type = EIO_DT_UNKNOWN;
		1916	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1917	break;
		1918
		1919	#ifdef DT_FIFO
		1920	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1921	#endif
		1922	#ifdef DT_CHR
		1923	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1924	#endif
		1925	#ifdef DT_MPC
		1926	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1927	#endif
		1928	#ifdef DT_DIR
		1929	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1930	#endif
		1931	#ifdef DT_NAM
		1932	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1933	#endif
		1934	#ifdef DT_BLK
		1935	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1936	#endif
		1937	#ifdef DT_MPB
		1938	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1939	#endif
		1940	#ifdef DT_REG
		1941	case DT_REG: ent->type = EIO_DT_REG; break;
		1942	#endif
		1943	#ifdef DT_NWK
		1944	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1945	#endif
		1946	#ifdef DT_CMP
		1947	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1948	#endif
		1949	#ifdef DT_LNK
		1950	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1951	#endif
		1952	#ifdef DT_SOCK
		1953	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1954	#endif
		1955	#ifdef DT_DOOR
		1956	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1957	#endif
		1958	#ifdef DT_WHT
		1959	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1960	#endif
		1961	}
		1962
		1963	ent->score = 7;
		1964
		1965	if (flags & EIO_READDIR_DIRS_FIRST)
		1966	{
		1967	if (ent->type == EIO_DT_UNKNOWN)
1726	{	1968	{
1727	if (dir->type == EIO_DT_DIR)	1969	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1728	++dir;	1970	ent->score = 1;
1729	else if ((--oth)->type == EIO_DT_DIR)	1971	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1730	{	1972	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1731	eio_dirent tmp = dir; dir = oth; oth = tmp;
1732
1733	++dir;
1734	}
1735	}	1973	}
1736		1974	else if (ent->type == EIO_DT_DIR)
1737	/* now sort the dirs only (dirs all have the same score) */	1975	ent->score = 0;
1738	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1739	}	1976	}
1740
1741	break;
1742	}
1743
1744	/* now add the entry to our list(s) */
1745	name = D_NAME (entp);
1746
1747	/* skip . and .. entries */
1748	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
1749	{
1750	int len = D_NAMLEN (entp) + 1;
1751
1752	while (ecb_expect_false (namesoffs + len > namesalloc))
1753	{
1754	namesalloc *= 2;
1755	req->ptr2 = names = realloc (names, namesalloc);
1756
1757	if (!names)
1758	break;
1759	}	1977	}
1760		1978
1761	memcpy (names + namesoffs, name, len);
1762
1763	if (dents)
1764	{
1765	struct eio_dirent *ent;
1766
1767	if (ecb_expect_false (dentoffs == dentalloc))
1768	{
1769	dentalloc *= 2;
1770	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1771
1772	if (!dents)
1773	break;
1774	}
1775
1776	ent = dents + dentoffs;
1777
1778	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1779	ent->namelen = len - 1;
1780	ent->inode = D_INO (entp);
1781
1782	inode_bits \|= ent->inode;
1783
1784	switch (D_TYPE (entp))
1785	{
1786	default:
1787	ent->type = EIO_DT_UNKNOWN;
1788	flags \|= EIO_READDIR_FOUND_UNKNOWN;
1789	break;
1790
1791	#ifdef DT_FIFO
1792	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1793	#endif
1794	#ifdef DT_CHR
1795	case DT_CHR: ent->type = EIO_DT_CHR; break;
1796	#endif
1797	#ifdef DT_MPC
1798	case DT_MPC: ent->type = EIO_DT_MPC; break;
1799	#endif
1800	#ifdef DT_DIR
1801	case DT_DIR: ent->type = EIO_DT_DIR; break;
1802	#endif
1803	#ifdef DT_NAM
1804	case DT_NAM: ent->type = EIO_DT_NAM; break;
1805	#endif
1806	#ifdef DT_BLK
1807	case DT_BLK: ent->type = EIO_DT_BLK; break;
1808	#endif
1809	#ifdef DT_MPB
1810	case DT_MPB: ent->type = EIO_DT_MPB; break;
1811	#endif
1812	#ifdef DT_REG
1813	case DT_REG: ent->type = EIO_DT_REG; break;
1814	#endif
1815	#ifdef DT_NWK
1816	case DT_NWK: ent->type = EIO_DT_NWK; break;
1817	#endif
1818	#ifdef DT_CMP
1819	case DT_CMP: ent->type = EIO_DT_CMP; break;
1820	#endif
1821	#ifdef DT_LNK
1822	case DT_LNK: ent->type = EIO_DT_LNK; break;
1823	#endif
1824	#ifdef DT_SOCK
1825	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1826	#endif
1827	#ifdef DT_DOOR
1828	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1829	#endif
1830	#ifdef DT_WHT
1831	case DT_WHT: ent->type = EIO_DT_WHT; break;
1832	#endif
1833	}
1834
1835	ent->score = 7;
1836
1837	if (flags & EIO_READDIR_DIRS_FIRST)
1838	{
1839	if (ent->type == EIO_DT_UNKNOWN)
1840	{
1841	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1842	ent->score = 1;
1843	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1844	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1845	}
1846	else if (ent->type == EIO_DT_DIR)
1847	ent->score = 0;
1848	}
1849	}
1850
1851	namesoffs += len;	1979	namesoffs += len;
1852	++dentoffs;	1980	++dentoffs;
1853	}	1981	}
1854		1982
1855	if (EIO_CANCELLED (req))	1983	if (EIO_CANCELLED (req))
1856	{	1984	{
1857	errno = ECANCELED;	1985	errno = ECANCELED;
1858	break;	1986	break;
1859	}	1987	}
1860		1988
1861	#ifdef _WIN32	1989	#ifdef _WIN32
1862	if (!FindNextFile (dirp, &entp))	1990	if (!FindNextFile (dirp, &entp))
1863	{	1991	{
1864	FindClose (dirp);	1992	FindClose (dirp);
1865	dirp = 0;	1993	dirp = 0;
1866	}	1994	}
1867	#endif	1995	#endif
1868	}	1996	}
1869	}	1997	}
		1998
		1999	/*****************************************************************************/
		2000	/* working directory stuff */
		2001	/* various deficiencies in the posix 2008 api force us to */
		2002	/* keep the absolute path in string form at all times */
		2003	/* fuck yeah. */
		2004
		2005	#if !HAVE_AT
		2006
		2007	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2008	/* an absolute or canonical path */
		2009	static const char *
		2010	wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2011	{
		2012	if (!wd \|\| *path == '/')
		2013	return path;
		2014
		2015	if (path [0] == '.' && !path [1])
		2016	return wd->str;
		2017
		2018	{
		2019	int l1 = wd->len;
		2020	int l2 = strlen (path);
		2021
		2022	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2023
		2024	memcpy (res, wd->str, l1);
		2025	res [l1] = '/';
		2026	memcpy (res + l1 + 1, path, l2 + 1);
		2027
		2028	return res;
		2029	}
		2030	}
		2031
		2032	#endif
		2033
		2034	static eio_wd
		2035	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2036	{
		2037	int fd;
		2038	eio_wd res;
		2039	int len = eio__realpath (tmpbuf, wd, path);
		2040
		2041	if (len < 0)
		2042	return EIO_INVALID_WD;
		2043
		2044	#if HAVE_AT
		2045	fd = openat (WD2FD (wd), path, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
		2046
		2047	if (fd < 0)
		2048	return EIO_INVALID_WD;
		2049	#endif
		2050
		2051	res = malloc (sizeof (res) + len); / one extra 0-byte */
		2052
		2053	#if HAVE_AT
		2054	res->fd = fd;
		2055	#endif
		2056
		2057	res->len = len;
		2058	memcpy (res->str, tmpbuf->ptr, len);
		2059	res->str [len] = 0;
		2060
		2061	return res;
		2062	}
		2063
		2064	eio_wd
		2065	eio_wd_open_sync (eio_wd wd, const char *path)
		2066	{
		2067	struct tmpbuf tmpbuf = { 0 };
		2068	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2069	free (tmpbuf.ptr);
		2070
		2071	return wd;
		2072	}
		2073
		2074	void
		2075	eio_wd_close_sync (eio_wd wd)
		2076	{
		2077	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2078	{
		2079	#if HAVE_AT
		2080	close (wd->fd);
		2081	#endif
		2082	free (wd);
		2083	}
		2084	}
		2085
		2086	#if HAVE_AT
		2087
		2088	/* they forgot these */
		2089
		2090	static int
		2091	eio__truncateat (int dirfd, const char *path, off_t length)
		2092	{
		2093	int fd = openat (dirfd, path, O_WRONLY \| O_CLOEXEC);
		2094	int res;
		2095
		2096	if (fd < 0)
		2097	return fd;
		2098
		2099	res = ftruncate (fd, length);
		2100	close (fd);
		2101	return res;
		2102	}
		2103
		2104	static int
		2105	eio__statvfsat (int dirfd, const char path, struct statvfs buf)
		2106	{
		2107	int fd = openat (dirfd, path, O_SEARCH \| O_CLOEXEC);
		2108	int res;
		2109
		2110	if (fd < 0)
		2111	return fd;
		2112
		2113	res = fstatvfs (fd, buf);
		2114	close (fd);
		2115	return res;
		2116
		2117	}
		2118
		2119	#endif
1870		2120
1871	/*****************************************************************************/	2121	/*****************************************************************************/
1872		2122
1873	#define ALLOC(len) \	2123	#define ALLOC(len) \
1874	if (!req->ptr2) \	2124	if (!req->ptr2) \
…		…
1889	{	2139	{
1890	ETP_REQ *req;	2140	ETP_REQ *req;
1891	struct timespec ts;	2141	struct timespec ts;
1892	etp_worker self = (etp_worker )thr_arg;	2142	etp_worker self = (etp_worker )thr_arg;
1893		2143
		2144	#if HAVE_PRCTL_SET_NAME
		2145	prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
		2146	#endif
		2147
1894	/* try to distribute timeouts somewhat evenly */	2148	/* try to distribute timeouts somewhat evenly */
1895	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2149	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1896		2150
1897	for (;;)	2151	for (;;)
1898	{	2152	{
…		…
1900		2154
1901	X_LOCK (reqlock);	2155	X_LOCK (reqlock);
1902		2156
1903	for (;;)	2157	for (;;)
1904	{	2158	{
1905	self->req = req = reqq_shift (&req_queue);	2159	req = reqq_shift (&req_queue);
1906		2160
1907	if (req)	2161	if (req)
1908	break;	2162	break;
1909		2163
1910	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2164	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1948	++npending;	2202	++npending;
1949		2203
1950	if (!reqq_push (&res_queue, req) && want_poll_cb)	2204	if (!reqq_push (&res_queue, req) && want_poll_cb)
1951	want_poll_cb ();	2205	want_poll_cb ();
1952		2206
1953	self->req = 0;
1954	etp_worker_clear (self);	2207	etp_worker_clear (self);
1955		2208
1956	X_UNLOCK (reslock);	2209	X_UNLOCK (reslock);
1957	}	2210	}
1958		2211
1959	quit:	2212	quit:
		2213	free (req);
		2214
1960	X_LOCK (wrklock);	2215	X_LOCK (wrklock);
1961	etp_worker_free (self);	2216	etp_worker_free (self);
1962	X_UNLOCK (wrklock);	2217	X_UNLOCK (wrklock);
1963		2218
1964	return 0;	2219	return 0;
…		…
2007	}	2262	}
2008		2263
2009	static void	2264	static void
2010	eio_execute (etp_worker self, eio_req req)	2265	eio_execute (etp_worker self, eio_req req)
2011	{	2266	{
		2267	#if HAVE_AT
		2268	int dirfd;
		2269	#else
		2270	const char *path;
		2271	#endif
		2272
2012	if (ecb_expect_false (EIO_CANCELLED (req)))	2273	if (ecb_expect_false (EIO_CANCELLED (req)))
2013	{	2274	{
2014	req->result = -1;	2275	req->result = -1;
2015	req->errorno = ECANCELED;	2276	req->errorno = ECANCELED;
2016	return;	2277	return;
2017	}	2278	}
2018		2279
		2280	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2281	{
		2282	req->result = -1;
		2283	req->errorno = ENOENT;
		2284	return;
		2285	}
		2286
		2287	if (req->type >= EIO_OPEN)
		2288	{
		2289	#if HAVE_AT
		2290	dirfd = WD2FD (req->wd);
		2291	#else
		2292	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2293	#endif
		2294	}
		2295
2019	switch (req->type)	2296	switch (req->type)
2020	{	2297	{
		2298	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2299	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2300	break;
		2301	case EIO_WD_CLOSE: req->result = 0;
		2302	eio_wd_close_sync (req->wd); break;
		2303
2021	case EIO_READ: ALLOC (req->size);	2304	case EIO_READ: ALLOC (req->size);
2022	req->result = req->offs >= 0	2305	req->result = req->offs >= 0
2023	? pread (req->int1, req->ptr2, req->size, req->offs)	2306	? pread (req->int1, req->ptr2, req->size, req->offs)
2024	: read (req->int1, req->ptr2, req->size); break;	2307	: read (req->int1, req->ptr2, req->size); break;
2025	case EIO_WRITE: req->result = req->offs >= 0	2308	case EIO_WRITE: req->result = req->offs >= 0
2026	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2309	? pwrite (req->int1, req->ptr2, req->size, req->offs)
2027	: write (req->int1, req->ptr2, req->size); break;	2310	: write (req->int1, req->ptr2, req->size); break;
2028		2311
2029	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2312	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2030	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;	2313	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
		2314
		2315	#if HAVE_AT
2031		2316
2032	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2317	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2033	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2318	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2034	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2319	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2320	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2321	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2322	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2323	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2324	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2325
		2326	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2327	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2328	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2329	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2330	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2331	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2332	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2333	case EIO_READLINK: ALLOC (PATH_MAX);
		2334	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2335	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2336	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2337	case EIO_UTIME:
		2338	case EIO_FUTIME:
		2339	{
		2340	struct timespec ts[2];
		2341	struct timespec *times;
		2342
		2343	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2344	{
		2345	ts[0].tv_sec = req->nv1;
		2346	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2347	ts[1].tv_sec = req->nv2;
		2348	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2349
		2350	times = ts;
		2351	}
		2352	else
		2353	times = 0;
		2354
		2355	req->result = req->type == EIO_FUTIME
		2356	? futimens (req->int1, times)
		2357	: utimensat (dirfd, req->ptr1, times, 0);
		2358	}
		2359	break;
		2360
		2361	#else
		2362
		2363	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2364	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2365	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2035	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2366	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2367	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2368	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2369	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2370	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2371
		2372	case EIO_UNLINK: req->result = unlink (path ); break;
		2373	case EIO_RMDIR: req->result = rmdir (path ); break;
		2374	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2375	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2376	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2377	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2378	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2379	case EIO_READLINK: ALLOC (PATH_MAX);
		2380	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2381	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2382	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2383
		2384	case EIO_UTIME:
		2385	case EIO_FUTIME:
		2386	{
		2387	struct timeval tv[2];
		2388	struct timeval *times;
		2389
		2390	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2391	{
		2392	tv[0].tv_sec = req->nv1;
		2393	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2394	tv[1].tv_sec = req->nv2;
		2395	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2396
		2397	times = tv;
		2398	}
		2399	else
		2400	times = 0;
		2401
		2402	req->result = req->type == EIO_FUTIME
		2403	? futimes (req->int1, times)
		2404	: utimes (req->ptr1, times);
		2405	}
		2406	break;
		2407
		2408	#endif
		2409
		2410	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2411	{
		2412	ALLOC (req->result);
		2413	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2414	}
		2415	break;
		2416
2036	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2417	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2037	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2418	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2038		2419
2039	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2040	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2041	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2420	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2042	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2421	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2043		2422
2044	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2045	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2423	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2046	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2047	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2424	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2048	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2049	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2425	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2050		2426
2051	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2052	case EIO_CLOSE: req->result = close (req->int1); break;	2427	case EIO_CLOSE: req->result = close (req->int1); break;
2053	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2428	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2054	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2055	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2056	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2057	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2058	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2059	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2060	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2061
2062	case EIO_REALPATH: eio__realpath (req, self); break;
2063
2064	case EIO_READLINK: ALLOC (PATH_MAX);
2065	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2066
2067	case EIO_SYNC: req->result = 0; sync (); break;	2429	case EIO_SYNC: req->result = 0; sync (); break;
2068	case EIO_FSYNC: req->result = fsync (req->int1); break;	2430	case EIO_FSYNC: req->result = fsync (req->int1); break;
2069	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2431	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2432	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2433	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2070	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	2434	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2071	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2435	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2072	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2436	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2073	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2437	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2074	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2075	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	2438	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2076		2439
2077	case EIO_READDIR: eio__scandir (req, self); break;	2440	case EIO_READDIR: eio__scandir (req, self); break;
2078		2441
2079	case EIO_BUSY:	2442	case EIO_BUSY:
…		…
2089	req->result = select (0, 0, 0, 0, &tv);	2452	req->result = select (0, 0, 0, 0, &tv);
2090	}	2453	}
2091	#endif	2454	#endif
2092	break;	2455	break;
2093		2456
2094	case EIO_UTIME:
2095	case EIO_FUTIME:
2096	{
2097	struct timeval tv[2];
2098	struct timeval *times;
2099
2100	if (req->nv1 != -1. \|\| req->nv2 != -1.)
2101	{
2102	tv[0].tv_sec = req->nv1;
2103	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2104	tv[1].tv_sec = req->nv2;
2105	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2106
2107	times = tv;
2108	}
2109	else
2110	times = 0;
2111
2112	req->result = req->type == EIO_FUTIME
2113	? futimes (req->int1, times)
2114	: utimes (req->ptr1, times);
2115	}
2116	break;
2117
2118	case EIO_GROUP:	2457	case EIO_GROUP:
2119	abort (); /* handled in eio_request */	2458	abort (); /* handled in eio_request */
2120		2459
2121	case EIO_NOP:	2460	case EIO_NOP:
2122	req->result = 0;	2461	req->result = 0;
…		…
2135	req->errorno = errno;	2474	req->errorno = errno;
2136	}	2475	}
2137		2476
2138	#ifndef EIO_NO_WRAPPERS	2477	#ifndef EIO_NO_WRAPPERS
2139		2478
		2479	eio_req eio_wd_open (const char path, int pri, eio_cb cb, void *data)
		2480	{
		2481	REQ (EIO_WD_OPEN); PATH; SEND;
		2482	}
		2483
		2484	eio_req eio_wd_close (eio_wd wd, int pri, eio_cb cb, void data)
		2485	{
		2486	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2487	}
		2488
2140	eio_req eio_nop (int pri, eio_cb cb, void data)	2489	eio_req eio_nop (int pri, eio_cb cb, void data)
2141	{	2490	{
2142	REQ (EIO_NOP); SEND;	2491	REQ (EIO_NOP); SEND;
2143	}	2492	}
2144		2493
…		…
2160	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2509	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2161	{	2510	{
2162	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2511	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2163	}	2512	}
2164		2513
		2514	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
		2515	{
		2516	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2517	}
		2518
		2519	eio_req eio_syncfs (int fd, int pri, eio_cb cb, void data)
		2520	{
		2521	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2522	}
		2523
		2524	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		2525	{
		2526	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2527	}
		2528
2165	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2529	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2166	{	2530	{
2167	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2531	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2168	}	2532	}
2169		2533
…		…
2175	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)	2539	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
2176	{	2540	{
2177	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2541	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2178	}	2542	}
2179		2543
2180	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
2181	{
2182	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2183	}
2184
2185	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)	2544	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)
2186	{	2545	{
2187	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2546	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2188	}
2189
2190	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
2191	{
2192	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2193	}	2547	}
2194		2548
2195	eio_req eio_close (int fd, int pri, eio_cb cb, void data)	2549	eio_req eio_close (int fd, int pri, eio_cb cb, void data)
2196	{	2550	{
2197	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2551	REQ (EIO_CLOSE); req->int1 = fd; SEND;
…		…
2425	/* misc garbage */	2779	/* misc garbage */
2426		2780
2427	eio_ssize_t	2781	eio_ssize_t
2428	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2782	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2429	{	2783	{
2430	etp_worker wrk;
2431	eio_ssize_t ret;
2432
2433	wrk.dbuf = 0;
2434
2435	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2784	return eio__sendfile (ofd, ifd, offset, count);
2436
2437	if (wrk.dbuf)
2438	free (wrk.dbuf);
2439
2440	return ret;
2441	}	2785	}
2442		2786

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC vs. Revision 1.110 by root, Tue Sep 27 12:36:19 2011 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC vs.
Revision 1.110 by root, Tue Sep 27 12:36:19 2011 UTC