[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.104 by root, Mon Sep 26 16:54:25 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	/*****************************************************************************/
		318
294	#define ETP_PRI_MIN EIO_PRI_MIN	319	#define ETP_PRI_MIN EIO_PRI_MIN
295	#define ETP_PRI_MAX EIO_PRI_MAX	320	#define ETP_PRI_MAX EIO_PRI_MAX
296		321
297	struct etp_worker;	322	struct etp_worker;
298		323
…		…
321	static void (*done_poll_cb) (void);	346	static void (*done_poll_cb) (void);
322		347
323	static unsigned int max_poll_time; /* reslock */	348	static unsigned int max_poll_time; /* reslock */
324	static unsigned int max_poll_reqs; /* reslock */	349	static unsigned int max_poll_reqs; /* reslock */
325		350
326	static volatile unsigned int nreqs; /* reqlock */	351	static unsigned int nreqs; /* reqlock */
327	static volatile unsigned int nready; /* reqlock */	352	static unsigned int nready; /* reqlock */
328	static volatile unsigned int npending; /* reqlock */	353	static unsigned int npending; /* reqlock */
329	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	354	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 */	355	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
331		356
332	static xmutex_t wrklock;	357	static xmutex_t wrklock;
333	static xmutex_t reslock;	358	static xmutex_t reslock;
334	static xmutex_t reqlock;	359	static xmutex_t reqlock;
335	static xcond_t reqwait;	360	static xcond_t reqwait;
…		…
343	static xmutex_t preadwritelock;	368	static xmutex_t preadwritelock;
344	#endif	369	#endif
345		370
346	typedef struct etp_worker	371	typedef struct etp_worker
347	{	372	{
		373	struct tmpbuf tmpbuf;
		374
348	/* locked by wrklock */	375	/* locked by wrklock */
349	struct etp_worker prev, next;	376	struct etp_worker prev, next;
350		377
351	xthread_t tid;	378	xthread_t tid;
352		379
353	/* locked by reslock, reqlock or wrklock */
354	ETP_REQ req; / currently processed request */
355
356	#ifdef ETP_WORKER_COMMON	380	#ifdef ETP_WORKER_COMMON
357	ETP_WORKER_COMMON	381	ETP_WORKER_COMMON
358	#endif	382	#endif
359	} etp_worker;	383	} etp_worker;
360		384
…		…
371	}	395	}
372		396
373	static void ecb_cold	397	static void ecb_cold
374	etp_worker_free (etp_worker *wrk)	398	etp_worker_free (etp_worker *wrk)
375	{	399	{
		400	free (wrk->tmpbuf.ptr);
		401
376	wrk->next->prev = wrk->prev;	402	wrk->next->prev = wrk->prev;
377	wrk->prev->next = wrk->next;	403	wrk->prev->next = wrk->next;
378		404
379	free (wrk);	405	free (wrk);
380	}	406	}
…		…
1334	}	1360	}
1335		1361
1336	/*****************************************************************************/	1362	/*****************************************************************************/
1337	/* requests implemented outside eio_execute, because they are so large */	1363	/* requests implemented outside eio_execute, because they are so large */
1338		1364
		1365	/* copies some absolute path to tmpbuf */
		1366	static char *
		1367	eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
		1368	{
		1369	if (wd == EIO_CWD)
		1370	return getcwd (tmpbuf->ptr, PATH_MAX);
		1371
		1372	#if HAVE_AT
		1373	abort (); /TODO/
		1374	#else
		1375	strcpy (tmpbuf->ptr, wd);
		1376	#endif
		1377	return tmpbuf->ptr;
		1378	}
		1379
		1380	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1339	static void	1381	static int
1340	eio__realpath (eio_req req, etp_worker self)	1382	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
1341	{	1383	{
1342	char *rel = req->ptr1;	1384	const char *rel = path;
1343	char *res;	1385	char *res;
1344	char tmp1, tmp2;	1386	char tmp1, tmp2;
1345	#if SYMLOOP_MAX > 32	1387	#if SYMLOOP_MAX > 32
1346	int symlinks = SYMLOOP_MAX;	1388	int symlinks = SYMLOOP_MAX;
1347	#else	1389	#else
1348	int symlinks = 32;	1390	int symlinks = 32;
1349	#endif	1391	#endif
1350		1392
1351	req->result = -1;	1393	/D/ /TODO: wd ignored /
1352		1394
1353	errno = EINVAL;	1395	errno = EINVAL;
1354	if (!rel)	1396	if (!rel)
1355	return;	1397	return -1;
1356		1398
1357	errno = ENOENT;	1399	errno = ENOENT;
1358	if (!*rel)	1400	if (!*rel)
1359	return;	1401	return -1;
1360		1402
1361	if (!req->ptr2)	1403	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;	1404	tmp1 = res + PATH_MAX;
1375	tmp2 = tmp1 + PATH_MAX;	1405	tmp2 = tmp1 + PATH_MAX;
1376		1406
1377	#if 0 /* disabled, the musl way to do things is just too racy */	1407	#if 0 /* disabled, the musl way to do things is just too racy */
1378	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1408	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1397	#endif	1427	#endif
1398	#endif	1428	#endif
1399		1429
1400	if (*rel != '/')	1430	if (*rel != '/')
1401	{	1431	{
1402	if (!getcwd (res, PATH_MAX))	1432	if (!eio__getwd (tmpbuf, wd))
1403	return;	1433	return -1;
1404		1434
1405	if (res [1]) /* only use if not / */	1435	if (res [1]) /* only use if not / */
1406	res += strlen (res);	1436	res += strlen (res);
1407	}	1437	}
1408		1438
1409	while (*rel)	1439	while (*rel)
1410	{	1440	{
1411	eio_ssize_t len, linklen;	1441	eio_ssize_t len, linklen;
1412	char *beg = rel;	1442	const char *beg = rel;
1413		1443
1414	while (rel && rel != '/')	1444	while (rel && rel != '/')
1415	++rel;	1445	++rel;
1416		1446
1417	len = rel - beg;	1447	len = rel - beg;
…		…
1429		1459
1430	if (beg [1] == '.' && len == 2)	1460	if (beg [1] == '.' && len == 2)
1431	{	1461	{
1432	/* .. - back up one component, if possible */	1462	/* .. - back up one component, if possible */
1433		1463
1434	while (res != req->ptr2)	1464	while (res != tmpbuf->ptr)
1435	if (*--res == '/')	1465	if (*--res == '/')
1436	break;	1466	break;
1437		1467
1438	continue;	1468	continue;
1439	}	1469	}
…		…
1449		1479
1450	/* zero-terminate, for readlink */	1480	/* zero-terminate, for readlink */
1451	res [len + 1] = 0;	1481	res [len + 1] = 0;
1452		1482
1453	/* now check if it's a symlink */	1483	/* now check if it's a symlink */
1454	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1484	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1455		1485
1456	if (linklen < 0)	1486	if (linklen < 0)
1457	{	1487	{
1458	if (errno != EINVAL)	1488	if (errno != EINVAL)
1459	return;	1489	return -1;
1460		1490
1461	/* it's a normal directory. hopefully */	1491	/* it's a normal directory. hopefully */
1462	res += len + 1;	1492	res += len + 1;
1463	}	1493	}
1464	else	1494	else
…		…
1466	/* yay, it was a symlink - build new path in tmp2 */	1496	/* yay, it was a symlink - build new path in tmp2 */
1467	int rellen = strlen (rel);	1497	int rellen = strlen (rel);
1468		1498
1469	errno = ENAMETOOLONG;	1499	errno = ENAMETOOLONG;
1470	if (linklen + 1 + rellen >= PATH_MAX)	1500	if (linklen + 1 + rellen >= PATH_MAX)
1471	return;	1501	return -1;
1472		1502
1473	errno = ELOOP;	1503	errno = ELOOP;
1474	if (!--symlinks)	1504	if (!--symlinks)
1475	return;	1505	return -1;
1476		1506
1477	if (*tmp1 == '/')	1507	if (*tmp1 == '/')
1478	res = req->ptr2; /* symlink resolves to an absolute path */	1508	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1479		1509
1480	/* we need to be careful, as rel might point into tmp2 already */	1510	/* we need to be careful, as rel might point into tmp2 already */
1481	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1511	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1482	tmp2 [linklen] = '/';	1512	tmp2 [linklen] = '/';
1483	memcpy (tmp2, tmp1, linklen);	1513	memcpy (tmp2, tmp1, linklen);
…		…
1485	rel = tmp2;	1515	rel = tmp2;
1486	}	1516	}
1487	}	1517	}
1488		1518
1489	/* special case for the lone root path */	1519	/* special case for the lone root path */
1490	if (res == req->ptr2)	1520	if (res == tmpbuf->ptr)
1491	*res++ = '/';	1521	*res++ = '/';
1492		1522
1493	req->result = res - (char *)req->ptr2;	1523	return res - (char *)tmpbuf->ptr;
1494
1495	done:
1496	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1497	}	1524	}
1498		1525
1499	static signed char	1526	static signed char
1500	eio_dent_cmp (const eio_dirent a, const eio_dirent b)	1527	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
1501	{	1528	{
…		…
1661	eio_dent_insertion_sort (dents, size);	1688	eio_dent_insertion_sort (dents, size);
1662	}	1689	}
1663		1690
1664	/* read a full directory */	1691	/* read a full directory */
1665	static void	1692	static void
1666	eio__scandir (eio_req req, etp_worker self)	1693	eio__scandir (eio_req *req)
1667	{	1694	{
1668	char name, names;	1695	char name, names;
1669	int namesalloc = 4096 - sizeof (void ) 4;	1696	int namesalloc = 4096 - sizeof (void ) 4;
1670	int namesoffs = 0;	1697	int namesoffs = 0;
1671	int flags = req->int1;	1698	int flags = req->int1;
…		…
1703	dirp = FindFirstFile (path, &entp);	1730	dirp = FindFirstFile (path, &entp);
1704	free (path);	1731	free (path);
1705		1732
1706	if (dirp == INVALID_HANDLE_VALUE)	1733	if (dirp == INVALID_HANDLE_VALUE)
1707	{	1734	{
1708	dirp = 0;
1709
1710	/* should steal _dosmaperr */	1735	/* should steal _dosmaperr */
1711	switch (GetLastError ())	1736	switch (GetLastError ())
1712	{	1737	{
1713	case ERROR_FILE_NOT_FOUND:	1738	case ERROR_FILE_NOT_FOUND:
1714	req->result = 0;	1739	req->result = 0;
1715	break;	1740	break;
1716		1741
1717	case ERROR_INVALID_NAME:	1742	case ERROR_INVALID_NAME:
1718	case ERROR_PATH_NOT_FOUND:	1743	case ERROR_PATH_NOT_FOUND:
1719	case ERROR_NO_MORE_FILES:	1744	case ERROR_NO_MORE_FILES:
1720	errno = ENOENT;	1745	errno = ENOENT;
1721	break;	1746	break;
1722		1747
1723	case ERROR_NOT_ENOUGH_MEMORY:	1748	case ERROR_NOT_ENOUGH_MEMORY:
1724	errno = ENOMEM;	1749	errno = ENOMEM;
1725	break;	1750	break;
1726		1751
1727	default:	1752	default:
1728	errno = EINVAL;	1753	errno = EINVAL;
1729	break;	1754	break;
1730	}	1755	}
		1756
		1757	return;
1731	}	1758	}
1732	}	1759	}
1733	#else	1760	#else
1734	dirp = opendir (req->ptr1);	1761	dirp = opendir (req->ptr1);
		1762
		1763	if (!dirp)
		1764	return;
1735	#endif	1765	#endif
1736		1766
1737	if (req->flags & EIO_FLAG_PTR1_FREE)	1767	if (req->flags & EIO_FLAG_PTR1_FREE)
1738	free (req->ptr1);	1768	free (req->ptr1);
1739		1769
1740	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1770	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1741	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1771	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1742	req->ptr2 = names = malloc (namesalloc);	1772	req->ptr2 = names = malloc (namesalloc);
1743		1773
1744	if (dirp && names && (!flags \|\| dents))	1774	if (!names \|\| (flags && !dents))
		1775	return;
		1776
1745	for (;;)	1777	for (;;)
1746	{	1778	{
1747	int done;	1779	int done;
1748		1780
1749	#ifdef _WIN32	1781	#ifdef _WIN32
1750	done = !dirp;	1782	done = !dirp;
1751	#else	1783	#else
1752	errno = 0;	1784	errno = 0;
1753	entp = readdir (dirp);	1785	entp = readdir (dirp);
1754	done = !entp;	1786	done = !entp;
1755	#endif	1787	#endif
1756		1788
1757	if (done)	1789	if (done)
1758	{	1790	{
1759	#ifndef _WIN32	1791	#ifndef _WIN32
1760	int old_errno = errno;	1792	int old_errno = errno;
1761	closedir (dirp);	1793	closedir (dirp);
1762	errno = old_errno;	1794	errno = old_errno;
1763		1795
1764	if (errno)	1796	if (errno)
1765	break;	1797	break;
1766	#endif	1798	#endif
1767		1799
1768	/* sort etc. */	1800	/* sort etc. */
1769	req->int1 = flags;	1801	req->int1 = flags;
1770	req->result = dentoffs;	1802	req->result = dentoffs;
1771		1803
1772	if (flags & EIO_READDIR_STAT_ORDER)	1804	if (flags & EIO_READDIR_STAT_ORDER)
1773	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1805	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1774	else if (flags & EIO_READDIR_DIRS_FIRST)	1806	else if (flags & EIO_READDIR_DIRS_FIRST)
1775	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1807	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1776	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1808	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1777	else	1809	else
		1810	{
		1811	/* in this case, all is known, and we just put dirs first and sort them */
		1812	eio_dirent *oth = dents + dentoffs;
		1813	eio_dirent *dir = dents;
		1814
		1815	/* now partition dirs to the front, and non-dirs to the back */
		1816	/* by walking from both sides and swapping if necessary */
		1817	while (oth > dir)
		1818	{
		1819	if (dir->type == EIO_DT_DIR)
		1820	++dir;
		1821	else if ((--oth)->type == EIO_DT_DIR)
		1822	{
		1823	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1824
		1825	++dir;
		1826	}
		1827	}
		1828
		1829	/* now sort the dirs only (dirs all have the same score) */
		1830	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1831	}
		1832
		1833	break;
		1834	}
		1835
		1836	/* now add the entry to our list(s) */
		1837	name = D_NAME (entp);
		1838
		1839	/* skip . and .. entries */
		1840	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
		1841	{
		1842	int len = D_NAMLEN (entp) + 1;
		1843
		1844	while (ecb_expect_false (namesoffs + len > namesalloc))
		1845	{
		1846	namesalloc *= 2;
		1847	req->ptr2 = names = realloc (names, namesalloc);
		1848
		1849	if (!names)
		1850	break;
		1851	}
		1852
		1853	memcpy (names + namesoffs, name, len);
		1854
		1855	if (dents)
		1856	{
		1857	struct eio_dirent *ent;
		1858
		1859	if (ecb_expect_false (dentoffs == dentalloc))
1778	{	1860	{
1779	/* in this case, all is known, and we just put dirs first and sort them */	1861	dentalloc *= 2;
		1862	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1863
		1864	if (!dents)
		1865	break;
		1866	}
		1867
1780	eio_dirent *oth = dents + dentoffs;	1868	ent = dents + dentoffs;
1781	eio_dirent *dir = dents;
1782		1869
1783	/* now partition dirs to the front, and non-dirs to the back */	1870	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1784	/* by walking from both sides and swapping if necessary */	1871	ent->namelen = len - 1;
1785	while (oth > dir)	1872	ent->inode = D_INO (entp);
		1873
		1874	inode_bits \|= ent->inode;
		1875
		1876	switch (D_TYPE (entp))
		1877	{
		1878	default:
		1879	ent->type = EIO_DT_UNKNOWN;
		1880	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1881	break;
		1882
		1883	#ifdef DT_FIFO
		1884	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1885	#endif
		1886	#ifdef DT_CHR
		1887	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1888	#endif
		1889	#ifdef DT_MPC
		1890	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1891	#endif
		1892	#ifdef DT_DIR
		1893	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1894	#endif
		1895	#ifdef DT_NAM
		1896	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1897	#endif
		1898	#ifdef DT_BLK
		1899	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1900	#endif
		1901	#ifdef DT_MPB
		1902	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1903	#endif
		1904	#ifdef DT_REG
		1905	case DT_REG: ent->type = EIO_DT_REG; break;
		1906	#endif
		1907	#ifdef DT_NWK
		1908	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1909	#endif
		1910	#ifdef DT_CMP
		1911	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1912	#endif
		1913	#ifdef DT_LNK
		1914	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1915	#endif
		1916	#ifdef DT_SOCK
		1917	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1918	#endif
		1919	#ifdef DT_DOOR
		1920	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1921	#endif
		1922	#ifdef DT_WHT
		1923	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1924	#endif
		1925	}
		1926
		1927	ent->score = 7;
		1928
		1929	if (flags & EIO_READDIR_DIRS_FIRST)
		1930	{
		1931	if (ent->type == EIO_DT_UNKNOWN)
1786	{	1932	{
1787	if (dir->type == EIO_DT_DIR)	1933	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1788	++dir;	1934	ent->score = 1;
1789	else if ((--oth)->type == EIO_DT_DIR)	1935	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1790	{	1936	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	}	1937	}
1796		1938	else if (ent->type == EIO_DT_DIR)
1797	/* now sort the dirs only (dirs all have the same score) */	1939	ent->score = 0;
1798	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1799	}	1940	}
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	}	1941	}
1820		1942
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;	1943	namesoffs += len;
1912	++dentoffs;	1944	++dentoffs;
1913	}	1945	}
1914		1946
1915	if (EIO_CANCELLED (req))	1947	if (EIO_CANCELLED (req))
1916	{	1948	{
1917	errno = ECANCELED;	1949	errno = ECANCELED;
1918	break;	1950	break;
1919	}	1951	}
1920		1952
1921	#ifdef _WIN32	1953	#ifdef _WIN32
1922	if (!FindNextFile (dirp, &entp))	1954	if (!FindNextFile (dirp, &entp))
1923	{	1955	{
1924	FindClose (dirp);	1956	FindClose (dirp);
1925	dirp = 0;	1957	dirp = 0;
1926	}	1958	}
1927	#endif	1959	#endif
		1960	}
		1961	}
		1962
		1963	/*****************************************************************************/
		1964	/* working directory stuff */
		1965
		1966	#if HAVE_AT
		1967
		1968	#define WD2FD(wd) (wd ? ((int)wd) - 1 : AT_FDCWD)
		1969
		1970	eio_wd
		1971	eio_wd_open_sync (eio_wd wd, const char *path)
		1972	{
		1973	int fd = openat (WD2FD (wd), path, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
		1974
		1975	return fd >= 0 ? (eio_wd)(fd + 1) : EIO_INVALID_WD;
		1976	}
		1977
		1978	void
		1979	eio_wd_close_sync (eio_wd wd)
		1980	{
		1981	int fd = WD2FD (wd);
		1982
		1983	if (fd >= 0)
		1984	close (fd);
		1985	}
		1986
		1987	#else
		1988
		1989	/* on legacy systems, we represent the working directories simply by their path strings */
		1990
		1991	static const char *
		1992	wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		1993	{
		1994	if (!wd \|\| *path == '/')
		1995	return path;
		1996
		1997	{
		1998	int l1 = strlen ((const char *)wd);
		1999	int l2 = strlen (path);
		2000
		2001	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2002
		2003	memcpy (res, wd, l1);
		2004	res [l1] = '/';
		2005	memcpy (res + l1 + 1, path, l2 + 1);
		2006
		2007	return res;
		2008	}
		2009	}
		2010
		2011	eio_wd
		2012	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2013	{
		2014	if (path == '/') / absolute paths ignore wd */
		2015	path = strdup (path);
		2016	else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
		2017	return wd;
		2018	else
		2019	{
		2020	int len = eio__realpath (tmpbuf, wd, path);
		2021
		2022	path = EIO_INVALID_WD;
		2023
		2024	if (len >= 0)
		2025	{
		2026	((char *)tmpbuf->ptr)[len] = 0;
		2027	path = strdup (tmpbuf->ptr);
1928	}	2028	}
		2029	}
		2030
		2031	if (!path)
		2032	path = EIO_INVALID_WD;
		2033
		2034	return (eio_wd)path;
1929	}	2035	}
		2036
		2037	eio_wd
		2038	eio_wd_open_sync (eio_wd wd, const char *path)
		2039	{
		2040	struct tmpbuf tmpbuf = { 0 };
		2041	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2042	free (tmpbuf.ptr);
		2043
		2044	return wd;
		2045	}
		2046
		2047	void
		2048	eio_wd_close_sync (eio_wd wd)
		2049	{
		2050	if (wd != EIO_INVALID_WD)
		2051	free (wd);
		2052	}
		2053
		2054	#endif
1930		2055
1931	/*****************************************************************************/	2056	/*****************************************************************************/
1932		2057
1933	#define ALLOC(len) \	2058	#define ALLOC(len) \
1934	if (!req->ptr2) \	2059	if (!req->ptr2) \
…		…
1964		2089
1965	X_LOCK (reqlock);	2090	X_LOCK (reqlock);
1966		2091
1967	for (;;)	2092	for (;;)
1968	{	2093	{
1969	self->req = req = reqq_shift (&req_queue);	2094	req = reqq_shift (&req_queue);
1970		2095
1971	if (req)	2096	if (req)
1972	break;	2097	break;
1973		2098
1974	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2099	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
2012	++npending;	2137	++npending;
2013		2138
2014	if (!reqq_push (&res_queue, req) && want_poll_cb)	2139	if (!reqq_push (&res_queue, req) && want_poll_cb)
2015	want_poll_cb ();	2140	want_poll_cb ();
2016		2141
2017	self->req = 0;
2018	etp_worker_clear (self);	2142	etp_worker_clear (self);
2019		2143
2020	X_UNLOCK (reslock);	2144	X_UNLOCK (reslock);
2021	}	2145	}
2022		2146
2023	quit:	2147	quit:
		2148	free (req);
		2149
2024	X_LOCK (wrklock);	2150	X_LOCK (wrklock);
2025	etp_worker_free (self);	2151	etp_worker_free (self);
2026	X_UNLOCK (wrklock);	2152	X_UNLOCK (wrklock);
2027		2153
2028	return 0;	2154	return 0;
…		…
2071	}	2197	}
2072		2198
2073	static void	2199	static void
2074	eio_execute (etp_worker self, eio_req req)	2200	eio_execute (etp_worker self, eio_req req)
2075	{	2201	{
		2202	#if HAVE_AT
		2203	int dirfd;
		2204	#else
		2205	const char *path;
		2206	#endif
		2207
2076	if (ecb_expect_false (EIO_CANCELLED (req)))	2208	if (ecb_expect_false (EIO_CANCELLED (req)))
2077	{	2209	{
2078	req->result = -1;	2210	req->result = -1;
2079	req->errorno = ECANCELED;	2211	req->errorno = ECANCELED;
2080	return;	2212	return;
2081	}	2213	}
2082		2214
		2215	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2216	{
		2217	req->result = -1;
		2218	req->errorno = ENOENT;
		2219	return;
		2220	}
		2221
		2222	if (req->type >= EIO_OPEN)
		2223	{
		2224	#if HAVE_AT
		2225	dirfd = WD2FD (req->wd);
		2226	#else
		2227	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2228	#endif
		2229	}
		2230
2083	switch (req->type)	2231	switch (req->type)
2084	{	2232	{
		2233	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2234	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2235	break;
		2236	case EIO_WD_CLOSE: eio_wd_close_sync (req->wd); break;
		2237
2085	case EIO_READ: ALLOC (req->size);	2238	case EIO_READ: ALLOC (req->size);
2086	req->result = req->offs >= 0	2239	req->result = req->offs >= 0
2087	? pread (req->int1, req->ptr2, req->size, req->offs)	2240	? pread (req->int1, req->ptr2, req->size, req->offs)
2088	: read (req->int1, req->ptr2, req->size); break;	2241	: read (req->int1, req->ptr2, req->size); break;
2089	case EIO_WRITE: req->result = req->offs >= 0	2242	case EIO_WRITE: req->result = req->offs >= 0
…		…
2091	: write (req->int1, req->ptr2, req->size); break;	2244	: write (req->int1, req->ptr2, req->size); break;
2092		2245
2093	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2246	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;	2247	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2095		2248
		2249	#if HAVE_AT
		2250	case EIO_GETPATH: abort ();
2096	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2251	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2097	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2252	req->result = fstatat (dirfd, path, (EIO_STRUCT_STAT *)req->ptr2); break;
2098	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2253	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2099	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2254	req->result = lstat (dirfd, path, (EIO_STRUCT_STAT *)req->ptr2); break;
		2255	#if 0/D/
		2256	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2257	req->result = statvfs (dirfd, path, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2258	#endif
		2259	case EIO_CHOWN: req->result = chown (dirfd, path, req->int2, req->int3); break;
		2260	case EIO_CHMOD: req->result = chmod (dirfd, path, (mode_t)req->int2); break;
		2261	case EIO_TRUNCATE: req->result = truncate (dirfd, path, req->offs); break;
		2262	case EIO_OPEN: req->result = open (dirfd, path, req->int1, (mode_t)req->int2); break;
		2263
		2264	case EIO_UNLINK: req->result = unlink (dirfd, path); break;
		2265	case EIO_RMDIR: req->result = rmdir (dirfd, path); break;
		2266	case EIO_MKDIR: req->result = mkdir (dirfd, path, (mode_t)req->int2); break;
		2267	case EIO_RENAME: req->result = rename (dirfd, path, req->ptr2); break;
		2268	case EIO_LINK: req->result = link (dirfd, path, req->ptr2); break;
		2269	case EIO_SYMLINK: req->result = symlink (dirfd, path, req->ptr2); break;
		2270	case EIO_MKNOD: req->result = mknod (dirfd, path, (mode_t)req->int2, (dev_t)req->offs); break;
		2271	#else
		2272	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2273	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2274	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2275	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2276	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2277	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2278	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2279	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2280
		2281	case EIO_UNLINK: req->result = unlink (path ); break;
		2282	case EIO_RMDIR: req->result = rmdir (path ); break;
		2283	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2284	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2285	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2286	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2287	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2288
		2289	case EIO_READLINK: ALLOC (PATH_MAX);
		2290	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2291	#endif
		2292
		2293	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2294	{
		2295	ALLOC (req->result);
		2296	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2297	}
		2298	break;
		2299
		2300	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); /D/
		2301	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2302
2100	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2303	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2101	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2304	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2102		2305
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));	2306	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2106	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2307	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2107		2308
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;	2309	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;	2310	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;	2311	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2114		2312
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;	2313	case EIO_CLOSE: req->result = close (req->int1); break;
2117	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2314	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;	2315	case EIO_SYNC: req->result = 0; sync (); break;
2132	case EIO_FSYNC: req->result = fsync (req->int1); break;	2316	case EIO_FSYNC: req->result = fsync (req->int1); break;
2133	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2317	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2134	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;	2318	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;	2319	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
…		…
2137	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2321	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2138	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2322	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2139	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2323	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2140	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	2324	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2141		2325
2142	case EIO_READDIR: eio__scandir (req, self); break;	2326	case EIO_READDIR: eio__scandir (req); break;
2143		2327
2144	case EIO_BUSY:	2328	case EIO_BUSY:
2145	#ifdef _WIN32	2329	#ifdef _WIN32
2146	Sleep (req->nv1 * 1e3);	2330	Sleep (req->nv1 * 1e3);
2147	#else	2331	#else

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.104 by root, Mon Sep 26 16:54:25 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.104 by root, Mon Sep 26 16:54:25 2011 UTC