[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.109 by root, Tue Sep 27 02:16:49 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>
…		…
105	#ifdef _WIN32	105	#ifdef _WIN32
106		106
107	#undef PAGESIZE	107	#undef PAGESIZE
108	#define PAGESIZE 4096 /* GetSystemInfo? */	108	#define PAGESIZE 4096 /* GetSystemInfo? */
109		109
		110	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		111
110	#ifdef EIO_STRUCT_STATI64	112	#ifdef EIO_STRUCT_STATI64
		113	/* look at perl's non-sloppy stat */
111	#define stat(path,buf) _stati64 (path,buf)	114	#define stat(path,buf) _stati64 (path,buf)
112	#define fstat(fd,buf) _fstati64 (fd,buf)	115	#define fstat(fd,buf) _fstati64 (fd,buf)
113	#endif	116	#endif
114	#define lstat(path,buf) stat (path,buf)	117	#define lstat(path,buf) stat (path,buf)
115	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))	118	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
…		…
289	#define FUBd \	292	#define FUBd \
290	free (eio_buf)	293	free (eio_buf)
291		294
292	#define EIO_TICKS ((1000000 + 1023) >> 10)	295	#define EIO_TICKS ((1000000 + 1023) >> 10)
293		296
		297	/*****************************************************************************/
		298
		299	struct tmpbuf
		300	{
		301	void *ptr;
		302	int len;
		303	};
		304
		305	static void *
		306	tmpbuf_get (struct tmpbuf *buf, int len)
		307	{
		308	if (buf->len < len)
		309	{
		310	free (buf->ptr);
		311	buf->ptr = malloc (buf->len = len);
		312	}
		313
		314	return buf->ptr;
		315	}
		316
		317	struct tmpbuf;
		318
		319	#if _POSIX_VERSION >= 200809L
		320	#define HAVE_AT 1
		321	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		322	#ifndef O_SEARCH
		323	#define O_SEARCH O_RDONLY
		324	#endif
		325	#else
		326	#define HAVE_AT 0
		327	static const char wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char *path);
		328	#endif
		329
		330	struct eio_pwd
		331	{
		332	#if HAVE_AT
		333	int fd;
		334	#endif
		335	int len;
		336	char str[1]; /* actually, a 0-terminated canonical path */
		337	};
		338
		339	/*****************************************************************************/
		340
294	#define ETP_PRI_MIN EIO_PRI_MIN	341	#define ETP_PRI_MIN EIO_PRI_MIN
295	#define ETP_PRI_MAX EIO_PRI_MAX	342	#define ETP_PRI_MAX EIO_PRI_MAX
296		343
297	struct etp_worker;	344	struct etp_worker;
298		345
…		…
321	static void (*done_poll_cb) (void);	368	static void (*done_poll_cb) (void);
322		369
323	static unsigned int max_poll_time; /* reslock */	370	static unsigned int max_poll_time; /* reslock */
324	static unsigned int max_poll_reqs; /* reslock */	371	static unsigned int max_poll_reqs; /* reslock */
325		372
326	static volatile unsigned int nreqs; /* reqlock */	373	static unsigned int nreqs; /* reqlock */
327	static volatile unsigned int nready; /* reqlock */	374	static unsigned int nready; /* reqlock */
328	static volatile unsigned int npending; /* reqlock */	375	static unsigned int npending; /* reqlock */
329	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 */
330	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 */
331		378
332	static xmutex_t wrklock;	379	static xmutex_t wrklock;
333	static xmutex_t reslock;	380	static xmutex_t reslock;
334	static xmutex_t reqlock;	381	static xmutex_t reqlock;
335	static xcond_t reqwait;	382	static xcond_t reqwait;
…		…
343	static xmutex_t preadwritelock;	390	static xmutex_t preadwritelock;
344	#endif	391	#endif
345		392
346	typedef struct etp_worker	393	typedef struct etp_worker
347	{	394	{
		395	struct tmpbuf tmpbuf;
		396
348	/* locked by wrklock */	397	/* locked by wrklock */
349	struct etp_worker prev, next;	398	struct etp_worker prev, next;
350		399
351	xthread_t tid;	400	xthread_t tid;
352		401
353	/* locked by reslock, reqlock or wrklock */
354	ETP_REQ req; / currently processed request */
355
356	#ifdef ETP_WORKER_COMMON	402	#ifdef ETP_WORKER_COMMON
357	ETP_WORKER_COMMON	403	ETP_WORKER_COMMON
358	#endif	404	#endif
359	} etp_worker;	405	} etp_worker;
360		406
…		…
363	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	409	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
364	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	410	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
365		411
366	/* worker threads management */	412	/* worker threads management */
367		413
368	static void ecb_cold	414	static void
369	etp_worker_clear (etp_worker *wrk)	415	etp_worker_clear (etp_worker *wrk)
370	{	416	{
371	}	417	}
372		418
373	static void ecb_cold	419	static void ecb_cold
374	etp_worker_free (etp_worker *wrk)	420	etp_worker_free (etp_worker *wrk)
375	{	421	{
		422	free (wrk->tmpbuf.ptr);
		423
376	wrk->next->prev = wrk->prev;	424	wrk->next->prev = wrk->prev;
377	wrk->prev->next = wrk->next;	425	wrk->prev->next = wrk->next;
378		426
379	free (wrk);	427	free (wrk);
380	}	428	}
…		…
558	}	606	}
559		607
560	static void ecb_cold	608	static void ecb_cold
561	etp_end_thread (void)	609	etp_end_thread (void)
562	{	610	{
563	eio_req *req = calloc (1, sizeof (eio_req));	611	eio_req req = calloc (1, sizeof (eio_req)); / will be freed by worker */
564		612
565	req->type = -1;	613	req->type = -1;
566	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	614	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
567		615
568	X_LOCK (reqlock);	616	X_LOCK (reqlock);
…		…
1334	}	1382	}
1335		1383
1336	/*****************************************************************************/	1384	/*****************************************************************************/
1337	/* requests implemented outside eio_execute, because they are so large */	1385	/* requests implemented outside eio_execute, because they are so large */
1338		1386
		1387	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1339	static void	1388	static int
1340	eio__realpath (eio_req req, etp_worker self)	1389	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
1341	{	1390	{
1342	char *rel = req->ptr1;	1391	const char *rel = path;
1343	char *res;	1392	char *res;
1344	char tmp1, tmp2;	1393	char tmp1, tmp2;
1345	#if SYMLOOP_MAX > 32	1394	#if SYMLOOP_MAX > 32
1346	int symlinks = SYMLOOP_MAX;	1395	int symlinks = SYMLOOP_MAX;
1347	#else	1396	#else
1348	int symlinks = 32;	1397	int symlinks = 32;
1349	#endif	1398	#endif
1350		1399
1351	req->result = -1;
1352
1353	errno = EINVAL;	1400	errno = EINVAL;
1354	if (!rel)	1401	if (!rel)
1355	return;	1402	return -1;
1356		1403
1357	errno = ENOENT;	1404	errno = ENOENT;
1358	if (!*rel)	1405	if (!*rel)
1359	return;	1406	return -1;
1360		1407
1361	if (!req->ptr2)	1408	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;	1409	tmp1 = res + PATH_MAX;
1375	tmp2 = tmp1 + PATH_MAX;	1410	tmp2 = tmp1 + PATH_MAX;
1376		1411
1377	#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 */
1378	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1413	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1397	#endif	1432	#endif
1398	#endif	1433	#endif
1399		1434
1400	if (*rel != '/')	1435	if (*rel != '/')
1401	{	1436	{
		1437	int len;
		1438
		1439	errno = ENOENT;
		1440	if (wd == EIO_INVALID_WD)
		1441	return -1;
		1442
		1443	if (wd == EIO_CWD)
		1444	{
1402	if (!getcwd (res, PATH_MAX))	1445	if (!getcwd (res, PATH_MAX))
1403	return;	1446	return -1;
		1447
		1448	len = strlen (res);
		1449	}
		1450	else
		1451	memcpy (res, wd->str, len = wd->len);
1404		1452
1405	if (res [1]) /* only use if not / */	1453	if (res [1]) /* only use if not / */
1406	res += strlen (res);	1454	res += len;
1407	}	1455	}
1408		1456
1409	while (*rel)	1457	while (*rel)
1410	{	1458	{
1411	eio_ssize_t len, linklen;	1459	eio_ssize_t len, linklen;
1412	char *beg = rel;	1460	const char *beg = rel;
1413		1461
1414	while (rel && rel != '/')	1462	while (rel && rel != '/')
1415	++rel;	1463	++rel;
1416		1464
1417	len = rel - beg;	1465	len = rel - beg;
…		…
1429		1477
1430	if (beg [1] == '.' && len == 2)	1478	if (beg [1] == '.' && len == 2)
1431	{	1479	{
1432	/* .. - back up one component, if possible */	1480	/* .. - back up one component, if possible */
1433		1481
1434	while (res != req->ptr2)	1482	while (res != tmpbuf->ptr)
1435	if (*--res == '/')	1483	if (*--res == '/')
1436	break;	1484	break;
1437		1485
1438	continue;	1486	continue;
1439	}	1487	}
…		…
1449		1497
1450	/* zero-terminate, for readlink */	1498	/* zero-terminate, for readlink */
1451	res [len + 1] = 0;	1499	res [len + 1] = 0;
1452		1500
1453	/* now check if it's a symlink */	1501	/* now check if it's a symlink */
1454	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1502	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1455		1503
1456	if (linklen < 0)	1504	if (linklen < 0)
1457	{	1505	{
1458	if (errno != EINVAL)	1506	if (errno != EINVAL)
1459	return;	1507	return -1;
1460		1508
1461	/* it's a normal directory. hopefully */	1509	/* it's a normal directory. hopefully */
1462	res += len + 1;	1510	res += len + 1;
1463	}	1511	}
1464	else	1512	else
…		…
1466	/* yay, it was a symlink - build new path in tmp2 */	1514	/* yay, it was a symlink - build new path in tmp2 */
1467	int rellen = strlen (rel);	1515	int rellen = strlen (rel);
1468		1516
1469	errno = ENAMETOOLONG;	1517	errno = ENAMETOOLONG;
1470	if (linklen + 1 + rellen >= PATH_MAX)	1518	if (linklen + 1 + rellen >= PATH_MAX)
1471	return;	1519	return -1;
1472		1520
1473	errno = ELOOP;	1521	errno = ELOOP;
1474	if (!--symlinks)	1522	if (!--symlinks)
1475	return;	1523	return -1;
1476		1524
1477	if (*tmp1 == '/')	1525	if (*tmp1 == '/')
1478	res = req->ptr2; /* symlink resolves to an absolute path */	1526	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1479		1527
1480	/* 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 */
1481	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1529	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1482	tmp2 [linklen] = '/';	1530	tmp2 [linklen] = '/';
1483	memcpy (tmp2, tmp1, linklen);	1531	memcpy (tmp2, tmp1, linklen);
…		…
1485	rel = tmp2;	1533	rel = tmp2;
1486	}	1534	}
1487	}	1535	}
1488		1536
1489	/* special case for the lone root path */	1537	/* special case for the lone root path */
1490	if (res == req->ptr2)	1538	if (res == tmpbuf->ptr)
1491	*res++ = '/';	1539	*res++ = '/';
1492		1540
1493	req->result = res - (char *)req->ptr2;	1541	return res - (char *)tmpbuf->ptr;
1494
1495	done:
1496	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1497	}	1542	}
1498		1543
1499	static signed char	1544	static signed char
1500	eio_dent_cmp (const eio_dirent a, const eio_dirent b)	1545	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
1501	{	1546	{
…		…
1689	#ifdef _WIN32	1734	#ifdef _WIN32
1690	{	1735	{
1691	int len = strlen ((const char *)req->ptr1);	1736	int len = strlen ((const char *)req->ptr1);
1692	char *path = malloc (MAX_PATH);	1737	char *path = malloc (MAX_PATH);
1693	const char *fmt;	1738	const char *fmt;
		1739	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1694		1740
1695	if (!len)	1741	if (!len)
1696	fmt = "./*";	1742	fmt = "./*";
1697	else if (((const char )req->ptr1)[len - 1] == '/' \|\| ((const char )req->ptr1)[len - 1] == '\\')	1743	else if (reqpath[len - 1] == '/' \|\| reqpath[len - 1] == '\\')
1698	fmt = "%s*";	1744	fmt = "%s*";
1699	else	1745	else
1700	fmt = "%s/*";	1746	fmt = "%s/*";
1701		1747
1702	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1748	_snprintf (path, MAX_PATH, fmt, reqpath);
1703	dirp = FindFirstFile (path, &entp);	1749	dirp = FindFirstFile (path, &entp);
1704	free (path);	1750	free (path);
1705		1751
1706	if (dirp == INVALID_HANDLE_VALUE)	1752	if (dirp == INVALID_HANDLE_VALUE)
1707	{	1753	{
1708	dirp = 0;
1709
1710	/* should steal _dosmaperr */	1754	/* should steal _dosmaperr */
1711	switch (GetLastError ())	1755	switch (GetLastError ())
1712	{	1756	{
1713	case ERROR_FILE_NOT_FOUND:	1757	case ERROR_FILE_NOT_FOUND:
1714	req->result = 0;	1758	req->result = 0;
1715	break;	1759	break;
1716		1760
1717	case ERROR_INVALID_NAME:	1761	case ERROR_INVALID_NAME:
1718	case ERROR_PATH_NOT_FOUND:	1762	case ERROR_PATH_NOT_FOUND:
1719	case ERROR_NO_MORE_FILES:	1763	case ERROR_NO_MORE_FILES:
1720	errno = ENOENT;	1764	errno = ENOENT;
1721	break;	1765	break;
1722		1766
1723	case ERROR_NOT_ENOUGH_MEMORY:	1767	case ERROR_NOT_ENOUGH_MEMORY:
1724	errno = ENOMEM;	1768	errno = ENOMEM;
1725	break;	1769	break;
1726		1770
1727	default:	1771	default:
1728	errno = EINVAL;	1772	errno = EINVAL;
1729	break;	1773	break;
1730	}	1774	}
		1775
		1776	return;
1731	}	1777	}
1732	}	1778	}
1733	#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
1734	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;
1735	#endif	1801	#endif
1736		1802
1737	if (req->flags & EIO_FLAG_PTR1_FREE)	1803	if (req->flags & EIO_FLAG_PTR1_FREE)
1738	free (req->ptr1);	1804	free (req->ptr1);
1739		1805
1740	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1806	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1741	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1807	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1742	req->ptr2 = names = malloc (namesalloc);	1808	req->ptr2 = names = malloc (namesalloc);
1743		1809
1744	if (dirp && names && (!flags \|\| dents))	1810	if (!names \|\| (flags && !dents))
		1811	return;
		1812
1745	for (;;)	1813	for (;;)
1746	{	1814	{
1747	int done;	1815	int done;
1748		1816
1749	#ifdef _WIN32	1817	#ifdef _WIN32
1750	done = !dirp;	1818	done = !dirp;
1751	#else	1819	#else
1752	errno = 0;	1820	errno = 0;
1753	entp = readdir (dirp);	1821	entp = readdir (dirp);
1754	done = !entp;	1822	done = !entp;
1755	#endif	1823	#endif
1756		1824
1757	if (done)	1825	if (done)
1758	{	1826	{
1759	#ifndef _WIN32	1827	#ifndef _WIN32
1760	int old_errno = errno;	1828	int old_errno = errno;
1761	closedir (dirp);	1829	closedir (dirp);
1762	errno = old_errno;	1830	errno = old_errno;
1763		1831
1764	if (errno)	1832	if (errno)
1765	break;	1833	break;
1766	#endif	1834	#endif
1767		1835
1768	/* sort etc. */	1836	/* sort etc. */
1769	req->int1 = flags;	1837	req->int1 = flags;
1770	req->result = dentoffs;	1838	req->result = dentoffs;
1771		1839
1772	if (flags & EIO_READDIR_STAT_ORDER)	1840	if (flags & EIO_READDIR_STAT_ORDER)
1773	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);
1774	else if (flags & EIO_READDIR_DIRS_FIRST)	1842	else if (flags & EIO_READDIR_DIRS_FIRST)
1775	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1843	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1776	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 */
1777	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))
1778	{	1896	{
1779	/* 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
1780	eio_dirent *oth = dents + dentoffs;	1904	ent = dents + dentoffs;
1781	eio_dirent *dir = dents;
1782		1905
1783	/* 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 */
1784	/* by walking from both sides and swapping if necessary */	1907	ent->namelen = len - 1;
1785	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)
1786	{	1968	{
1787	if (dir->type == EIO_DT_DIR)	1969	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1788	++dir;	1970	ent->score = 1;
1789	else if ((--oth)->type == EIO_DT_DIR)	1971	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1790	{	1972	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	}	1973	}
1796		1974	else if (ent->type == EIO_DT_DIR)
1797	/* now sort the dirs only (dirs all have the same score) */	1975	ent->score = 0;
1798	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1799	}	1976	}
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	}	1977	}
1820		1978
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;	1979	namesoffs += len;
1912	++dentoffs;	1980	++dentoffs;
1913	}	1981	}
1914		1982
1915	if (EIO_CANCELLED (req))	1983	if (EIO_CANCELLED (req))
1916	{	1984	{
1917	errno = ECANCELED;	1985	errno = ECANCELED;
1918	break;	1986	break;
1919	}	1987	}
1920		1988
1921	#ifdef _WIN32	1989	#ifdef _WIN32
1922	if (!FindNextFile (dirp, &entp))	1990	if (!FindNextFile (dirp, &entp))
1923	{	1991	{
1924	FindClose (dirp);	1992	FindClose (dirp);
1925	dirp = 0;	1993	dirp = 0;
1926	}	1994	}
1927	#endif	1995	#endif
1928	}	1996	}
1929	}	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
1930		2120
1931	/*****************************************************************************/	2121	/*****************************************************************************/
1932		2122
1933	#define ALLOC(len) \	2123	#define ALLOC(len) \
1934	if (!req->ptr2) \	2124	if (!req->ptr2) \
…		…
1964		2154
1965	X_LOCK (reqlock);	2155	X_LOCK (reqlock);
1966		2156
1967	for (;;)	2157	for (;;)
1968	{	2158	{
1969	self->req = req = reqq_shift (&req_queue);	2159	req = reqq_shift (&req_queue);
1970		2160
1971	if (req)	2161	if (req)
1972	break;	2162	break;
1973		2163
1974	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 */
…		…
2012	++npending;	2202	++npending;
2013		2203
2014	if (!reqq_push (&res_queue, req) && want_poll_cb)	2204	if (!reqq_push (&res_queue, req) && want_poll_cb)
2015	want_poll_cb ();	2205	want_poll_cb ();
2016		2206
2017	self->req = 0;
2018	etp_worker_clear (self);	2207	etp_worker_clear (self);
2019		2208
2020	X_UNLOCK (reslock);	2209	X_UNLOCK (reslock);
2021	}	2210	}
2022		2211
2023	quit:	2212	quit:
		2213	free (req);
		2214
2024	X_LOCK (wrklock);	2215	X_LOCK (wrklock);
2025	etp_worker_free (self);	2216	etp_worker_free (self);
2026	X_UNLOCK (wrklock);	2217	X_UNLOCK (wrklock);
2027		2218
2028	return 0;	2219	return 0;
…		…
2071	}	2262	}
2072		2263
2073	static void	2264	static void
2074	eio_execute (etp_worker self, eio_req req)	2265	eio_execute (etp_worker self, eio_req req)
2075	{	2266	{
		2267	#if HAVE_AT
		2268	int dirfd;
		2269	#else
		2270	const char *path;
		2271	#endif
		2272
2076	if (ecb_expect_false (EIO_CANCELLED (req)))	2273	if (ecb_expect_false (EIO_CANCELLED (req)))
2077	{	2274	{
2078	req->result = -1;	2275	req->result = -1;
2079	req->errorno = ECANCELED;	2276	req->errorno = ECANCELED;
2080	return;	2277	return;
2081	}	2278	}
2082		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
2083	switch (req->type)	2296	switch (req->type)
2084	{	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
2085	case EIO_READ: ALLOC (req->size);	2304	case EIO_READ: ALLOC (req->size);
2086	req->result = req->offs >= 0	2305	req->result = req->offs >= 0
2087	? pread (req->int1, req->ptr2, req->size, req->offs)	2306	? pread (req->int1, req->ptr2, req->size, req->offs)
2088	: read (req->int1, req->ptr2, req->size); break;	2307	: read (req->int1, req->ptr2, req->size); break;
2089	case EIO_WRITE: req->result = req->offs >= 0	2308	case EIO_WRITE: req->result = req->offs >= 0
…		…
2091	: write (req->int1, req->ptr2, req->size); break;	2310	: write (req->int1, req->ptr2, req->size); break;
2092		2311
2093	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;
2094	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;	2313	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2095		2314
		2315	#if HAVE_AT
		2316
2096	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2317	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2097	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;
2098	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));
2099	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
2100	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2417	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2101	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2418	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2102		2419
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));	2420	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2106	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2421	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2107		2422
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;	2423	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;	2424	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;	2425	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2114		2426
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;	2427	case EIO_CLOSE: req->result = close (req->int1); break;
2117	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2428	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;	2429	case EIO_SYNC: req->result = 0; sync (); break;
2132	case EIO_FSYNC: req->result = fsync (req->int1); break;	2430	case EIO_FSYNC: req->result = fsync (req->int1); break;
2133	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2431	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2134	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;	2432	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;	2433	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
…		…
2154	req->result = select (0, 0, 0, 0, &tv);	2452	req->result = select (0, 0, 0, 0, &tv);
2155	}	2453	}
2156	#endif	2454	#endif
2157	break;	2455	break;
2158		2456
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:	2457	case EIO_GROUP:
2184	abort (); /* handled in eio_request */	2458	abort (); /* handled in eio_request */
2185		2459
2186	case EIO_NOP:	2460	case EIO_NOP:
2187	req->result = 0;	2461	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.109 by root, Tue Sep 27 02:16:49 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.109 by root, Tue Sep 27 02:16:49 2011 UTC