ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/libeio/eio.c

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.97 by root, Sun Jul 24 03:32:54 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	*
…		…
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))
…		…
129	#define sync() EIO_ENOSYS ()	132	#define sync() EIO_ENOSYS ()
130	#define readlink(path,buf,s) EIO_ENOSYS ()	133	#define readlink(path,buf,s) EIO_ENOSYS ()
131	#define statvfs(path,buf) EIO_ENOSYS ()	134	#define statvfs(path,buf) EIO_ENOSYS ()
132	#define fstatvfs(fd,buf) EIO_ENOSYS ()	135	#define fstatvfs(fd,buf) EIO_ENOSYS ()
133		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	}
		171
		172	/* rename() uses MoveFile, which fails to overwrite */
		173	#define rename(old,neu) eio__rename (old, neu)
		174
		175	static int
		176	eio__rename (const char *old, const char *neu)
		177	{
		178	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		179	return 0;
		180
		181	/* should steal _dosmaperr */
		182	switch (GetLastError ())
		183	{
		184	case ERROR_FILE_NOT_FOUND:
		185	case ERROR_PATH_NOT_FOUND:
		186	case ERROR_INVALID_DRIVE:
		187	case ERROR_NO_MORE_FILES:
		188	case ERROR_BAD_NETPATH:
		189	case ERROR_BAD_NET_NAME:
		190	case ERROR_BAD_PATHNAME:
		191	case ERROR_FILENAME_EXCED_RANGE:
		192	errno = ENOENT;
		193	break;
		194
		195	default:
		196	errno = EACCES;
		197	break;
		198	}
		199
		200	return -1;
		201	}
		202
134	/* we could even stat and see if it exists */	203	/* we could even stat and see if it exists */
135	static int	204	static int
136	symlink (const char *old, const char *neu)	205	symlink (const char *old, const char *neu)
137	{	206	{
138	#if WINVER >= 0x0600	207	#if WINVER >= 0x0600
…		…
174	#endif	243	#endif
175		244
176	#define D_NAME(entp) entp->d_name	245	#define D_NAME(entp) entp->d_name
177		246
178	/* 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 */
179	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__	248	#if __FreeBSD__ || __NetBSD__ || __OpenBSD__
180	#define _DIRENT_HAVE_D_TYPE /* sigh */	249	#define _DIRENT_HAVE_D_TYPE /* sigh */
181	#define D_INO(de) (de)->d_fileno	250	#define D_INO(de) (de)->d_fileno
182	#define D_NAMLEN(de) (de)->d_namlen	251	#define D_NAMLEN(de) (de)->d_namlen
183	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600	252	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
184	#define D_INO(de) (de)->d_ino	253	#define D_INO(de) (de)->d_ino
…		…
199		268
200	#endif	269	#endif
201		270
202	#if HAVE_UTIMES	271	#if HAVE_UTIMES
203	# include <utime.h>	272	# include <utime.h>
		273	#endif
		274
		275	#if HAVE_SYS_SYSCALL_H
		276	# include <sys/syscall.h>
		277	#endif
		278
		279	#if HAVE_SYS_PRCTL_H
		280	# include <sys/prctl.h>
204	#endif	281	#endif
205		282
206	#if HAVE_SENDFILE	283	#if HAVE_SENDFILE
207	# if __linux	284	# if __linux
208	# include <sys/sendfile.h>	285	# include <sys/sendfile.h>
…		…
216	# else	293	# else
217	# error sendfile support requested but not available	294	# error sendfile support requested but not available
218	# endif	295	# endif
219	#endif	296	#endif
220		297
221	#if HAVE_SYS_SYSCALL_H
222	# include <sys/syscall.h>
223	#endif
224
225	#ifndef D_TYPE	298	#ifndef D_TYPE
226	# define D_TYPE(de) 0	299	# define D_TYPE(de) 0
227	#endif	300	#endif
228	#ifndef D_INO	301	#ifndef D_INO
229	# define D_INO(de) 0	302	# define D_INO(de) 0
…		…
253		326
254	#define FUBd \	327	#define FUBd \
255	free (eio_buf)	328	free (eio_buf)
256		329
257	#define EIO_TICKS ((1000000 + 1023) >> 10)	330	#define EIO_TICKS ((1000000 + 1023) >> 10)
		331
		332	/*****************************************************************************/
		333
		334	struct tmpbuf
		335	{
		336	void *ptr;
		337	int len;
		338	};
		339
		340	static void *
		341	tmpbuf_get (struct tmpbuf *buf, int len)
		342	{
		343	if (buf->len < len)
		344	{
		345	free (buf->ptr);
		346	buf->ptr = malloc (buf->len = len);
		347	}
		348
		349	return buf->ptr;
		350	}
		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
		374	/*****************************************************************************/
258		375
259	#define ETP_PRI_MIN EIO_PRI_MIN	376	#define ETP_PRI_MIN EIO_PRI_MIN
260	#define ETP_PRI_MAX EIO_PRI_MAX	377	#define ETP_PRI_MAX EIO_PRI_MAX
261		378
262	struct etp_worker;	379	struct etp_worker;
…		…
286	static void (*done_poll_cb) (void);	403	static void (*done_poll_cb) (void);
287		404
288	static unsigned int max_poll_time; /* reslock */	405	static unsigned int max_poll_time; /* reslock */
289	static unsigned int max_poll_reqs; /* reslock */	406	static unsigned int max_poll_reqs; /* reslock */
290		407
291	static volatile unsigned int nreqs; /* reqlock */	408	static unsigned int nreqs; /* reqlock */
292	static volatile unsigned int nready; /* reqlock */	409	static unsigned int nready; /* reqlock */
293	static volatile unsigned int npending; /* reqlock */	410	static unsigned int npending; /* reqlock */
294	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	411	static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
295	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */	412	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
296		413
297	static xmutex_t wrklock;	414	static xmutex_t wrklock;
298	static xmutex_t reslock;	415	static xmutex_t reslock;
299	static xmutex_t reqlock;	416	static xmutex_t reqlock;
300	static xcond_t reqwait;	417	static xcond_t reqwait;
301		418
302	#if !HAVE_PREADWRITE
303	/*
304	* make our pread/pwrite emulation safe against themselves, but not against
305	* normal read/write by using a mutex. slows down execution a lot,
306	* but that's your problem, not mine.
307	*/
308	static xmutex_t preadwritelock;
309	#endif
310
311	typedef struct etp_worker	419	typedef struct etp_worker
312	{	420	{
		421	struct tmpbuf tmpbuf;
		422
313	/* locked by wrklock */	423	/* locked by wrklock */
314	struct etp_worker *prev, *next;	424	struct etp_worker *prev, *next;
315		425
316	xthread_t tid;	426	xthread_t tid;
317		427
318	/* locked by reslock, reqlock or wrklock */
319	ETP_REQ *req; /* currently processed request */
320
321	#ifdef ETP_WORKER_COMMON	428	#ifdef ETP_WORKER_COMMON
322	ETP_WORKER_COMMON	429	ETP_WORKER_COMMON
323	#endif	430	#endif
324	} etp_worker;	431	} etp_worker;
325		432
…		…
328	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	435	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
329	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	436	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
330		437
331	/* worker threads management */	438	/* worker threads management */
332		439
333	static void ecb_cold	440	static void
334	etp_worker_clear (etp_worker *wrk)	441	etp_worker_clear (etp_worker *wrk)
335	{	442	{
336	}	443	}
337		444
338	static void ecb_cold	445	static void ecb_cold
339	etp_worker_free (etp_worker *wrk)	446	etp_worker_free (etp_worker *wrk)
340	{	447	{
		448	free (wrk->tmpbuf.ptr);
		449
341	wrk->next->prev = wrk->prev;	450	wrk->next->prev = wrk->prev;
342	wrk->prev->next = wrk->next;	451	wrk->prev->next = wrk->next;
343		452
344	free (wrk);	453	free (wrk);
345	}	454	}
…		…
523	}	632	}
524		633
525	static void ecb_cold	634	static void ecb_cold
526	etp_end_thread (void)	635	etp_end_thread (void)
527	{	636	{
528	eio_req *req = calloc (1, sizeof (eio_req));	637	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
529		638
530	req->type = -1;	639	req->type = -1;
531	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	640	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
532		641
533	X_LOCK (reqlock);	642	X_LOCK (reqlock);
…		…
860	}	969	}
861		970
862	/*****************************************************************************/	971	/*****************************************************************************/
863	/* work around various missing functions */	972	/* work around various missing functions */
864		973
865	#if !HAVE_PREADWRITE
866	# undef pread
867	# undef pwrite
868	# define pread eio__pread
869	# define pwrite eio__pwrite
870
871	static eio_ssize_t
872	eio__pread (int fd, void *buf, size_t count, off_t offset)
873	{
874	eio_ssize_t res;
875	off_t ooffset;
876
877	X_LOCK (preadwritelock);
878	ooffset = lseek (fd, 0, SEEK_CUR);
879	lseek (fd, offset, SEEK_SET);
880	res = read (fd, buf, count);
881	lseek (fd, ooffset, SEEK_SET);
882	X_UNLOCK (preadwritelock);
883
884	return res;
885	}
886
887	static eio_ssize_t
888	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
889	{
890	eio_ssize_t res;
891	off_t ooffset;
892
893	X_LOCK (preadwritelock);
894	ooffset = lseek (fd, 0, SEEK_CUR);
895	lseek (fd, offset, SEEK_SET);
896	res = write (fd, buf, count);
897	lseek (fd, ooffset, SEEK_SET);
898	X_UNLOCK (preadwritelock);
899
900	return res;
901	}
902	#endif
903
904	#ifndef HAVE_UTIMES	974	#ifndef HAVE_UTIMES
905		975
906	# undef utimes	976	# undef utimes
907	# define utimes(path,times) eio__utimes (path, times)	977	# define utimes(path,times) eio__utimes (path, times)
908		978
…		…
949	int res;	1019	int res;
950		1020
951	#if HAVE_SYS_SYNCFS	1021	#if HAVE_SYS_SYNCFS
952	res = (int)syscall (__NR_syncfs, (int)(fd));	1022	res = (int)syscall (__NR_syncfs, (int)(fd));
953	#else	1023	#else
954	res = -1;	1024	res = EIO_ENOSYS ();
955	errno = ENOSYS;
956	#endif	1025	#endif
957		1026
958	if (res < 0 && errno == ENOSYS && fd >= 0)	1027	if (res < 0 && errno == ENOSYS && fd >= 0)
959	sync ();	1028	sync ();
960		1029
…		…
990	}	1059	}
991		1060
992	static int	1061	static int
993	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)
994	{	1063	{
995	#if HAVE_FALLOCATE	1064	#if HAVE_LINUX_FALLOCATE
996	return fallocate (fd, mode, offset, len);	1065	return fallocate (fd, mode, offset, len);
997	#else	1066	#else
998	errno = ENOSYS;	1067	return EIO_ENOSYS ();
999	return -1;
1000	#endif	1068	#endif
1001	}	1069	}
1002		1070
1003	#if !HAVE_READAHEAD	1071	#if !HAVE_READAHEAD
1004	# undef readahead	1072	# undef readahead
…		…
1019	todo -= len;	1087	todo -= len;
1020	}	1088	}
1021		1089
1022	FUBd;	1090	FUBd;
1023		1091
1024	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 */
1025	return count;	1094	return 0;
1026	}	1095	}
1027		1096
1028	#endif	1097	#endif
1029		1098
1030	/* sendfile always needs emulation */	1099	/* sendfile always needs emulation */
…		…
1065		1134
1066	/* according to source inspection, this is correct, and useful behaviour */	1135	/* according to source inspection, this is correct, and useful behaviour */
1067	if (sbytes)	1136	if (sbytes)
1068	res = sbytes;	1137	res = sbytes;
1069		1138
1070	# elif defined (__APPLE__)	1139	# elif defined __APPLE__
1071	off_t sbytes = count;	1140	off_t sbytes = count;
1072	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1141	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1073		1142
1074	/* according to the manpage, sbytes is always valid */	1143	/* according to the manpage, sbytes is always valid */
1075	if (sbytes)	1144	if (sbytes)
…		…
1102	HANDLE h = TO_SOCKET (ifd);	1171	HANDLE h = TO_SOCKET (ifd);
1103	SetFilePointer (h, offset, 0, FILE_BEGIN);	1172	SetFilePointer (h, offset, 0, FILE_BEGIN);
1104	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);	1173	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1105		1174
1106	#else	1175	#else
1107	res = -1;	1176	res = EIO_ENOSYS ();
1108	errno = ENOSYS;
1109	#endif	1177	#endif
1110		1178
1111	/* we assume sendfile can copy at least 128mb in one go */	1179	/* we assume sendfile can copy at least 128mb in one go */
1112	if (res <= 128 * 1024 * 1024)	1180	if (res <= 128 * 1024 * 1024)
1113	{	1181	{
…		…
1300		1368
1301	/*****************************************************************************/	1369	/*****************************************************************************/
1302	/* requests implemented outside eio_execute, because they are so large */	1370	/* requests implemented outside eio_execute, because they are so large */
1303		1371
1304	static void	1372	static void
1305	eio__realpath (eio_req *req, etp_worker *self)	1373	eio__lseek (eio_req *req)
1306	{	1374	{
1307	char *rel = req->ptr1;	1375	/* this usually gets optimised away completely, or your compiler sucks, */
		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;
		1381
		1382	req->offs = lseek (req->int1, req->offs, whence);
		1383	req->result = req->offs == (off_t)-1 ? -1 : 0;
		1384	}
		1385
		1386	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
		1387	static int
		1388	eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		1389	{
		1390	const char *rel = path;
1308	char *res;	1391	char *res;
1309	char *tmp1, *tmp2;	1392	char *tmp1, *tmp2;
1310	#if SYMLOOP_MAX > 32	1393	#if SYMLOOP_MAX > 32
1311	int symlinks = SYMLOOP_MAX;	1394	int symlinks = SYMLOOP_MAX;
1312	#else	1395	#else
1313	int symlinks = 32;	1396	int symlinks = 32;
1314	#endif	1397	#endif
1315		1398
1316	req->result = -1;
1317
1318	errno = EINVAL;	1399	errno = EINVAL;
1319	if (!rel)	1400	if (!rel)
1320	return;	1401	return -1;
1321		1402
1322	errno = ENOENT;	1403	errno = ENOENT;
1323	if (!*rel)	1404	if (!*rel)
1324	return;	1405	return -1;
1325		1406
1326	if (!req->ptr2)	1407	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1327	{
1328	X_LOCK (wrklock);
1329	req->flags |= EIO_FLAG_PTR2_FREE;
1330	X_UNLOCK (wrklock);
1331	req->ptr2 = malloc (PATH_MAX * 3);
1332
1333	errno = ENOMEM;
1334	if (!req->ptr2)
1335	return;
1336	}
1337
1338	res = req->ptr2;
1339	tmp1 = res + PATH_MAX;	1408	tmp1 = res + PATH_MAX;
1340	tmp2 = tmp1 + PATH_MAX;	1409	tmp2 = tmp1 + PATH_MAX;
1341		1410
1342	#if 0 /* disabled, the musl way to do things is just too racy */	1411	#if 0 /* disabled, the musl way to do things is just too racy */
1343	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1412	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1362	#endif	1431	#endif
1363	#endif	1432	#endif
1364		1433
1365	if (*rel != '/')	1434	if (*rel != '/')
1366	{	1435	{
		1436	int len;
		1437
		1438	errno = ENOENT;
		1439	if (wd == EIO_INVALID_WD)
		1440	return -1;
		1441
		1442	if (wd == EIO_CWD)
		1443	{
1367	if (!getcwd (res, PATH_MAX))	1444	if (!getcwd (res, PATH_MAX))
1368	return;	1445	return -1;
		1446
		1447	len = strlen (res);
		1448	}
		1449	else
		1450	memcpy (res, wd->str, len = wd->len);
1369		1451
1370	if (res [1]) /* only use if not / */	1452	if (res [1]) /* only use if not / */
1371	res += strlen (res);	1453	res += len;
1372	}	1454	}
1373		1455
1374	while (*rel)	1456	while (*rel)
1375	{	1457	{
1376	eio_ssize_t len, linklen;	1458	eio_ssize_t len, linklen;
1377	char *beg = rel;	1459	const char *beg = rel;
1378		1460
1379	while (*rel && *rel != '/')	1461	while (*rel && *rel != '/')
1380	++rel;	1462	++rel;
1381		1463
1382	len = rel - beg;	1464	len = rel - beg;
…		…
1394		1476
1395	if (beg [1] == '.' && len == 2)	1477	if (beg [1] == '.' && len == 2)
1396	{	1478	{
1397	/* .. - back up one component, if possible */	1479	/* .. - back up one component, if possible */
1398		1480
1399	while (res != req->ptr2)	1481	while (res != tmpbuf->ptr)
1400	if (*--res == '/')	1482	if (*--res == '/')
1401	break;	1483	break;
1402		1484
1403	continue;	1485	continue;
1404	}	1486	}
1405	}	1487	}
1406		1488
1407	errno = ENAMETOOLONG;	1489	errno = ENAMETOOLONG;
1408	if (res + 1 + len + 1 >= tmp1)	1490	if (res + 1 + len + 1 >= tmp1)
1409	return;	1491	return -1;
1410		1492
1411	/* copy one component */	1493	/* copy one component */
1412	*res = '/';	1494	*res = '/';
1413	memcpy (res + 1, beg, len);	1495	memcpy (res + 1, beg, len);
1414		1496
1415	/* zero-terminate, for readlink */	1497	/* zero-terminate, for readlink */
1416	res [len + 1] = 0;	1498	res [len + 1] = 0;
1417		1499
1418	/* now check if it's a symlink */	1500	/* now check if it's a symlink */
1419	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1501	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1420		1502
1421	if (linklen < 0)	1503	if (linklen < 0)
1422	{	1504	{
1423	if (errno != EINVAL)	1505	if (errno != EINVAL)
1424	return;	1506	return -1;
1425		1507
1426	/* it's a normal directory. hopefully */	1508	/* it's a normal directory. hopefully */
1427	res += len + 1;	1509	res += len + 1;
1428	}	1510	}
1429	else	1511	else
…		…
1431	/* yay, it was a symlink - build new path in tmp2 */	1513	/* yay, it was a symlink - build new path in tmp2 */
1432	int rellen = strlen (rel);	1514	int rellen = strlen (rel);
1433		1515
1434	errno = ENAMETOOLONG;	1516	errno = ENAMETOOLONG;
1435	if (linklen + 1 + rellen >= PATH_MAX)	1517	if (linklen + 1 + rellen >= PATH_MAX)
1436	return;	1518	return -1;
1437		1519
1438	errno = ELOOP;	1520	errno = ELOOP;
1439	if (!--symlinks)	1521	if (!--symlinks)
1440	return;	1522	return -1;
1441		1523
1442	if (*tmp1 == '/')	1524	if (*tmp1 == '/')
1443	res = req->ptr2; /* symlink resolves to an absolute path */	1525	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1444		1526
1445	/* we need to be careful, as rel might point into tmp2 already */	1527	/* we need to be careful, as rel might point into tmp2 already */
1446	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1528	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1447	tmp2 [linklen] = '/';	1529	tmp2 [linklen] = '/';
1448	memcpy (tmp2, tmp1, linklen);	1530	memcpy (tmp2, tmp1, linklen);
…		…
1450	rel = tmp2;	1532	rel = tmp2;
1451	}	1533	}
1452	}	1534	}
1453		1535
1454	/* special case for the lone root path */	1536	/* special case for the lone root path */
1455	if (res == req->ptr2)	1537	if (res == tmpbuf->ptr)
1456	*res++ = '/';	1538	*res++ = '/';
1457		1539
1458	req->result = res - (char *)req->ptr2;	1540	return res - (char *)tmpbuf->ptr;
1459
1460	done:
1461	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1462	}	1541	}
1463		1542
1464	static signed char	1543	static signed char
1465	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1544	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1466	{	1545	{
…		…
1654	#ifdef _WIN32	1733	#ifdef _WIN32
1655	{	1734	{
1656	int len = strlen ((const char *)req->ptr1);	1735	int len = strlen ((const char *)req->ptr1);
1657	char *path = malloc (MAX_PATH);	1736	char *path = malloc (MAX_PATH);
1658	const char *fmt;	1737	const char *fmt;
		1738	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1659		1739
1660	if (!len)	1740	if (!len)
1661	fmt = "./*";	1741	fmt = "./*";
1662	else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')	1742	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1663	fmt = "%s*";	1743	fmt = "%s*";
1664	else	1744	else
1665	fmt = "%s/*";	1745	fmt = "%s/*";
1666		1746
1667	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1747	_snprintf (path, MAX_PATH, fmt, reqpath);
1668	dirp = FindFirstFile (path, &entp);	1748	dirp = FindFirstFile (path, &entp);
1669	free (path);	1749	free (path);
1670		1750
1671	if (dirp == INVALID_HANDLE_VALUE)	1751	if (dirp == INVALID_HANDLE_VALUE)
1672	{	1752	{
1673	dirp = 0;	1753	/* should steal _dosmaperr */
1674
1675	switch (GetLastError ())	1754	switch (GetLastError ())
1676	{	1755	{
1677	case ERROR_FILE_NOT_FOUND:	1756	case ERROR_FILE_NOT_FOUND:
1678	req->result = 0;	1757	req->result = 0;
1679	break;	1758	break;
1680		1759
1681	case ERROR_INVALID_NAME:	1760	case ERROR_INVALID_NAME:
1682	case ERROR_PATH_NOT_FOUND:	1761	case ERROR_PATH_NOT_FOUND:
1683	case ERROR_NO_MORE_FILES:	1762	case ERROR_NO_MORE_FILES:
1684	errno = ENOENT;	1763	errno = ENOENT;
1685	break;	1764	break;
1686		1765
1687	case ERROR_NOT_ENOUGH_MEMORY:	1766	case ERROR_NOT_ENOUGH_MEMORY:
1688	errno = ENOMEM;	1767	errno = ENOMEM;
1689	break;	1768	break;
1690		1769
1691	default:	1770	default:
1692	errno = EINVAL;	1771	errno = EINVAL;
1693	break;	1772	break;
1694	}	1773	}
		1774
		1775	return;
1695	}	1776	}
1696	}	1777	}
1697	#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
1698	dirp = opendir (req->ptr1);	1793	dirp = opendir (req->ptr1);
		1794	#else
		1795	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1796	#endif
		1797
		1798	if (!dirp)
		1799	return;
1699	#endif	1800	#endif
1700		1801
1701	if (req->flags & EIO_FLAG_PTR1_FREE)	1802	if (req->flags & EIO_FLAG_PTR1_FREE)
1702	free (req->ptr1);	1803	free (req->ptr1);
1703		1804
1704	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1805	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1705	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1806	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1706	req->ptr2 = names = malloc (namesalloc);	1807	req->ptr2 = names = malloc (namesalloc);
1707		1808
1708	if (dirp && names && (!flags || dents))	1809	if (!names || (flags && !dents))
		1810	return;
		1811
1709	for (;;)	1812	for (;;)
1710	{	1813	{
1711	int done;	1814	int done;
1712		1815
1713	#ifdef _WIN32	1816	#ifdef _WIN32
1714	done = !dirp;	1817	done = !dirp;
1715	#else	1818	#else
1716	errno = 0;	1819	errno = 0;
1717	entp = readdir (dirp);	1820	entp = readdir (dirp);
1718	done = !entp;	1821	done = !entp;
1719	#endif	1822	#endif
1720		1823
1721	if (done)	1824	if (done)
1722	{	1825	{
1723	#ifndef _WIN32	1826	#ifndef _WIN32
1724	int old_errno = errno;	1827	int old_errno = errno;
1725	closedir (dirp);	1828	closedir (dirp);
1726	errno = old_errno;	1829	errno = old_errno;
1727		1830
1728	if (errno)	1831	if (errno)
1729	break;	1832	break;
1730	#endif	1833	#endif
1731		1834
1732	/* sort etc. */	1835	/* sort etc. */
1733	req->int1 = flags;	1836	req->int1 = flags;
1734	req->result = dentoffs;	1837	req->result = dentoffs;
1735		1838
1736	if (flags & EIO_READDIR_STAT_ORDER)	1839	if (flags & EIO_READDIR_STAT_ORDER)
1737	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1840	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1738	else if (flags & EIO_READDIR_DIRS_FIRST)	1841	else if (flags & EIO_READDIR_DIRS_FIRST)
1739	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1842	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1740	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1843	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1741	else	1844	else
		1845	{
		1846	/* in this case, all is known, and we just put dirs first and sort them */
		1847	eio_dirent *oth = dents + dentoffs;
		1848	eio_dirent *dir = dents;
		1849
		1850	/* now partition dirs to the front, and non-dirs to the back */
		1851	/* by walking from both sides and swapping if necessary */
		1852	while (oth > dir)
		1853	{
		1854	if (dir->type == EIO_DT_DIR)
		1855	++dir;
		1856	else if ((--oth)->type == EIO_DT_DIR)
		1857	{
		1858	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
		1859
		1860	++dir;
		1861	}
		1862	}
		1863
		1864	/* now sort the dirs only (dirs all have the same score) */
		1865	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1866	}
		1867
		1868	break;
		1869	}
		1870
		1871	/* now add the entry to our list(s) */
		1872	name = D_NAME (entp);
		1873
		1874	/* skip . and .. entries */
		1875	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		1876	{
		1877	int len = D_NAMLEN (entp) + 1;
		1878
		1879	while (ecb_expect_false (namesoffs + len > namesalloc))
		1880	{
		1881	namesalloc *= 2;
		1882	req->ptr2 = names = realloc (names, namesalloc);
		1883
		1884	if (!names)
		1885	break;
		1886	}
		1887
		1888	memcpy (names + namesoffs, name, len);
		1889
		1890	if (dents)
		1891	{
		1892	struct eio_dirent *ent;
		1893
		1894	if (ecb_expect_false (dentoffs == dentalloc))
1742	{	1895	{
1743	/* in this case, all is known, and we just put dirs first and sort them */	1896	dentalloc *= 2;
		1897	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1898
		1899	if (!dents)
		1900	break;
		1901	}
		1902
1744	eio_dirent *oth = dents + dentoffs;	1903	ent = dents + dentoffs;
1745	eio_dirent *dir = dents;
1746		1904
1747	/* now partition dirs to the front, and non-dirs to the back */	1905	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1748	/* by walking from both sides and swapping if necessary */	1906	ent->namelen = len - 1;
1749	while (oth > dir)	1907	ent->inode = D_INO (entp);
		1908
		1909	inode_bits |= ent->inode;
		1910
		1911	switch (D_TYPE (entp))
		1912	{
		1913	default:
		1914	ent->type = EIO_DT_UNKNOWN;
		1915	flags |= EIO_READDIR_FOUND_UNKNOWN;
		1916	break;
		1917
		1918	#ifdef DT_FIFO
		1919	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1920	#endif
		1921	#ifdef DT_CHR
		1922	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1923	#endif
		1924	#ifdef DT_MPC
		1925	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1926	#endif
		1927	#ifdef DT_DIR
		1928	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1929	#endif
		1930	#ifdef DT_NAM
		1931	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1932	#endif
		1933	#ifdef DT_BLK
		1934	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1935	#endif
		1936	#ifdef DT_MPB
		1937	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1938	#endif
		1939	#ifdef DT_REG
		1940	case DT_REG: ent->type = EIO_DT_REG; break;
		1941	#endif
		1942	#ifdef DT_NWK
		1943	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1944	#endif
		1945	#ifdef DT_CMP
		1946	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1947	#endif
		1948	#ifdef DT_LNK
		1949	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1950	#endif
		1951	#ifdef DT_SOCK
		1952	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1953	#endif
		1954	#ifdef DT_DOOR
		1955	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1956	#endif
		1957	#ifdef DT_WHT
		1958	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1959	#endif
		1960	}
		1961
		1962	ent->score = 7;
		1963
		1964	if (flags & EIO_READDIR_DIRS_FIRST)
		1965	{
		1966	if (ent->type == EIO_DT_UNKNOWN)
1750	{	1967	{
1751	if (dir->type == EIO_DT_DIR)	1968	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1752	++dir;	1969	ent->score = 1;
1753	else if ((--oth)->type == EIO_DT_DIR)	1970	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1754	{	1971	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1755	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1756
1757	++dir;
1758	}
1759	}	1972	}
1760		1973	else if (ent->type == EIO_DT_DIR)
1761	/* now sort the dirs only (dirs all have the same score) */	1974	ent->score = 0;
1762	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1763	}	1975	}
1764
1765	break;
1766	}
1767
1768	/* now add the entry to our list(s) */
1769	name = D_NAME (entp);
1770
1771	/* skip . and .. entries */
1772	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1773	{
1774	int len = D_NAMLEN (entp) + 1;
1775
1776	while (ecb_expect_false (namesoffs + len > namesalloc))
1777	{
1778	namesalloc *= 2;
1779	req->ptr2 = names = realloc (names, namesalloc);
1780
1781	if (!names)
1782	break;
1783	}	1976	}
1784		1977
1785	memcpy (names + namesoffs, name, len);
1786
1787	if (dents)
1788	{
1789	struct eio_dirent *ent;
1790
1791	if (ecb_expect_false (dentoffs == dentalloc))
1792	{
1793	dentalloc *= 2;
1794	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1795
1796	if (!dents)
1797	break;
1798	}
1799
1800	ent = dents + dentoffs;
1801
1802	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1803	ent->namelen = len - 1;
1804	ent->inode = D_INO (entp);
1805
1806	inode_bits |= ent->inode;
1807
1808	switch (D_TYPE (entp))
1809	{
1810	default:
1811	ent->type = EIO_DT_UNKNOWN;
1812	flags |= EIO_READDIR_FOUND_UNKNOWN;
1813	break;
1814
1815	#ifdef DT_FIFO
1816	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1817	#endif
1818	#ifdef DT_CHR
1819	case DT_CHR: ent->type = EIO_DT_CHR; break;
1820	#endif
1821	#ifdef DT_MPC
1822	case DT_MPC: ent->type = EIO_DT_MPC; break;
1823	#endif
1824	#ifdef DT_DIR
1825	case DT_DIR: ent->type = EIO_DT_DIR; break;
1826	#endif
1827	#ifdef DT_NAM
1828	case DT_NAM: ent->type = EIO_DT_NAM; break;
1829	#endif
1830	#ifdef DT_BLK
1831	case DT_BLK: ent->type = EIO_DT_BLK; break;
1832	#endif
1833	#ifdef DT_MPB
1834	case DT_MPB: ent->type = EIO_DT_MPB; break;
1835	#endif
1836	#ifdef DT_REG
1837	case DT_REG: ent->type = EIO_DT_REG; break;
1838	#endif
1839	#ifdef DT_NWK
1840	case DT_NWK: ent->type = EIO_DT_NWK; break;
1841	#endif
1842	#ifdef DT_CMP
1843	case DT_CMP: ent->type = EIO_DT_CMP; break;
1844	#endif
1845	#ifdef DT_LNK
1846	case DT_LNK: ent->type = EIO_DT_LNK; break;
1847	#endif
1848	#ifdef DT_SOCK
1849	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1850	#endif
1851	#ifdef DT_DOOR
1852	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1853	#endif
1854	#ifdef DT_WHT
1855	case DT_WHT: ent->type = EIO_DT_WHT; break;
1856	#endif
1857	}
1858
1859	ent->score = 7;
1860
1861	if (flags & EIO_READDIR_DIRS_FIRST)
1862	{
1863	if (ent->type == EIO_DT_UNKNOWN)
1864	{
1865	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1866	ent->score = 1;
1867	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1868	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1869	}
1870	else if (ent->type == EIO_DT_DIR)
1871	ent->score = 0;
1872	}
1873	}
1874
1875	namesoffs += len;	1978	namesoffs += len;
1876	++dentoffs;	1979	++dentoffs;
1877	}	1980	}
1878		1981
1879	if (EIO_CANCELLED (req))	1982	if (EIO_CANCELLED (req))
1880	{	1983	{
1881	errno = ECANCELED;	1984	errno = ECANCELED;
1882	break;	1985	break;
1883	}	1986	}
1884		1987
1885	#ifdef _WIN32	1988	#ifdef _WIN32
1886	if (!FindNextFile (dirp, &entp))	1989	if (!FindNextFile (dirp, &entp))
1887	{	1990	{
1888	FindClose (dirp);	1991	FindClose (dirp);
1889	dirp = 0;	1992	dirp = 0;
1890	}	1993	}
1891	#endif	1994	#endif
1892	}	1995	}
1893	}	1996	}
		1997
		1998	/*****************************************************************************/
		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;
		2042
		2043	#if HAVE_AT
		2044	fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		2045
		2046	if (fd < 0)
		2047	return EIO_INVALID_WD;
		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	}
		2062
		2063	eio_wd
		2064	eio_wd_open_sync (eio_wd wd, const char *path)
		2065	{
		2066	struct tmpbuf tmpbuf = { 0 };
		2067	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2068	free (tmpbuf.ptr);
		2069
		2070	return wd;
		2071	}
		2072
		2073	void
		2074	eio_wd_close_sync (eio_wd wd)
		2075	{
		2076	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2077	{
		2078	#if HAVE_AT
		2079	close (wd->fd);
		2080	#endif
		2081	free (wd);
		2082	}
		2083	}
		2084
		2085	#if HAVE_AT
		2086
		2087	/* they forgot these */
		2088
		2089	static int
		2090	eio__truncateat (int dirfd, const char *path, off_t length)
		2091	{
		2092	int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
		2093	int res;
		2094
		2095	if (fd < 0)
		2096	return fd;
		2097
		2098	res = ftruncate (fd, length);
		2099	close (fd);
		2100	return res;
		2101	}
		2102
		2103	static int
		2104	eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
		2105	{
		2106	int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
		2107	int res;
		2108
		2109	if (fd < 0)
		2110	return fd;
		2111
		2112	res = fstatvfs (fd, buf);
		2113	close (fd);
		2114	return res;
		2115
		2116	}
		2117
		2118	#endif
1894		2119
1895	/*****************************************************************************/	2120	/*****************************************************************************/
1896		2121
1897	#define ALLOC(len) \	2122	#define ALLOC(len) \
1898	if (!req->ptr2) \	2123	if (!req->ptr2) \
…		…
1907	req->result = -1; \	2132	req->result = -1; \
1908	break; \	2133	break; \
1909	} \	2134	} \
1910	}	2135	}
1911		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
1912	X_THREAD_PROC (etp_proc)	2154	X_THREAD_PROC (etp_proc)
1913	{	2155	{
1914	ETP_REQ *req;	2156	ETP_REQ *req;
1915	struct timespec ts;	2157	struct timespec ts;
1916	etp_worker *self = (etp_worker *)thr_arg;	2158	etp_worker *self = (etp_worker *)thr_arg;
1917		2159
		2160	etp_proc_init ();
		2161
1918	/* try to distribute timeouts somewhat evenly */	2162	/* try to distribute timeouts somewhat evenly */
1919	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2163	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1920		2164
1921	for (;;)	2165	for (;;)
1922	{	2166	{
…		…
1924		2168
1925	X_LOCK (reqlock);	2169	X_LOCK (reqlock);
1926		2170
1927	for (;;)	2171	for (;;)
1928	{	2172	{
1929	self->req = req = reqq_shift (&req_queue);	2173	req = reqq_shift (&req_queue);
1930		2174
1931	if (req)	2175	if (req)
1932	break;	2176	break;
1933		2177
1934	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2178	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1972	++npending;	2216	++npending;
1973		2217
1974	if (!reqq_push (&res_queue, req) && want_poll_cb)	2218	if (!reqq_push (&res_queue, req) && want_poll_cb)
1975	want_poll_cb ();	2219	want_poll_cb ();
1976		2220
1977	self->req = 0;
1978	etp_worker_clear (self);	2221	etp_worker_clear (self);
1979		2222
1980	X_UNLOCK (reslock);	2223	X_UNLOCK (reslock);
1981	}	2224	}
1982		2225
1983	quit:	2226	quit:
		2227	free (req);
		2228
1984	X_LOCK (wrklock);	2229	X_LOCK (wrklock);
1985	etp_worker_free (self);	2230	etp_worker_free (self);
1986	X_UNLOCK (wrklock);	2231	X_UNLOCK (wrklock);
1987		2232
1988	return 0;	2233	return 0;
…		…
1991	/*****************************************************************************/	2236	/*****************************************************************************/
1992		2237
1993	int ecb_cold	2238	int ecb_cold
1994	eio_init (void (*want_poll)(void), void (*done_poll)(void))	2239	eio_init (void (*want_poll)(void), void (*done_poll)(void))
1995	{	2240	{
1996	#if !HAVE_PREADWRITE
1997	X_MUTEX_CREATE (preadwritelock);
1998	#endif
1999
2000	return etp_init (want_poll, done_poll);	2241	return etp_init (want_poll, done_poll);
2001	}	2242	}
2002		2243
2003	ecb_inline void	2244	ecb_inline void
2004	eio_api_destroy (eio_req *req)	2245	eio_api_destroy (eio_req *req)
2005	{	2246	{
2006	free (req);	2247	free (req);
2007	}	2248	}
2008		2249
2009	#define REQ(rtype) \	2250	#define REQ(rtype) \
2010	eio_req *req; \	2251	eio_req *req; \
2011	\	2252	\
2012	req = (eio_req *)calloc (1, sizeof *req); \	2253	req = (eio_req *)calloc (1, sizeof *req); \
2013	if (!req) \	2254	if (!req) \
2014	return 0; \	2255	return 0; \
…		…
2031	}	2272	}
2032		2273
2033	static void	2274	static void
2034	eio_execute (etp_worker *self, eio_req *req)	2275	eio_execute (etp_worker *self, eio_req *req)
2035	{	2276	{
		2277	#if HAVE_AT
		2278	int dirfd;
		2279	#else
		2280	const char *path;
		2281	#endif
		2282
2036	if (ecb_expect_false (EIO_CANCELLED (req)))	2283	if (ecb_expect_false (EIO_CANCELLED (req)))
2037	{	2284	{
2038	req->result = -1;	2285	req->result = -1;
2039	req->errorno = ECANCELED;	2286	req->errorno = ECANCELED;
2040	return;	2287	return;
2041	}	2288	}
2042		2289
		2290	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2291	{
		2292	req->result = -1;
		2293	req->errorno = ENOENT;
		2294	return;
		2295	}
		2296
		2297	if (req->type >= EIO_OPEN)
		2298	{
		2299	#if HAVE_AT
		2300	dirfd = WD2FD (req->wd);
		2301	#else
		2302	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2303	#endif
		2304	}
		2305
2043	switch (req->type)	2306	switch (req->type)
2044	{	2307	{
		2308	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2309	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2310	break;
		2311	case EIO_WD_CLOSE: req->result = 0;
		2312	eio_wd_close_sync (req->wd); break;
		2313
		2314	case EIO_SEEK: eio__lseek (req); break;
2045	case EIO_READ: ALLOC (req->size);	2315	case EIO_READ: ALLOC (req->size);
2046	req->result = req->offs >= 0	2316	req->result = req->offs >= 0
2047	? pread (req->int1, req->ptr2, req->size, req->offs)	2317	? pread (req->int1, req->ptr2, req->size, req->offs)
2048	: read (req->int1, req->ptr2, req->size); break;	2318	: read (req->int1, req->ptr2, req->size); break;
2049	case EIO_WRITE: req->result = req->offs >= 0	2319	case EIO_WRITE: req->result = req->offs >= 0
…		…
2051	: write (req->int1, req->ptr2, req->size); break;	2321	: write (req->int1, req->ptr2, req->size); break;
2052		2322
2053	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2323	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2054	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;	2324	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2055		2325
		2326	#if HAVE_AT
		2327
2056	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2328	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2057	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2329	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2058	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2330	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2331	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2332	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2333	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2334	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2335	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2336
		2337	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2338	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2339	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2340	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2341	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2342	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2343	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2344	case EIO_READLINK: ALLOC (PATH_MAX);
		2345	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2346	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2347	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2348	case EIO_UTIME:
		2349	case EIO_FUTIME:
		2350	{
		2351	struct timespec ts[2];
		2352	struct timespec *times;
		2353
		2354	if (req->nv1 != -1. || req->nv2 != -1.)
		2355	{
		2356	ts[0].tv_sec = req->nv1;
		2357	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2358	ts[1].tv_sec = req->nv2;
		2359	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2360
		2361	times = ts;
		2362	}
		2363	else
		2364	times = 0;
		2365
		2366	req->result = req->type == EIO_FUTIME
		2367	? futimens (req->int1, times)
		2368	: utimensat (dirfd, req->ptr1, times, 0);
		2369	}
		2370	break;
		2371
		2372	#else
		2373
		2374	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2375	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2376	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2059	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2377	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2378	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2379	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2380	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2381	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2382
		2383	case EIO_UNLINK: req->result = unlink (path ); break;
		2384	case EIO_RMDIR: req->result = rmdir (path ); break;
		2385	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2386	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2387	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2388	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2389	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2390	case EIO_READLINK: ALLOC (PATH_MAX);
		2391	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2392	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2393	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2394
		2395	case EIO_UTIME:
		2396	case EIO_FUTIME:
		2397	{
		2398	struct timeval tv[2];
		2399	struct timeval *times;
		2400
		2401	if (req->nv1 != -1. || req->nv2 != -1.)
		2402	{
		2403	tv[0].tv_sec = req->nv1;
		2404	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2405	tv[1].tv_sec = req->nv2;
		2406	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2407
		2408	times = tv;
		2409	}
		2410	else
		2411	times = 0;
		2412
		2413	req->result = req->type == EIO_FUTIME
		2414	? futimes (req->int1, times)
		2415	: utimes (req->ptr1, times);
		2416	}
		2417	break;
		2418
		2419	#endif
		2420
		2421	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2422	{
		2423	ALLOC (req->result);
		2424	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2425	}
		2426	break;
		2427
2060	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2428	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2061	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2429	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2062		2430
2063	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2064	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2065	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2431	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2066	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2432	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2067		2433
2068	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2069	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2434	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2070	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2071	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2435	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2072	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2073	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2436	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2074		2437
2075	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2076	case EIO_CLOSE: req->result = close (req->int1); break;	2438	case EIO_CLOSE: req->result = close (req->int1); break;
2077	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2439	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2078	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2079	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2080	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2081	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2082	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2083	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2084	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2085
2086	case EIO_REALPATH: eio__realpath (req, self); break;
2087
2088	case EIO_READLINK: ALLOC (PATH_MAX);
2089	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2090
2091	case EIO_SYNC: req->result = 0; sync (); break;	2440	case EIO_SYNC: req->result = 0; sync (); break;
2092	case EIO_FSYNC: req->result = fsync (req->int1); break;	2441	case EIO_FSYNC: req->result = fsync (req->int1); break;
2093	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2442	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2094	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;	2443	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2095	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;	2444	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
…		…
2114	req->result = select (0, 0, 0, 0, &tv);	2463	req->result = select (0, 0, 0, 0, &tv);
2115	}	2464	}
2116	#endif	2465	#endif
2117	break;	2466	break;
2118		2467
2119	case EIO_UTIME:
2120	case EIO_FUTIME:
2121	{
2122	struct timeval tv[2];
2123	struct timeval *times;
2124
2125	if (req->nv1 != -1. || req->nv2 != -1.)
2126	{
2127	tv[0].tv_sec = req->nv1;
2128	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2129	tv[1].tv_sec = req->nv2;
2130	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2131
2132	times = tv;
2133	}
2134	else
2135	times = 0;
2136
2137	req->result = req->type == EIO_FUTIME
2138	? futimes (req->int1, times)
2139	: utimes (req->ptr1, times);
2140	}
2141	break;
2142
2143	case EIO_GROUP:	2468	case EIO_GROUP:
2144	abort (); /* handled in eio_request */	2469	abort (); /* handled in eio_request */
2145		2470
2146	case EIO_NOP:	2471	case EIO_NOP:
2147	req->result = 0;	2472	req->result = 0;
…		…
2150	case EIO_CUSTOM:	2475	case EIO_CUSTOM:
2151	req->feed (req);	2476	req->feed (req);
2152	break;	2477	break;
2153		2478
2154	default:	2479	default:
2155	errno = ENOSYS;
2156	req->result = -1;	2480	req->result = EIO_ENOSYS ();
2157	break;	2481	break;
2158	}	2482	}
2159		2483
2160	req->errorno = errno;	2484	req->errorno = errno;
2161	}	2485	}
2162		2486
2163	#ifndef EIO_NO_WRAPPERS	2487	#ifndef EIO_NO_WRAPPERS
2164		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
2165	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2499	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2166	{	2500	{
2167	REQ (EIO_NOP); SEND;	2501	REQ (EIO_NOP); SEND;
2168	}	2502	}
2169		2503
…		…
2228	}	2562	}
2229		2563
2230	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)
2231	{	2565	{
2232	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;
2233	}	2572	}
2234		2573
2235	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)
2236	{	2575	{
2237	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