ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/libeio/eio.c

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.92 by root, Sun Jul 17 18:27:17 2011 UTC vs.
Revision 1.114 by root, Fri Dec 30 07:38:00 2011 UTC

…		…
43		43
44	#include "eio.h"	44	#include "eio.h"
45	#include "ecb.h"	45	#include "ecb.h"
46		46
47	#ifdef EIO_STACKSIZE	47	#ifdef EIO_STACKSIZE
48	# define XTHREAD_STACKSIZE EIO_STACKSIZE	48	# define X_STACKSIZE EIO_STACKSIZE
49	#endif	49	#endif
50	#include "xthread.h"	50	#include "xthread.h"
51		51
52	#include <errno.h>	52	#include <errno.h>
53	#include <stddef.h>	53	#include <stddef.h>
…		…
71	#endif	71	#endif
72	#ifndef ELOOP	72	#ifndef ELOOP
73	# define ELOOP EDOM	73	# define ELOOP EDOM
74	#endif	74	#endif
75		75
		76	#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
		77	# define ENOTSOCK WSAENOTSOCK
		78	#endif
		79
76	static void eio_destroy (eio_req *req);	80	static void eio_destroy (eio_req *req);
77		81
78	#ifndef EIO_FINISH	82	#ifndef EIO_FINISH
79	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0	83	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
80	#endif	84	#endif
…		…
101	#ifdef _WIN32	105	#ifdef _WIN32
102		106
103	#undef PAGESIZE	107	#undef PAGESIZE
104	#define PAGESIZE 4096 /* GetSystemInfo? */	108	#define PAGESIZE 4096 /* GetSystemInfo? */
105		109
		110	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		111
106	#ifdef EIO_STRUCT_STATI64	112	#ifdef EIO_STRUCT_STATI64
		113	/* look at perl's non-sloppy stat */
107	#define stat(path,buf) _stati64 (path,buf)	114	#define stat(path,buf) _stati64 (path,buf)
108	#define fstat(fd,buf) _fstati64 (path,buf)	115	#define fstat(fd,buf) _fstati64 (fd,buf)
109	#endif	116	#endif
110	#define lstat(path,buf) stat (path,buf)	117	#define lstat(path,buf) stat (path,buf)
111	#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))
112	#define mkdir(path,mode) _mkdir (path)	119	#define mkdir(path,mode) _mkdir (path)
113	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))	120	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
…		…
125	#define sync() EIO_ENOSYS ()	132	#define sync() EIO_ENOSYS ()
126	#define readlink(path,buf,s) EIO_ENOSYS ()	133	#define readlink(path,buf,s) EIO_ENOSYS ()
127	#define statvfs(path,buf) EIO_ENOSYS ()	134	#define statvfs(path,buf) EIO_ENOSYS ()
128	#define fstatvfs(fd,buf) EIO_ENOSYS ()	135	#define fstatvfs(fd,buf) EIO_ENOSYS ()
129		136
		137	/* rename() uses MoveFile, which fails to overwrite */
		138	#define rename(old,neu) eio__rename (old, neu)
		139
		140	static int
		141	eio__rename (const char *old, const char *neu)
		142	{
		143	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		144	return 0;
		145
		146	/* should steal _dosmaperr */
		147	switch (GetLastError ())
		148	{
		149	case ERROR_FILE_NOT_FOUND:
		150	case ERROR_PATH_NOT_FOUND:
		151	case ERROR_INVALID_DRIVE:
		152	case ERROR_NO_MORE_FILES:
		153	case ERROR_BAD_NETPATH:
		154	case ERROR_BAD_NET_NAME:
		155	case ERROR_BAD_PATHNAME:
		156	case ERROR_FILENAME_EXCED_RANGE:
		157	errno = ENOENT;
		158	break;
		159
		160	default:
		161	errno = EACCES;
		162	break;
		163	}
		164
		165	return -1;
		166	}
		167
130	/* we could even stat and see if it exists */	168	/* we could even stat and see if it exists */
131	static int	169	static int
132	symlink (const char *old, const char *neu)	170	symlink (const char *old, const char *neu)
133	{	171	{
134	#if WINVER >= 0x0600	172	#if WINVER >= 0x0600
…		…
160		198
161	#include <sys/time.h>	199	#include <sys/time.h>
162	#include <sys/select.h>	200	#include <sys/select.h>
163	#include <sys/statvfs.h>	201	#include <sys/statvfs.h>
164	#include <unistd.h>	202	#include <unistd.h>
165	#include <utime.h>
166	#include <signal.h>	203	#include <signal.h>
167	#include <dirent.h>	204	#include <dirent.h>
168		205
169	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES	206	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
170	#include <sys/mman.h>	207	#include <sys/mman.h>
…		…
192		229
193	#ifndef EIO_STRUCT_DIRENT	230	#ifndef EIO_STRUCT_DIRENT
194	#define EIO_STRUCT_DIRENT struct dirent	231	#define EIO_STRUCT_DIRENT struct dirent
195	#endif	232	#endif
196		233
		234	#endif
		235
		236	#if HAVE_UTIMES
		237	# include <utime.h>
		238	#endif
		239
		240	#if HAVE_SYS_SYSCALL_H
		241	# include <sys/syscall.h>
		242	#endif
		243
		244	#if HAVE_SYS_PRCTL_H
		245	# include <sys/prctl.h>
197	#endif	246	#endif
198		247
199	#if HAVE_SENDFILE	248	#if HAVE_SENDFILE
200	# if __linux	249	# if __linux
201	# include <sys/sendfile.h>	250	# include <sys/sendfile.h>
…		…
233		282
234	/* buffer size for various temporary buffers */	283	/* buffer size for various temporary buffers */
235	#define EIO_BUFSIZE 65536	284	#define EIO_BUFSIZE 65536
236		285
237	#define dBUF \	286	#define dBUF \
238	char *eio_buf; \
239	ETP_WORKER_LOCK (self); \
240	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	287	char *eio_buf = malloc (EIO_BUFSIZE); \
241	ETP_WORKER_UNLOCK (self); \
242	errno = ENOMEM; \	288	errno = ENOMEM; \
243	if (!eio_buf) \	289	if (!eio_buf) \
244	return -1;	290	return -1
		291
		292	#define FUBd \
		293	free (eio_buf)
245		294
246	#define EIO_TICKS ((1000000 + 1023) >> 10)	295	#define EIO_TICKS ((1000000 + 1023) >> 10)
		296
		297	/*****************************************************************************/
		298
		299	struct tmpbuf
		300	{
		301	void *ptr;
		302	int len;
		303	};
		304
		305	static void *
		306	tmpbuf_get (struct tmpbuf *buf, int len)
		307	{
		308	if (buf->len < len)
		309	{
		310	free (buf->ptr);
		311	buf->ptr = malloc (buf->len = len);
		312	}
		313
		314	return buf->ptr;
		315	}
		316
		317	struct tmpbuf;
		318
		319	#if _POSIX_VERSION >= 200809L
		320	#define HAVE_AT 1
		321	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		322	#ifndef O_SEARCH
		323	#define O_SEARCH O_RDONLY
		324	#endif
		325	#else
		326	#define HAVE_AT 0
		327	static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
		328	#endif
		329
		330	struct eio_pwd
		331	{
		332	#if HAVE_AT
		333	int fd;
		334	#endif
		335	int len;
		336	char str[1]; /* actually, a 0-terminated canonical path */
		337	};
		338
		339	/*****************************************************************************/
247		340
248	#define ETP_PRI_MIN EIO_PRI_MIN	341	#define ETP_PRI_MIN EIO_PRI_MIN
249	#define ETP_PRI_MAX EIO_PRI_MAX	342	#define ETP_PRI_MAX EIO_PRI_MAX
250		343
251	struct etp_worker;	344	struct etp_worker;
…		…
255	static int eio_finish (eio_req *req);	348	static int eio_finish (eio_req *req);
256	#define ETP_FINISH(req) eio_finish (req)	349	#define ETP_FINISH(req) eio_finish (req)
257	static void eio_execute (struct etp_worker *self, eio_req *req);	350	static void eio_execute (struct etp_worker *self, eio_req *req);
258	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	351	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
259		352
260	#define ETP_WORKER_CLEAR(req) \
261	if (wrk->dbuf) \
262	{ \
263	free (wrk->dbuf); \
264	wrk->dbuf = 0; \
265	}
266
267	#define ETP_WORKER_COMMON \
268	void *dbuf;
269
270	/*****************************************************************************/	353	/*****************************************************************************/
271		354
272	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	355	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273		356
274	/* calculate time difference in ~1/EIO_TICKS of a second */	357	/* calculate time difference in ~1/EIO_TICKS of a second */
…		…
285	static void (*done_poll_cb) (void);	368	static void (*done_poll_cb) (void);
286		369
287	static unsigned int max_poll_time; /* reslock */	370	static unsigned int max_poll_time; /* reslock */
288	static unsigned int max_poll_reqs; /* reslock */	371	static unsigned int max_poll_reqs; /* reslock */
289		372
290	static volatile unsigned int nreqs; /* reqlock */	373	static unsigned int nreqs; /* reqlock */
291	static volatile unsigned int nready; /* reqlock */	374	static unsigned int nready; /* reqlock */
292	static volatile unsigned int npending; /* reqlock */	375	static unsigned int npending; /* reqlock */
293	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	376	static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
294	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */	377	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
295		378
296	static xmutex_t wrklock;	379	static xmutex_t wrklock;
297	static xmutex_t reslock;	380	static xmutex_t reslock;
298	static xmutex_t reqlock;	381	static xmutex_t reqlock;
299	static xcond_t reqwait;	382	static xcond_t reqwait;
…		…
302	/*	385	/*
303	* make our pread/pwrite emulation safe against themselves, but not against	386	* make our pread/pwrite emulation safe against themselves, but not against
304	* normal read/write by using a mutex. slows down execution a lot,	387	* normal read/write by using a mutex. slows down execution a lot,
305	* but that's your problem, not mine.	388	* but that's your problem, not mine.
306	*/	389	*/
307	static xmutex_t preadwritelock = X_MUTEX_INIT;	390	static xmutex_t preadwritelock;
308	#endif	391	#endif
309		392
310	typedef struct etp_worker	393	typedef struct etp_worker
311	{	394	{
		395	struct tmpbuf tmpbuf;
		396
312	/* locked by wrklock */	397	/* locked by wrklock */
313	struct etp_worker *prev, *next;	398	struct etp_worker *prev, *next;
314		399
315	xthread_t tid;	400	xthread_t tid;
316		401
317	/* locked by reslock, reqlock or wrklock */	402	#ifdef ETP_WORKER_COMMON
318	ETP_REQ *req; /* currently processed request */
319
320	ETP_WORKER_COMMON	403	ETP_WORKER_COMMON
		404	#endif
321	} etp_worker;	405	} etp_worker;
322		406
323	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	407	static etp_worker wrk_first; /* NOT etp */
324		408
325	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	409	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
326	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	410	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
327		411
328	/* worker threads management */	412	/* worker threads management */
329		413
330	static void ecb_cold	414	static void
331	etp_worker_clear (etp_worker *wrk)	415	etp_worker_clear (etp_worker *wrk)
332	{	416	{
333	ETP_WORKER_CLEAR (wrk);
334	}	417	}
335		418
336	static void ecb_cold	419	static void ecb_cold
337	etp_worker_free (etp_worker *wrk)	420	etp_worker_free (etp_worker *wrk)
338	{	421	{
		422	free (wrk->tmpbuf.ptr);
		423
339	wrk->next->prev = wrk->prev;	424	wrk->next->prev = wrk->prev;
340	wrk->prev->next = wrk->next;	425	wrk->prev->next = wrk->next;
341		426
342	free (wrk);	427	free (wrk);
343	}	428	}
…		…
453	}	538	}
454		539
455	abort ();	540	abort ();
456	}	541	}
457		542
458	static void ecb_cold	543	static int ecb_cold
459	etp_thread_init (void)	544	etp_init (void (*want_poll)(void), void (*done_poll)(void))
460	{	545	{
461	#if !HAVE_PREADWRITE
462	X_MUTEX_CREATE (preadwritelock);
463	#endif
464	X_MUTEX_CREATE (wrklock);	546	X_MUTEX_CREATE (wrklock);
465	X_MUTEX_CREATE (reslock);	547	X_MUTEX_CREATE (reslock);
466	X_MUTEX_CREATE (reqlock);	548	X_MUTEX_CREATE (reqlock);
467	X_COND_CREATE (reqwait);	549	X_COND_CREATE (reqwait);
468	}
469		550
470	static void ecb_cold
471	etp_atfork_child (void)
472	{
473	reqq_init (&req_queue);	551	reqq_init (&req_queue);
474	reqq_init (&res_queue);	552	reqq_init (&res_queue);
475		553
476	wrk_first.next =	554	wrk_first.next =
477	wrk_first.prev = &wrk_first;	555	wrk_first.prev = &wrk_first;
…		…
479	started = 0;	557	started = 0;
480	idle = 0;	558	idle = 0;
481	nreqs = 0;	559	nreqs = 0;
482	nready = 0;	560	nready = 0;
483	npending = 0;	561	npending = 0;
484
485	etp_thread_init ();
486	}
487
488	static void ecb_cold
489	etp_once_init (void)
490	{
491	etp_thread_init ();
492	X_THREAD_ATFORK (0, 0, etp_atfork_child);
493	}
494
495	static int ecb_cold
496	etp_init (void (*want_poll)(void), void (*done_poll)(void))
497	{
498	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
499
500	pthread_once (&doinit, etp_once_init);
501		562
502	want_poll_cb = want_poll;	563	want_poll_cb = want_poll;
503	done_poll_cb = done_poll;	564	done_poll_cb = done_poll;
504		565
505	return 0;	566	return 0;
…		…
545	}	606	}
546		607
547	static void ecb_cold	608	static void ecb_cold
548	etp_end_thread (void)	609	etp_end_thread (void)
549	{	610	{
550	eio_req *req = calloc (1, sizeof (eio_req));	611	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
551		612
552	req->type = -1;	613	req->type = -1;
553	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	614	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
554		615
555	X_LOCK (reqlock);	616	X_LOCK (reqlock);
…		…
963	#if !HAVE_FDATASYNC	1024	#if !HAVE_FDATASYNC
964	# undef fdatasync	1025	# undef fdatasync
965	# define fdatasync(fd) fsync (fd)	1026	# define fdatasync(fd) fsync (fd)
966	#endif	1027	#endif
967		1028
		1029	static int
		1030	eio__syncfs (int fd)
		1031	{
		1032	int res;
		1033
		1034	#if HAVE_SYS_SYNCFS
		1035	res = (int)syscall (__NR_syncfs, (int)(fd));
		1036	#else
		1037	res = -1;
		1038	errno = ENOSYS;
		1039	#endif
		1040
		1041	if (res < 0 && errno == ENOSYS && fd >= 0)
		1042	sync ();
		1043
		1044	return res;
		1045	}
		1046
968	/* sync_file_range always needs emulation */	1047	/* sync_file_range always needs emulation */
969	static int	1048	static int
970	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1049	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
971	{	1050	{
972	#if HAVE_SYNC_FILE_RANGE	1051	#if HAVE_SYNC_FILE_RANGE
…		…
1021	pread (fd, eio_buf, len, offset);	1100	pread (fd, eio_buf, len, offset);
1022	offset += len;	1101	offset += len;
1023	todo -= len;	1102	todo -= len;
1024	}	1103	}
1025		1104
		1105	FUBd;
		1106
1026	errno = 0;	1107	errno = 0;
1027	return count;	1108	return count;
1028	}	1109	}
1029		1110
1030	#endif	1111	#endif
1031		1112
1032	/* sendfile always needs emulation */	1113	/* sendfile always needs emulation */
1033	static eio_ssize_t	1114	static eio_ssize_t
1034	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1115	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1035	{	1116	{
1036	eio_ssize_t written = 0;	1117	eio_ssize_t written = 0;
1037	eio_ssize_t res;	1118	eio_ssize_t res;
1038		1119
1039	if (!count)	1120	if (!count)
…		…
1175		1256
1176	offset += cnt;	1257	offset += cnt;
1177	res += cnt;	1258	res += cnt;
1178	count -= cnt;	1259	count -= cnt;
1179	}	1260	}
		1261
		1262	FUBd;
1180	}	1263	}
1181		1264
1182	return res;	1265	return res;
1183	}	1266	}
1184		1267
…		…
1299	}	1382	}
1300		1383
1301	/*****************************************************************************/	1384	/*****************************************************************************/
1302	/* requests implemented outside eio_execute, because they are so large */	1385	/* requests implemented outside eio_execute, because they are so large */
1303		1386
		1387	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1304	static void	1388	static int
1305	eio__realpath (eio_req *req, etp_worker *self)	1389	eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1306	{	1390	{
1307	char *rel = req->ptr1;	1391	const char *rel = path;
1308	char *res;	1392	char *res;
1309	char *tmp1, *tmp2;	1393	char *tmp1, *tmp2;
1310	#if SYMLOOP_MAX > 32	1394	#if SYMLOOP_MAX > 32
1311	int symlinks = SYMLOOP_MAX;	1395	int symlinks = SYMLOOP_MAX;
1312	#else	1396	#else
1313	int symlinks = 32;	1397	int symlinks = 32;
1314	#endif	1398	#endif
1315		1399
1316	req->result = -1;
1317
1318	errno = EINVAL;	1400	errno = EINVAL;
1319	if (!rel)	1401	if (!rel)
1320	return;	1402	return -1;
1321		1403
1322	errno = ENOENT;	1404	errno = ENOENT;
1323	if (!*rel)	1405	if (!*rel)
1324	return;	1406	return -1;
1325		1407
1326	if (!req->ptr2)	1408	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;	1409	tmp1 = res + PATH_MAX;
1340	tmp2 = tmp1 + PATH_MAX;	1410	tmp2 = tmp1 + PATH_MAX;
1341		1411
1342	#if 0 /* disabled, the musl way to do things is just too racy */	1412	#if 0 /* disabled, the musl way to do things is just too racy */
1343	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1413	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1362	#endif	1432	#endif
1363	#endif	1433	#endif
1364		1434
1365	if (*rel != '/')	1435	if (*rel != '/')
1366	{	1436	{
		1437	int len;
		1438
		1439	errno = ENOENT;
		1440	if (wd == EIO_INVALID_WD)
		1441	return -1;
		1442
		1443	if (wd == EIO_CWD)
		1444	{
1367	if (!getcwd (res, PATH_MAX))	1445	if (!getcwd (res, PATH_MAX))
1368	return;	1446	return -1;
		1447
		1448	len = strlen (res);
		1449	}
		1450	else
		1451	memcpy (res, wd->str, len = wd->len);
1369		1452
1370	if (res [1]) /* only use if not / */	1453	if (res [1]) /* only use if not / */
1371	res += strlen (res);	1454	res += len;
1372	}	1455	}
1373		1456
1374	while (*rel)	1457	while (*rel)
1375	{	1458	{
1376	eio_ssize_t len, linklen;	1459	eio_ssize_t len, linklen;
1377	char *beg = rel;	1460	const char *beg = rel;
1378		1461
1379	while (*rel && *rel != '/')	1462	while (*rel && *rel != '/')
1380	++rel;	1463	++rel;
1381		1464
1382	len = rel - beg;	1465	len = rel - beg;
…		…
1394		1477
1395	if (beg [1] == '.' && len == 2)	1478	if (beg [1] == '.' && len == 2)
1396	{	1479	{
1397	/* .. - back up one component, if possible */	1480	/* .. - back up one component, if possible */
1398		1481
1399	while (res != req->ptr2)	1482	while (res != tmpbuf->ptr)
1400	if (*--res == '/')	1483	if (*--res == '/')
1401	break;	1484	break;
1402		1485
1403	continue;	1486	continue;
1404	}	1487	}
1405	}	1488	}
1406		1489
1407	errno = ENAMETOOLONG;	1490	errno = ENAMETOOLONG;
1408	if (res + 1 + len + 1 >= tmp1)	1491	if (res + 1 + len + 1 >= tmp1)
1409	return;	1492	return -1;
1410		1493
1411	/* copy one component */	1494	/* copy one component */
1412	*res = '/';	1495	*res = '/';
1413	memcpy (res + 1, beg, len);	1496	memcpy (res + 1, beg, len);
1414		1497
1415	/* zero-terminate, for readlink */	1498	/* zero-terminate, for readlink */
1416	res [len + 1] = 0;	1499	res [len + 1] = 0;
1417		1500
1418	/* now check if it's a symlink */	1501	/* now check if it's a symlink */
1419	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1502	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1420		1503
1421	if (linklen < 0)	1504	if (linklen < 0)
1422	{	1505	{
1423	if (errno != EINVAL)	1506	if (errno != EINVAL)
1424	return;	1507	return -1;
1425		1508
1426	/* it's a normal directory. hopefully */	1509	/* it's a normal directory. hopefully */
1427	res += len + 1;	1510	res += len + 1;
1428	}	1511	}
1429	else	1512	else
…		…
1431	/* yay, it was a symlink - build new path in tmp2 */	1514	/* yay, it was a symlink - build new path in tmp2 */
1432	int rellen = strlen (rel);	1515	int rellen = strlen (rel);
1433		1516
1434	errno = ENAMETOOLONG;	1517	errno = ENAMETOOLONG;
1435	if (linklen + 1 + rellen >= PATH_MAX)	1518	if (linklen + 1 + rellen >= PATH_MAX)
1436	return;	1519	return -1;
1437		1520
1438	errno = ELOOP;	1521	errno = ELOOP;
1439	if (!--symlinks)	1522	if (!--symlinks)
1440	return;	1523	return -1;
1441		1524
1442	if (*tmp1 == '/')	1525	if (*tmp1 == '/')
1443	res = req->ptr2; /* symlink resolves to an absolute path */	1526	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1444		1527
1445	/* we need to be careful, as rel might point into tmp2 already */	1528	/* we need to be careful, as rel might point into tmp2 already */
1446	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1529	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1447	tmp2 [linklen] = '/';	1530	tmp2 [linklen] = '/';
1448	memcpy (tmp2, tmp1, linklen);	1531	memcpy (tmp2, tmp1, linklen);
…		…
1450	rel = tmp2;	1533	rel = tmp2;
1451	}	1534	}
1452	}	1535	}
1453		1536
1454	/* special case for the lone root path */	1537	/* special case for the lone root path */
1455	if (res == req->ptr2)	1538	if (res == tmpbuf->ptr)
1456	*res++ = '/';	1539	*res++ = '/';
1457		1540
1458	req->result = res - (char *)req->ptr2;	1541	return res - (char *)tmpbuf->ptr;
1459
1460	done:
1461	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1462	}	1542	}
1463		1543
1464	static signed char	1544	static signed char
1465	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1545	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1466	{	1546	{
…		…
1654	#ifdef _WIN32	1734	#ifdef _WIN32
1655	{	1735	{
1656	int len = strlen ((const char *)req->ptr1);	1736	int len = strlen ((const char *)req->ptr1);
1657	char *path = malloc (MAX_PATH);	1737	char *path = malloc (MAX_PATH);
1658	const char *fmt;	1738	const char *fmt;
		1739	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1659		1740
1660	if (!len)	1741	if (!len)
1661	fmt = "./*";	1742	fmt = "./*";
1662	else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')	1743	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1663	fmt = "%s*";	1744	fmt = "%s*";
1664	else	1745	else
1665	fmt = "%s/*";	1746	fmt = "%s/*";
1666		1747
1667	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1748	_snprintf (path, MAX_PATH, fmt, reqpath);
1668	dirp = FindFirstFile (path, &entp);	1749	dirp = FindFirstFile (path, &entp);
1669	free (path);	1750	free (path);
1670		1751
1671	if (dirp == INVALID_HANDLE_VALUE)	1752	if (dirp == INVALID_HANDLE_VALUE)
1672	{	1753	{
1673	dirp = 0;	1754	/* should steal _dosmaperr */
1674
1675	switch (GetLastError ())	1755	switch (GetLastError ())
1676	{	1756	{
1677	case ERROR_FILE_NOT_FOUND:	1757	case ERROR_FILE_NOT_FOUND:
1678	req->result = 0;	1758	req->result = 0;
1679	break;	1759	break;
1680		1760
1681	case ERROR_INVALID_NAME:	1761	case ERROR_INVALID_NAME:
1682	case ERROR_PATH_NOT_FOUND:	1762	case ERROR_PATH_NOT_FOUND:
1683	case ERROR_NO_MORE_FILES:	1763	case ERROR_NO_MORE_FILES:
1684	errno = ENOENT;	1764	errno = ENOENT;
1685	break;	1765	break;
1686		1766
1687	case ERROR_NOT_ENOUGH_MEMORY:	1767	case ERROR_NOT_ENOUGH_MEMORY:
1688	errno = ENOMEM;	1768	errno = ENOMEM;
1689	break;	1769	break;
1690		1770
1691	default:	1771	default:
1692	errno = EINVAL;	1772	errno = EINVAL;
1693	break;	1773	break;
1694	}	1774	}
		1775
		1776	return;
1695	}	1777	}
1696	}	1778	}
1697	#else	1779	#else
		1780	#if HAVE_AT
		1781	if (req->wd)
		1782	{
		1783	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		1784
		1785	if (fd < 0)
		1786	return;
		1787
		1788	dirp = fdopendir (fd);
		1789
		1790	if (!dirp)
		1791	close (fd);
		1792	}
		1793	else
1698	dirp = opendir (req->ptr1);	1794	dirp = opendir (req->ptr1);
		1795	#else
		1796	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1797	#endif
		1798
		1799	if (!dirp)
		1800	return;
1699	#endif	1801	#endif
1700		1802
1701	if (req->flags & EIO_FLAG_PTR1_FREE)	1803	if (req->flags & EIO_FLAG_PTR1_FREE)
1702	free (req->ptr1);	1804	free (req->ptr1);
1703		1805
1704	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1806	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1705	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1807	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1706	req->ptr2 = names = malloc (namesalloc);	1808	req->ptr2 = names = malloc (namesalloc);
1707		1809
1708	if (dirp && names && (!flags || dents))	1810	if (!names || (flags && !dents))
		1811	return;
		1812
1709	for (;;)	1813	for (;;)
1710	{	1814	{
1711	int done;	1815	int done;
1712		1816
1713	#ifdef _WIN32	1817	#ifdef _WIN32
1714	done = !dirp;	1818	done = !dirp;
1715	#else	1819	#else
1716	errno = 0;	1820	errno = 0;
1717	entp = readdir (dirp);	1821	entp = readdir (dirp);
1718	done = !entp;	1822	done = !entp;
1719	#endif	1823	#endif
1720		1824
1721	if (done)	1825	if (done)
1722	{	1826	{
1723	#ifndef _WIN32	1827	#ifndef _WIN32
1724	int old_errno = errno;	1828	int old_errno = errno;
1725	closedir (dirp);	1829	closedir (dirp);
1726	errno = old_errno;	1830	errno = old_errno;
1727		1831
1728	if (errno)	1832	if (errno)
1729	break;	1833	break;
1730	#endif	1834	#endif
1731		1835
1732	/* sort etc. */	1836	/* sort etc. */
1733	req->int1 = flags;	1837	req->int1 = flags;
1734	req->result = dentoffs;	1838	req->result = dentoffs;
1735		1839
1736	if (flags & EIO_READDIR_STAT_ORDER)	1840	if (flags & EIO_READDIR_STAT_ORDER)
1737	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1841	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1738	else if (flags & EIO_READDIR_DIRS_FIRST)	1842	else if (flags & EIO_READDIR_DIRS_FIRST)
1739	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1843	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1740	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1844	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1741	else	1845	else
		1846	{
		1847	/* in this case, all is known, and we just put dirs first and sort them */
		1848	eio_dirent *oth = dents + dentoffs;
		1849	eio_dirent *dir = dents;
		1850
		1851	/* now partition dirs to the front, and non-dirs to the back */
		1852	/* by walking from both sides and swapping if necessary */
		1853	while (oth > dir)
		1854	{
		1855	if (dir->type == EIO_DT_DIR)
		1856	++dir;
		1857	else if ((--oth)->type == EIO_DT_DIR)
		1858	{
		1859	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
		1860
		1861	++dir;
		1862	}
		1863	}
		1864
		1865	/* now sort the dirs only (dirs all have the same score) */
		1866	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1867	}
		1868
		1869	break;
		1870	}
		1871
		1872	/* now add the entry to our list(s) */
		1873	name = D_NAME (entp);
		1874
		1875	/* skip . and .. entries */
		1876	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		1877	{
		1878	int len = D_NAMLEN (entp) + 1;
		1879
		1880	while (ecb_expect_false (namesoffs + len > namesalloc))
		1881	{
		1882	namesalloc *= 2;
		1883	req->ptr2 = names = realloc (names, namesalloc);
		1884
		1885	if (!names)
		1886	break;
		1887	}
		1888
		1889	memcpy (names + namesoffs, name, len);
		1890
		1891	if (dents)
		1892	{
		1893	struct eio_dirent *ent;
		1894
		1895	if (ecb_expect_false (dentoffs == dentalloc))
1742	{	1896	{
1743	/* in this case, all is known, and we just put dirs first and sort them */	1897	dentalloc *= 2;
		1898	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1899
		1900	if (!dents)
		1901	break;
		1902	}
		1903
1744	eio_dirent *oth = dents + dentoffs;	1904	ent = dents + dentoffs;
1745	eio_dirent *dir = dents;
1746		1905
1747	/* now partition dirs to the front, and non-dirs to the back */	1906	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1748	/* by walking from both sides and swapping if necessary */	1907	ent->namelen = len - 1;
1749	while (oth > dir)	1908	ent->inode = D_INO (entp);
		1909
		1910	inode_bits |= ent->inode;
		1911
		1912	switch (D_TYPE (entp))
		1913	{
		1914	default:
		1915	ent->type = EIO_DT_UNKNOWN;
		1916	flags |= EIO_READDIR_FOUND_UNKNOWN;
		1917	break;
		1918
		1919	#ifdef DT_FIFO
		1920	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1921	#endif
		1922	#ifdef DT_CHR
		1923	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1924	#endif
		1925	#ifdef DT_MPC
		1926	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1927	#endif
		1928	#ifdef DT_DIR
		1929	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1930	#endif
		1931	#ifdef DT_NAM
		1932	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1933	#endif
		1934	#ifdef DT_BLK
		1935	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1936	#endif
		1937	#ifdef DT_MPB
		1938	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1939	#endif
		1940	#ifdef DT_REG
		1941	case DT_REG: ent->type = EIO_DT_REG; break;
		1942	#endif
		1943	#ifdef DT_NWK
		1944	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1945	#endif
		1946	#ifdef DT_CMP
		1947	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1948	#endif
		1949	#ifdef DT_LNK
		1950	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1951	#endif
		1952	#ifdef DT_SOCK
		1953	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1954	#endif
		1955	#ifdef DT_DOOR
		1956	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1957	#endif
		1958	#ifdef DT_WHT
		1959	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1960	#endif
		1961	}
		1962
		1963	ent->score = 7;
		1964
		1965	if (flags & EIO_READDIR_DIRS_FIRST)
		1966	{
		1967	if (ent->type == EIO_DT_UNKNOWN)
1750	{	1968	{
1751	if (dir->type == EIO_DT_DIR)	1969	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1752	++dir;	1970	ent->score = 1;
1753	else if ((--oth)->type == EIO_DT_DIR)	1971	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1754	{	1972	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	}	1973	}
1760		1974	else if (ent->type == EIO_DT_DIR)
1761	/* now sort the dirs only (dirs all have the same score) */	1975	ent->score = 0;
1762	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1763	}	1976	}
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	}	1977	}
1784		1978
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;	1979	namesoffs += len;
1876	++dentoffs;	1980	++dentoffs;
1877	}	1981	}
1878		1982
1879	if (EIO_CANCELLED (req))	1983	if (EIO_CANCELLED (req))
1880	{	1984	{
1881	errno = ECANCELED;	1985	errno = ECANCELED;
1882	break;	1986	break;
1883	}	1987	}
1884		1988
1885	#ifdef _WIN32	1989	#ifdef _WIN32
1886	if (!FindNextFile (dirp, &entp))	1990	if (!FindNextFile (dirp, &entp))
1887	{	1991	{
1888	FindClose (dirp);	1992	FindClose (dirp);
1889	dirp = 0;	1993	dirp = 0;
1890	}	1994	}
1891	#endif	1995	#endif
1892	}	1996	}
1893	}	1997	}
		1998
		1999	/*****************************************************************************/
		2000	/* working directory stuff */
		2001	/* various deficiencies in the posix 2008 api force us to */
		2002	/* keep the absolute path in string form at all times */
		2003	/* fuck yeah. */
		2004
		2005	#if !HAVE_AT
		2006
		2007	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2008	/* an absolute or canonical path */
		2009	static const char *
		2010	wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2011	{
		2012	if (!wd || *path == '/')
		2013	return path;
		2014
		2015	if (path [0] == '.' && !path [1])
		2016	return wd->str;
		2017
		2018	{
		2019	int l1 = wd->len;
		2020	int l2 = strlen (path);
		2021
		2022	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2023
		2024	memcpy (res, wd->str, l1);
		2025	res [l1] = '/';
		2026	memcpy (res + l1 + 1, path, l2 + 1);
		2027
		2028	return res;
		2029	}
		2030	}
		2031
		2032	#endif
		2033
		2034	static eio_wd
		2035	eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2036	{
		2037	int fd;
		2038	eio_wd res;
		2039	int len = eio__realpath (tmpbuf, wd, path);
		2040
		2041	if (len < 0)
		2042	return EIO_INVALID_WD;
		2043
		2044	#if HAVE_AT
		2045	fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		2046
		2047	if (fd < 0)
		2048	return EIO_INVALID_WD;
		2049	#endif
		2050
		2051	res = malloc (sizeof (*res) + len); /* one extra 0-byte */
		2052
		2053	#if HAVE_AT
		2054	res->fd = fd;
		2055	#endif
		2056
		2057	res->len = len;
		2058	memcpy (res->str, tmpbuf->ptr, len);
		2059	res->str [len] = 0;
		2060
		2061	return res;
		2062	}
		2063
		2064	eio_wd
		2065	eio_wd_open_sync (eio_wd wd, const char *path)
		2066	{
		2067	struct tmpbuf tmpbuf = { 0 };
		2068	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2069	free (tmpbuf.ptr);
		2070
		2071	return wd;
		2072	}
		2073
		2074	void
		2075	eio_wd_close_sync (eio_wd wd)
		2076	{
		2077	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2078	{
		2079	#if HAVE_AT
		2080	close (wd->fd);
		2081	#endif
		2082	free (wd);
		2083	}
		2084	}
		2085
		2086	#if HAVE_AT
		2087
		2088	/* they forgot these */
		2089
		2090	static int
		2091	eio__truncateat (int dirfd, const char *path, off_t length)
		2092	{
		2093	int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
		2094	int res;
		2095
		2096	if (fd < 0)
		2097	return fd;
		2098
		2099	res = ftruncate (fd, length);
		2100	close (fd);
		2101	return res;
		2102	}
		2103
		2104	static int
		2105	eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
		2106	{
		2107	int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
		2108	int res;
		2109
		2110	if (fd < 0)
		2111	return fd;
		2112
		2113	res = fstatvfs (fd, buf);
		2114	close (fd);
		2115	return res;
		2116
		2117	}
		2118
		2119	#endif
1894		2120
1895	/*****************************************************************************/	2121	/*****************************************************************************/
1896		2122
1897	#define ALLOC(len) \	2123	#define ALLOC(len) \
1898	if (!req->ptr2) \	2124	if (!req->ptr2) \
…		…
1907	req->result = -1; \	2133	req->result = -1; \
1908	break; \	2134	break; \
1909	} \	2135	} \
1910	}	2136	}
1911		2137
		2138	static void ecb_noinline ecb_cold
		2139	etp_proc_init (void)
		2140	{
		2141	#if HAVE_PRCTL_SET_NAME
		2142	/* provide a more sensible "thread name" */
		2143	char name[16 + 1];
		2144	const int namelen = sizeof (name) - 1;
		2145	int len;
		2146
		2147	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2148	name [namelen] = 0;
		2149	len = strlen (name);
		2150	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2151	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2152	#endif
		2153	}
		2154
1912	X_THREAD_PROC (etp_proc)	2155	X_THREAD_PROC (etp_proc)
1913	{	2156	{
1914	ETP_REQ *req;	2157	ETP_REQ *req;
1915	struct timespec ts;	2158	struct timespec ts;
1916	etp_worker *self = (etp_worker *)thr_arg;	2159	etp_worker *self = (etp_worker *)thr_arg;
1917		2160
		2161	etp_proc_init ();
		2162
1918	/* try to distribute timeouts somewhat evenly */	2163	/* try to distribute timeouts somewhat evenly */
1919	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2164	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1920		2165
1921	for (;;)	2166	for (;;)
1922	{	2167	{
…		…
1924		2169
1925	X_LOCK (reqlock);	2170	X_LOCK (reqlock);
1926		2171
1927	for (;;)	2172	for (;;)
1928	{	2173	{
1929	self->req = req = reqq_shift (&req_queue);	2174	req = reqq_shift (&req_queue);
1930		2175
1931	if (req)	2176	if (req)
1932	break;	2177	break;
1933		2178
1934	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2179	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1972	++npending;	2217	++npending;
1973		2218
1974	if (!reqq_push (&res_queue, req) && want_poll_cb)	2219	if (!reqq_push (&res_queue, req) && want_poll_cb)
1975	want_poll_cb ();	2220	want_poll_cb ();
1976		2221
1977	self->req = 0;
1978	etp_worker_clear (self);	2222	etp_worker_clear (self);
1979		2223
1980	X_UNLOCK (reslock);	2224	X_UNLOCK (reslock);
1981	}	2225	}
1982		2226
1983	quit:	2227	quit:
		2228	free (req);
		2229
1984	X_LOCK (wrklock);	2230	X_LOCK (wrklock);
1985	etp_worker_free (self);	2231	etp_worker_free (self);
1986	X_UNLOCK (wrklock);	2232	X_UNLOCK (wrklock);
1987		2233
1988	return 0;	2234	return 0;
…		…
1991	/*****************************************************************************/	2237	/*****************************************************************************/
1992		2238
1993	int ecb_cold	2239	int ecb_cold
1994	eio_init (void (*want_poll)(void), void (*done_poll)(void))	2240	eio_init (void (*want_poll)(void), void (*done_poll)(void))
1995	{	2241	{
		2242	#if !HAVE_PREADWRITE
		2243	X_MUTEX_CREATE (preadwritelock);
		2244	#endif
		2245
1996	return etp_init (want_poll, done_poll);	2246	return etp_init (want_poll, done_poll);
1997	}	2247	}
1998		2248
1999	ecb_inline void	2249	ecb_inline void
2000	eio_api_destroy (eio_req *req)	2250	eio_api_destroy (eio_req *req)
…		…
2027	}	2277	}
2028		2278
2029	static void	2279	static void
2030	eio_execute (etp_worker *self, eio_req *req)	2280	eio_execute (etp_worker *self, eio_req *req)
2031	{	2281	{
		2282	#if HAVE_AT
		2283	int dirfd;
		2284	#else
		2285	const char *path;
		2286	#endif
		2287
2032	if (ecb_expect_false (EIO_CANCELLED (req)))	2288	if (ecb_expect_false (EIO_CANCELLED (req)))
2033	{	2289	{
2034	req->result = -1;	2290	req->result = -1;
2035	req->errorno = ECANCELED;	2291	req->errorno = ECANCELED;
2036	return;	2292	return;
2037	}	2293	}
2038		2294
		2295	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2296	{
		2297	req->result = -1;
		2298	req->errorno = ENOENT;
		2299	return;
		2300	}
		2301
		2302	if (req->type >= EIO_OPEN)
		2303	{
		2304	#if HAVE_AT
		2305	dirfd = WD2FD (req->wd);
		2306	#else
		2307	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2308	#endif
		2309	}
		2310
2039	switch (req->type)	2311	switch (req->type)
2040	{	2312	{
		2313	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2314	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2315	break;
		2316	case EIO_WD_CLOSE: req->result = 0;
		2317	eio_wd_close_sync (req->wd); break;
		2318
2041	case EIO_READ: ALLOC (req->size);	2319	case EIO_READ: ALLOC (req->size);
2042	req->result = req->offs >= 0	2320	req->result = req->offs >= 0
2043	? pread (req->int1, req->ptr2, req->size, req->offs)	2321	? pread (req->int1, req->ptr2, req->size, req->offs)
2044	: read (req->int1, req->ptr2, req->size); break;	2322	: read (req->int1, req->ptr2, req->size); break;
2045	case EIO_WRITE: req->result = req->offs >= 0	2323	case EIO_WRITE: req->result = req->offs >= 0
2046	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2324	? pwrite (req->int1, req->ptr2, req->size, req->offs)
2047	: write (req->int1, req->ptr2, req->size); break;	2325	: write (req->int1, req->ptr2, req->size); break;
2048		2326
2049	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2327	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2050	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;	2328	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
		2329
		2330	#if HAVE_AT
2051		2331
2052	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2332	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2053	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2333	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2054	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2334	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2335	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2336	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2337	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2338	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2339	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2340
		2341	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2342	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2343	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2344	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2345	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2346	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2347	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2348	case EIO_READLINK: ALLOC (PATH_MAX);
		2349	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2350	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2351	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2352	case EIO_UTIME:
		2353	case EIO_FUTIME:
		2354	{
		2355	struct timespec ts[2];
		2356	struct timespec *times;
		2357
		2358	if (req->nv1 != -1. || req->nv2 != -1.)
		2359	{
		2360	ts[0].tv_sec = req->nv1;
		2361	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2362	ts[1].tv_sec = req->nv2;
		2363	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2364
		2365	times = ts;
		2366	}
		2367	else
		2368	times = 0;
		2369
		2370	req->result = req->type == EIO_FUTIME
		2371	? futimens (req->int1, times)
		2372	: utimensat (dirfd, req->ptr1, times, 0);
		2373	}
		2374	break;
		2375
		2376	#else
		2377
		2378	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2379	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2380	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2055	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2381	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2382	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2383	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2384	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2385	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2386
		2387	case EIO_UNLINK: req->result = unlink (path ); break;
		2388	case EIO_RMDIR: req->result = rmdir (path ); break;
		2389	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2390	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2391	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2392	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2393	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2394	case EIO_READLINK: ALLOC (PATH_MAX);
		2395	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2396	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2397	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2398
		2399	case EIO_UTIME:
		2400	case EIO_FUTIME:
		2401	{
		2402	struct timeval tv[2];
		2403	struct timeval *times;
		2404
		2405	if (req->nv1 != -1. || req->nv2 != -1.)
		2406	{
		2407	tv[0].tv_sec = req->nv1;
		2408	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2409	tv[1].tv_sec = req->nv2;
		2410	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2411
		2412	times = tv;
		2413	}
		2414	else
		2415	times = 0;
		2416
		2417	req->result = req->type == EIO_FUTIME
		2418	? futimes (req->int1, times)
		2419	: utimes (req->ptr1, times);
		2420	}
		2421	break;
		2422
		2423	#endif
		2424
		2425	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2426	{
		2427	ALLOC (req->result);
		2428	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2429	}
		2430	break;
		2431
2056	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2432	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2057	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2433	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2058		2434
2059	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2060	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2061	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2435	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2062	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2436	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2063		2437
2064	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2065	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2438	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2066	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2067	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2439	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2068	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2069	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2440	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2070		2441
2071	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2072	case EIO_CLOSE: req->result = close (req->int1); break;	2442	case EIO_CLOSE: req->result = close (req->int1); break;
2073	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2443	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2074	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2075	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2076	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2077	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2078	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2079	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2080	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2081
2082	case EIO_REALPATH: eio__realpath (req, self); break;
2083
2084	case EIO_READLINK: ALLOC (PATH_MAX);
2085	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2086
2087	case EIO_SYNC: req->result = 0; sync (); break;	2444	case EIO_SYNC: req->result = 0; sync (); break;
2088	case EIO_FSYNC: req->result = fsync (req->int1); break;	2445	case EIO_FSYNC: req->result = fsync (req->int1); break;
2089	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2446	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2447	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2448	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2090	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	2449	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2091	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2450	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2092	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2451	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2093	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2452	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2094	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2095	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	2453	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2096		2454
2097	case EIO_READDIR: eio__scandir (req, self); break;	2455	case EIO_READDIR: eio__scandir (req, self); break;
2098		2456
2099	case EIO_BUSY:	2457	case EIO_BUSY:
…		…
2109	req->result = select (0, 0, 0, 0, &tv);	2467	req->result = select (0, 0, 0, 0, &tv);
2110	}	2468	}
2111	#endif	2469	#endif
2112	break;	2470	break;
2113		2471
2114	case EIO_UTIME:
2115	case EIO_FUTIME:
2116	{
2117	struct timeval tv[2];
2118	struct timeval *times;
2119
2120	if (req->nv1 != -1. || req->nv2 != -1.)
2121	{
2122	tv[0].tv_sec = req->nv1;
2123	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2124	tv[1].tv_sec = req->nv2;
2125	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2126
2127	times = tv;
2128	}
2129	else
2130	times = 0;
2131
2132	req->result = req->type == EIO_FUTIME
2133	? futimes (req->int1, times)
2134	: utimes (req->ptr1, times);
2135	}
2136	break;
2137
2138	case EIO_GROUP:	2472	case EIO_GROUP:
2139	abort (); /* handled in eio_request */	2473	abort (); /* handled in eio_request */
2140		2474
2141	case EIO_NOP:	2475	case EIO_NOP:
2142	req->result = 0;	2476	req->result = 0;
…		…
2155	req->errorno = errno;	2489	req->errorno = errno;
2156	}	2490	}
2157		2491
2158	#ifndef EIO_NO_WRAPPERS	2492	#ifndef EIO_NO_WRAPPERS
2159		2493
		2494	eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
		2495	{
		2496	REQ (EIO_WD_OPEN); PATH; SEND;
		2497	}
		2498
		2499	eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
		2500	{
		2501	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2502	}
		2503
2160	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2504	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2161	{	2505	{
2162	REQ (EIO_NOP); SEND;	2506	REQ (EIO_NOP); SEND;
2163	}	2507	}
2164		2508
…		…
2180	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2524	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2181	{	2525	{
2182	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2526	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2183	}	2527	}
2184		2528
		2529	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
		2530	{
		2531	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2532	}
		2533
		2534	eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
		2535	{
		2536	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2537	}
		2538
		2539	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
		2540	{
		2541	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2542	}
		2543
2185	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2544	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2186	{	2545	{
2187	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2546	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2188	}	2547	}
2189		2548
…		…
2195	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)	2554	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2196	{	2555	{
2197	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2556	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2198	}	2557	}
2199		2558
2200	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2201	{
2202	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2203	}
2204
2205	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)	2559	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2206	{	2560	{
2207	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2561	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2208	}
2209
2210	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2211	{
2212	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2213	}	2562	}
2214		2563
2215	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)	2564	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2216	{	2565	{
2217	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2566	REQ (EIO_CLOSE); req->int1 = fd; SEND;
…		…
2445	/* misc garbage */	2794	/* misc garbage */
2446		2795
2447	eio_ssize_t	2796	eio_ssize_t
2448	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2797	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2449	{	2798	{
2450	etp_worker wrk;
2451	eio_ssize_t ret;
2452
2453	wrk.dbuf = 0;
2454
2455	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2799	return eio__sendfile (ofd, ifd, offset, count);
2456
2457	if (wrk.dbuf)
2458	free (wrk.dbuf);
2459
2460	return ret;
2461	}	2800	}
2462		2801

Diff Legend

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