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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC vs.
Revision 1.123 by root, Tue Oct 9 04:53:53 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	*
58	#include <sys/stat.h>	58	#include <sys/stat.h>
59	#include <limits.h>	59	#include <limits.h>
60	#include <fcntl.h>	60	#include <fcntl.h>
61	#include <assert.h>	61	#include <assert.h>
62		62
63	#if _POSIX_VERSION >= 200809L
64	# define HAVE_AT 1
65	#else
66	# define HAVE_AT 0
67	#endif
68
69	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */	63	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
70	/* intptr_t only comes from stdint.h, says idiot openbsd coder */	64	/* intptr_t only comes from stdint.h, says idiot openbsd coder */
71	#if HAVE_STDINT_H	65	#if HAVE_STDINT_H
72	# include <stdint.h>	66	# include <stdint.h>
73	#endif	67	#endif
…		…
137	#define mknod(path,mode,dev) EIO_ENOSYS ()	131	#define mknod(path,mode,dev) EIO_ENOSYS ()
138	#define sync() EIO_ENOSYS ()	132	#define sync() EIO_ENOSYS ()
139	#define readlink(path,buf,s) EIO_ENOSYS ()	133	#define readlink(path,buf,s) EIO_ENOSYS ()
140	#define statvfs(path,buf) EIO_ENOSYS ()	134	#define statvfs(path,buf) EIO_ENOSYS ()
141	#define fstatvfs(fd,buf) EIO_ENOSYS ()	135	#define fstatvfs(fd,buf) EIO_ENOSYS ()
		136
		137	#define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
		138	#define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
		139
		140	#if __GNUC__
		141	typedef long long eio_off_t; /* signed for compatibility to msvc */
		142	#else
		143	typedef __int64 eio_off_t; /* unsigned not supported by msvc */
		144	#endif
		145
		146	static eio_ssize_t
		147	eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
		148	{
		149	OVERLAPPED o = { 0 };
		150	DWORD got;
		151
		152	o.Offset = offset;
		153	o.OffsetHigh = offset >> 32;
		154
		155	return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
		156	? got : -1;
		157	}
		158
		159	static eio_ssize_t
		160	eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
		161	{
		162	OVERLAPPED o = { 0 };
		163	DWORD got;
		164
		165	o.Offset = offset;
		166	o.OffsetHigh = offset >> 32;
		167
		168	return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
		169	? got : -1;
		170	}
142		171
143	/* rename() uses MoveFile, which fails to overwrite */	172	/* rename() uses MoveFile, which fails to overwrite */
144	#define rename(old,neu) eio__rename (old, neu)	173	#define rename(old,neu) eio__rename (old, neu)
145		174
146	static int	175	static int
…		…
214	#endif	243	#endif
215		244
216	#define D_NAME(entp) entp->d_name	245	#define D_NAME(entp) entp->d_name
217		246
218	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	247	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
219	#if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__	248	#if __FreeBSD__ \|\| __NetBSD__ \|\| __OpenBSD__
220	#define _DIRENT_HAVE_D_TYPE /* sigh */	249	#define _DIRENT_HAVE_D_TYPE /* sigh */
221	#define D_INO(de) (de)->d_fileno	250	#define D_INO(de) (de)->d_fileno
222	#define D_NAMLEN(de) (de)->d_namlen	251	#define D_NAMLEN(de) (de)->d_namlen
223	#elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600	252	#elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600
224	#define D_INO(de) (de)->d_ino	253	#define D_INO(de) (de)->d_ino
…		…
318	}	347	}
319		348
320	return buf->ptr;	349	return buf->ptr;
321	}	350	}
322		351
		352	struct tmpbuf;
		353
		354	#if _POSIX_VERSION >= 200809L
		355	#define HAVE_AT 1
		356	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		357	#ifndef O_SEARCH
		358	#define O_SEARCH O_RDONLY
		359	#endif
		360	#else
		361	#define HAVE_AT 0
		362	static const char wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char *path);
		363	#endif
		364
		365	struct eio_pwd
		366	{
		367	#if HAVE_AT
		368	int fd;
		369	#endif
		370	int len;
		371	char str[1]; /* actually, a 0-terminated canonical path */
		372	};
		373
323	/*****************************************************************************/	374	/*****************************************************************************/
324		375
325	#define ETP_PRI_MIN EIO_PRI_MIN	376	#define ETP_PRI_MIN EIO_PRI_MIN
326	#define ETP_PRI_MAX EIO_PRI_MAX	377	#define ETP_PRI_MAX EIO_PRI_MAX
327		378
…		…
363	static xmutex_t wrklock;	414	static xmutex_t wrklock;
364	static xmutex_t reslock;	415	static xmutex_t reslock;
365	static xmutex_t reqlock;	416	static xmutex_t reqlock;
366	static xcond_t reqwait;	417	static xcond_t reqwait;
367		418
368	#if !HAVE_PREADWRITE
369	/*
370	* make our pread/pwrite emulation safe against themselves, but not against
371	* normal read/write by using a mutex. slows down execution a lot,
372	* but that's your problem, not mine.
373	*/
374	static xmutex_t preadwritelock;
375	#endif
376
377	typedef struct etp_worker	419	typedef struct etp_worker
378	{	420	{
379	struct tmpbuf tmpbuf;	421	struct tmpbuf tmpbuf;
380		422
381	/* locked by wrklock */	423	/* locked by wrklock */
…		…
393	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	435	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
394	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	436	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
395		437
396	/* worker threads management */	438	/* worker threads management */
397		439
398	static void ecb_cold	440	static void
399	etp_worker_clear (etp_worker *wrk)	441	etp_worker_clear (etp_worker *wrk)
400	{	442	{
401	}	443	}
402		444
403	static void ecb_cold	445	static void ecb_cold
…		…
927	}	969	}
928		970
929	/*****************************************************************************/	971	/*****************************************************************************/
930	/* work around various missing functions */	972	/* work around various missing functions */
931		973
932	#if !HAVE_PREADWRITE
933	# undef pread
934	# undef pwrite
935	# define pread eio__pread
936	# define pwrite eio__pwrite
937
938	static eio_ssize_t
939	eio__pread (int fd, void *buf, size_t count, off_t offset)
940	{
941	eio_ssize_t res;
942	off_t ooffset;
943
944	X_LOCK (preadwritelock);
945	ooffset = lseek (fd, 0, SEEK_CUR);
946	lseek (fd, offset, SEEK_SET);
947	res = read (fd, buf, count);
948	lseek (fd, ooffset, SEEK_SET);
949	X_UNLOCK (preadwritelock);
950
951	return res;
952	}
953
954	static eio_ssize_t
955	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
956	{
957	eio_ssize_t res;
958	off_t ooffset;
959
960	X_LOCK (preadwritelock);
961	ooffset = lseek (fd, 0, SEEK_CUR);
962	lseek (fd, offset, SEEK_SET);
963	res = write (fd, buf, count);
964	lseek (fd, ooffset, SEEK_SET);
965	X_UNLOCK (preadwritelock);
966
967	return res;
968	}
969	#endif
970
971	#ifndef HAVE_UTIMES	974	#ifndef HAVE_UTIMES
972		975
973	# undef utimes	976	# undef utimes
974	# define utimes(path,times) eio__utimes (path, times)	977	# define utimes(path,times) eio__utimes (path, times)
975		978
…		…
1016	int res;	1019	int res;
1017		1020
1018	#if HAVE_SYS_SYNCFS	1021	#if HAVE_SYS_SYNCFS
1019	res = (int)syscall (__NR_syncfs, (int)(fd));	1022	res = (int)syscall (__NR_syncfs, (int)(fd));
1020	#else	1023	#else
1021	res = -1;	1024	res = EIO_ENOSYS ();
1022	errno = ENOSYS;
1023	#endif	1025	#endif
1024		1026
1025	if (res < 0 && errno == ENOSYS && fd >= 0)	1027	if (res < 0 && errno == ENOSYS && fd >= 0)
1026	sync ();	1028	sync ();
1027		1029
…		…
1057	}	1059	}
1058		1060
1059	static int	1061	static int
1060	eio__fallocate (int fd, int mode, off_t offset, size_t len)	1062	eio__fallocate (int fd, int mode, off_t offset, size_t len)
1061	{	1063	{
1062	#if HAVE_FALLOCATE	1064	#if HAVE_LINUX_FALLOCATE
1063	return fallocate (fd, mode, offset, len);	1065	return fallocate (fd, mode, offset, len);
1064	#else	1066	#else
1065	errno = ENOSYS;	1067	return EIO_ENOSYS ();
1066	return -1;
1067	#endif	1068	#endif
1068	}	1069	}
1069		1070
1070	#if !HAVE_READAHEAD	1071	#if !HAVE_READAHEAD
1071	# undef readahead	1072	# undef readahead
…		…
1086	todo -= len;	1087	todo -= len;
1087	}	1088	}
1088		1089
1089	FUBd;	1090	FUBd;
1090		1091
1091	errno = 0;	1092	/* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
		1093	/* but not for e.g. EIO or eof, so we also never fail */
1092	return count;	1094	return 0;
1093	}	1095	}
1094		1096
1095	#endif	1097	#endif
1096		1098
1097	/* sendfile always needs emulation */	1099	/* sendfile always needs emulation */
…		…
1132		1134
1133	/* according to source inspection, this is correct, and useful behaviour */	1135	/* according to source inspection, this is correct, and useful behaviour */
1134	if (sbytes)	1136	if (sbytes)
1135	res = sbytes;	1137	res = sbytes;
1136		1138
1137	# elif defined (__APPLE__)	1139	# elif defined __APPLE__
1138	off_t sbytes = count;	1140	off_t sbytes = count;
1139	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1141	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1140		1142
1141	/* according to the manpage, sbytes is always valid */	1143	/* according to the manpage, sbytes is always valid */
1142	if (sbytes)	1144	if (sbytes)
…		…
1169	HANDLE h = TO_SOCKET (ifd);	1171	HANDLE h = TO_SOCKET (ifd);
1170	SetFilePointer (h, offset, 0, FILE_BEGIN);	1172	SetFilePointer (h, offset, 0, FILE_BEGIN);
1171	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);	1173	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1172		1174
1173	#else	1175	#else
1174	res = -1;	1176	res = EIO_ENOSYS ();
1175	errno = ENOSYS;
1176	#endif	1177	#endif
1177		1178
1178	/* we assume sendfile can copy at least 128mb in one go */	1179	/* we assume sendfile can copy at least 128mb in one go */
1179	if (res <= 128 * 1024 * 1024)	1180	if (res <= 128 * 1024 * 1024)
1180	{	1181	{
…		…
1366	}	1367	}
1367		1368
1368	/*****************************************************************************/	1369	/*****************************************************************************/
1369	/* requests implemented outside eio_execute, because they are so large */	1370	/* requests implemented outside eio_execute, because they are so large */
1370		1371
1371	/* copies some absolute path to tmpbuf */	1372	static void
1372	static char *	1373	eio__lseek (eio_req *req)
1373	eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1374	{	1374	{
1375	if (wd == EIO_CWD)	1375	/* this usually gets optimised away completely, or your compiler sucks, */
1376	return getcwd (tmpbuf->ptr, PATH_MAX);	1376	/* or the whence constants really are not 0, 1, 2 */
		1377	int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
		1378	: req->int2 == EIO_SEEK_CUR ? SEEK_CUR
		1379	: req->int2 == EIO_SEEK_END ? SEEK_END
		1380	: req->int2;
1377		1381
1378	#if HAVE_AT	1382	req->offs = lseek (req->int1, req->offs, whence);
1379	abort (); /TODO/	1383	req->result = req->offs == (off_t)-1 ? -1 : 0;
1380	#else
1381	strcpy (tmpbuf->ptr, wd);
1382	#endif
1383	return tmpbuf->ptr;
1384	}	1384	}
1385		1385
1386	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */	1386	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387	static int	1387	static int
1388	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)	1388	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
…		…
1394	int symlinks = SYMLOOP_MAX;	1394	int symlinks = SYMLOOP_MAX;
1395	#else	1395	#else
1396	int symlinks = 32;	1396	int symlinks = 32;
1397	#endif	1397	#endif
1398		1398
1399	/D/ /TODO: wd ignored /
1400
1401	errno = EINVAL;	1399	errno = EINVAL;
1402	if (!rel)	1400	if (!rel)
1403	return -1;	1401	return -1;
1404		1402
1405	errno = ENOENT;	1403	errno = ENOENT;
…		…
1433	#endif	1431	#endif
1434	#endif	1432	#endif
1435		1433
1436	if (*rel != '/')	1434	if (*rel != '/')
1437	{	1435	{
1438	if (!eio__getwd (tmpbuf, wd))	1436	int len;
		1437
		1438	errno = ENOENT;
		1439	if (wd == EIO_INVALID_WD)
1439	return -1;	1440	return -1;
		1441
		1442	if (wd == EIO_CWD)
		1443	{
		1444	if (!getcwd (res, PATH_MAX))
		1445	return -1;
		1446
		1447	len = strlen (res);
		1448	}
		1449	else
		1450	memcpy (res, wd->str, len = wd->len);
1440		1451
1441	if (res [1]) /* only use if not / */	1452	if (res [1]) /* only use if not / */
1442	res += strlen (res);	1453	res += len;
1443	}	1454	}
1444		1455
1445	while (*rel)	1456	while (*rel)
1446	{	1457	{
1447	eio_ssize_t len, linklen;	1458	eio_ssize_t len, linklen;
…		…
1475	}	1486	}
1476	}	1487	}
1477		1488
1478	errno = ENAMETOOLONG;	1489	errno = ENAMETOOLONG;
1479	if (res + 1 + len + 1 >= tmp1)	1490	if (res + 1 + len + 1 >= tmp1)
1480	return;	1491	return -1;
1481		1492
1482	/* copy one component */	1493	/* copy one component */
1483	*res = '/';	1494	*res = '/';
1484	memcpy (res + 1, beg, len);	1495	memcpy (res + 1, beg, len);
1485		1496
…		…
1694	eio_dent_insertion_sort (dents, size);	1705	eio_dent_insertion_sort (dents, size);
1695	}	1706	}
1696		1707
1697	/* read a full directory */	1708	/* read a full directory */
1698	static void	1709	static void
1699	eio__scandir (eio_req *req)	1710	eio__scandir (eio_req req, etp_worker self)
1700	{	1711	{
1701	char name, names;	1712	char name, names;
1702	int namesalloc = 4096 - sizeof (void ) 4;	1713	int namesalloc = 4096 - sizeof (void ) 4;
1703	int namesoffs = 0;	1714	int namesoffs = 0;
1704	int flags = req->int1;	1715	int flags = req->int1;
…		…
1722	#ifdef _WIN32	1733	#ifdef _WIN32
1723	{	1734	{
1724	int len = strlen ((const char *)req->ptr1);	1735	int len = strlen ((const char *)req->ptr1);
1725	char *path = malloc (MAX_PATH);	1736	char *path = malloc (MAX_PATH);
1726	const char *fmt;	1737	const char *fmt;
		1738	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1727		1739
1728	if (!len)	1740	if (!len)
1729	fmt = "./*";	1741	fmt = "./*";
1730	else if (((const char )req->ptr1)[len - 1] == '/' \|\| ((const char )req->ptr1)[len - 1] == '\\')	1742	else if (reqpath[len - 1] == '/' \|\| reqpath[len - 1] == '\\')
1731	fmt = "%s*";	1743	fmt = "%s*";
1732	else	1744	else
1733	fmt = "%s/*";	1745	fmt = "%s/*";
1734		1746
1735	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1747	_snprintf (path, MAX_PATH, fmt, reqpath);
1736	dirp = FindFirstFile (path, &entp);	1748	dirp = FindFirstFile (path, &entp);
1737	free (path);	1749	free (path);
1738		1750
1739	if (dirp == INVALID_HANDLE_VALUE)	1751	if (dirp == INVALID_HANDLE_VALUE)
1740	{	1752	{
…		…
1762		1774
1763	return;	1775	return;
1764	}	1776	}
1765	}	1777	}
1766	#else	1778	#else
		1779	#if HAVE_AT
		1780	if (req->wd)
		1781	{
		1782	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
		1783
		1784	if (fd < 0)
		1785	return;
		1786
		1787	dirp = fdopendir (fd);
		1788
		1789	if (!dirp)
		1790	close (fd);
		1791	}
		1792	else
1767	dirp = opendir (req->ptr1);	1793	dirp = opendir (req->ptr1);
		1794	#else
		1795	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1796	#endif
1768		1797
1769	if (!dirp)	1798	if (!dirp)
1770	return;	1799	return;
1771	#endif	1800	#endif
1772		1801
…		…
1889	#ifdef DT_FIFO	1918	#ifdef DT_FIFO
1890	case DT_FIFO: ent->type = EIO_DT_FIFO; break;	1919	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1891	#endif	1920	#endif
1892	#ifdef DT_CHR	1921	#ifdef DT_CHR
1893	case DT_CHR: ent->type = EIO_DT_CHR; break;	1922	case DT_CHR: ent->type = EIO_DT_CHR; break;
1894	#endif	1923	#endif
1895	#ifdef DT_MPC	1924	#ifdef DT_MPC
1896	case DT_MPC: ent->type = EIO_DT_MPC; break;	1925	case DT_MPC: ent->type = EIO_DT_MPC; break;
1897	#endif	1926	#endif
1898	#ifdef DT_DIR	1927	#ifdef DT_DIR
1899	case DT_DIR: ent->type = EIO_DT_DIR; break;	1928	case DT_DIR: ent->type = EIO_DT_DIR; break;
1900	#endif	1929	#endif
1901	#ifdef DT_NAM	1930	#ifdef DT_NAM
1902	case DT_NAM: ent->type = EIO_DT_NAM; break;	1931	case DT_NAM: ent->type = EIO_DT_NAM; break;
1903	#endif	1932	#endif
1904	#ifdef DT_BLK	1933	#ifdef DT_BLK
1905	case DT_BLK: ent->type = EIO_DT_BLK; break;	1934	case DT_BLK: ent->type = EIO_DT_BLK; break;
1906	#endif	1935	#endif
1907	#ifdef DT_MPB	1936	#ifdef DT_MPB
1908	case DT_MPB: ent->type = EIO_DT_MPB; break;	1937	case DT_MPB: ent->type = EIO_DT_MPB; break;
1909	#endif	1938	#endif
1910	#ifdef DT_REG	1939	#ifdef DT_REG
1911	case DT_REG: ent->type = EIO_DT_REG; break;	1940	case DT_REG: ent->type = EIO_DT_REG; break;
1912	#endif	1941	#endif
1913	#ifdef DT_NWK	1942	#ifdef DT_NWK
1914	case DT_NWK: ent->type = EIO_DT_NWK; break;	1943	case DT_NWK: ent->type = EIO_DT_NWK; break;
1915	#endif	1944	#endif
1916	#ifdef DT_CMP	1945	#ifdef DT_CMP
1917	case DT_CMP: ent->type = EIO_DT_CMP; break;	1946	case DT_CMP: ent->type = EIO_DT_CMP; break;
1918	#endif	1947	#endif
1919	#ifdef DT_LNK	1948	#ifdef DT_LNK
1920	case DT_LNK: ent->type = EIO_DT_LNK; break;	1949	case DT_LNK: ent->type = EIO_DT_LNK; break;
1921	#endif	1950	#endif
1922	#ifdef DT_SOCK	1951	#ifdef DT_SOCK
1923	case DT_SOCK: ent->type = EIO_DT_SOCK; break;	1952	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
…		…
1936	{	1965	{
1937	if (ent->type == EIO_DT_UNKNOWN)	1966	if (ent->type == EIO_DT_UNKNOWN)
1938	{	1967	{
1939	if (name == '.') / leading dots are likely directories, and, in any case, rare */	1968	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1940	ent->score = 1;	1969	ent->score = 1;
1941	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */	1970	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1942	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */	1971	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1943	}	1972	}
1944	else if (ent->type == EIO_DT_DIR)	1973	else if (ent->type == EIO_DT_DIR)
1945	ent->score = 0;	1974	ent->score = 0;
1946	}	1975	}
…		…
1966	}	1995	}
1967	}	1996	}
1968		1997
1969	/*****************************************************************************/	1998	/*****************************************************************************/
1970	/* working directory stuff */	1999	/* working directory stuff */
		2000	/* various deficiencies in the posix 2008 api force us to */
		2001	/* keep the absolute path in string form at all times */
		2002	/* fuck yeah. */
		2003
		2004	#if !HAVE_AT
		2005
		2006	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2007	/* an absolute or canonical path */
		2008	static const char *
		2009	wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2010	{
		2011	if (!wd \|\| *path == '/')
		2012	return path;
		2013
		2014	if (path [0] == '.' && !path [1])
		2015	return wd->str;
		2016
		2017	{
		2018	int l1 = wd->len;
		2019	int l2 = strlen (path);
		2020
		2021	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2022
		2023	memcpy (res, wd->str, l1);
		2024	res [l1] = '/';
		2025	memcpy (res + l1 + 1, path, l2 + 1);
		2026
		2027	return res;
		2028	}
		2029	}
		2030
		2031	#endif
		2032
		2033	static eio_wd
		2034	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2035	{
		2036	int fd;
		2037	eio_wd res;
		2038	int len = eio__realpath (tmpbuf, wd, path);
		2039
		2040	if (len < 0)
		2041	return EIO_INVALID_WD;
1971		2042
1972	#if HAVE_AT	2043	#if HAVE_AT
		2044	fd = openat (WD2FD (wd), path, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
1973		2045
1974	#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD)	2046	if (fd < 0)
1975		2047	return EIO_INVALID_WD;
1976	#ifndef O_SEARCH
1977	# define O_SEARCH O_RDONLY
1978	#endif	2048	#endif
		2049
		2050	res = malloc (sizeof (res) + len); / one extra 0-byte */
		2051
		2052	#if HAVE_AT
		2053	res->fd = fd;
		2054	#endif
		2055
		2056	res->len = len;
		2057	memcpy (res->str, tmpbuf->ptr, len);
		2058	res->str [len] = 0;
		2059
		2060	return res;
		2061	}
1979		2062
1980	eio_wd	2063	eio_wd
1981	eio_wd_open_sync (eio_wd wd, const char *path)	2064	eio_wd_open_sync (eio_wd wd, const char *path)
1982	{	2065	{
1983	int fd = openat (WD2FD (wd), path, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);	2066	struct tmpbuf tmpbuf = { 0 };
1984
1985	return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1986	}
1987
1988	static eio_wd
1989	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
1990	{
1991	return eio_wd_open_sync (wd, path);	2067	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2068	free (tmpbuf.ptr);
		2069
		2070	return wd;
1992	}	2071	}
1993		2072
1994	void	2073	void
1995	eio_wd_close_sync (eio_wd wd)	2074	eio_wd_close_sync (eio_wd wd)
1996	{	2075	{
1997	int fd = WD2FD (wd);	2076	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1998		2077	{
1999	if (fd >= 0)	2078	#if HAVE_AT
2000	close (fd);	2079	close (wd->fd);
		2080	#endif
		2081	free (wd);
		2082	}
2001	}	2083	}
		2084
		2085	#if HAVE_AT
		2086
		2087	/* they forgot these */
2002		2088
2003	static int	2089	static int
2004	eio__truncateat (int dirfd, const char *path, off_t length)	2090	eio__truncateat (int dirfd, const char *path, off_t length)
2005	{	2091	{
2006	int fd = openat (dirfd, path, O_WRONLY \| O_CLOEXEC);	2092	int fd = openat (dirfd, path, O_WRONLY \| O_CLOEXEC);
…		…
2025		2111
2026	res = fstatvfs (fd, buf);	2112	res = fstatvfs (fd, buf);
2027	close (fd);	2113	close (fd);
2028	return res;	2114	return res;
2029		2115
2030	}
2031
2032	#else
2033
2034	/* on legacy systems, we represent the working directories simply by their path strings */
2035
2036	static const char *
2037	wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char path)
2038	{
2039	if (!wd \|\| *path == '/')
2040	return path;
2041
2042	{
2043	int l1 = strlen ((const char *)wd);
2044	int l2 = strlen (path);
2045
2046	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2047
2048	memcpy (res, wd, l1);
2049	res [l1] = '/';
2050	memcpy (res + l1 + 1, path, l2 + 1);
2051
2052	return res;
2053	}
2054	}
2055
2056	static eio_wd
2057	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
2058	{
2059	if (path == '/') / absolute paths ignore wd */
2060	path = strdup (path);
2061	else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2062	return wd;
2063	else
2064	{
2065	int len = eio__realpath (tmpbuf, wd, path);
2066
2067	path = EIO_INVALID_WD;
2068
2069	if (len >= 0)
2070	{
2071	((char *)tmpbuf->ptr)[len] = 0;
2072	path = strdup (tmpbuf->ptr);
2073	}
2074	}
2075
2076	if (!path)
2077	path = EIO_INVALID_WD;
2078
2079	return (eio_wd)path;
2080	}
2081
2082	eio_wd
2083	eio_wd_open_sync (eio_wd wd, const char *path)
2084	{
2085	struct tmpbuf tmpbuf = { 0 };
2086	wd = eio__wd_open_sync (&tmpbuf, wd, path);
2087	free (tmpbuf.ptr);
2088
2089	return wd;
2090	}
2091
2092	void
2093	eio_wd_close_sync (eio_wd wd)
2094	{
2095	if (wd != EIO_INVALID_WD)
2096	free (wd);
2097	}	2116	}
2098		2117
2099	#endif	2118	#endif
2100		2119
2101	/*****************************************************************************/	2120	/*****************************************************************************/
…		…
2113	req->result = -1; \	2132	req->result = -1; \
2114	break; \	2133	break; \
2115	} \	2134	} \
2116	}	2135	}
2117		2136
		2137	static void ecb_noinline ecb_cold
		2138	etp_proc_init (void)
		2139	{
		2140	#if HAVE_PRCTL_SET_NAME
		2141	/* provide a more sensible "thread name" */
		2142	char name[16 + 1];
		2143	const int namelen = sizeof (name) - 1;
		2144	int len;
		2145
		2146	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2147	name [namelen] = 0;
		2148	len = strlen (name);
		2149	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2150	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2151	#endif
		2152	}
		2153
2118	X_THREAD_PROC (etp_proc)	2154	X_THREAD_PROC (etp_proc)
2119	{	2155	{
2120	ETP_REQ *req;	2156	ETP_REQ *req;
2121	struct timespec ts;	2157	struct timespec ts;
2122	etp_worker self = (etp_worker )thr_arg;	2158	etp_worker self = (etp_worker )thr_arg;
2123		2159
2124	#if HAVE_PRCTL_SET_NAME	2160	etp_proc_init ();
2125	prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2126	#endif
2127		2161
2128	/* try to distribute timeouts somewhat evenly */	2162	/* try to distribute timeouts somewhat evenly */
2129	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2163	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
2130		2164
2131	for (;;)	2165	for (;;)
…		…
2202	/*****************************************************************************/	2236	/*****************************************************************************/
2203		2237
2204	int ecb_cold	2238	int ecb_cold
2205	eio_init (void (want_poll)(void), void (done_poll)(void))	2239	eio_init (void (want_poll)(void), void (done_poll)(void))
2206	{	2240	{
2207	#if !HAVE_PREADWRITE
2208	X_MUTEX_CREATE (preadwritelock);
2209	#endif
2210
2211	return etp_init (want_poll, done_poll);	2241	return etp_init (want_poll, done_poll);
2212	}	2242	}
2213		2243
2214	ecb_inline void	2244	ecb_inline void
2215	eio_api_destroy (eio_req *req)	2245	eio_api_destroy (eio_req *req)
2216	{	2246	{
2217	free (req);	2247	free (req);
2218	}	2248	}
2219		2249
2220	#define REQ(rtype) \	2250	#define REQ(rtype) \
2221	eio_req *req; \	2251	eio_req *req; \
2222	\	2252	\
2223	req = (eio_req )calloc (1, sizeof req); \	2253	req = (eio_req )calloc (1, sizeof req); \
2224	if (!req) \	2254	if (!req) \
2225	return 0; \	2255	return 0; \
…		…
2279	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;	2309	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2280	break;	2310	break;
2281	case EIO_WD_CLOSE: req->result = 0;	2311	case EIO_WD_CLOSE: req->result = 0;
2282	eio_wd_close_sync (req->wd); break;	2312	eio_wd_close_sync (req->wd); break;
2283		2313
		2314	case EIO_SEEK: eio__lseek (req); break;
2284	case EIO_READ: ALLOC (req->size);	2315	case EIO_READ: ALLOC (req->size);
2285	req->result = req->offs >= 0	2316	req->result = req->offs >= 0
2286	? pread (req->int1, req->ptr2, req->size, req->offs)	2317	? pread (req->int1, req->ptr2, req->size, req->offs)
2287	: read (req->int1, req->ptr2, req->size); break;	2318	: read (req->int1, req->ptr2, req->size); break;
2288	case EIO_WRITE: req->result = req->offs >= 0	2319	case EIO_WRITE: req->result = req->offs >= 0
…		…
2304	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;	2335	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2305		2336
2306	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;	2337	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2307	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;	2338	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2308	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;	2339	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2309	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break;	2340	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2310	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break;	2341	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2311	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;	2342	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2312	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;	2343	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2313	case EIO_READLINK: ALLOC (PATH_MAX);	2344	case EIO_READLINK: ALLOC (PATH_MAX);
2314	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;	2345	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2315	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2346	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
…		…
2415	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2446	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2416	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2447	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2417	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2448	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2418	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	2449	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2419		2450
2420	case EIO_READDIR: eio__scandir (req); break;	2451	case EIO_READDIR: eio__scandir (req, self); break;
2421		2452
2422	case EIO_BUSY:	2453	case EIO_BUSY:
2423	#ifdef _WIN32	2454	#ifdef _WIN32
2424	Sleep (req->nv1 * 1e3);	2455	Sleep (req->nv1 * 1e3);
2425	#else	2456	#else
…		…
2444	case EIO_CUSTOM:	2475	case EIO_CUSTOM:
2445	req->feed (req);	2476	req->feed (req);
2446	break;	2477	break;
2447		2478
2448	default:	2479	default:
2449	errno = ENOSYS;
2450	req->result = -1;	2480	req->result = EIO_ENOSYS ();
2451	break;	2481	break;
2452	}	2482	}
2453		2483
2454	req->errorno = errno;	2484	req->errorno = errno;
2455	}	2485	}
2456		2486
2457	#ifndef EIO_NO_WRAPPERS	2487	#ifndef EIO_NO_WRAPPERS
2458		2488
		2489	eio_req eio_wd_open (const char path, int pri, eio_cb cb, void *data)
		2490	{
		2491	REQ (EIO_WD_OPEN); PATH; SEND;
		2492	}
		2493
		2494	eio_req eio_wd_close (eio_wd wd, int pri, eio_cb cb, void data)
		2495	{
		2496	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2497	}
		2498
2459	eio_req eio_nop (int pri, eio_cb cb, void data)	2499	eio_req eio_nop (int pri, eio_cb cb, void data)
2460	{	2500	{
2461	REQ (EIO_NOP); SEND;	2501	REQ (EIO_NOP); SEND;
2462	}	2502	}
2463		2503
…		…
2522	}	2562	}
2523		2563
2524	eio_req eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void data)	2564	eio_req eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void data)
2525	{	2565	{
2526	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;	2566	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
		2567	}
		2568
		2569	eio_req eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void data)
		2570	{
		2571	REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2527	}	2572	}
2528		2573
2529	eio_req eio_read (int fd, void buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)	2574	eio_req eio_read (int fd, void buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2530	{	2575	{
2531	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;	2576	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 cvsroot/libeio/eio.c (file contents): Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC vs. Revision 1.123 by root, Tue Oct 9 04:53:53 2012 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC vs.
Revision 1.123 by root, Tue Oct 9 04:53:53 2012 UTC