[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.118 by root, Mon Apr 2 17:53:27 2012 UTC

…		…
1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libeio@schmorp.de>
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without modifica-	7	* Redistribution and use in source and binary forms, with or without modifica-
8	* tion, are permitted provided that the following conditions are met:	8	* tion, are permitted provided that the following conditions are met:
9	*	9	*
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>
…		…
208	#endif	208	#endif
209		209
210	#define D_NAME(entp) entp->d_name	210	#define D_NAME(entp) entp->d_name
211		211
212	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	212	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
213	#if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__	213	#if __FreeBSD__ \|\| __NetBSD__ \|\| __OpenBSD__
214	#define _DIRENT_HAVE_D_TYPE /* sigh */	214	#define _DIRENT_HAVE_D_TYPE /* sigh */
215	#define D_INO(de) (de)->d_fileno	215	#define D_INO(de) (de)->d_fileno
216	#define D_NAMLEN(de) (de)->d_namlen	216	#define D_NAMLEN(de) (de)->d_namlen
217	#elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600	217	#elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600
218	#define D_INO(de) (de)->d_ino	218	#define D_INO(de) (de)->d_ino
…		…
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);
…		…
1057	todo -= len;	1102	todo -= len;
1058	}	1103	}
1059		1104
1060	FUBd;	1105	FUBd;
1061		1106
1062	errno = 0;	1107	/* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
		1108	/* but not for e.g. EIO or eof, so we also never fail */
1063	return count;	1109	return 0;
1064	}	1110	}
1065		1111
1066	#endif	1112	#endif
1067		1113
1068	/* sendfile always needs emulation */	1114	/* sendfile always needs emulation */
…		…
1103		1149
1104	/* according to source inspection, this is correct, and useful behaviour */	1150	/* according to source inspection, this is correct, and useful behaviour */
1105	if (sbytes)	1151	if (sbytes)
1106	res = sbytes;	1152	res = sbytes;
1107		1153
1108	# elif defined (__APPLE__)	1154	# elif defined __APPLE__
1109	off_t sbytes = count;	1155	off_t sbytes = count;
1110	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1156	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1111		1157
1112	/* according to the manpage, sbytes is always valid */	1158	/* according to the manpage, sbytes is always valid */
1113	if (sbytes)	1159	if (sbytes)
…		…
1338		1384
1339	/*****************************************************************************/	1385	/*****************************************************************************/
1340	/* requests implemented outside eio_execute, because they are so large */	1386	/* requests implemented outside eio_execute, because they are so large */
1341		1387
1342	static void	1388	static void
1343	eio__realpath (eio_req req, etp_worker self)	1389	eio__lseek (eio_req *req)
1344	{	1390	{
1345	char *rel = req->ptr1;	1391	/* this usually gets optimised away completely, or your compiler sucks, */
		1392	/* or the whence constants really are not 0, 1, 2 */
		1393	int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
		1394	: req->int2 == EIO_SEEK_CUR ? SEEK_CUR
		1395	: req->int2 == EIO_SEEK_END ? SEEK_END
		1396	: req->int2;
		1397
		1398	req->offs = lseek (req->int1, req->offs, whence);
		1399	req->result = req->offs == (off_t)-1 ? -1 : 0;
		1400	}
		1401
		1402	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
		1403	static int
		1404	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		1405	{
		1406	const char *rel = path;
1346	char *res;	1407	char *res;
1347	char tmp1, tmp2;	1408	char tmp1, tmp2;
1348	#if SYMLOOP_MAX > 32	1409	#if SYMLOOP_MAX > 32
1349	int symlinks = SYMLOOP_MAX;	1410	int symlinks = SYMLOOP_MAX;
1350	#else	1411	#else
1351	int symlinks = 32;	1412	int symlinks = 32;
1352	#endif	1413	#endif
1353		1414
1354	req->result = -1;
1355
1356	errno = EINVAL;	1415	errno = EINVAL;
1357	if (!rel)	1416	if (!rel)
1358	return;	1417	return -1;
1359		1418
1360	errno = ENOENT;	1419	errno = ENOENT;
1361	if (!*rel)	1420	if (!*rel)
1362	return;	1421	return -1;
1363		1422
1364	if (!req->ptr2)	1423	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;	1424	tmp1 = res + PATH_MAX;
1378	tmp2 = tmp1 + PATH_MAX;	1425	tmp2 = tmp1 + PATH_MAX;
1379		1426
1380	#if 0 /* disabled, the musl way to do things is just too racy */	1427	#if 0 /* disabled, the musl way to do things is just too racy */
1381	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1428	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1400	#endif	1447	#endif
1401	#endif	1448	#endif
1402		1449
1403	if (*rel != '/')	1450	if (*rel != '/')
1404	{	1451	{
		1452	int len;
		1453
		1454	errno = ENOENT;
		1455	if (wd == EIO_INVALID_WD)
		1456	return -1;
		1457
		1458	if (wd == EIO_CWD)
		1459	{
1405	if (!getcwd (res, PATH_MAX))	1460	if (!getcwd (res, PATH_MAX))
1406	return;	1461	return -1;
		1462
		1463	len = strlen (res);
		1464	}
		1465	else
		1466	memcpy (res, wd->str, len = wd->len);
1407		1467
1408	if (res [1]) /* only use if not / */	1468	if (res [1]) /* only use if not / */
1409	res += strlen (res);	1469	res += len;
1410	}	1470	}
1411		1471
1412	while (*rel)	1472	while (*rel)
1413	{	1473	{
1414	eio_ssize_t len, linklen;	1474	eio_ssize_t len, linklen;
1415	char *beg = rel;	1475	const char *beg = rel;
1416		1476
1417	while (rel && rel != '/')	1477	while (rel && rel != '/')
1418	++rel;	1478	++rel;
1419		1479
1420	len = rel - beg;	1480	len = rel - beg;
…		…
1432		1492
1433	if (beg [1] == '.' && len == 2)	1493	if (beg [1] == '.' && len == 2)
1434	{	1494	{
1435	/* .. - back up one component, if possible */	1495	/* .. - back up one component, if possible */
1436		1496
1437	while (res != req->ptr2)	1497	while (res != tmpbuf->ptr)
1438	if (*--res == '/')	1498	if (*--res == '/')
1439	break;	1499	break;
1440		1500
1441	continue;	1501	continue;
1442	}	1502	}
1443	}	1503	}
1444		1504
1445	errno = ENAMETOOLONG;	1505	errno = ENAMETOOLONG;
1446	if (res + 1 + len + 1 >= tmp1)	1506	if (res + 1 + len + 1 >= tmp1)
1447	return;	1507	return -1;
1448		1508
1449	/* copy one component */	1509	/* copy one component */
1450	*res = '/';	1510	*res = '/';
1451	memcpy (res + 1, beg, len);	1511	memcpy (res + 1, beg, len);
1452		1512
1453	/* zero-terminate, for readlink */	1513	/* zero-terminate, for readlink */
1454	res [len + 1] = 0;	1514	res [len + 1] = 0;
1455		1515
1456	/* now check if it's a symlink */	1516	/* now check if it's a symlink */
1457	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1517	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1458		1518
1459	if (linklen < 0)	1519	if (linklen < 0)
1460	{	1520	{
1461	if (errno != EINVAL)	1521	if (errno != EINVAL)
1462	return;	1522	return -1;
1463		1523
1464	/* it's a normal directory. hopefully */	1524	/* it's a normal directory. hopefully */
1465	res += len + 1;	1525	res += len + 1;
1466	}	1526	}
1467	else	1527	else
…		…
1469	/* yay, it was a symlink - build new path in tmp2 */	1529	/* yay, it was a symlink - build new path in tmp2 */
1470	int rellen = strlen (rel);	1530	int rellen = strlen (rel);
1471		1531
1472	errno = ENAMETOOLONG;	1532	errno = ENAMETOOLONG;
1473	if (linklen + 1 + rellen >= PATH_MAX)	1533	if (linklen + 1 + rellen >= PATH_MAX)
1474	return;	1534	return -1;
1475		1535
1476	errno = ELOOP;	1536	errno = ELOOP;
1477	if (!--symlinks)	1537	if (!--symlinks)
1478	return;	1538	return -1;
1479		1539
1480	if (*tmp1 == '/')	1540	if (*tmp1 == '/')
1481	res = req->ptr2; /* symlink resolves to an absolute path */	1541	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1482		1542
1483	/* we need to be careful, as rel might point into tmp2 already */	1543	/* we need to be careful, as rel might point into tmp2 already */
1484	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1544	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1485	tmp2 [linklen] = '/';	1545	tmp2 [linklen] = '/';
1486	memcpy (tmp2, tmp1, linklen);	1546	memcpy (tmp2, tmp1, linklen);
…		…
1488	rel = tmp2;	1548	rel = tmp2;
1489	}	1549	}
1490	}	1550	}
1491		1551
1492	/* special case for the lone root path */	1552	/* special case for the lone root path */
1493	if (res == req->ptr2)	1553	if (res == tmpbuf->ptr)
1494	*res++ = '/';	1554	*res++ = '/';
1495		1555
1496	req->result = res - (char *)req->ptr2;	1556	return res - (char *)tmpbuf->ptr;
1497
1498	done:
1499	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1500	}	1557	}
1501		1558
1502	static signed char	1559	static signed char
1503	eio_dent_cmp (const eio_dirent a, const eio_dirent b)	1560	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
1504	{	1561	{
…		…
1692	#ifdef _WIN32	1749	#ifdef _WIN32
1693	{	1750	{
1694	int len = strlen ((const char *)req->ptr1);	1751	int len = strlen ((const char *)req->ptr1);
1695	char *path = malloc (MAX_PATH);	1752	char *path = malloc (MAX_PATH);
1696	const char *fmt;	1753	const char *fmt;
		1754	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1697		1755
1698	if (!len)	1756	if (!len)
1699	fmt = "./*";	1757	fmt = "./*";
1700	else if (((const char )req->ptr1)[len - 1] == '/' \|\| ((const char )req->ptr1)[len - 1] == '\\')	1758	else if (reqpath[len - 1] == '/' \|\| reqpath[len - 1] == '\\')
1701	fmt = "%s*";	1759	fmt = "%s*";
1702	else	1760	else
1703	fmt = "%s/*";	1761	fmt = "%s/*";
1704		1762
1705	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1763	_snprintf (path, MAX_PATH, fmt, reqpath);
1706	dirp = FindFirstFile (path, &entp);	1764	dirp = FindFirstFile (path, &entp);
1707	free (path);	1765	free (path);
1708		1766
1709	if (dirp == INVALID_HANDLE_VALUE)	1767	if (dirp == INVALID_HANDLE_VALUE)
1710	{	1768	{
1711	dirp = 0;
1712
1713	/* should steal _dosmaperr */	1769	/* should steal _dosmaperr */
1714	switch (GetLastError ())	1770	switch (GetLastError ())
1715	{	1771	{
1716	case ERROR_FILE_NOT_FOUND:	1772	case ERROR_FILE_NOT_FOUND:
1717	req->result = 0;	1773	req->result = 0;
1718	break;	1774	break;
1719		1775
1720	case ERROR_INVALID_NAME:	1776	case ERROR_INVALID_NAME:
1721	case ERROR_PATH_NOT_FOUND:	1777	case ERROR_PATH_NOT_FOUND:
1722	case ERROR_NO_MORE_FILES:	1778	case ERROR_NO_MORE_FILES:
1723	errno = ENOENT;	1779	errno = ENOENT;
1724	break;	1780	break;
1725		1781
1726	case ERROR_NOT_ENOUGH_MEMORY:	1782	case ERROR_NOT_ENOUGH_MEMORY:
1727	errno = ENOMEM;	1783	errno = ENOMEM;
1728	break;	1784	break;
1729		1785
1730	default:	1786	default:
1731	errno = EINVAL;	1787	errno = EINVAL;
1732	break;	1788	break;
1733	}	1789	}
		1790
		1791	return;
1734	}	1792	}
1735	}	1793	}
1736	#else	1794	#else
		1795	#if HAVE_AT
		1796	if (req->wd)
		1797	{
		1798	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
		1799
		1800	if (fd < 0)
		1801	return;
		1802
		1803	dirp = fdopendir (fd);
		1804
		1805	if (!dirp)
		1806	close (fd);
		1807	}
		1808	else
1737	dirp = opendir (req->ptr1);	1809	dirp = opendir (req->ptr1);
		1810	#else
		1811	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1812	#endif
		1813
		1814	if (!dirp)
		1815	return;
1738	#endif	1816	#endif
1739		1817
1740	if (req->flags & EIO_FLAG_PTR1_FREE)	1818	if (req->flags & EIO_FLAG_PTR1_FREE)
1741	free (req->ptr1);	1819	free (req->ptr1);
1742		1820
1743	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1821	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1744	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1822	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1745	req->ptr2 = names = malloc (namesalloc);	1823	req->ptr2 = names = malloc (namesalloc);
1746		1824
1747	if (dirp && names && (!flags \|\| dents))	1825	if (!names \|\| (flags && !dents))
		1826	return;
		1827
1748	for (;;)	1828	for (;;)
1749	{	1829	{
1750	int done;	1830	int done;
1751		1831
1752	#ifdef _WIN32	1832	#ifdef _WIN32
1753	done = !dirp;	1833	done = !dirp;
1754	#else	1834	#else
1755	errno = 0;	1835	errno = 0;
1756	entp = readdir (dirp);	1836	entp = readdir (dirp);
1757	done = !entp;	1837	done = !entp;
1758	#endif	1838	#endif
1759		1839
1760	if (done)	1840	if (done)
1761	{	1841	{
1762	#ifndef _WIN32	1842	#ifndef _WIN32
1763	int old_errno = errno;	1843	int old_errno = errno;
1764	closedir (dirp);	1844	closedir (dirp);
1765	errno = old_errno;	1845	errno = old_errno;
1766		1846
1767	if (errno)	1847	if (errno)
1768	break;	1848	break;
1769	#endif	1849	#endif
1770		1850
1771	/* sort etc. */	1851	/* sort etc. */
1772	req->int1 = flags;	1852	req->int1 = flags;
1773	req->result = dentoffs;	1853	req->result = dentoffs;
1774		1854
1775	if (flags & EIO_READDIR_STAT_ORDER)	1855	if (flags & EIO_READDIR_STAT_ORDER)
1776	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1856	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1777	else if (flags & EIO_READDIR_DIRS_FIRST)	1857	else if (flags & EIO_READDIR_DIRS_FIRST)
1778	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1858	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1779	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1859	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1780	else	1860	else
		1861	{
		1862	/* in this case, all is known, and we just put dirs first and sort them */
		1863	eio_dirent *oth = dents + dentoffs;
		1864	eio_dirent *dir = dents;
		1865
		1866	/* now partition dirs to the front, and non-dirs to the back */
		1867	/* by walking from both sides and swapping if necessary */
		1868	while (oth > dir)
		1869	{
		1870	if (dir->type == EIO_DT_DIR)
		1871	++dir;
		1872	else if ((--oth)->type == EIO_DT_DIR)
		1873	{
		1874	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1875
		1876	++dir;
		1877	}
		1878	}
		1879
		1880	/* now sort the dirs only (dirs all have the same score) */
		1881	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1882	}
		1883
		1884	break;
		1885	}
		1886
		1887	/* now add the entry to our list(s) */
		1888	name = D_NAME (entp);
		1889
		1890	/* skip . and .. entries */
		1891	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
		1892	{
		1893	int len = D_NAMLEN (entp) + 1;
		1894
		1895	while (ecb_expect_false (namesoffs + len > namesalloc))
		1896	{
		1897	namesalloc *= 2;
		1898	req->ptr2 = names = realloc (names, namesalloc);
		1899
		1900	if (!names)
		1901	break;
		1902	}
		1903
		1904	memcpy (names + namesoffs, name, len);
		1905
		1906	if (dents)
		1907	{
		1908	struct eio_dirent *ent;
		1909
		1910	if (ecb_expect_false (dentoffs == dentalloc))
1781	{	1911	{
1782	/* in this case, all is known, and we just put dirs first and sort them */	1912	dentalloc *= 2;
		1913	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1914
		1915	if (!dents)
		1916	break;
		1917	}
		1918
1783	eio_dirent *oth = dents + dentoffs;	1919	ent = dents + dentoffs;
1784	eio_dirent *dir = dents;
1785		1920
1786	/* now partition dirs to the front, and non-dirs to the back */	1921	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1787	/* by walking from both sides and swapping if necessary */	1922	ent->namelen = len - 1;
1788	while (oth > dir)	1923	ent->inode = D_INO (entp);
		1924
		1925	inode_bits \|= ent->inode;
		1926
		1927	switch (D_TYPE (entp))
		1928	{
		1929	default:
		1930	ent->type = EIO_DT_UNKNOWN;
		1931	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1932	break;
		1933
		1934	#ifdef DT_FIFO
		1935	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1936	#endif
		1937	#ifdef DT_CHR
		1938	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1939	#endif
		1940	#ifdef DT_MPC
		1941	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1942	#endif
		1943	#ifdef DT_DIR
		1944	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1945	#endif
		1946	#ifdef DT_NAM
		1947	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1948	#endif
		1949	#ifdef DT_BLK
		1950	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1951	#endif
		1952	#ifdef DT_MPB
		1953	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1954	#endif
		1955	#ifdef DT_REG
		1956	case DT_REG: ent->type = EIO_DT_REG; break;
		1957	#endif
		1958	#ifdef DT_NWK
		1959	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1960	#endif
		1961	#ifdef DT_CMP
		1962	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1963	#endif
		1964	#ifdef DT_LNK
		1965	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1966	#endif
		1967	#ifdef DT_SOCK
		1968	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1969	#endif
		1970	#ifdef DT_DOOR
		1971	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1972	#endif
		1973	#ifdef DT_WHT
		1974	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1975	#endif
		1976	}
		1977
		1978	ent->score = 7;
		1979
		1980	if (flags & EIO_READDIR_DIRS_FIRST)
		1981	{
		1982	if (ent->type == EIO_DT_UNKNOWN)
1789	{	1983	{
1790	if (dir->type == EIO_DT_DIR)	1984	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1791	++dir;	1985	ent->score = 1;
1792	else if ((--oth)->type == EIO_DT_DIR)	1986	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1793	{	1987	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	}	1988	}
1799		1989	else if (ent->type == EIO_DT_DIR)
1800	/* now sort the dirs only (dirs all have the same score) */	1990	ent->score = 0;
1801	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1802	}	1991	}
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	}	1992	}
1823		1993
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;	1994	namesoffs += len;
1915	++dentoffs;	1995	++dentoffs;
1916	}	1996	}
1917		1997
1918	if (EIO_CANCELLED (req))	1998	if (EIO_CANCELLED (req))
1919	{	1999	{
1920	errno = ECANCELED;	2000	errno = ECANCELED;
1921	break;	2001	break;
1922	}	2002	}
1923		2003
1924	#ifdef _WIN32	2004	#ifdef _WIN32
1925	if (!FindNextFile (dirp, &entp))	2005	if (!FindNextFile (dirp, &entp))
1926	{	2006	{
1927	FindClose (dirp);	2007	FindClose (dirp);
1928	dirp = 0;	2008	dirp = 0;
1929	}	2009	}
1930	#endif	2010	#endif
1931	}	2011	}
1932	}	2012	}
		2013
		2014	/*****************************************************************************/
		2015	/* working directory stuff */
		2016	/* various deficiencies in the posix 2008 api force us to */
		2017	/* keep the absolute path in string form at all times */
		2018	/* fuck yeah. */
		2019
		2020	#if !HAVE_AT
		2021
		2022	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2023	/* an absolute or canonical path */
		2024	static const char *
		2025	wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2026	{
		2027	if (!wd \|\| *path == '/')
		2028	return path;
		2029
		2030	if (path [0] == '.' && !path [1])
		2031	return wd->str;
		2032
		2033	{
		2034	int l1 = wd->len;
		2035	int l2 = strlen (path);
		2036
		2037	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2038
		2039	memcpy (res, wd->str, l1);
		2040	res [l1] = '/';
		2041	memcpy (res + l1 + 1, path, l2 + 1);
		2042
		2043	return res;
		2044	}
		2045	}
		2046
		2047	#endif
		2048
		2049	static eio_wd
		2050	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2051	{
		2052	int fd;
		2053	eio_wd res;
		2054	int len = eio__realpath (tmpbuf, wd, path);
		2055
		2056	if (len < 0)
		2057	return EIO_INVALID_WD;
		2058
		2059	#if HAVE_AT
		2060	fd = openat (WD2FD (wd), path, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
		2061
		2062	if (fd < 0)
		2063	return EIO_INVALID_WD;
		2064	#endif
		2065
		2066	res = malloc (sizeof (res) + len); / one extra 0-byte */
		2067
		2068	#if HAVE_AT
		2069	res->fd = fd;
		2070	#endif
		2071
		2072	res->len = len;
		2073	memcpy (res->str, tmpbuf->ptr, len);
		2074	res->str [len] = 0;
		2075
		2076	return res;
		2077	}
		2078
		2079	eio_wd
		2080	eio_wd_open_sync (eio_wd wd, const char *path)
		2081	{
		2082	struct tmpbuf tmpbuf = { 0 };
		2083	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2084	free (tmpbuf.ptr);
		2085
		2086	return wd;
		2087	}
		2088
		2089	void
		2090	eio_wd_close_sync (eio_wd wd)
		2091	{
		2092	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2093	{
		2094	#if HAVE_AT
		2095	close (wd->fd);
		2096	#endif
		2097	free (wd);
		2098	}
		2099	}
		2100
		2101	#if HAVE_AT
		2102
		2103	/* they forgot these */
		2104
		2105	static int
		2106	eio__truncateat (int dirfd, const char *path, off_t length)
		2107	{
		2108	int fd = openat (dirfd, path, O_WRONLY \| O_CLOEXEC);
		2109	int res;
		2110
		2111	if (fd < 0)
		2112	return fd;
		2113
		2114	res = ftruncate (fd, length);
		2115	close (fd);
		2116	return res;
		2117	}
		2118
		2119	static int
		2120	eio__statvfsat (int dirfd, const char path, struct statvfs buf)
		2121	{
		2122	int fd = openat (dirfd, path, O_SEARCH \| O_CLOEXEC);
		2123	int res;
		2124
		2125	if (fd < 0)
		2126	return fd;
		2127
		2128	res = fstatvfs (fd, buf);
		2129	close (fd);
		2130	return res;
		2131
		2132	}
		2133
		2134	#endif
1933		2135
1934	/*****************************************************************************/	2136	/*****************************************************************************/
1935		2137
1936	#define ALLOC(len) \	2138	#define ALLOC(len) \
1937	if (!req->ptr2) \	2139	if (!req->ptr2) \
…		…
1946	req->result = -1; \	2148	req->result = -1; \
1947	break; \	2149	break; \
1948	} \	2150	} \
1949	}	2151	}
1950		2152
		2153	static void ecb_noinline ecb_cold
		2154	etp_proc_init (void)
		2155	{
		2156	#if HAVE_PRCTL_SET_NAME
		2157	/* provide a more sensible "thread name" */
		2158	char name[16 + 1];
		2159	const int namelen = sizeof (name) - 1;
		2160	int len;
		2161
		2162	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2163	name [namelen] = 0;
		2164	len = strlen (name);
		2165	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2166	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2167	#endif
		2168	}
		2169
1951	X_THREAD_PROC (etp_proc)	2170	X_THREAD_PROC (etp_proc)
1952	{	2171	{
1953	ETP_REQ *req;	2172	ETP_REQ *req;
1954	struct timespec ts;	2173	struct timespec ts;
1955	etp_worker self = (etp_worker )thr_arg;	2174	etp_worker self = (etp_worker )thr_arg;
1956		2175
1957	#if HAVE_PRCTL_SET_NAME	2176	etp_proc_init ();
1958	prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1959	#endif
1960		2177
1961	/* try to distribute timeouts somewhat evenly */	2178	/* try to distribute timeouts somewhat evenly */
1962	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2179	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1963		2180
1964	for (;;)	2181	for (;;)
…		…
1967		2184
1968	X_LOCK (reqlock);	2185	X_LOCK (reqlock);
1969		2186
1970	for (;;)	2187	for (;;)
1971	{	2188	{
1972	self->req = req = reqq_shift (&req_queue);	2189	req = reqq_shift (&req_queue);
1973		2190
1974	if (req)	2191	if (req)
1975	break;	2192	break;
1976		2193
1977	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2194	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
2015	++npending;	2232	++npending;
2016		2233
2017	if (!reqq_push (&res_queue, req) && want_poll_cb)	2234	if (!reqq_push (&res_queue, req) && want_poll_cb)
2018	want_poll_cb ();	2235	want_poll_cb ();
2019		2236
2020	self->req = 0;
2021	etp_worker_clear (self);	2237	etp_worker_clear (self);
2022		2238
2023	X_UNLOCK (reslock);	2239	X_UNLOCK (reslock);
2024	}	2240	}
2025		2241
2026	quit:	2242	quit:
		2243	free (req);
		2244
2027	X_LOCK (wrklock);	2245	X_LOCK (wrklock);
2028	etp_worker_free (self);	2246	etp_worker_free (self);
2029	X_UNLOCK (wrklock);	2247	X_UNLOCK (wrklock);
2030		2248
2031	return 0;	2249	return 0;
…		…
2074	}	2292	}
2075		2293
2076	static void	2294	static void
2077	eio_execute (etp_worker self, eio_req req)	2295	eio_execute (etp_worker self, eio_req req)
2078	{	2296	{
		2297	#if HAVE_AT
		2298	int dirfd;
		2299	#else
		2300	const char *path;
		2301	#endif
		2302
2079	if (ecb_expect_false (EIO_CANCELLED (req)))	2303	if (ecb_expect_false (EIO_CANCELLED (req)))
2080	{	2304	{
2081	req->result = -1;	2305	req->result = -1;
2082	req->errorno = ECANCELED;	2306	req->errorno = ECANCELED;
2083	return;	2307	return;
2084	}	2308	}
2085		2309
		2310	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2311	{
		2312	req->result = -1;
		2313	req->errorno = ENOENT;
		2314	return;
		2315	}
		2316
		2317	if (req->type >= EIO_OPEN)
		2318	{
		2319	#if HAVE_AT
		2320	dirfd = WD2FD (req->wd);
		2321	#else
		2322	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2323	#endif
		2324	}
		2325
2086	switch (req->type)	2326	switch (req->type)
2087	{	2327	{
		2328	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2329	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2330	break;
		2331	case EIO_WD_CLOSE: req->result = 0;
		2332	eio_wd_close_sync (req->wd); break;
		2333
		2334	case EIO_SEEK: eio__lseek (req); break;
2088	case EIO_READ: ALLOC (req->size);	2335	case EIO_READ: ALLOC (req->size);
2089	req->result = req->offs >= 0	2336	req->result = req->offs >= 0
2090	? pread (req->int1, req->ptr2, req->size, req->offs)	2337	? pread (req->int1, req->ptr2, req->size, req->offs)
2091	: read (req->int1, req->ptr2, req->size); break;	2338	: read (req->int1, req->ptr2, req->size); break;
2092	case EIO_WRITE: req->result = req->offs >= 0	2339	case EIO_WRITE: req->result = req->offs >= 0
…		…
2094	: write (req->int1, req->ptr2, req->size); break;	2341	: write (req->int1, req->ptr2, req->size); break;
2095		2342
2096	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2343	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;	2344	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2098		2345
		2346	#if HAVE_AT
		2347
2099	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2348	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2100	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2349	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2101	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2350	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2351	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2352	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2353	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2354	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2355	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2356
		2357	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2358	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2359	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2360	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2361	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2362	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2363	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2364	case EIO_READLINK: ALLOC (PATH_MAX);
		2365	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2366	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2367	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2368	case EIO_UTIME:
		2369	case EIO_FUTIME:
		2370	{
		2371	struct timespec ts[2];
		2372	struct timespec *times;
		2373
		2374	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2375	{
		2376	ts[0].tv_sec = req->nv1;
		2377	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2378	ts[1].tv_sec = req->nv2;
		2379	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2380
		2381	times = ts;
		2382	}
		2383	else
		2384	times = 0;
		2385
		2386	req->result = req->type == EIO_FUTIME
		2387	? futimens (req->int1, times)
		2388	: utimensat (dirfd, req->ptr1, times, 0);
		2389	}
		2390	break;
		2391
		2392	#else
		2393
		2394	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2395	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2396	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2102	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2397	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2398	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2399	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2400	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2401	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2402
		2403	case EIO_UNLINK: req->result = unlink (path ); break;
		2404	case EIO_RMDIR: req->result = rmdir (path ); break;
		2405	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2406	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2407	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2408	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2409	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2410	case EIO_READLINK: ALLOC (PATH_MAX);
		2411	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2412	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2413	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2414
		2415	case EIO_UTIME:
		2416	case EIO_FUTIME:
		2417	{
		2418	struct timeval tv[2];
		2419	struct timeval *times;
		2420
		2421	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2422	{
		2423	tv[0].tv_sec = req->nv1;
		2424	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2425	tv[1].tv_sec = req->nv2;
		2426	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2427
		2428	times = tv;
		2429	}
		2430	else
		2431	times = 0;
		2432
		2433	req->result = req->type == EIO_FUTIME
		2434	? futimes (req->int1, times)
		2435	: utimes (req->ptr1, times);
		2436	}
		2437	break;
		2438
		2439	#endif
		2440
		2441	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2442	{
		2443	ALLOC (req->result);
		2444	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2445	}
		2446	break;
		2447
2103	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2448	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2104	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2449	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2105		2450
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));	2451	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2109	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2452	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2110		2453
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;	2454	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;	2455	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;	2456	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2117		2457
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;	2458	case EIO_CLOSE: req->result = close (req->int1); break;
2120	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2459	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;	2460	case EIO_SYNC: req->result = 0; sync (); break;
2135	case EIO_FSYNC: req->result = fsync (req->int1); break;	2461	case EIO_FSYNC: req->result = fsync (req->int1); break;
2136	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2462	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2137	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;	2463	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;	2464	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);	2483	req->result = select (0, 0, 0, 0, &tv);
2158	}	2484	}
2159	#endif	2485	#endif
2160	break;	2486	break;
2161		2487
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:	2488	case EIO_GROUP:
2187	abort (); /* handled in eio_request */	2489	abort (); /* handled in eio_request */
2188		2490
2189	case EIO_NOP:	2491	case EIO_NOP:
2190	req->result = 0;	2492	req->result = 0;
…		…
2203	req->errorno = errno;	2505	req->errorno = errno;
2204	}	2506	}
2205		2507
2206	#ifndef EIO_NO_WRAPPERS	2508	#ifndef EIO_NO_WRAPPERS
2207		2509
		2510	eio_req eio_wd_open (const char path, int pri, eio_cb cb, void *data)
		2511	{
		2512	REQ (EIO_WD_OPEN); PATH; SEND;
		2513	}
		2514
		2515	eio_req eio_wd_close (eio_wd wd, int pri, eio_cb cb, void data)
		2516	{
		2517	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2518	}
		2519
2208	eio_req eio_nop (int pri, eio_cb cb, void data)	2520	eio_req eio_nop (int pri, eio_cb cb, void data)
2209	{	2521	{
2210	REQ (EIO_NOP); SEND;	2522	REQ (EIO_NOP); SEND;
2211	}	2523	}
2212		2524
…		…
2271	}	2583	}
2272		2584
2273	eio_req eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void data)	2585	eio_req eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void data)
2274	{	2586	{
2275	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;	2587	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
		2588	}
		2589
		2590	eio_req eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void data)
		2591	{
		2592	REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2276	}	2593	}
2277		2594
2278	eio_req eio_read (int fd, void buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)	2595	eio_req eio_read (int fd, void buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2279	{	2596	{
2280	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;	2597	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;

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.118 by root, Mon Apr 2 17:53:27 2012 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.118 by root, Mon Apr 2 17:53:27 2012 UTC