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

Comparing libeio/eio.c (file contents):
Revision 1.96 by root, Tue Jul 19 05:20:36 2011 UTC vs.
Revision 1.106 by root, Mon Sep 26 20:19:08 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>
…		…
58	#include <sys/stat.h>	58	#include <sys/stat.h>
59	#include <limits.h>	59	#include <limits.h>
60	#include <fcntl.h>	60	#include <fcntl.h>
61	#include <assert.h>	61	#include <assert.h>
62		62
		63	#if _POSIX_VERSION >= 200809L
		64	# define HAVE_AT 1
		65	#else
		66	# define HAVE_AT 0
		67	#endif
		68
63	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */	69	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64	/* intptr_t only comes from stdint.h, says idiot openbsd coder */	70	/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65	#if HAVE_STDINT_H	71	#if HAVE_STDINT_H
66	# include <stdint.h>	72	# include <stdint.h>
67	#endif	73	#endif
…		…
105	#ifdef _WIN32	111	#ifdef _WIN32
106		112
107	#undef PAGESIZE	113	#undef PAGESIZE
108	#define PAGESIZE 4096 /* GetSystemInfo? */	114	#define PAGESIZE 4096 /* GetSystemInfo? */
109		115
		116	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		117
110	#ifdef EIO_STRUCT_STATI64	118	#ifdef EIO_STRUCT_STATI64
		119	/* look at perl's non-sloppy stat */
111	#define stat(path,buf) _stati64 (path,buf)	120	#define stat(path,buf) _stati64 (path,buf)
112	#define fstat(fd,buf) _fstati64 (fd,buf)	121	#define fstat(fd,buf) _fstati64 (fd,buf)
113	#endif	122	#endif
114	#define lstat(path,buf) stat (path,buf)	123	#define lstat(path,buf) stat (path,buf)
115	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))	124	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
…		…
129	#define sync() EIO_ENOSYS ()	138	#define sync() EIO_ENOSYS ()
130	#define readlink(path,buf,s) EIO_ENOSYS ()	139	#define readlink(path,buf,s) EIO_ENOSYS ()
131	#define statvfs(path,buf) EIO_ENOSYS ()	140	#define statvfs(path,buf) EIO_ENOSYS ()
132	#define fstatvfs(fd,buf) EIO_ENOSYS ()	141	#define fstatvfs(fd,buf) EIO_ENOSYS ()
133		142
		143	/* rename() uses MoveFile, which fails to overwrite */
		144	#define rename(old,neu) eio__rename (old, neu)
		145
		146	static int
		147	eio__rename (const char old, const char neu)
		148	{
		149	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		150	return 0;
		151
		152	/* should steal _dosmaperr */
		153	switch (GetLastError ())
		154	{
		155	case ERROR_FILE_NOT_FOUND:
		156	case ERROR_PATH_NOT_FOUND:
		157	case ERROR_INVALID_DRIVE:
		158	case ERROR_NO_MORE_FILES:
		159	case ERROR_BAD_NETPATH:
		160	case ERROR_BAD_NET_NAME:
		161	case ERROR_BAD_PATHNAME:
		162	case ERROR_FILENAME_EXCED_RANGE:
		163	errno = ENOENT;
		164	break;
		165
		166	default:
		167	errno = EACCES;
		168	break;
		169	}
		170
		171	return -1;
		172	}
		173
134	/* we could even stat and see if it exists */	174	/* we could even stat and see if it exists */
135	static int	175	static int
136	symlink (const char old, const char neu)	176	symlink (const char old, const char neu)
137	{	177	{
138	#if WINVER >= 0x0600	178	#if WINVER >= 0x0600
…		…
199		239
200	#endif	240	#endif
201		241
202	#if HAVE_UTIMES	242	#if HAVE_UTIMES
203	# include <utime.h>	243	# include <utime.h>
		244	#endif
		245
		246	#if HAVE_SYS_SYSCALL_H
		247	# include <sys/syscall.h>
		248	#endif
		249
		250	#if HAVE_SYS_PRCTL_H
		251	# include <sys/prctl.h>
204	#endif	252	#endif
205		253
206	#if HAVE_SENDFILE	254	#if HAVE_SENDFILE
207	# if __linux	255	# if __linux
208	# include <sys/sendfile.h>	256	# include <sys/sendfile.h>
…		…
250	#define FUBd \	298	#define FUBd \
251	free (eio_buf)	299	free (eio_buf)
252		300
253	#define EIO_TICKS ((1000000 + 1023) >> 10)	301	#define EIO_TICKS ((1000000 + 1023) >> 10)
254		302
		303	/*****************************************************************************/
		304
		305	struct tmpbuf
		306	{
		307	void *ptr;
		308	int len;
		309	};
		310
		311	static void *
		312	tmpbuf_get (struct tmpbuf *buf, int len)
		313	{
		314	if (buf->len < len)
		315	{
		316	free (buf->ptr);
		317	buf->ptr = malloc (buf->len = len);
		318	}
		319
		320	return buf->ptr;
		321	}
		322
		323	/*****************************************************************************/
		324
255	#define ETP_PRI_MIN EIO_PRI_MIN	325	#define ETP_PRI_MIN EIO_PRI_MIN
256	#define ETP_PRI_MAX EIO_PRI_MAX	326	#define ETP_PRI_MAX EIO_PRI_MAX
257		327
258	struct etp_worker;	328	struct etp_worker;
259		329
…		…
282	static void (*done_poll_cb) (void);	352	static void (*done_poll_cb) (void);
283		353
284	static unsigned int max_poll_time; /* reslock */	354	static unsigned int max_poll_time; /* reslock */
285	static unsigned int max_poll_reqs; /* reslock */	355	static unsigned int max_poll_reqs; /* reslock */
286		356
287	static volatile unsigned int nreqs; /* reqlock */	357	static unsigned int nreqs; /* reqlock */
288	static volatile unsigned int nready; /* reqlock */	358	static unsigned int nready; /* reqlock */
289	static volatile unsigned int npending; /* reqlock */	359	static unsigned int npending; /* reqlock */
290	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	360	static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
291	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */	361	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
292		362
293	static xmutex_t wrklock;	363	static xmutex_t wrklock;
294	static xmutex_t reslock;	364	static xmutex_t reslock;
295	static xmutex_t reqlock;	365	static xmutex_t reqlock;
296	static xcond_t reqwait;	366	static xcond_t reqwait;
…		…
304	static xmutex_t preadwritelock;	374	static xmutex_t preadwritelock;
305	#endif	375	#endif
306		376
307	typedef struct etp_worker	377	typedef struct etp_worker
308	{	378	{
		379	struct tmpbuf tmpbuf;
		380
309	/* locked by wrklock */	381	/* locked by wrklock */
310	struct etp_worker prev, next;	382	struct etp_worker prev, next;
311		383
312	xthread_t tid;	384	xthread_t tid;
313		385
314	/* locked by reslock, reqlock or wrklock */
315	ETP_REQ req; / currently processed request */
316
317	#ifdef ETP_WORKER_COMMON	386	#ifdef ETP_WORKER_COMMON
318	ETP_WORKER_COMMON	387	ETP_WORKER_COMMON
319	#endif	388	#endif
320	} etp_worker;	389	} etp_worker;
321		390
…		…
332	}	401	}
333		402
334	static void ecb_cold	403	static void ecb_cold
335	etp_worker_free (etp_worker *wrk)	404	etp_worker_free (etp_worker *wrk)
336	{	405	{
		406	free (wrk->tmpbuf.ptr);
		407
337	wrk->next->prev = wrk->prev;	408	wrk->next->prev = wrk->prev;
338	wrk->prev->next = wrk->next;	409	wrk->prev->next = wrk->next;
339		410
340	free (wrk);	411	free (wrk);
341	}	412	}
…		…
519	}	590	}
520		591
521	static void ecb_cold	592	static void ecb_cold
522	etp_end_thread (void)	593	etp_end_thread (void)
523	{	594	{
524	eio_req *req = calloc (1, sizeof (eio_req));	595	eio_req req = calloc (1, sizeof (eio_req)); / will be freed by worker */
525		596
526	req->type = -1;	597	req->type = -1;
527	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	598	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
528		599
529	X_LOCK (reqlock);	600	X_LOCK (reqlock);
…		…
937	#if !HAVE_FDATASYNC	1008	#if !HAVE_FDATASYNC
938	# undef fdatasync	1009	# undef fdatasync
939	# define fdatasync(fd) fsync (fd)	1010	# define fdatasync(fd) fsync (fd)
940	#endif	1011	#endif
941		1012
		1013	static int
		1014	eio__syncfs (int fd)
		1015	{
		1016	int res;
		1017
		1018	#if HAVE_SYS_SYNCFS
		1019	res = (int)syscall (__NR_syncfs, (int)(fd));
		1020	#else
		1021	res = -1;
		1022	errno = ENOSYS;
		1023	#endif
		1024
		1025	if (res < 0 && errno == ENOSYS && fd >= 0)
		1026	sync ();
		1027
		1028	return res;
		1029	}
		1030
942	/* sync_file_range always needs emulation */	1031	/* sync_file_range always needs emulation */
943	static int	1032	static int
944	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1033	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
945	{	1034	{
946	#if HAVE_SYNC_FILE_RANGE	1035	#if HAVE_SYNC_FILE_RANGE
…		…
1277	}	1366	}
1278		1367
1279	/*****************************************************************************/	1368	/*****************************************************************************/
1280	/* requests implemented outside eio_execute, because they are so large */	1369	/* requests implemented outside eio_execute, because they are so large */
1281		1370
		1371	/* copies some absolute path to tmpbuf */
		1372	static char *
		1373	eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
		1374	{
		1375	if (wd == EIO_CWD)
		1376	return getcwd (tmpbuf->ptr, PATH_MAX);
		1377
		1378	#if HAVE_AT
		1379	abort (); /TODO/
		1380	#else
		1381	strcpy (tmpbuf->ptr, wd);
		1382	#endif
		1383	return tmpbuf->ptr;
		1384	}
		1385
		1386	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1282	static void	1387	static int
1283	eio__realpath (eio_req req, etp_worker self)	1388	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
1284	{	1389	{
1285	char *rel = req->ptr1;	1390	const char *rel = path;
1286	char *res;	1391	char *res;
1287	char tmp1, tmp2;	1392	char tmp1, tmp2;
1288	#if SYMLOOP_MAX > 32	1393	#if SYMLOOP_MAX > 32
1289	int symlinks = SYMLOOP_MAX;	1394	int symlinks = SYMLOOP_MAX;
1290	#else	1395	#else
1291	int symlinks = 32;	1396	int symlinks = 32;
1292	#endif	1397	#endif
1293		1398
1294	req->result = -1;	1399	/D/ /TODO: wd ignored /
1295		1400
1296	errno = EINVAL;	1401	errno = EINVAL;
1297	if (!rel)	1402	if (!rel)
1298	return;	1403	return -1;
1299		1404
1300	errno = ENOENT;	1405	errno = ENOENT;
1301	if (!*rel)	1406	if (!*rel)
1302	return;	1407	return -1;
1303		1408
1304	if (!req->ptr2)	1409	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1305	{
1306	X_LOCK (wrklock);
1307	req->flags \|= EIO_FLAG_PTR2_FREE;
1308	X_UNLOCK (wrklock);
1309	req->ptr2 = malloc (PATH_MAX * 3);
1310
1311	errno = ENOMEM;
1312	if (!req->ptr2)
1313	return;
1314	}
1315
1316	res = req->ptr2;
1317	tmp1 = res + PATH_MAX;	1410	tmp1 = res + PATH_MAX;
1318	tmp2 = tmp1 + PATH_MAX;	1411	tmp2 = tmp1 + PATH_MAX;
1319		1412
1320	#if 0 /* disabled, the musl way to do things is just too racy */	1413	#if 0 /* disabled, the musl way to do things is just too racy */
1321	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1414	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1340	#endif	1433	#endif
1341	#endif	1434	#endif
1342		1435
1343	if (*rel != '/')	1436	if (*rel != '/')
1344	{	1437	{
1345	if (!getcwd (res, PATH_MAX))	1438	if (!eio__getwd (tmpbuf, wd))
1346	return;	1439	return -1;
1347		1440
1348	if (res [1]) /* only use if not / */	1441	if (res [1]) /* only use if not / */
1349	res += strlen (res);	1442	res += strlen (res);
1350	}	1443	}
1351		1444
1352	while (*rel)	1445	while (*rel)
1353	{	1446	{
1354	eio_ssize_t len, linklen;	1447	eio_ssize_t len, linklen;
1355	char *beg = rel;	1448	const char *beg = rel;
1356		1449
1357	while (rel && rel != '/')	1450	while (rel && rel != '/')
1358	++rel;	1451	++rel;
1359		1452
1360	len = rel - beg;	1453	len = rel - beg;
…		…
1372		1465
1373	if (beg [1] == '.' && len == 2)	1466	if (beg [1] == '.' && len == 2)
1374	{	1467	{
1375	/* .. - back up one component, if possible */	1468	/* .. - back up one component, if possible */
1376		1469
1377	while (res != req->ptr2)	1470	while (res != tmpbuf->ptr)
1378	if (*--res == '/')	1471	if (*--res == '/')
1379	break;	1472	break;
1380		1473
1381	continue;	1474	continue;
1382	}	1475	}
…		…
1392		1485
1393	/* zero-terminate, for readlink */	1486	/* zero-terminate, for readlink */
1394	res [len + 1] = 0;	1487	res [len + 1] = 0;
1395		1488
1396	/* now check if it's a symlink */	1489	/* now check if it's a symlink */
1397	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1490	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1398		1491
1399	if (linklen < 0)	1492	if (linklen < 0)
1400	{	1493	{
1401	if (errno != EINVAL)	1494	if (errno != EINVAL)
1402	return;	1495	return -1;
1403		1496
1404	/* it's a normal directory. hopefully */	1497	/* it's a normal directory. hopefully */
1405	res += len + 1;	1498	res += len + 1;
1406	}	1499	}
1407	else	1500	else
…		…
1409	/* yay, it was a symlink - build new path in tmp2 */	1502	/* yay, it was a symlink - build new path in tmp2 */
1410	int rellen = strlen (rel);	1503	int rellen = strlen (rel);
1411		1504
1412	errno = ENAMETOOLONG;	1505	errno = ENAMETOOLONG;
1413	if (linklen + 1 + rellen >= PATH_MAX)	1506	if (linklen + 1 + rellen >= PATH_MAX)
1414	return;	1507	return -1;
1415		1508
1416	errno = ELOOP;	1509	errno = ELOOP;
1417	if (!--symlinks)	1510	if (!--symlinks)
1418	return;	1511	return -1;
1419		1512
1420	if (*tmp1 == '/')	1513	if (*tmp1 == '/')
1421	res = req->ptr2; /* symlink resolves to an absolute path */	1514	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1422		1515
1423	/* we need to be careful, as rel might point into tmp2 already */	1516	/* we need to be careful, as rel might point into tmp2 already */
1424	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1517	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1425	tmp2 [linklen] = '/';	1518	tmp2 [linklen] = '/';
1426	memcpy (tmp2, tmp1, linklen);	1519	memcpy (tmp2, tmp1, linklen);
…		…
1428	rel = tmp2;	1521	rel = tmp2;
1429	}	1522	}
1430	}	1523	}
1431		1524
1432	/* special case for the lone root path */	1525	/* special case for the lone root path */
1433	if (res == req->ptr2)	1526	if (res == tmpbuf->ptr)
1434	*res++ = '/';	1527	*res++ = '/';
1435		1528
1436	req->result = res - (char *)req->ptr2;	1529	return res - (char *)tmpbuf->ptr;
1437
1438	done:
1439	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1440	}	1530	}
1441		1531
1442	static signed char	1532	static signed char
1443	eio_dent_cmp (const eio_dirent a, const eio_dirent b)	1533	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
1444	{	1534	{
…		…
1604	eio_dent_insertion_sort (dents, size);	1694	eio_dent_insertion_sort (dents, size);
1605	}	1695	}
1606		1696
1607	/* read a full directory */	1697	/* read a full directory */
1608	static void	1698	static void
1609	eio__scandir (eio_req req, etp_worker self)	1699	eio__scandir (eio_req *req)
1610	{	1700	{
1611	char name, names;	1701	char name, names;
1612	int namesalloc = 4096 - sizeof (void ) 4;	1702	int namesalloc = 4096 - sizeof (void ) 4;
1613	int namesoffs = 0;	1703	int namesoffs = 0;
1614	int flags = req->int1;	1704	int flags = req->int1;
…		…
1646	dirp = FindFirstFile (path, &entp);	1736	dirp = FindFirstFile (path, &entp);
1647	free (path);	1737	free (path);
1648		1738
1649	if (dirp == INVALID_HANDLE_VALUE)	1739	if (dirp == INVALID_HANDLE_VALUE)
1650	{	1740	{
1651	dirp = 0;	1741	/* should steal _dosmaperr */
1652
1653	switch (GetLastError ())	1742	switch (GetLastError ())
1654	{	1743	{
1655	case ERROR_FILE_NOT_FOUND:	1744	case ERROR_FILE_NOT_FOUND:
1656	req->result = 0;	1745	req->result = 0;
1657	break;	1746	break;
1658		1747
1659	case ERROR_INVALID_NAME:	1748	case ERROR_INVALID_NAME:
1660	case ERROR_PATH_NOT_FOUND:	1749	case ERROR_PATH_NOT_FOUND:
1661	case ERROR_NO_MORE_FILES:	1750	case ERROR_NO_MORE_FILES:
1662	errno = ENOENT;	1751	errno = ENOENT;
1663	break;	1752	break;
1664		1753
1665	case ERROR_NOT_ENOUGH_MEMORY:	1754	case ERROR_NOT_ENOUGH_MEMORY:
1666	errno = ENOMEM;	1755	errno = ENOMEM;
1667	break;	1756	break;
1668		1757
1669	default:	1758	default:
1670	errno = EINVAL;	1759	errno = EINVAL;
1671	break;	1760	break;
1672	}	1761	}
		1762
		1763	return;
1673	}	1764	}
1674	}	1765	}
1675	#else	1766	#else
1676	dirp = opendir (req->ptr1);	1767	dirp = opendir (req->ptr1);
		1768
		1769	if (!dirp)
		1770	return;
1677	#endif	1771	#endif
1678		1772
1679	if (req->flags & EIO_FLAG_PTR1_FREE)	1773	if (req->flags & EIO_FLAG_PTR1_FREE)
1680	free (req->ptr1);	1774	free (req->ptr1);
1681		1775
1682	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1776	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1683	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1777	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1684	req->ptr2 = names = malloc (namesalloc);	1778	req->ptr2 = names = malloc (namesalloc);
1685		1779
1686	if (dirp && names && (!flags \|\| dents))	1780	if (!names \|\| (flags && !dents))
		1781	return;
		1782
1687	for (;;)	1783	for (;;)
1688	{	1784	{
1689	int done;	1785	int done;
1690		1786
1691	#ifdef _WIN32	1787	#ifdef _WIN32
1692	done = !dirp;	1788	done = !dirp;
1693	#else	1789	#else
1694	errno = 0;	1790	errno = 0;
1695	entp = readdir (dirp);	1791	entp = readdir (dirp);
1696	done = !entp;	1792	done = !entp;
1697	#endif	1793	#endif
1698		1794
1699	if (done)	1795	if (done)
1700	{	1796	{
1701	#ifndef _WIN32	1797	#ifndef _WIN32
1702	int old_errno = errno;	1798	int old_errno = errno;
1703	closedir (dirp);	1799	closedir (dirp);
1704	errno = old_errno;	1800	errno = old_errno;
1705		1801
1706	if (errno)	1802	if (errno)
1707	break;	1803	break;
1708	#endif	1804	#endif
1709		1805
1710	/* sort etc. */	1806	/* sort etc. */
1711	req->int1 = flags;	1807	req->int1 = flags;
1712	req->result = dentoffs;	1808	req->result = dentoffs;
1713		1809
1714	if (flags & EIO_READDIR_STAT_ORDER)	1810	if (flags & EIO_READDIR_STAT_ORDER)
1715	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1811	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1716	else if (flags & EIO_READDIR_DIRS_FIRST)	1812	else if (flags & EIO_READDIR_DIRS_FIRST)
1717	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1813	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1718	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1814	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1719	else	1815	else
		1816	{
		1817	/* in this case, all is known, and we just put dirs first and sort them */
		1818	eio_dirent *oth = dents + dentoffs;
		1819	eio_dirent *dir = dents;
		1820
		1821	/* now partition dirs to the front, and non-dirs to the back */
		1822	/* by walking from both sides and swapping if necessary */
		1823	while (oth > dir)
		1824	{
		1825	if (dir->type == EIO_DT_DIR)
		1826	++dir;
		1827	else if ((--oth)->type == EIO_DT_DIR)
		1828	{
		1829	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1830
		1831	++dir;
		1832	}
		1833	}
		1834
		1835	/* now sort the dirs only (dirs all have the same score) */
		1836	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1837	}
		1838
		1839	break;
		1840	}
		1841
		1842	/* now add the entry to our list(s) */
		1843	name = D_NAME (entp);
		1844
		1845	/* skip . and .. entries */
		1846	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
		1847	{
		1848	int len = D_NAMLEN (entp) + 1;
		1849
		1850	while (ecb_expect_false (namesoffs + len > namesalloc))
		1851	{
		1852	namesalloc *= 2;
		1853	req->ptr2 = names = realloc (names, namesalloc);
		1854
		1855	if (!names)
		1856	break;
		1857	}
		1858
		1859	memcpy (names + namesoffs, name, len);
		1860
		1861	if (dents)
		1862	{
		1863	struct eio_dirent *ent;
		1864
		1865	if (ecb_expect_false (dentoffs == dentalloc))
1720	{	1866	{
1721	/* in this case, all is known, and we just put dirs first and sort them */	1867	dentalloc *= 2;
		1868	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1869
		1870	if (!dents)
		1871	break;
		1872	}
		1873
1722	eio_dirent *oth = dents + dentoffs;	1874	ent = dents + dentoffs;
1723	eio_dirent *dir = dents;
1724		1875
1725	/* now partition dirs to the front, and non-dirs to the back */	1876	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1726	/* by walking from both sides and swapping if necessary */	1877	ent->namelen = len - 1;
1727	while (oth > dir)	1878	ent->inode = D_INO (entp);
		1879
		1880	inode_bits \|= ent->inode;
		1881
		1882	switch (D_TYPE (entp))
		1883	{
		1884	default:
		1885	ent->type = EIO_DT_UNKNOWN;
		1886	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1887	break;
		1888
		1889	#ifdef DT_FIFO
		1890	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1891	#endif
		1892	#ifdef DT_CHR
		1893	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1894	#endif
		1895	#ifdef DT_MPC
		1896	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1897	#endif
		1898	#ifdef DT_DIR
		1899	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1900	#endif
		1901	#ifdef DT_NAM
		1902	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1903	#endif
		1904	#ifdef DT_BLK
		1905	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1906	#endif
		1907	#ifdef DT_MPB
		1908	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1909	#endif
		1910	#ifdef DT_REG
		1911	case DT_REG: ent->type = EIO_DT_REG; break;
		1912	#endif
		1913	#ifdef DT_NWK
		1914	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1915	#endif
		1916	#ifdef DT_CMP
		1917	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1918	#endif
		1919	#ifdef DT_LNK
		1920	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1921	#endif
		1922	#ifdef DT_SOCK
		1923	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1924	#endif
		1925	#ifdef DT_DOOR
		1926	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1927	#endif
		1928	#ifdef DT_WHT
		1929	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1930	#endif
		1931	}
		1932
		1933	ent->score = 7;
		1934
		1935	if (flags & EIO_READDIR_DIRS_FIRST)
		1936	{
		1937	if (ent->type == EIO_DT_UNKNOWN)
1728	{	1938	{
1729	if (dir->type == EIO_DT_DIR)	1939	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1730	++dir;	1940	ent->score = 1;
1731	else if ((--oth)->type == EIO_DT_DIR)	1941	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1732	{	1942	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1733	eio_dirent tmp = dir; dir = oth; oth = tmp;
1734
1735	++dir;
1736	}
1737	}	1943	}
1738		1944	else if (ent->type == EIO_DT_DIR)
1739	/* now sort the dirs only (dirs all have the same score) */	1945	ent->score = 0;
1740	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1741	}	1946	}
1742
1743	break;
1744	}
1745
1746	/* now add the entry to our list(s) */
1747	name = D_NAME (entp);
1748
1749	/* skip . and .. entries */
1750	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
1751	{
1752	int len = D_NAMLEN (entp) + 1;
1753
1754	while (ecb_expect_false (namesoffs + len > namesalloc))
1755	{
1756	namesalloc *= 2;
1757	req->ptr2 = names = realloc (names, namesalloc);
1758
1759	if (!names)
1760	break;
1761	}	1947	}
1762		1948
1763	memcpy (names + namesoffs, name, len);
1764
1765	if (dents)
1766	{
1767	struct eio_dirent *ent;
1768
1769	if (ecb_expect_false (dentoffs == dentalloc))
1770	{
1771	dentalloc *= 2;
1772	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1773
1774	if (!dents)
1775	break;
1776	}
1777
1778	ent = dents + dentoffs;
1779
1780	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1781	ent->namelen = len - 1;
1782	ent->inode = D_INO (entp);
1783
1784	inode_bits \|= ent->inode;
1785
1786	switch (D_TYPE (entp))
1787	{
1788	default:
1789	ent->type = EIO_DT_UNKNOWN;
1790	flags \|= EIO_READDIR_FOUND_UNKNOWN;
1791	break;
1792
1793	#ifdef DT_FIFO
1794	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1795	#endif
1796	#ifdef DT_CHR
1797	case DT_CHR: ent->type = EIO_DT_CHR; break;
1798	#endif
1799	#ifdef DT_MPC
1800	case DT_MPC: ent->type = EIO_DT_MPC; break;
1801	#endif
1802	#ifdef DT_DIR
1803	case DT_DIR: ent->type = EIO_DT_DIR; break;
1804	#endif
1805	#ifdef DT_NAM
1806	case DT_NAM: ent->type = EIO_DT_NAM; break;
1807	#endif
1808	#ifdef DT_BLK
1809	case DT_BLK: ent->type = EIO_DT_BLK; break;
1810	#endif
1811	#ifdef DT_MPB
1812	case DT_MPB: ent->type = EIO_DT_MPB; break;
1813	#endif
1814	#ifdef DT_REG
1815	case DT_REG: ent->type = EIO_DT_REG; break;
1816	#endif
1817	#ifdef DT_NWK
1818	case DT_NWK: ent->type = EIO_DT_NWK; break;
1819	#endif
1820	#ifdef DT_CMP
1821	case DT_CMP: ent->type = EIO_DT_CMP; break;
1822	#endif
1823	#ifdef DT_LNK
1824	case DT_LNK: ent->type = EIO_DT_LNK; break;
1825	#endif
1826	#ifdef DT_SOCK
1827	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1828	#endif
1829	#ifdef DT_DOOR
1830	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1831	#endif
1832	#ifdef DT_WHT
1833	case DT_WHT: ent->type = EIO_DT_WHT; break;
1834	#endif
1835	}
1836
1837	ent->score = 7;
1838
1839	if (flags & EIO_READDIR_DIRS_FIRST)
1840	{
1841	if (ent->type == EIO_DT_UNKNOWN)
1842	{
1843	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1844	ent->score = 1;
1845	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1846	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1847	}
1848	else if (ent->type == EIO_DT_DIR)
1849	ent->score = 0;
1850	}
1851	}
1852
1853	namesoffs += len;	1949	namesoffs += len;
1854	++dentoffs;	1950	++dentoffs;
1855	}	1951	}
1856		1952
1857	if (EIO_CANCELLED (req))	1953	if (EIO_CANCELLED (req))
1858	{	1954	{
1859	errno = ECANCELED;	1955	errno = ECANCELED;
1860	break;	1956	break;
1861	}	1957	}
1862		1958
1863	#ifdef _WIN32	1959	#ifdef _WIN32
1864	if (!FindNextFile (dirp, &entp))	1960	if (!FindNextFile (dirp, &entp))
1865	{	1961	{
1866	FindClose (dirp);	1962	FindClose (dirp);
1867	dirp = 0;	1963	dirp = 0;
1868	}	1964	}
1869	#endif	1965	#endif
		1966	}
		1967	}
		1968
		1969	/*****************************************************************************/
		1970	/* working directory stuff */
		1971
		1972	#if HAVE_AT
		1973
		1974	#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD)
		1975
		1976	#ifndef O_SEARCH
		1977	# define O_SEARCH O_RDONLY
		1978	#endif
		1979
		1980	eio_wd
		1981	eio_wd_open_sync (eio_wd wd, const char *path)
		1982	{
		1983	int fd = openat (WD2FD (wd), path, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
		1984
		1985	return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
		1986	}
		1987
		1988	static eio_wd
		1989	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		1990	{
		1991	return eio_wd_open_sync (wd, path);
		1992	}
		1993
		1994	void
		1995	eio_wd_close_sync (eio_wd wd)
		1996	{
		1997	int fd = WD2FD (wd);
		1998
		1999	if (fd >= 0)
		2000	close (fd);
		2001	}
		2002
		2003	static int
		2004	eio__truncateat (int dirfd, const char *path, off_t length)
		2005	{
		2006	int fd = openat (dirfd, path, O_WRONLY \| O_CLOEXEC);
		2007	int res;
		2008
		2009	if (fd < 0)
		2010	return fd;
		2011
		2012	res = ftruncate (fd, length);
		2013	close (fd);
		2014	return res;
		2015	}
		2016
		2017	static int
		2018	eio__statvfsat (int dirfd, const char path, struct statvfs buf)
		2019	{
		2020	int fd = openat (dirfd, path, O_SEARCH \| O_CLOEXEC);
		2021	int res;
		2022
		2023	if (fd < 0)
		2024	return fd;
		2025
		2026	res = fstatvfs (fd, buf);
		2027	close (fd);
		2028	return res;
		2029
		2030	}
		2031
		2032	#else
		2033
		2034	/* on legacy systems, we represent the working directories simply by their path strings */
		2035
		2036	static const char *
		2037	wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2038	{
		2039	if (!wd \|\| *path == '/')
		2040	return path;
		2041
		2042	{
		2043	int l1 = strlen ((const char *)wd);
		2044	int l2 = strlen (path);
		2045
		2046	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2047
		2048	memcpy (res, wd, l1);
		2049	res [l1] = '/';
		2050	memcpy (res + l1 + 1, path, l2 + 1);
		2051
		2052	return res;
		2053	}
		2054	}
		2055
		2056	static eio_wd
		2057	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2058	{
		2059	if (path == '/') / absolute paths ignore wd */
		2060	path = strdup (path);
		2061	else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
		2062	return wd;
		2063	else
		2064	{
		2065	int len = eio__realpath (tmpbuf, wd, path);
		2066
		2067	path = EIO_INVALID_WD;
		2068
		2069	if (len >= 0)
		2070	{
		2071	((char *)tmpbuf->ptr)[len] = 0;
		2072	path = strdup (tmpbuf->ptr);
1870	}	2073	}
		2074	}
		2075
		2076	if (!path)
		2077	path = EIO_INVALID_WD;
		2078
		2079	return (eio_wd)path;
1871	}	2080	}
		2081
		2082	eio_wd
		2083	eio_wd_open_sync (eio_wd wd, const char *path)
		2084	{
		2085	struct tmpbuf tmpbuf = { 0 };
		2086	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2087	free (tmpbuf.ptr);
		2088
		2089	return wd;
		2090	}
		2091
		2092	void
		2093	eio_wd_close_sync (eio_wd wd)
		2094	{
		2095	if (wd != EIO_INVALID_WD)
		2096	free (wd);
		2097	}
		2098
		2099	#endif
1872		2100
1873	/*****************************************************************************/	2101	/*****************************************************************************/
1874		2102
1875	#define ALLOC(len) \	2103	#define ALLOC(len) \
1876	if (!req->ptr2) \	2104	if (!req->ptr2) \
…		…
1891	{	2119	{
1892	ETP_REQ *req;	2120	ETP_REQ *req;
1893	struct timespec ts;	2121	struct timespec ts;
1894	etp_worker self = (etp_worker )thr_arg;	2122	etp_worker self = (etp_worker )thr_arg;
1895		2123
		2124	#if HAVE_PRCTL_SET_NAME
		2125	prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
		2126	#endif
		2127
1896	/* try to distribute timeouts somewhat evenly */	2128	/* try to distribute timeouts somewhat evenly */
1897	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2129	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1898		2130
1899	for (;;)	2131	for (;;)
1900	{	2132	{
…		…
1902		2134
1903	X_LOCK (reqlock);	2135	X_LOCK (reqlock);
1904		2136
1905	for (;;)	2137	for (;;)
1906	{	2138	{
1907	self->req = req = reqq_shift (&req_queue);	2139	req = reqq_shift (&req_queue);
1908		2140
1909	if (req)	2141	if (req)
1910	break;	2142	break;
1911		2143
1912	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2144	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1950	++npending;	2182	++npending;
1951		2183
1952	if (!reqq_push (&res_queue, req) && want_poll_cb)	2184	if (!reqq_push (&res_queue, req) && want_poll_cb)
1953	want_poll_cb ();	2185	want_poll_cb ();
1954		2186
1955	self->req = 0;
1956	etp_worker_clear (self);	2187	etp_worker_clear (self);
1957		2188
1958	X_UNLOCK (reslock);	2189	X_UNLOCK (reslock);
1959	}	2190	}
1960		2191
1961	quit:	2192	quit:
		2193	free (req);
		2194
1962	X_LOCK (wrklock);	2195	X_LOCK (wrklock);
1963	etp_worker_free (self);	2196	etp_worker_free (self);
1964	X_UNLOCK (wrklock);	2197	X_UNLOCK (wrklock);
1965		2198
1966	return 0;	2199	return 0;
…		…
2009	}	2242	}
2010		2243
2011	static void	2244	static void
2012	eio_execute (etp_worker self, eio_req req)	2245	eio_execute (etp_worker self, eio_req req)
2013	{	2246	{
		2247	#if HAVE_AT
		2248	int dirfd;
		2249	#else
		2250	const char *path;
		2251	#endif
		2252
2014	if (ecb_expect_false (EIO_CANCELLED (req)))	2253	if (ecb_expect_false (EIO_CANCELLED (req)))
2015	{	2254	{
2016	req->result = -1;	2255	req->result = -1;
2017	req->errorno = ECANCELED;	2256	req->errorno = ECANCELED;
2018	return;	2257	return;
2019	}	2258	}
2020		2259
		2260	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2261	{
		2262	req->result = -1;
		2263	req->errorno = ENOENT;
		2264	return;
		2265	}
		2266
		2267	if (req->type >= EIO_OPEN)
		2268	{
		2269	#if HAVE_AT
		2270	dirfd = WD2FD (req->wd);
		2271	#else
		2272	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2273	#endif
		2274	}
		2275
2021	switch (req->type)	2276	switch (req->type)
2022	{	2277	{
		2278	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2279	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2280	break;
		2281	case EIO_WD_CLOSE: req->result = 0;
		2282	eio_wd_close_sync (req->wd); break;
		2283
2023	case EIO_READ: ALLOC (req->size);	2284	case EIO_READ: ALLOC (req->size);
2024	req->result = req->offs >= 0	2285	req->result = req->offs >= 0
2025	? pread (req->int1, req->ptr2, req->size, req->offs)	2286	? pread (req->int1, req->ptr2, req->size, req->offs)
2026	: read (req->int1, req->ptr2, req->size); break;	2287	: read (req->int1, req->ptr2, req->size); break;
2027	case EIO_WRITE: req->result = req->offs >= 0	2288	case EIO_WRITE: req->result = req->offs >= 0
…		…
2029	: write (req->int1, req->ptr2, req->size); break;	2290	: write (req->int1, req->ptr2, req->size); break;
2030		2291
2031	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2292	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2032	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;	2293	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2033		2294
		2295	#if HAVE_AT
		2296
2034	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2297	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2035	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2298	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2036	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2299	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2300	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2301	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2302	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2303	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2304	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2305
		2306	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2307	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2308	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2309	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break;
		2310	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break;
		2311	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2312	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2313	case EIO_READLINK: ALLOC (PATH_MAX);
		2314	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2315	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2316	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2317	case EIO_UTIME:
		2318	case EIO_FUTIME:
		2319	{
		2320	struct timespec ts[2];
		2321	struct timespec *times;
		2322
		2323	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2324	{
		2325	ts[0].tv_sec = req->nv1;
		2326	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2327	ts[1].tv_sec = req->nv2;
		2328	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2329
		2330	times = ts;
		2331	}
		2332	else
		2333	times = 0;
		2334
		2335	req->result = req->type == EIO_FUTIME
		2336	? futimens (req->int1, times)
		2337	: utimensat (dirfd, req->ptr1, times, 0);
		2338	}
		2339	break;
		2340
		2341	#else
		2342
		2343	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2344	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2345	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2037	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2346	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2347	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2348	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2349	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2350	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2351
		2352	case EIO_UNLINK: req->result = unlink (path ); break;
		2353	case EIO_RMDIR: req->result = rmdir (path ); break;
		2354	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2355	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2356	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2357	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2358	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2359	case EIO_READLINK: ALLOC (PATH_MAX);
		2360	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2361	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2362	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2363
		2364	case EIO_UTIME:
		2365	case EIO_FUTIME:
		2366	{
		2367	struct timeval tv[2];
		2368	struct timeval *times;
		2369
		2370	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2371	{
		2372	tv[0].tv_sec = req->nv1;
		2373	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2374	tv[1].tv_sec = req->nv2;
		2375	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2376
		2377	times = tv;
		2378	}
		2379	else
		2380	times = 0;
		2381
		2382	req->result = req->type == EIO_FUTIME
		2383	? futimes (req->int1, times)
		2384	: utimes (req->ptr1, times);
		2385	}
		2386	break;
		2387
		2388	#endif
		2389
		2390	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2391	{
		2392	ALLOC (req->result);
		2393	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2394	}
		2395	break;
		2396
2038	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2397	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2039	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2398	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2040		2399
2041	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2042	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2043	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2400	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2044	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2401	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2045		2402
2046	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2047	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2403	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2048	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2049	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2404	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2050	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2051	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2405	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2052		2406
2053	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2054	case EIO_CLOSE: req->result = close (req->int1); break;	2407	case EIO_CLOSE: req->result = close (req->int1); break;
2055	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2408	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2056	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2057	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2058	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2059	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2060	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2061	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2062	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2063
2064	case EIO_REALPATH: eio__realpath (req, self); break;
2065
2066	case EIO_READLINK: ALLOC (PATH_MAX);
2067	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2068
2069	case EIO_SYNC: req->result = 0; sync (); break;	2409	case EIO_SYNC: req->result = 0; sync (); break;
2070	case EIO_FSYNC: req->result = fsync (req->int1); break;	2410	case EIO_FSYNC: req->result = fsync (req->int1); break;
2071	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2411	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2412	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2413	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2072	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	2414	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2073	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2415	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2074	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2416	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2075	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2417	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2076	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2077	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	2418	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2078		2419
2079	case EIO_READDIR: eio__scandir (req, self); break;	2420	case EIO_READDIR: eio__scandir (req); break;
2080		2421
2081	case EIO_BUSY:	2422	case EIO_BUSY:
2082	#ifdef _WIN32	2423	#ifdef _WIN32
2083	Sleep (req->nv1 * 1e3);	2424	Sleep (req->nv1 * 1e3);
2084	#else	2425	#else
…		…
2091	req->result = select (0, 0, 0, 0, &tv);	2432	req->result = select (0, 0, 0, 0, &tv);
2092	}	2433	}
2093	#endif	2434	#endif
2094	break;	2435	break;
2095		2436
2096	case EIO_UTIME:
2097	case EIO_FUTIME:
2098	{
2099	struct timeval tv[2];
2100	struct timeval *times;
2101
2102	if (req->nv1 != -1. \|\| req->nv2 != -1.)
2103	{
2104	tv[0].tv_sec = req->nv1;
2105	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2106	tv[1].tv_sec = req->nv2;
2107	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2108
2109	times = tv;
2110	}
2111	else
2112	times = 0;
2113
2114	req->result = req->type == EIO_FUTIME
2115	? futimes (req->int1, times)
2116	: utimes (req->ptr1, times);
2117	}
2118	break;
2119
2120	case EIO_GROUP:	2437	case EIO_GROUP:
2121	abort (); /* handled in eio_request */	2438	abort (); /* handled in eio_request */
2122		2439
2123	case EIO_NOP:	2440	case EIO_NOP:
2124	req->result = 0;	2441	req->result = 0;
…		…
2162	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2479	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2163	{	2480	{
2164	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2481	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2165	}	2482	}
2166		2483
		2484	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
		2485	{
		2486	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2487	}
		2488
		2489	eio_req eio_syncfs (int fd, int pri, eio_cb cb, void data)
		2490	{
		2491	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2492	}
		2493
		2494	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		2495	{
		2496	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2497	}
		2498
2167	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2499	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2168	{	2500	{
2169	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2501	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2170	}	2502	}
2171		2503
…		…
2177	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)	2509	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
2178	{	2510	{
2179	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2511	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2180	}	2512	}
2181		2513
2182	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
2183	{
2184	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2185	}
2186
2187	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)	2514	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)
2188	{	2515	{
2189	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2516	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2190	}
2191
2192	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
2193	{
2194	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2195	}	2517	}
2196		2518
2197	eio_req eio_close (int fd, int pri, eio_cb cb, void data)	2519	eio_req eio_close (int fd, int pri, eio_cb cb, void data)
2198	{	2520	{
2199	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2521	REQ (EIO_CLOSE); req->int1 = fd; SEND;

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.96 by root, Tue Jul 19 05:20:36 2011 UTC vs. Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.96 by root, Tue Jul 19 05:20:36 2011 UTC vs.
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC