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

Comparing libeio/eio.c (file contents):
Revision 1.101 by root, Wed Aug 3 15:25:38 2011 UTC vs.
Revision 1.114 by root, Fri Dec 30 07:38:00 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>
…		…
292	#define FUBd \	292	#define FUBd \
293	free (eio_buf)	293	free (eio_buf)
294		294
295	#define EIO_TICKS ((1000000 + 1023) >> 10)	295	#define EIO_TICKS ((1000000 + 1023) >> 10)
296		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
297	#define ETP_PRI_MIN EIO_PRI_MIN	341	#define ETP_PRI_MIN EIO_PRI_MIN
298	#define ETP_PRI_MAX EIO_PRI_MAX	342	#define ETP_PRI_MAX EIO_PRI_MAX
299		343
300	struct etp_worker;	344	struct etp_worker;
301		345
…		…
346	static xmutex_t preadwritelock;	390	static xmutex_t preadwritelock;
347	#endif	391	#endif
348		392
349	typedef struct etp_worker	393	typedef struct etp_worker
350	{	394	{
		395	struct tmpbuf tmpbuf;
		396
351	/* locked by wrklock */	397	/* locked by wrklock */
352	struct etp_worker prev, next;	398	struct etp_worker prev, next;
353		399
354	xthread_t tid;	400	xthread_t tid;
355		401
356	/* locked by reslock, reqlock or wrklock */
357	ETP_REQ req; / currently processed request */
358
359	#ifdef ETP_WORKER_COMMON	402	#ifdef ETP_WORKER_COMMON
360	ETP_WORKER_COMMON	403	ETP_WORKER_COMMON
361	#endif	404	#endif
362	} etp_worker;	405	} etp_worker;
363		406
…		…
366	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	409	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
367	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	410	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
368		411
369	/* worker threads management */	412	/* worker threads management */
370		413
371	static void ecb_cold	414	static void
372	etp_worker_clear (etp_worker *wrk)	415	etp_worker_clear (etp_worker *wrk)
373	{	416	{
374	}	417	}
375		418
376	static void ecb_cold	419	static void ecb_cold
377	etp_worker_free (etp_worker *wrk)	420	etp_worker_free (etp_worker *wrk)
378	{	421	{
		422	free (wrk->tmpbuf.ptr);
		423
379	wrk->next->prev = wrk->prev;	424	wrk->next->prev = wrk->prev;
380	wrk->prev->next = wrk->next;	425	wrk->prev->next = wrk->next;
381		426
382	free (wrk);	427	free (wrk);
383	}	428	}
…		…
561	}	606	}
562		607
563	static void ecb_cold	608	static void ecb_cold
564	etp_end_thread (void)	609	etp_end_thread (void)
565	{	610	{
566	eio_req *req = calloc (1, sizeof (eio_req));	611	eio_req req = calloc (1, sizeof (eio_req)); / will be freed by worker */
567		612
568	req->type = -1;	613	req->type = -1;
569	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	614	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
570		615
571	X_LOCK (reqlock);	616	X_LOCK (reqlock);
…		…
1337	}	1382	}
1338		1383
1339	/*****************************************************************************/	1384	/*****************************************************************************/
1340	/* requests implemented outside eio_execute, because they are so large */	1385	/* requests implemented outside eio_execute, because they are so large */
1341		1386
		1387	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1342	static void	1388	static int
1343	eio__realpath (eio_req req, etp_worker self)	1389	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
1344	{	1390	{
1345	char *rel = req->ptr1;	1391	const char *rel = path;
1346	char *res;	1392	char *res;
1347	char tmp1, tmp2;	1393	char tmp1, tmp2;
1348	#if SYMLOOP_MAX > 32	1394	#if SYMLOOP_MAX > 32
1349	int symlinks = SYMLOOP_MAX;	1395	int symlinks = SYMLOOP_MAX;
1350	#else	1396	#else
1351	int symlinks = 32;	1397	int symlinks = 32;
1352	#endif	1398	#endif
1353		1399
1354	req->result = -1;
1355
1356	errno = EINVAL;	1400	errno = EINVAL;
1357	if (!rel)	1401	if (!rel)
1358	return;	1402	return -1;
1359		1403
1360	errno = ENOENT;	1404	errno = ENOENT;
1361	if (!*rel)	1405	if (!*rel)
1362	return;	1406	return -1;
1363		1407
1364	if (!req->ptr2)	1408	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1365	{
1366	X_LOCK (wrklock);
1367	req->flags \|= EIO_FLAG_PTR2_FREE;
1368	X_UNLOCK (wrklock);
1369	req->ptr2 = malloc (PATH_MAX * 3);
1370
1371	errno = ENOMEM;
1372	if (!req->ptr2)
1373	return;
1374	}
1375
1376	res = req->ptr2;
1377	tmp1 = res + PATH_MAX;	1409	tmp1 = res + PATH_MAX;
1378	tmp2 = tmp1 + PATH_MAX;	1410	tmp2 = tmp1 + PATH_MAX;
1379		1411
1380	#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 */
1381	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1413	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1400	#endif	1432	#endif
1401	#endif	1433	#endif
1402		1434
1403	if (*rel != '/')	1435	if (*rel != '/')
1404	{	1436	{
		1437	int len;
		1438
		1439	errno = ENOENT;
		1440	if (wd == EIO_INVALID_WD)
		1441	return -1;
		1442
		1443	if (wd == EIO_CWD)
		1444	{
1405	if (!getcwd (res, PATH_MAX))	1445	if (!getcwd (res, PATH_MAX))
1406	return;	1446	return -1;
		1447
		1448	len = strlen (res);
		1449	}
		1450	else
		1451	memcpy (res, wd->str, len = wd->len);
1407		1452
1408	if (res [1]) /* only use if not / */	1453	if (res [1]) /* only use if not / */
1409	res += strlen (res);	1454	res += len;
1410	}	1455	}
1411		1456
1412	while (*rel)	1457	while (*rel)
1413	{	1458	{
1414	eio_ssize_t len, linklen;	1459	eio_ssize_t len, linklen;
1415	char *beg = rel;	1460	const char *beg = rel;
1416		1461
1417	while (rel && rel != '/')	1462	while (rel && rel != '/')
1418	++rel;	1463	++rel;
1419		1464
1420	len = rel - beg;	1465	len = rel - beg;
…		…
1432		1477
1433	if (beg [1] == '.' && len == 2)	1478	if (beg [1] == '.' && len == 2)
1434	{	1479	{
1435	/* .. - back up one component, if possible */	1480	/* .. - back up one component, if possible */
1436		1481
1437	while (res != req->ptr2)	1482	while (res != tmpbuf->ptr)
1438	if (*--res == '/')	1483	if (*--res == '/')
1439	break;	1484	break;
1440		1485
1441	continue;	1486	continue;
1442	}	1487	}
1443	}	1488	}
1444		1489
1445	errno = ENAMETOOLONG;	1490	errno = ENAMETOOLONG;
1446	if (res + 1 + len + 1 >= tmp1)	1491	if (res + 1 + len + 1 >= tmp1)
1447	return;	1492	return -1;
1448		1493
1449	/* copy one component */	1494	/* copy one component */
1450	*res = '/';	1495	*res = '/';
1451	memcpy (res + 1, beg, len);	1496	memcpy (res + 1, beg, len);
1452		1497
1453	/* zero-terminate, for readlink */	1498	/* zero-terminate, for readlink */
1454	res [len + 1] = 0;	1499	res [len + 1] = 0;
1455		1500
1456	/* now check if it's a symlink */	1501	/* now check if it's a symlink */
1457	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1502	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1458		1503
1459	if (linklen < 0)	1504	if (linklen < 0)
1460	{	1505	{
1461	if (errno != EINVAL)	1506	if (errno != EINVAL)
1462	return;	1507	return -1;
1463		1508
1464	/* it's a normal directory. hopefully */	1509	/* it's a normal directory. hopefully */
1465	res += len + 1;	1510	res += len + 1;
1466	}	1511	}
1467	else	1512	else
…		…
1469	/* yay, it was a symlink - build new path in tmp2 */	1514	/* yay, it was a symlink - build new path in tmp2 */
1470	int rellen = strlen (rel);	1515	int rellen = strlen (rel);
1471		1516
1472	errno = ENAMETOOLONG;	1517	errno = ENAMETOOLONG;
1473	if (linklen + 1 + rellen >= PATH_MAX)	1518	if (linklen + 1 + rellen >= PATH_MAX)
1474	return;	1519	return -1;
1475		1520
1476	errno = ELOOP;	1521	errno = ELOOP;
1477	if (!--symlinks)	1522	if (!--symlinks)
1478	return;	1523	return -1;
1479		1524
1480	if (*tmp1 == '/')	1525	if (*tmp1 == '/')
1481	res = req->ptr2; /* symlink resolves to an absolute path */	1526	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1482		1527
1483	/* 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 */
1484	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1529	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1485	tmp2 [linklen] = '/';	1530	tmp2 [linklen] = '/';
1486	memcpy (tmp2, tmp1, linklen);	1531	memcpy (tmp2, tmp1, linklen);
…		…
1488	rel = tmp2;	1533	rel = tmp2;
1489	}	1534	}
1490	}	1535	}
1491		1536
1492	/* special case for the lone root path */	1537	/* special case for the lone root path */
1493	if (res == req->ptr2)	1538	if (res == tmpbuf->ptr)
1494	*res++ = '/';	1539	*res++ = '/';
1495		1540
1496	req->result = res - (char *)req->ptr2;	1541	return res - (char *)tmpbuf->ptr;
1497
1498	done:
1499	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1500	}	1542	}
1501		1543
1502	static signed char	1544	static signed char
1503	eio_dent_cmp (const eio_dirent a, const eio_dirent b)	1545	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
1504	{	1546	{
…		…
1692	#ifdef _WIN32	1734	#ifdef _WIN32
1693	{	1735	{
1694	int len = strlen ((const char *)req->ptr1);	1736	int len = strlen ((const char *)req->ptr1);
1695	char *path = malloc (MAX_PATH);	1737	char *path = malloc (MAX_PATH);
1696	const char *fmt;	1738	const char *fmt;
		1739	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1697		1740
1698	if (!len)	1741	if (!len)
1699	fmt = "./*";	1742	fmt = "./*";
1700	else if (((const char )req->ptr1)[len - 1] == '/' \|\| ((const char )req->ptr1)[len - 1] == '\\')	1743	else if (reqpath[len - 1] == '/' \|\| reqpath[len - 1] == '\\')
1701	fmt = "%s*";	1744	fmt = "%s*";
1702	else	1745	else
1703	fmt = "%s/*";	1746	fmt = "%s/*";
1704		1747
1705	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1748	_snprintf (path, MAX_PATH, fmt, reqpath);
1706	dirp = FindFirstFile (path, &entp);	1749	dirp = FindFirstFile (path, &entp);
1707	free (path);	1750	free (path);
1708		1751
1709	if (dirp == INVALID_HANDLE_VALUE)	1752	if (dirp == INVALID_HANDLE_VALUE)
1710	{	1753	{
1711	dirp = 0;
1712
1713	/* should steal _dosmaperr */	1754	/* should steal _dosmaperr */
1714	switch (GetLastError ())	1755	switch (GetLastError ())
1715	{	1756	{
1716	case ERROR_FILE_NOT_FOUND:	1757	case ERROR_FILE_NOT_FOUND:
1717	req->result = 0;	1758	req->result = 0;
1718	break;	1759	break;
1719		1760
1720	case ERROR_INVALID_NAME:	1761	case ERROR_INVALID_NAME:
1721	case ERROR_PATH_NOT_FOUND:	1762	case ERROR_PATH_NOT_FOUND:
1722	case ERROR_NO_MORE_FILES:	1763	case ERROR_NO_MORE_FILES:
1723	errno = ENOENT;	1764	errno = ENOENT;
1724	break;	1765	break;
1725		1766
1726	case ERROR_NOT_ENOUGH_MEMORY:	1767	case ERROR_NOT_ENOUGH_MEMORY:
1727	errno = ENOMEM;	1768	errno = ENOMEM;
1728	break;	1769	break;
1729		1770
1730	default:	1771	default:
1731	errno = EINVAL;	1772	errno = EINVAL;
1732	break;	1773	break;
1733	}	1774	}
		1775
		1776	return;
1734	}	1777	}
1735	}	1778	}
1736	#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
1737	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;
1738	#endif	1801	#endif
1739		1802
1740	if (req->flags & EIO_FLAG_PTR1_FREE)	1803	if (req->flags & EIO_FLAG_PTR1_FREE)
1741	free (req->ptr1);	1804	free (req->ptr1);
1742		1805
1743	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1806	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1744	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1807	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1745	req->ptr2 = names = malloc (namesalloc);	1808	req->ptr2 = names = malloc (namesalloc);
1746		1809
1747	if (dirp && names && (!flags \|\| dents))	1810	if (!names \|\| (flags && !dents))
		1811	return;
		1812
1748	for (;;)	1813	for (;;)
1749	{	1814	{
1750	int done;	1815	int done;
1751		1816
1752	#ifdef _WIN32	1817	#ifdef _WIN32
1753	done = !dirp;	1818	done = !dirp;
1754	#else	1819	#else
1755	errno = 0;	1820	errno = 0;
1756	entp = readdir (dirp);	1821	entp = readdir (dirp);
1757	done = !entp;	1822	done = !entp;
1758	#endif	1823	#endif
1759		1824
1760	if (done)	1825	if (done)
1761	{	1826	{
1762	#ifndef _WIN32	1827	#ifndef _WIN32
1763	int old_errno = errno;	1828	int old_errno = errno;
1764	closedir (dirp);	1829	closedir (dirp);
1765	errno = old_errno;	1830	errno = old_errno;
1766		1831
1767	if (errno)	1832	if (errno)
1768	break;	1833	break;
1769	#endif	1834	#endif
1770		1835
1771	/* sort etc. */	1836	/* sort etc. */
1772	req->int1 = flags;	1837	req->int1 = flags;
1773	req->result = dentoffs;	1838	req->result = dentoffs;
1774		1839
1775	if (flags & EIO_READDIR_STAT_ORDER)	1840	if (flags & EIO_READDIR_STAT_ORDER)
1776	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);
1777	else if (flags & EIO_READDIR_DIRS_FIRST)	1842	else if (flags & EIO_READDIR_DIRS_FIRST)
1778	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1843	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1779	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 */
1780	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))
1781	{	1896	{
1782	/* 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
1783	eio_dirent *oth = dents + dentoffs;	1904	ent = dents + dentoffs;
1784	eio_dirent *dir = dents;
1785		1905
1786	/* 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 */
1787	/* by walking from both sides and swapping if necessary */	1907	ent->namelen = len - 1;
1788	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)
1789	{	1968	{
1790	if (dir->type == EIO_DT_DIR)	1969	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1791	++dir;	1970	ent->score = 1;
1792	else if ((--oth)->type == EIO_DT_DIR)	1971	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1793	{	1972	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1794	eio_dirent tmp = dir; dir = oth; oth = tmp;
1795
1796	++dir;
1797	}
1798	}	1973	}
1799		1974	else if (ent->type == EIO_DT_DIR)
1800	/* now sort the dirs only (dirs all have the same score) */	1975	ent->score = 0;
1801	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1802	}	1976	}
1803
1804	break;
1805	}
1806
1807	/* now add the entry to our list(s) */
1808	name = D_NAME (entp);
1809
1810	/* skip . and .. entries */
1811	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
1812	{
1813	int len = D_NAMLEN (entp) + 1;
1814
1815	while (ecb_expect_false (namesoffs + len > namesalloc))
1816	{
1817	namesalloc *= 2;
1818	req->ptr2 = names = realloc (names, namesalloc);
1819
1820	if (!names)
1821	break;
1822	}	1977	}
1823		1978
1824	memcpy (names + namesoffs, name, len);
1825
1826	if (dents)
1827	{
1828	struct eio_dirent *ent;
1829
1830	if (ecb_expect_false (dentoffs == dentalloc))
1831	{
1832	dentalloc *= 2;
1833	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1834
1835	if (!dents)
1836	break;
1837	}
1838
1839	ent = dents + dentoffs;
1840
1841	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1842	ent->namelen = len - 1;
1843	ent->inode = D_INO (entp);
1844
1845	inode_bits \|= ent->inode;
1846
1847	switch (D_TYPE (entp))
1848	{
1849	default:
1850	ent->type = EIO_DT_UNKNOWN;
1851	flags \|= EIO_READDIR_FOUND_UNKNOWN;
1852	break;
1853
1854	#ifdef DT_FIFO
1855	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1856	#endif
1857	#ifdef DT_CHR
1858	case DT_CHR: ent->type = EIO_DT_CHR; break;
1859	#endif
1860	#ifdef DT_MPC
1861	case DT_MPC: ent->type = EIO_DT_MPC; break;
1862	#endif
1863	#ifdef DT_DIR
1864	case DT_DIR: ent->type = EIO_DT_DIR; break;
1865	#endif
1866	#ifdef DT_NAM
1867	case DT_NAM: ent->type = EIO_DT_NAM; break;
1868	#endif
1869	#ifdef DT_BLK
1870	case DT_BLK: ent->type = EIO_DT_BLK; break;
1871	#endif
1872	#ifdef DT_MPB
1873	case DT_MPB: ent->type = EIO_DT_MPB; break;
1874	#endif
1875	#ifdef DT_REG
1876	case DT_REG: ent->type = EIO_DT_REG; break;
1877	#endif
1878	#ifdef DT_NWK
1879	case DT_NWK: ent->type = EIO_DT_NWK; break;
1880	#endif
1881	#ifdef DT_CMP
1882	case DT_CMP: ent->type = EIO_DT_CMP; break;
1883	#endif
1884	#ifdef DT_LNK
1885	case DT_LNK: ent->type = EIO_DT_LNK; break;
1886	#endif
1887	#ifdef DT_SOCK
1888	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1889	#endif
1890	#ifdef DT_DOOR
1891	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1892	#endif
1893	#ifdef DT_WHT
1894	case DT_WHT: ent->type = EIO_DT_WHT; break;
1895	#endif
1896	}
1897
1898	ent->score = 7;
1899
1900	if (flags & EIO_READDIR_DIRS_FIRST)
1901	{
1902	if (ent->type == EIO_DT_UNKNOWN)
1903	{
1904	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1905	ent->score = 1;
1906	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1907	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1908	}
1909	else if (ent->type == EIO_DT_DIR)
1910	ent->score = 0;
1911	}
1912	}
1913
1914	namesoffs += len;	1979	namesoffs += len;
1915	++dentoffs;	1980	++dentoffs;
1916	}	1981	}
1917		1982
1918	if (EIO_CANCELLED (req))	1983	if (EIO_CANCELLED (req))
1919	{	1984	{
1920	errno = ECANCELED;	1985	errno = ECANCELED;
1921	break;	1986	break;
1922	}	1987	}
1923		1988
1924	#ifdef _WIN32	1989	#ifdef _WIN32
1925	if (!FindNextFile (dirp, &entp))	1990	if (!FindNextFile (dirp, &entp))
1926	{	1991	{
1927	FindClose (dirp);	1992	FindClose (dirp);
1928	dirp = 0;	1993	dirp = 0;
1929	}	1994	}
1930	#endif	1995	#endif
1931	}	1996	}
1932	}	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
1933		2120
1934	/*****************************************************************************/	2121	/*****************************************************************************/
1935		2122
1936	#define ALLOC(len) \	2123	#define ALLOC(len) \
1937	if (!req->ptr2) \	2124	if (!req->ptr2) \
…		…
1946	req->result = -1; \	2133	req->result = -1; \
1947	break; \	2134	break; \
1948	} \	2135	} \
1949	}	2136	}
1950		2137
		2138	static void ecb_noinline ecb_cold
		2139	etp_proc_init (void)
		2140	{
		2141	#if HAVE_PRCTL_SET_NAME
		2142	/* provide a more sensible "thread name" */
		2143	char name[16 + 1];
		2144	const int namelen = sizeof (name) - 1;
		2145	int len;
		2146
		2147	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2148	name [namelen] = 0;
		2149	len = strlen (name);
		2150	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2151	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2152	#endif
		2153	}
		2154
1951	X_THREAD_PROC (etp_proc)	2155	X_THREAD_PROC (etp_proc)
1952	{	2156	{
1953	ETP_REQ *req;	2157	ETP_REQ *req;
1954	struct timespec ts;	2158	struct timespec ts;
1955	etp_worker self = (etp_worker )thr_arg;	2159	etp_worker self = (etp_worker )thr_arg;
1956		2160
1957	#if HAVE_PRCTL_SET_NAME	2161	etp_proc_init ();
1958	prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1959	#endif
1960		2162
1961	/* try to distribute timeouts somewhat evenly */	2163	/* try to distribute timeouts somewhat evenly */
1962	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2164	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1963		2165
1964	for (;;)	2166	for (;;)
…		…
1967		2169
1968	X_LOCK (reqlock);	2170	X_LOCK (reqlock);
1969		2171
1970	for (;;)	2172	for (;;)
1971	{	2173	{
1972	self->req = req = reqq_shift (&req_queue);	2174	req = reqq_shift (&req_queue);
1973		2175
1974	if (req)	2176	if (req)
1975	break;	2177	break;
1976		2178
1977	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2179	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
2015	++npending;	2217	++npending;
2016		2218
2017	if (!reqq_push (&res_queue, req) && want_poll_cb)	2219	if (!reqq_push (&res_queue, req) && want_poll_cb)
2018	want_poll_cb ();	2220	want_poll_cb ();
2019		2221
2020	self->req = 0;
2021	etp_worker_clear (self);	2222	etp_worker_clear (self);
2022		2223
2023	X_UNLOCK (reslock);	2224	X_UNLOCK (reslock);
2024	}	2225	}
2025		2226
2026	quit:	2227	quit:
		2228	free (req);
		2229
2027	X_LOCK (wrklock);	2230	X_LOCK (wrklock);
2028	etp_worker_free (self);	2231	etp_worker_free (self);
2029	X_UNLOCK (wrklock);	2232	X_UNLOCK (wrklock);
2030		2233
2031	return 0;	2234	return 0;
…		…
2074	}	2277	}
2075		2278
2076	static void	2279	static void
2077	eio_execute (etp_worker self, eio_req req)	2280	eio_execute (etp_worker self, eio_req req)
2078	{	2281	{
		2282	#if HAVE_AT
		2283	int dirfd;
		2284	#else
		2285	const char *path;
		2286	#endif
		2287
2079	if (ecb_expect_false (EIO_CANCELLED (req)))	2288	if (ecb_expect_false (EIO_CANCELLED (req)))
2080	{	2289	{
2081	req->result = -1;	2290	req->result = -1;
2082	req->errorno = ECANCELED;	2291	req->errorno = ECANCELED;
2083	return;	2292	return;
2084	}	2293	}
2085		2294
		2295	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2296	{
		2297	req->result = -1;
		2298	req->errorno = ENOENT;
		2299	return;
		2300	}
		2301
		2302	if (req->type >= EIO_OPEN)
		2303	{
		2304	#if HAVE_AT
		2305	dirfd = WD2FD (req->wd);
		2306	#else
		2307	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2308	#endif
		2309	}
		2310
2086	switch (req->type)	2311	switch (req->type)
2087	{	2312	{
		2313	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2314	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2315	break;
		2316	case EIO_WD_CLOSE: req->result = 0;
		2317	eio_wd_close_sync (req->wd); break;
		2318
2088	case EIO_READ: ALLOC (req->size);	2319	case EIO_READ: ALLOC (req->size);
2089	req->result = req->offs >= 0	2320	req->result = req->offs >= 0
2090	? pread (req->int1, req->ptr2, req->size, req->offs)	2321	? pread (req->int1, req->ptr2, req->size, req->offs)
2091	: read (req->int1, req->ptr2, req->size); break;	2322	: read (req->int1, req->ptr2, req->size); break;
2092	case EIO_WRITE: req->result = req->offs >= 0	2323	case EIO_WRITE: req->result = req->offs >= 0
…		…
2094	: write (req->int1, req->ptr2, req->size); break;	2325	: write (req->int1, req->ptr2, req->size); break;
2095		2326
2096	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2327	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2097	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;	2328	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2098		2329
		2330	#if HAVE_AT
		2331
2099	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2332	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2100	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2333	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2101	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2334	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2335	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2336	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2337	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2338	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2339	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2340
		2341	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2342	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2343	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2344	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2345	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2346	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2347	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2348	case EIO_READLINK: ALLOC (PATH_MAX);
		2349	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2350	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2351	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2352	case EIO_UTIME:
		2353	case EIO_FUTIME:
		2354	{
		2355	struct timespec ts[2];
		2356	struct timespec *times;
		2357
		2358	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2359	{
		2360	ts[0].tv_sec = req->nv1;
		2361	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2362	ts[1].tv_sec = req->nv2;
		2363	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2364
		2365	times = ts;
		2366	}
		2367	else
		2368	times = 0;
		2369
		2370	req->result = req->type == EIO_FUTIME
		2371	? futimens (req->int1, times)
		2372	: utimensat (dirfd, req->ptr1, times, 0);
		2373	}
		2374	break;
		2375
		2376	#else
		2377
		2378	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2379	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2380	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2102	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2381	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2382	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2383	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2384	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2385	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2386
		2387	case EIO_UNLINK: req->result = unlink (path ); break;
		2388	case EIO_RMDIR: req->result = rmdir (path ); break;
		2389	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2390	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2391	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2392	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2393	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2394	case EIO_READLINK: ALLOC (PATH_MAX);
		2395	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2396	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2397	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2398
		2399	case EIO_UTIME:
		2400	case EIO_FUTIME:
		2401	{
		2402	struct timeval tv[2];
		2403	struct timeval *times;
		2404
		2405	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2406	{
		2407	tv[0].tv_sec = req->nv1;
		2408	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2409	tv[1].tv_sec = req->nv2;
		2410	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2411
		2412	times = tv;
		2413	}
		2414	else
		2415	times = 0;
		2416
		2417	req->result = req->type == EIO_FUTIME
		2418	? futimes (req->int1, times)
		2419	: utimes (req->ptr1, times);
		2420	}
		2421	break;
		2422
		2423	#endif
		2424
		2425	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2426	{
		2427	ALLOC (req->result);
		2428	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2429	}
		2430	break;
		2431
2103	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2432	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2104	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2433	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2105		2434
2106	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2107	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2108	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2435	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2109	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2436	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2110		2437
2111	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2112	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2438	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2113	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2114	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2439	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2115	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2116	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2440	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2117		2441
2118	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2119	case EIO_CLOSE: req->result = close (req->int1); break;	2442	case EIO_CLOSE: req->result = close (req->int1); break;
2120	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2443	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2121	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2122	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2123	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2124	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2125	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2126	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2127	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2128
2129	case EIO_REALPATH: eio__realpath (req, self); break;
2130
2131	case EIO_READLINK: ALLOC (PATH_MAX);
2132	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2133
2134	case EIO_SYNC: req->result = 0; sync (); break;	2444	case EIO_SYNC: req->result = 0; sync (); break;
2135	case EIO_FSYNC: req->result = fsync (req->int1); break;	2445	case EIO_FSYNC: req->result = fsync (req->int1); break;
2136	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2446	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2137	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;	2447	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2138	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;	2448	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
…		…
2157	req->result = select (0, 0, 0, 0, &tv);	2467	req->result = select (0, 0, 0, 0, &tv);
2158	}	2468	}
2159	#endif	2469	#endif
2160	break;	2470	break;
2161		2471
2162	case EIO_UTIME:
2163	case EIO_FUTIME:
2164	{
2165	struct timeval tv[2];
2166	struct timeval *times;
2167
2168	if (req->nv1 != -1. \|\| req->nv2 != -1.)
2169	{
2170	tv[0].tv_sec = req->nv1;
2171	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2172	tv[1].tv_sec = req->nv2;
2173	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2174
2175	times = tv;
2176	}
2177	else
2178	times = 0;
2179
2180	req->result = req->type == EIO_FUTIME
2181	? futimes (req->int1, times)
2182	: utimes (req->ptr1, times);
2183	}
2184	break;
2185
2186	case EIO_GROUP:	2472	case EIO_GROUP:
2187	abort (); /* handled in eio_request */	2473	abort (); /* handled in eio_request */
2188		2474
2189	case EIO_NOP:	2475	case EIO_NOP:
2190	req->result = 0;	2476	req->result = 0;
…		…
2202		2488
2203	req->errorno = errno;	2489	req->errorno = errno;
2204	}	2490	}
2205		2491
2206	#ifndef EIO_NO_WRAPPERS	2492	#ifndef EIO_NO_WRAPPERS
		2493
		2494	eio_req eio_wd_open (const char path, int pri, eio_cb cb, void *data)
		2495	{
		2496	REQ (EIO_WD_OPEN); PATH; SEND;
		2497	}
		2498
		2499	eio_req eio_wd_close (eio_wd wd, int pri, eio_cb cb, void data)
		2500	{
		2501	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2502	}
2207		2503
2208	eio_req eio_nop (int pri, eio_cb cb, void data)	2504	eio_req eio_nop (int pri, eio_cb cb, void data)
2209	{	2505	{
2210	REQ (EIO_NOP); SEND;	2506	REQ (EIO_NOP); SEND;
2211	}	2507	}

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.101 by root, Wed Aug 3 15:25:38 2011 UTC vs. Revision 1.114 by root, Fri Dec 30 07:38:00 2011 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.101 by root, Wed Aug 3 15:25:38 2011 UTC vs.
Revision 1.114 by root, Fri Dec 30 07:38:00 2011 UTC