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

Comparing libeio/eio.c (file contents):
Revision 1.99 by root, Tue Jul 26 11:07:08 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))
…		…
289	#define FUBd \	298	#define FUBd \
290	free (eio_buf)	299	free (eio_buf)
291		300
292	#define EIO_TICKS ((1000000 + 1023) >> 10)	301	#define EIO_TICKS ((1000000 + 1023) >> 10)
293		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
294	#define ETP_PRI_MIN EIO_PRI_MIN	325	#define ETP_PRI_MIN EIO_PRI_MIN
295	#define ETP_PRI_MAX EIO_PRI_MAX	326	#define ETP_PRI_MAX EIO_PRI_MAX
296		327
297	struct etp_worker;	328	struct etp_worker;
298		329
…		…
321	static void (*done_poll_cb) (void);	352	static void (*done_poll_cb) (void);
322		353
323	static unsigned int max_poll_time; /* reslock */	354	static unsigned int max_poll_time; /* reslock */
324	static unsigned int max_poll_reqs; /* reslock */	355	static unsigned int max_poll_reqs; /* reslock */
325		356
326	static volatile unsigned int nreqs; /* reqlock */	357	static unsigned int nreqs; /* reqlock */
327	static volatile unsigned int nready; /* reqlock */	358	static unsigned int nready; /* reqlock */
328	static volatile unsigned int npending; /* reqlock */	359	static unsigned int npending; /* reqlock */
329	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 */
330	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 */
331		362
332	static xmutex_t wrklock;	363	static xmutex_t wrklock;
333	static xmutex_t reslock;	364	static xmutex_t reslock;
334	static xmutex_t reqlock;	365	static xmutex_t reqlock;
335	static xcond_t reqwait;	366	static xcond_t reqwait;
…		…
343	static xmutex_t preadwritelock;	374	static xmutex_t preadwritelock;
344	#endif	375	#endif
345		376
346	typedef struct etp_worker	377	typedef struct etp_worker
347	{	378	{
		379	struct tmpbuf tmpbuf;
		380
348	/* locked by wrklock */	381	/* locked by wrklock */
349	struct etp_worker prev, next;	382	struct etp_worker prev, next;
350		383
351	xthread_t tid;	384	xthread_t tid;
352		385
353	/* locked by reslock, reqlock or wrklock */
354	ETP_REQ req; / currently processed request */
355
356	#ifdef ETP_WORKER_COMMON	386	#ifdef ETP_WORKER_COMMON
357	ETP_WORKER_COMMON	387	ETP_WORKER_COMMON
358	#endif	388	#endif
359	} etp_worker;	389	} etp_worker;
360		390
…		…
371	}	401	}
372		402
373	static void ecb_cold	403	static void ecb_cold
374	etp_worker_free (etp_worker *wrk)	404	etp_worker_free (etp_worker *wrk)
375	{	405	{
		406	free (wrk->tmpbuf.ptr);
		407
376	wrk->next->prev = wrk->prev;	408	wrk->next->prev = wrk->prev;
377	wrk->prev->next = wrk->next;	409	wrk->prev->next = wrk->next;
378		410
379	free (wrk);	411	free (wrk);
380	}	412	}
…		…
558	}	590	}
559		591
560	static void ecb_cold	592	static void ecb_cold
561	etp_end_thread (void)	593	etp_end_thread (void)
562	{	594	{
563	eio_req *req = calloc (1, sizeof (eio_req));	595	eio_req req = calloc (1, sizeof (eio_req)); / will be freed by worker */
564		596
565	req->type = -1;	597	req->type = -1;
566	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	598	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
567		599
568	X_LOCK (reqlock);	600	X_LOCK (reqlock);
…		…
1334	}	1366	}
1335		1367
1336	/*****************************************************************************/	1368	/*****************************************************************************/
1337	/* requests implemented outside eio_execute, because they are so large */	1369	/* requests implemented outside eio_execute, because they are so large */
1338		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 */
1339	static void	1387	static int
1340	eio__realpath (eio_req req, etp_worker self)	1388	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
1341	{	1389	{
1342	char *rel = req->ptr1;	1390	const char *rel = path;
1343	char *res;	1391	char *res;
1344	char tmp1, tmp2;	1392	char tmp1, tmp2;
1345	#if SYMLOOP_MAX > 32	1393	#if SYMLOOP_MAX > 32
1346	int symlinks = SYMLOOP_MAX;	1394	int symlinks = SYMLOOP_MAX;
1347	#else	1395	#else
1348	int symlinks = 32;	1396	int symlinks = 32;
1349	#endif	1397	#endif
1350		1398
1351	req->result = -1;	1399	/D/ /TODO: wd ignored /
1352		1400
1353	errno = EINVAL;	1401	errno = EINVAL;
1354	if (!rel)	1402	if (!rel)
1355	return;	1403	return -1;
1356		1404
1357	errno = ENOENT;	1405	errno = ENOENT;
1358	if (!*rel)	1406	if (!*rel)
1359	return;	1407	return -1;
1360		1408
1361	if (!req->ptr2)	1409	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1362	{
1363	X_LOCK (wrklock);
1364	req->flags \|= EIO_FLAG_PTR2_FREE;
1365	X_UNLOCK (wrklock);
1366	req->ptr2 = malloc (PATH_MAX * 3);
1367
1368	errno = ENOMEM;
1369	if (!req->ptr2)
1370	return;
1371	}
1372
1373	res = req->ptr2;
1374	tmp1 = res + PATH_MAX;	1410	tmp1 = res + PATH_MAX;
1375	tmp2 = tmp1 + PATH_MAX;	1411	tmp2 = tmp1 + PATH_MAX;
1376		1412
1377	#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 */
1378	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1414	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1397	#endif	1433	#endif
1398	#endif	1434	#endif
1399		1435
1400	if (*rel != '/')	1436	if (*rel != '/')
1401	{	1437	{
1402	if (!getcwd (res, PATH_MAX))	1438	if (!eio__getwd (tmpbuf, wd))
1403	return;	1439	return -1;
1404		1440
1405	if (res [1]) /* only use if not / */	1441	if (res [1]) /* only use if not / */
1406	res += strlen (res);	1442	res += strlen (res);
1407	}	1443	}
1408		1444
1409	while (*rel)	1445	while (*rel)
1410	{	1446	{
1411	eio_ssize_t len, linklen;	1447	eio_ssize_t len, linklen;
1412	char *beg = rel;	1448	const char *beg = rel;
1413		1449
1414	while (rel && rel != '/')	1450	while (rel && rel != '/')
1415	++rel;	1451	++rel;
1416		1452
1417	len = rel - beg;	1453	len = rel - beg;
…		…
1429		1465
1430	if (beg [1] == '.' && len == 2)	1466	if (beg [1] == '.' && len == 2)
1431	{	1467	{
1432	/* .. - back up one component, if possible */	1468	/* .. - back up one component, if possible */
1433		1469
1434	while (res != req->ptr2)	1470	while (res != tmpbuf->ptr)
1435	if (*--res == '/')	1471	if (*--res == '/')
1436	break;	1472	break;
1437		1473
1438	continue;	1474	continue;
1439	}	1475	}
…		…
1449		1485
1450	/* zero-terminate, for readlink */	1486	/* zero-terminate, for readlink */
1451	res [len + 1] = 0;	1487	res [len + 1] = 0;
1452		1488
1453	/* now check if it's a symlink */	1489	/* now check if it's a symlink */
1454	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1490	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1455		1491
1456	if (linklen < 0)	1492	if (linklen < 0)
1457	{	1493	{
1458	if (errno != EINVAL)	1494	if (errno != EINVAL)
1459	return;	1495	return -1;
1460		1496
1461	/* it's a normal directory. hopefully */	1497	/* it's a normal directory. hopefully */
1462	res += len + 1;	1498	res += len + 1;
1463	}	1499	}
1464	else	1500	else
…		…
1466	/* yay, it was a symlink - build new path in tmp2 */	1502	/* yay, it was a symlink - build new path in tmp2 */
1467	int rellen = strlen (rel);	1503	int rellen = strlen (rel);
1468		1504
1469	errno = ENAMETOOLONG;	1505	errno = ENAMETOOLONG;
1470	if (linklen + 1 + rellen >= PATH_MAX)	1506	if (linklen + 1 + rellen >= PATH_MAX)
1471	return;	1507	return -1;
1472		1508
1473	errno = ELOOP;	1509	errno = ELOOP;
1474	if (!--symlinks)	1510	if (!--symlinks)
1475	return;	1511	return -1;
1476		1512
1477	if (*tmp1 == '/')	1513	if (*tmp1 == '/')
1478	res = req->ptr2; /* symlink resolves to an absolute path */	1514	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1479		1515
1480	/* 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 */
1481	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1517	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1482	tmp2 [linklen] = '/';	1518	tmp2 [linklen] = '/';
1483	memcpy (tmp2, tmp1, linklen);	1519	memcpy (tmp2, tmp1, linklen);
…		…
1485	rel = tmp2;	1521	rel = tmp2;
1486	}	1522	}
1487	}	1523	}
1488		1524
1489	/* special case for the lone root path */	1525	/* special case for the lone root path */
1490	if (res == req->ptr2)	1526	if (res == tmpbuf->ptr)
1491	*res++ = '/';	1527	*res++ = '/';
1492		1528
1493	req->result = res - (char *)req->ptr2;	1529	return res - (char *)tmpbuf->ptr;
1494
1495	done:
1496	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1497	}	1530	}
1498		1531
1499	static signed char	1532	static signed char
1500	eio_dent_cmp (const eio_dirent a, const eio_dirent b)	1533	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
1501	{	1534	{
…		…
1661	eio_dent_insertion_sort (dents, size);	1694	eio_dent_insertion_sort (dents, size);
1662	}	1695	}
1663		1696
1664	/* read a full directory */	1697	/* read a full directory */
1665	static void	1698	static void
1666	eio__scandir (eio_req req, etp_worker self)	1699	eio__scandir (eio_req *req)
1667	{	1700	{
1668	char name, names;	1701	char name, names;
1669	int namesalloc = 4096 - sizeof (void ) 4;	1702	int namesalloc = 4096 - sizeof (void ) 4;
1670	int namesoffs = 0;	1703	int namesoffs = 0;
1671	int flags = req->int1;	1704	int flags = req->int1;
…		…
1703	dirp = FindFirstFile (path, &entp);	1736	dirp = FindFirstFile (path, &entp);
1704	free (path);	1737	free (path);
1705		1738
1706	if (dirp == INVALID_HANDLE_VALUE)	1739	if (dirp == INVALID_HANDLE_VALUE)
1707	{	1740	{
1708	dirp = 0;
1709
1710	/* should steal _dosmaperr */	1741	/* should steal _dosmaperr */
1711	switch (GetLastError ())	1742	switch (GetLastError ())
1712	{	1743	{
1713	case ERROR_FILE_NOT_FOUND:	1744	case ERROR_FILE_NOT_FOUND:
1714	req->result = 0;	1745	req->result = 0;
1715	break;	1746	break;
1716		1747
1717	case ERROR_INVALID_NAME:	1748	case ERROR_INVALID_NAME:
1718	case ERROR_PATH_NOT_FOUND:	1749	case ERROR_PATH_NOT_FOUND:
1719	case ERROR_NO_MORE_FILES:	1750	case ERROR_NO_MORE_FILES:
1720	errno = ENOENT;	1751	errno = ENOENT;
1721	break;	1752	break;
1722		1753
1723	case ERROR_NOT_ENOUGH_MEMORY:	1754	case ERROR_NOT_ENOUGH_MEMORY:
1724	errno = ENOMEM;	1755	errno = ENOMEM;
1725	break;	1756	break;
1726		1757
1727	default:	1758	default:
1728	errno = EINVAL;	1759	errno = EINVAL;
1729	break;	1760	break;
1730	}	1761	}
		1762
		1763	return;
1731	}	1764	}
1732	}	1765	}
1733	#else	1766	#else
1734	dirp = opendir (req->ptr1);	1767	dirp = opendir (req->ptr1);
		1768
		1769	if (!dirp)
		1770	return;
1735	#endif	1771	#endif
1736		1772
1737	if (req->flags & EIO_FLAG_PTR1_FREE)	1773	if (req->flags & EIO_FLAG_PTR1_FREE)
1738	free (req->ptr1);	1774	free (req->ptr1);
1739		1775
1740	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1776	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1741	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1777	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1742	req->ptr2 = names = malloc (namesalloc);	1778	req->ptr2 = names = malloc (namesalloc);
1743		1779
1744	if (dirp && names && (!flags \|\| dents))	1780	if (!names \|\| (flags && !dents))
		1781	return;
		1782
1745	for (;;)	1783	for (;;)
1746	{	1784	{
1747	int done;	1785	int done;
1748		1786
1749	#ifdef _WIN32	1787	#ifdef _WIN32
1750	done = !dirp;	1788	done = !dirp;
1751	#else	1789	#else
1752	errno = 0;	1790	errno = 0;
1753	entp = readdir (dirp);	1791	entp = readdir (dirp);
1754	done = !entp;	1792	done = !entp;
1755	#endif	1793	#endif
1756		1794
1757	if (done)	1795	if (done)
1758	{	1796	{
1759	#ifndef _WIN32	1797	#ifndef _WIN32
1760	int old_errno = errno;	1798	int old_errno = errno;
1761	closedir (dirp);	1799	closedir (dirp);
1762	errno = old_errno;	1800	errno = old_errno;
1763		1801
1764	if (errno)	1802	if (errno)
1765	break;	1803	break;
1766	#endif	1804	#endif
1767		1805
1768	/* sort etc. */	1806	/* sort etc. */
1769	req->int1 = flags;	1807	req->int1 = flags;
1770	req->result = dentoffs;	1808	req->result = dentoffs;
1771		1809
1772	if (flags & EIO_READDIR_STAT_ORDER)	1810	if (flags & EIO_READDIR_STAT_ORDER)
1773	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);
1774	else if (flags & EIO_READDIR_DIRS_FIRST)	1812	else if (flags & EIO_READDIR_DIRS_FIRST)
1775	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1813	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1776	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 */
1777	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))
1778	{	1866	{
1779	/* 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
1780	eio_dirent *oth = dents + dentoffs;	1874	ent = dents + dentoffs;
1781	eio_dirent *dir = dents;
1782		1875
1783	/* 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 */
1784	/* by walking from both sides and swapping if necessary */	1877	ent->namelen = len - 1;
1785	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)
1786	{	1938	{
1787	if (dir->type == EIO_DT_DIR)	1939	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1788	++dir;	1940	ent->score = 1;
1789	else if ((--oth)->type == EIO_DT_DIR)	1941	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1790	{	1942	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1791	eio_dirent tmp = dir; dir = oth; oth = tmp;
1792
1793	++dir;
1794	}
1795	}	1943	}
1796		1944	else if (ent->type == EIO_DT_DIR)
1797	/* now sort the dirs only (dirs all have the same score) */	1945	ent->score = 0;
1798	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1799	}	1946	}
1800
1801	break;
1802	}
1803
1804	/* now add the entry to our list(s) */
1805	name = D_NAME (entp);
1806
1807	/* skip . and .. entries */
1808	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
1809	{
1810	int len = D_NAMLEN (entp) + 1;
1811
1812	while (ecb_expect_false (namesoffs + len > namesalloc))
1813	{
1814	namesalloc *= 2;
1815	req->ptr2 = names = realloc (names, namesalloc);
1816
1817	if (!names)
1818	break;
1819	}	1947	}
1820		1948
1821	memcpy (names + namesoffs, name, len);
1822
1823	if (dents)
1824	{
1825	struct eio_dirent *ent;
1826
1827	if (ecb_expect_false (dentoffs == dentalloc))
1828	{
1829	dentalloc *= 2;
1830	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1831
1832	if (!dents)
1833	break;
1834	}
1835
1836	ent = dents + dentoffs;
1837
1838	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1839	ent->namelen = len - 1;
1840	ent->inode = D_INO (entp);
1841
1842	inode_bits \|= ent->inode;
1843
1844	switch (D_TYPE (entp))
1845	{
1846	default:
1847	ent->type = EIO_DT_UNKNOWN;
1848	flags \|= EIO_READDIR_FOUND_UNKNOWN;
1849	break;
1850
1851	#ifdef DT_FIFO
1852	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1853	#endif
1854	#ifdef DT_CHR
1855	case DT_CHR: ent->type = EIO_DT_CHR; break;
1856	#endif
1857	#ifdef DT_MPC
1858	case DT_MPC: ent->type = EIO_DT_MPC; break;
1859	#endif
1860	#ifdef DT_DIR
1861	case DT_DIR: ent->type = EIO_DT_DIR; break;
1862	#endif
1863	#ifdef DT_NAM
1864	case DT_NAM: ent->type = EIO_DT_NAM; break;
1865	#endif
1866	#ifdef DT_BLK
1867	case DT_BLK: ent->type = EIO_DT_BLK; break;
1868	#endif
1869	#ifdef DT_MPB
1870	case DT_MPB: ent->type = EIO_DT_MPB; break;
1871	#endif
1872	#ifdef DT_REG
1873	case DT_REG: ent->type = EIO_DT_REG; break;
1874	#endif
1875	#ifdef DT_NWK
1876	case DT_NWK: ent->type = EIO_DT_NWK; break;
1877	#endif
1878	#ifdef DT_CMP
1879	case DT_CMP: ent->type = EIO_DT_CMP; break;
1880	#endif
1881	#ifdef DT_LNK
1882	case DT_LNK: ent->type = EIO_DT_LNK; break;
1883	#endif
1884	#ifdef DT_SOCK
1885	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1886	#endif
1887	#ifdef DT_DOOR
1888	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1889	#endif
1890	#ifdef DT_WHT
1891	case DT_WHT: ent->type = EIO_DT_WHT; break;
1892	#endif
1893	}
1894
1895	ent->score = 7;
1896
1897	if (flags & EIO_READDIR_DIRS_FIRST)
1898	{
1899	if (ent->type == EIO_DT_UNKNOWN)
1900	{
1901	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1902	ent->score = 1;
1903	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1904	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1905	}
1906	else if (ent->type == EIO_DT_DIR)
1907	ent->score = 0;
1908	}
1909	}
1910
1911	namesoffs += len;	1949	namesoffs += len;
1912	++dentoffs;	1950	++dentoffs;
1913	}	1951	}
1914		1952
1915	if (EIO_CANCELLED (req))	1953	if (EIO_CANCELLED (req))
1916	{	1954	{
1917	errno = ECANCELED;	1955	errno = ECANCELED;
1918	break;	1956	break;
1919	}	1957	}
1920		1958
1921	#ifdef _WIN32	1959	#ifdef _WIN32
1922	if (!FindNextFile (dirp, &entp))	1960	if (!FindNextFile (dirp, &entp))
1923	{	1961	{
1924	FindClose (dirp);	1962	FindClose (dirp);
1925	dirp = 0;	1963	dirp = 0;
1926	}	1964	}
1927	#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);
1928	}	2073	}
		2074	}
		2075
		2076	if (!path)
		2077	path = EIO_INVALID_WD;
		2078
		2079	return (eio_wd)path;
1929	}	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
1930		2100
1931	/*****************************************************************************/	2101	/*****************************************************************************/
1932		2102
1933	#define ALLOC(len) \	2103	#define ALLOC(len) \
1934	if (!req->ptr2) \	2104	if (!req->ptr2) \
…		…
1964		2134
1965	X_LOCK (reqlock);	2135	X_LOCK (reqlock);
1966		2136
1967	for (;;)	2137	for (;;)
1968	{	2138	{
1969	self->req = req = reqq_shift (&req_queue);	2139	req = reqq_shift (&req_queue);
1970		2140
1971	if (req)	2141	if (req)
1972	break;	2142	break;
1973		2143
1974	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 */
…		…
2012	++npending;	2182	++npending;
2013		2183
2014	if (!reqq_push (&res_queue, req) && want_poll_cb)	2184	if (!reqq_push (&res_queue, req) && want_poll_cb)
2015	want_poll_cb ();	2185	want_poll_cb ();
2016		2186
2017	self->req = 0;
2018	etp_worker_clear (self);	2187	etp_worker_clear (self);
2019		2188
2020	X_UNLOCK (reslock);	2189	X_UNLOCK (reslock);
2021	}	2190	}
2022		2191
2023	quit:	2192	quit:
		2193	free (req);
		2194
2024	X_LOCK (wrklock);	2195	X_LOCK (wrklock);
2025	etp_worker_free (self);	2196	etp_worker_free (self);
2026	X_UNLOCK (wrklock);	2197	X_UNLOCK (wrklock);
2027		2198
2028	return 0;	2199	return 0;
…		…
2071	}	2242	}
2072		2243
2073	static void	2244	static void
2074	eio_execute (etp_worker self, eio_req req)	2245	eio_execute (etp_worker self, eio_req req)
2075	{	2246	{
		2247	#if HAVE_AT
		2248	int dirfd;
		2249	#else
		2250	const char *path;
		2251	#endif
		2252
2076	if (ecb_expect_false (EIO_CANCELLED (req)))	2253	if (ecb_expect_false (EIO_CANCELLED (req)))
2077	{	2254	{
2078	req->result = -1;	2255	req->result = -1;
2079	req->errorno = ECANCELED;	2256	req->errorno = ECANCELED;
2080	return;	2257	return;
2081	}	2258	}
2082		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
2083	switch (req->type)	2276	switch (req->type)
2084	{	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
2085	case EIO_READ: ALLOC (req->size);	2284	case EIO_READ: ALLOC (req->size);
2086	req->result = req->offs >= 0	2285	req->result = req->offs >= 0
2087	? pread (req->int1, req->ptr2, req->size, req->offs)	2286	? pread (req->int1, req->ptr2, req->size, req->offs)
2088	: read (req->int1, req->ptr2, req->size); break;	2287	: read (req->int1, req->ptr2, req->size); break;
2089	case EIO_WRITE: req->result = req->offs >= 0	2288	case EIO_WRITE: req->result = req->offs >= 0
…		…
2091	: write (req->int1, req->ptr2, req->size); break;	2290	: write (req->int1, req->ptr2, req->size); break;
2092		2291
2093	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;
2094	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;
2095		2294
		2295	#if HAVE_AT
		2296
2096	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2297	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2097	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;
2098	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));
2099	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
2100	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2397	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2101	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2398	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2102		2399
2103	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2104	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2105	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2400	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2106	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2401	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2107		2402
2108	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2109	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;
2110	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2111	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;
2112	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2113	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2405	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2114		2406
2115	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2116	case EIO_CLOSE: req->result = close (req->int1); break;	2407	case EIO_CLOSE: req->result = close (req->int1); break;
2117	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2408	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2118	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2119	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2120	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2121	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2122	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2123	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2124	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2125
2126	case EIO_REALPATH: eio__realpath (req, self); break;
2127
2128	case EIO_READLINK: ALLOC (PATH_MAX);
2129	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2130
2131	case EIO_SYNC: req->result = 0; sync (); break;	2409	case EIO_SYNC: req->result = 0; sync (); break;
2132	case EIO_FSYNC: req->result = fsync (req->int1); break;	2410	case EIO_FSYNC: req->result = fsync (req->int1); break;
2133	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2411	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2134	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;	2412	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2135	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;	2413	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
…		…
2137	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2415	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2138	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;
2139	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2417	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2140	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;
2141		2419
2142	case EIO_READDIR: eio__scandir (req, self); break;	2420	case EIO_READDIR: eio__scandir (req); break;
2143		2421
2144	case EIO_BUSY:	2422	case EIO_BUSY:
2145	#ifdef _WIN32	2423	#ifdef _WIN32
2146	Sleep (req->nv1 * 1e3);	2424	Sleep (req->nv1 * 1e3);
2147	#else	2425	#else
…		…
2154	req->result = select (0, 0, 0, 0, &tv);	2432	req->result = select (0, 0, 0, 0, &tv);
2155	}	2433	}
2156	#endif	2434	#endif
2157	break;	2435	break;
2158		2436
2159	case EIO_UTIME:
2160	case EIO_FUTIME:
2161	{
2162	struct timeval tv[2];
2163	struct timeval *times;
2164
2165	if (req->nv1 != -1. \|\| req->nv2 != -1.)
2166	{
2167	tv[0].tv_sec = req->nv1;
2168	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2169	tv[1].tv_sec = req->nv2;
2170	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2171
2172	times = tv;
2173	}
2174	else
2175	times = 0;
2176
2177	req->result = req->type == EIO_FUTIME
2178	? futimes (req->int1, times)
2179	: utimes (req->ptr1, times);
2180	}
2181	break;
2182
2183	case EIO_GROUP:	2437	case EIO_GROUP:
2184	abort (); /* handled in eio_request */	2438	abort (); /* handled in eio_request */
2185		2439
2186	case EIO_NOP:	2440	case EIO_NOP:
2187	req->result = 0;	2441	req->result = 0;

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.99 by root, Tue Jul 26 11:07:08 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.99 by root, Tue Jul 26 11:07:08 2011 UTC vs.
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC