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

Comparing libeio/eio.c (file contents):
Revision 1.92 by root, Sun Jul 17 18:27:17 2011 UTC vs.
Revision 1.106 by root, Mon Sep 26 20:19:08 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>
…		…
58	#include <sys/stat.h>	58	#include <sys/stat.h>
59	#include <limits.h>	59	#include <limits.h>
60	#include <fcntl.h>	60	#include <fcntl.h>
61	#include <assert.h>	61	#include <assert.h>
62		62
		63	#if _POSIX_VERSION >= 200809L
		64	# define HAVE_AT 1
		65	#else
		66	# define HAVE_AT 0
		67	#endif
		68
63	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */	69	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64	/* intptr_t only comes from stdint.h, says idiot openbsd coder */	70	/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65	#if HAVE_STDINT_H	71	#if HAVE_STDINT_H
66	# include <stdint.h>	72	# include <stdint.h>
67	#endif	73	#endif
…		…
71	#endif	77	#endif
72	#ifndef ELOOP	78	#ifndef ELOOP
73	# define ELOOP EDOM	79	# define ELOOP EDOM
74	#endif	80	#endif
75		81
		82	#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
		83	# define ENOTSOCK WSAENOTSOCK
		84	#endif
		85
76	static void eio_destroy (eio_req *req);	86	static void eio_destroy (eio_req *req);
77		87
78	#ifndef EIO_FINISH	88	#ifndef EIO_FINISH
79	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0	89	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
80	#endif	90	#endif
…		…
101	#ifdef _WIN32	111	#ifdef _WIN32
102		112
103	#undef PAGESIZE	113	#undef PAGESIZE
104	#define PAGESIZE 4096 /* GetSystemInfo? */	114	#define PAGESIZE 4096 /* GetSystemInfo? */
105		115
		116	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		117
106	#ifdef EIO_STRUCT_STATI64	118	#ifdef EIO_STRUCT_STATI64
		119	/* look at perl's non-sloppy stat */
107	#define stat(path,buf) _stati64 (path,buf)	120	#define stat(path,buf) _stati64 (path,buf)
108	#define fstat(fd,buf) _fstati64 (path,buf)	121	#define fstat(fd,buf) _fstati64 (fd,buf)
109	#endif	122	#endif
110	#define lstat(path,buf) stat (path,buf)	123	#define lstat(path,buf) stat (path,buf)
111	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))	124	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
112	#define mkdir(path,mode) _mkdir (path)	125	#define mkdir(path,mode) _mkdir (path)
113	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))	126	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
…		…
125	#define sync() EIO_ENOSYS ()	138	#define sync() EIO_ENOSYS ()
126	#define readlink(path,buf,s) EIO_ENOSYS ()	139	#define readlink(path,buf,s) EIO_ENOSYS ()
127	#define statvfs(path,buf) EIO_ENOSYS ()	140	#define statvfs(path,buf) EIO_ENOSYS ()
128	#define fstatvfs(fd,buf) EIO_ENOSYS ()	141	#define fstatvfs(fd,buf) EIO_ENOSYS ()
129		142
		143	/* rename() uses MoveFile, which fails to overwrite */
		144	#define rename(old,neu) eio__rename (old, neu)
		145
		146	static int
		147	eio__rename (const char old, const char neu)
		148	{
		149	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		150	return 0;
		151
		152	/* should steal _dosmaperr */
		153	switch (GetLastError ())
		154	{
		155	case ERROR_FILE_NOT_FOUND:
		156	case ERROR_PATH_NOT_FOUND:
		157	case ERROR_INVALID_DRIVE:
		158	case ERROR_NO_MORE_FILES:
		159	case ERROR_BAD_NETPATH:
		160	case ERROR_BAD_NET_NAME:
		161	case ERROR_BAD_PATHNAME:
		162	case ERROR_FILENAME_EXCED_RANGE:
		163	errno = ENOENT;
		164	break;
		165
		166	default:
		167	errno = EACCES;
		168	break;
		169	}
		170
		171	return -1;
		172	}
		173
130	/* we could even stat and see if it exists */	174	/* we could even stat and see if it exists */
131	static int	175	static int
132	symlink (const char old, const char neu)	176	symlink (const char old, const char neu)
133	{	177	{
134	#if WINVER >= 0x0600	178	#if WINVER >= 0x0600
…		…
160		204
161	#include <sys/time.h>	205	#include <sys/time.h>
162	#include <sys/select.h>	206	#include <sys/select.h>
163	#include <sys/statvfs.h>	207	#include <sys/statvfs.h>
164	#include <unistd.h>	208	#include <unistd.h>
165	#include <utime.h>
166	#include <signal.h>	209	#include <signal.h>
167	#include <dirent.h>	210	#include <dirent.h>
168		211
169	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES	212	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
170	#include <sys/mman.h>	213	#include <sys/mman.h>
…		…
192		235
193	#ifndef EIO_STRUCT_DIRENT	236	#ifndef EIO_STRUCT_DIRENT
194	#define EIO_STRUCT_DIRENT struct dirent	237	#define EIO_STRUCT_DIRENT struct dirent
195	#endif	238	#endif
196		239
		240	#endif
		241
		242	#if HAVE_UTIMES
		243	# include <utime.h>
		244	#endif
		245
		246	#if HAVE_SYS_SYSCALL_H
		247	# include <sys/syscall.h>
		248	#endif
		249
		250	#if HAVE_SYS_PRCTL_H
		251	# include <sys/prctl.h>
197	#endif	252	#endif
198		253
199	#if HAVE_SENDFILE	254	#if HAVE_SENDFILE
200	# if __linux	255	# if __linux
201	# include <sys/sendfile.h>	256	# include <sys/sendfile.h>
…		…
233		288
234	/* buffer size for various temporary buffers */	289	/* buffer size for various temporary buffers */
235	#define EIO_BUFSIZE 65536	290	#define EIO_BUFSIZE 65536
236		291
237	#define dBUF \	292	#define dBUF \
238	char *eio_buf; \
239	ETP_WORKER_LOCK (self); \
240	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	293	char *eio_buf = malloc (EIO_BUFSIZE); \
241	ETP_WORKER_UNLOCK (self); \
242	errno = ENOMEM; \	294	errno = ENOMEM; \
243	if (!eio_buf) \	295	if (!eio_buf) \
244	return -1;	296	return -1
		297
		298	#define FUBd \
		299	free (eio_buf)
245		300
246	#define EIO_TICKS ((1000000 + 1023) >> 10)	301	#define EIO_TICKS ((1000000 + 1023) >> 10)
		302
		303	/*****************************************************************************/
		304
		305	struct tmpbuf
		306	{
		307	void *ptr;
		308	int len;
		309	};
		310
		311	static void *
		312	tmpbuf_get (struct tmpbuf *buf, int len)
		313	{
		314	if (buf->len < len)
		315	{
		316	free (buf->ptr);
		317	buf->ptr = malloc (buf->len = len);
		318	}
		319
		320	return buf->ptr;
		321	}
		322
		323	/*****************************************************************************/
247		324
248	#define ETP_PRI_MIN EIO_PRI_MIN	325	#define ETP_PRI_MIN EIO_PRI_MIN
249	#define ETP_PRI_MAX EIO_PRI_MAX	326	#define ETP_PRI_MAX EIO_PRI_MAX
250		327
251	struct etp_worker;	328	struct etp_worker;
…		…
255	static int eio_finish (eio_req *req);	332	static int eio_finish (eio_req *req);
256	#define ETP_FINISH(req) eio_finish (req)	333	#define ETP_FINISH(req) eio_finish (req)
257	static void eio_execute (struct etp_worker self, eio_req req);	334	static void eio_execute (struct etp_worker self, eio_req req);
258	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	335	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
259		336
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	/*****************************************************************************/	337	/*****************************************************************************/
271		338
272	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	339	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273		340
274	/* calculate time difference in ~1/EIO_TICKS of a second */	341	/* calculate time difference in ~1/EIO_TICKS of a second */
…		…
285	static void (*done_poll_cb) (void);	352	static void (*done_poll_cb) (void);
286		353
287	static unsigned int max_poll_time; /* reslock */	354	static unsigned int max_poll_time; /* reslock */
288	static unsigned int max_poll_reqs; /* reslock */	355	static unsigned int max_poll_reqs; /* reslock */
289		356
290	static volatile unsigned int nreqs; /* reqlock */	357	static unsigned int nreqs; /* reqlock */
291	static volatile unsigned int nready; /* reqlock */	358	static unsigned int nready; /* reqlock */
292	static volatile unsigned int npending; /* reqlock */	359	static unsigned int npending; /* reqlock */
293	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	360	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 */	361	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
295		362
296	static xmutex_t wrklock;	363	static xmutex_t wrklock;
297	static xmutex_t reslock;	364	static xmutex_t reslock;
298	static xmutex_t reqlock;	365	static xmutex_t reqlock;
299	static xcond_t reqwait;	366	static xcond_t reqwait;
…		…
302	/*	369	/*
303	* make our pread/pwrite emulation safe against themselves, but not against	370	* make our pread/pwrite emulation safe against themselves, but not against
304	* normal read/write by using a mutex. slows down execution a lot,	371	* normal read/write by using a mutex. slows down execution a lot,
305	* but that's your problem, not mine.	372	* but that's your problem, not mine.
306	*/	373	*/
307	static xmutex_t preadwritelock = X_MUTEX_INIT;	374	static xmutex_t preadwritelock;
308	#endif	375	#endif
309		376
310	typedef struct etp_worker	377	typedef struct etp_worker
311	{	378	{
		379	struct tmpbuf tmpbuf;
		380
312	/* locked by wrklock */	381	/* locked by wrklock */
313	struct etp_worker prev, next;	382	struct etp_worker prev, next;
314		383
315	xthread_t tid;	384	xthread_t tid;
316		385
317	/* locked by reslock, reqlock or wrklock */	386	#ifdef ETP_WORKER_COMMON
318	ETP_REQ req; / currently processed request */
319
320	ETP_WORKER_COMMON	387	ETP_WORKER_COMMON
		388	#endif
321	} etp_worker;	389	} etp_worker;
322		390
323	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	391	static etp_worker wrk_first; /* NOT etp */
324		392
325	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	393	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
326	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	394	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
327		395
328	/* worker threads management */	396	/* worker threads management */
329		397
330	static void ecb_cold	398	static void ecb_cold
331	etp_worker_clear (etp_worker *wrk)	399	etp_worker_clear (etp_worker *wrk)
332	{	400	{
333	ETP_WORKER_CLEAR (wrk);
334	}	401	}
335		402
336	static void ecb_cold	403	static void ecb_cold
337	etp_worker_free (etp_worker *wrk)	404	etp_worker_free (etp_worker *wrk)
338	{	405	{
		406	free (wrk->tmpbuf.ptr);
		407
339	wrk->next->prev = wrk->prev;	408	wrk->next->prev = wrk->prev;
340	wrk->prev->next = wrk->next;	409	wrk->prev->next = wrk->next;
341		410
342	free (wrk);	411	free (wrk);
343	}	412	}
…		…
453	}	522	}
454		523
455	abort ();	524	abort ();
456	}	525	}
457		526
458	static void ecb_cold	527	static int ecb_cold
459	etp_thread_init (void)	528	etp_init (void (want_poll)(void), void (done_poll)(void))
460	{	529	{
461	#if !HAVE_PREADWRITE
462	X_MUTEX_CREATE (preadwritelock);
463	#endif
464	X_MUTEX_CREATE (wrklock);	530	X_MUTEX_CREATE (wrklock);
465	X_MUTEX_CREATE (reslock);	531	X_MUTEX_CREATE (reslock);
466	X_MUTEX_CREATE (reqlock);	532	X_MUTEX_CREATE (reqlock);
467	X_COND_CREATE (reqwait);	533	X_COND_CREATE (reqwait);
468	}
469		534
470	static void ecb_cold
471	etp_atfork_child (void)
472	{
473	reqq_init (&req_queue);	535	reqq_init (&req_queue);
474	reqq_init (&res_queue);	536	reqq_init (&res_queue);
475		537
476	wrk_first.next =	538	wrk_first.next =
477	wrk_first.prev = &wrk_first;	539	wrk_first.prev = &wrk_first;
…		…
479	started = 0;	541	started = 0;
480	idle = 0;	542	idle = 0;
481	nreqs = 0;	543	nreqs = 0;
482	nready = 0;	544	nready = 0;
483	npending = 0;	545	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		546
502	want_poll_cb = want_poll;	547	want_poll_cb = want_poll;
503	done_poll_cb = done_poll;	548	done_poll_cb = done_poll;
504		549
505	return 0;	550	return 0;
…		…
545	}	590	}
546		591
547	static void ecb_cold	592	static void ecb_cold
548	etp_end_thread (void)	593	etp_end_thread (void)
549	{	594	{
550	eio_req *req = calloc (1, sizeof (eio_req));	595	eio_req req = calloc (1, sizeof (eio_req)); / will be freed by worker */
551		596
552	req->type = -1;	597	req->type = -1;
553	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	598	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
554		599
555	X_LOCK (reqlock);	600	X_LOCK (reqlock);
…		…
963	#if !HAVE_FDATASYNC	1008	#if !HAVE_FDATASYNC
964	# undef fdatasync	1009	# undef fdatasync
965	# define fdatasync(fd) fsync (fd)	1010	# define fdatasync(fd) fsync (fd)
966	#endif	1011	#endif
967		1012
		1013	static int
		1014	eio__syncfs (int fd)
		1015	{
		1016	int res;
		1017
		1018	#if HAVE_SYS_SYNCFS
		1019	res = (int)syscall (__NR_syncfs, (int)(fd));
		1020	#else
		1021	res = -1;
		1022	errno = ENOSYS;
		1023	#endif
		1024
		1025	if (res < 0 && errno == ENOSYS && fd >= 0)
		1026	sync ();
		1027
		1028	return res;
		1029	}
		1030
968	/* sync_file_range always needs emulation */	1031	/* sync_file_range always needs emulation */
969	static int	1032	static int
970	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1033	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
971	{	1034	{
972	#if HAVE_SYNC_FILE_RANGE	1035	#if HAVE_SYNC_FILE_RANGE
…		…
1021	pread (fd, eio_buf, len, offset);	1084	pread (fd, eio_buf, len, offset);
1022	offset += len;	1085	offset += len;
1023	todo -= len;	1086	todo -= len;
1024	}	1087	}
1025		1088
		1089	FUBd;
		1090
1026	errno = 0;	1091	errno = 0;
1027	return count;	1092	return count;
1028	}	1093	}
1029		1094
1030	#endif	1095	#endif
1031		1096
1032	/* sendfile always needs emulation */	1097	/* sendfile always needs emulation */
1033	static eio_ssize_t	1098	static eio_ssize_t
1034	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1099	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1035	{	1100	{
1036	eio_ssize_t written = 0;	1101	eio_ssize_t written = 0;
1037	eio_ssize_t res;	1102	eio_ssize_t res;
1038		1103
1039	if (!count)	1104	if (!count)
…		…
1175		1240
1176	offset += cnt;	1241	offset += cnt;
1177	res += cnt;	1242	res += cnt;
1178	count -= cnt;	1243	count -= cnt;
1179	}	1244	}
		1245
		1246	FUBd;
1180	}	1247	}
1181		1248
1182	return res;	1249	return res;
1183	}	1250	}
1184		1251
…		…
1299	}	1366	}
1300		1367
1301	/*****************************************************************************/	1368	/*****************************************************************************/
1302	/* requests implemented outside eio_execute, because they are so large */	1369	/* requests implemented outside eio_execute, because they are so large */
1303		1370
		1371	/* copies some absolute path to tmpbuf */
		1372	static char *
		1373	eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
		1374	{
		1375	if (wd == EIO_CWD)
		1376	return getcwd (tmpbuf->ptr, PATH_MAX);
		1377
		1378	#if HAVE_AT
		1379	abort (); /TODO/
		1380	#else
		1381	strcpy (tmpbuf->ptr, wd);
		1382	#endif
		1383	return tmpbuf->ptr;
		1384	}
		1385
		1386	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1304	static void	1387	static int
1305	eio__realpath (eio_req req, etp_worker self)	1388	eio__realpath (struct tmpbuf tmpbuf, eio_wd wd, const char path)
1306	{	1389	{
1307	char *rel = req->ptr1;	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;	1399	/D/ /TODO: wd ignored /
1317		1400
1318	errno = EINVAL;	1401	errno = EINVAL;
1319	if (!rel)	1402	if (!rel)
1320	return;	1403	return -1;
1321		1404
1322	errno = ENOENT;	1405	errno = ENOENT;
1323	if (!*rel)	1406	if (!*rel)
1324	return;	1407	return -1;
1325		1408
1326	if (!req->ptr2)	1409	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;	1410	tmp1 = res + PATH_MAX;
1340	tmp2 = tmp1 + PATH_MAX;	1411	tmp2 = tmp1 + PATH_MAX;
1341		1412
1342	#if 0 /* disabled, the musl way to do things is just too racy */	1413	#if 0 /* disabled, the musl way to do things is just too racy */
1343	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1414	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1362	#endif	1433	#endif
1363	#endif	1434	#endif
1364		1435
1365	if (*rel != '/')	1436	if (*rel != '/')
1366	{	1437	{
1367	if (!getcwd (res, PATH_MAX))	1438	if (!eio__getwd (tmpbuf, wd))
1368	return;	1439	return -1;
1369		1440
1370	if (res [1]) /* only use if not / */	1441	if (res [1]) /* only use if not / */
1371	res += strlen (res);	1442	res += strlen (res);
1372	}	1443	}
1373		1444
1374	while (*rel)	1445	while (*rel)
1375	{	1446	{
1376	eio_ssize_t len, linklen;	1447	eio_ssize_t len, linklen;
1377	char *beg = rel;	1448	const char *beg = rel;
1378		1449
1379	while (rel && rel != '/')	1450	while (rel && rel != '/')
1380	++rel;	1451	++rel;
1381		1452
1382	len = rel - beg;	1453	len = rel - beg;
…		…
1394		1465
1395	if (beg [1] == '.' && len == 2)	1466	if (beg [1] == '.' && len == 2)
1396	{	1467	{
1397	/* .. - back up one component, if possible */	1468	/* .. - back up one component, if possible */
1398		1469
1399	while (res != req->ptr2)	1470	while (res != tmpbuf->ptr)
1400	if (*--res == '/')	1471	if (*--res == '/')
1401	break;	1472	break;
1402		1473
1403	continue;	1474	continue;
1404	}	1475	}
…		…
1414		1485
1415	/* zero-terminate, for readlink */	1486	/* zero-terminate, for readlink */
1416	res [len + 1] = 0;	1487	res [len + 1] = 0;
1417		1488
1418	/* now check if it's a symlink */	1489	/* now check if it's a symlink */
1419	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1490	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1420		1491
1421	if (linklen < 0)	1492	if (linklen < 0)
1422	{	1493	{
1423	if (errno != EINVAL)	1494	if (errno != EINVAL)
1424	return;	1495	return -1;
1425		1496
1426	/* it's a normal directory. hopefully */	1497	/* it's a normal directory. hopefully */
1427	res += len + 1;	1498	res += len + 1;
1428	}	1499	}
1429	else	1500	else
…		…
1431	/* yay, it was a symlink - build new path in tmp2 */	1502	/* yay, it was a symlink - build new path in tmp2 */
1432	int rellen = strlen (rel);	1503	int rellen = strlen (rel);
1433		1504
1434	errno = ENAMETOOLONG;	1505	errno = ENAMETOOLONG;
1435	if (linklen + 1 + rellen >= PATH_MAX)	1506	if (linklen + 1 + rellen >= PATH_MAX)
1436	return;	1507	return -1;
1437		1508
1438	errno = ELOOP;	1509	errno = ELOOP;
1439	if (!--symlinks)	1510	if (!--symlinks)
1440	return;	1511	return -1;
1441		1512
1442	if (*tmp1 == '/')	1513	if (*tmp1 == '/')
1443	res = req->ptr2; /* symlink resolves to an absolute path */	1514	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1444		1515
1445	/* we need to be careful, as rel might point into tmp2 already */	1516	/* we need to be careful, as rel might point into tmp2 already */
1446	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1517	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1447	tmp2 [linklen] = '/';	1518	tmp2 [linklen] = '/';
1448	memcpy (tmp2, tmp1, linklen);	1519	memcpy (tmp2, tmp1, linklen);
…		…
1450	rel = tmp2;	1521	rel = tmp2;
1451	}	1522	}
1452	}	1523	}
1453		1524
1454	/* special case for the lone root path */	1525	/* special case for the lone root path */
1455	if (res == req->ptr2)	1526	if (res == tmpbuf->ptr)
1456	*res++ = '/';	1527	*res++ = '/';
1457		1528
1458	req->result = res - (char *)req->ptr2;	1529	return res - (char *)tmpbuf->ptr;
1459
1460	done:
1461	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1462	}	1530	}
1463		1531
1464	static signed char	1532	static signed char
1465	eio_dent_cmp (const eio_dirent a, const eio_dirent b)	1533	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
1466	{	1534	{
…		…
1626	eio_dent_insertion_sort (dents, size);	1694	eio_dent_insertion_sort (dents, size);
1627	}	1695	}
1628		1696
1629	/* read a full directory */	1697	/* read a full directory */
1630	static void	1698	static void
1631	eio__scandir (eio_req req, etp_worker self)	1699	eio__scandir (eio_req *req)
1632	{	1700	{
1633	char name, names;	1701	char name, names;
1634	int namesalloc = 4096 - sizeof (void ) 4;	1702	int namesalloc = 4096 - sizeof (void ) 4;
1635	int namesoffs = 0;	1703	int namesoffs = 0;
1636	int flags = req->int1;	1704	int flags = req->int1;
…		…
1668	dirp = FindFirstFile (path, &entp);	1736	dirp = FindFirstFile (path, &entp);
1669	free (path);	1737	free (path);
1670		1738
1671	if (dirp == INVALID_HANDLE_VALUE)	1739	if (dirp == INVALID_HANDLE_VALUE)
1672	{	1740	{
1673	dirp = 0;	1741	/* should steal _dosmaperr */
1674
1675	switch (GetLastError ())	1742	switch (GetLastError ())
1676	{	1743	{
1677	case ERROR_FILE_NOT_FOUND:	1744	case ERROR_FILE_NOT_FOUND:
1678	req->result = 0;	1745	req->result = 0;
1679	break;	1746	break;
1680		1747
1681	case ERROR_INVALID_NAME:	1748	case ERROR_INVALID_NAME:
1682	case ERROR_PATH_NOT_FOUND:	1749	case ERROR_PATH_NOT_FOUND:
1683	case ERROR_NO_MORE_FILES:	1750	case ERROR_NO_MORE_FILES:
1684	errno = ENOENT;	1751	errno = ENOENT;
1685	break;	1752	break;
1686		1753
1687	case ERROR_NOT_ENOUGH_MEMORY:	1754	case ERROR_NOT_ENOUGH_MEMORY:
1688	errno = ENOMEM;	1755	errno = ENOMEM;
1689	break;	1756	break;
1690		1757
1691	default:	1758	default:
1692	errno = EINVAL;	1759	errno = EINVAL;
1693	break;	1760	break;
1694	}	1761	}
		1762
		1763	return;
1695	}	1764	}
1696	}	1765	}
1697	#else	1766	#else
1698	dirp = opendir (req->ptr1);	1767	dirp = opendir (req->ptr1);
		1768
		1769	if (!dirp)
		1770	return;
1699	#endif	1771	#endif
1700		1772
1701	if (req->flags & EIO_FLAG_PTR1_FREE)	1773	if (req->flags & EIO_FLAG_PTR1_FREE)
1702	free (req->ptr1);	1774	free (req->ptr1);
1703		1775
1704	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1776	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1705	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1777	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1706	req->ptr2 = names = malloc (namesalloc);	1778	req->ptr2 = names = malloc (namesalloc);
1707		1779
1708	if (dirp && names && (!flags \|\| dents))	1780	if (!names \|\| (flags && !dents))
		1781	return;
		1782
1709	for (;;)	1783	for (;;)
1710	{	1784	{
1711	int done;	1785	int done;
1712		1786
1713	#ifdef _WIN32	1787	#ifdef _WIN32
1714	done = !dirp;	1788	done = !dirp;
1715	#else	1789	#else
1716	errno = 0;	1790	errno = 0;
1717	entp = readdir (dirp);	1791	entp = readdir (dirp);
1718	done = !entp;	1792	done = !entp;
1719	#endif	1793	#endif
1720		1794
1721	if (done)	1795	if (done)
1722	{	1796	{
1723	#ifndef _WIN32	1797	#ifndef _WIN32
1724	int old_errno = errno;	1798	int old_errno = errno;
1725	closedir (dirp);	1799	closedir (dirp);
1726	errno = old_errno;	1800	errno = old_errno;
1727		1801
1728	if (errno)	1802	if (errno)
1729	break;	1803	break;
1730	#endif	1804	#endif
1731		1805
1732	/* sort etc. */	1806	/* sort etc. */
1733	req->int1 = flags;	1807	req->int1 = flags;
1734	req->result = dentoffs;	1808	req->result = dentoffs;
1735		1809
1736	if (flags & EIO_READDIR_STAT_ORDER)	1810	if (flags & EIO_READDIR_STAT_ORDER)
1737	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1811	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1738	else if (flags & EIO_READDIR_DIRS_FIRST)	1812	else if (flags & EIO_READDIR_DIRS_FIRST)
1739	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1813	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1740	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1814	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1741	else	1815	else
		1816	{
		1817	/* in this case, all is known, and we just put dirs first and sort them */
		1818	eio_dirent *oth = dents + dentoffs;
		1819	eio_dirent *dir = dents;
		1820
		1821	/* now partition dirs to the front, and non-dirs to the back */
		1822	/* by walking from both sides and swapping if necessary */
		1823	while (oth > dir)
		1824	{
		1825	if (dir->type == EIO_DT_DIR)
		1826	++dir;
		1827	else if ((--oth)->type == EIO_DT_DIR)
		1828	{
		1829	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1830
		1831	++dir;
		1832	}
		1833	}
		1834
		1835	/* now sort the dirs only (dirs all have the same score) */
		1836	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1837	}
		1838
		1839	break;
		1840	}
		1841
		1842	/* now add the entry to our list(s) */
		1843	name = D_NAME (entp);
		1844
		1845	/* skip . and .. entries */
		1846	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
		1847	{
		1848	int len = D_NAMLEN (entp) + 1;
		1849
		1850	while (ecb_expect_false (namesoffs + len > namesalloc))
		1851	{
		1852	namesalloc *= 2;
		1853	req->ptr2 = names = realloc (names, namesalloc);
		1854
		1855	if (!names)
		1856	break;
		1857	}
		1858
		1859	memcpy (names + namesoffs, name, len);
		1860
		1861	if (dents)
		1862	{
		1863	struct eio_dirent *ent;
		1864
		1865	if (ecb_expect_false (dentoffs == dentalloc))
1742	{	1866	{
1743	/* in this case, all is known, and we just put dirs first and sort them */	1867	dentalloc *= 2;
		1868	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1869
		1870	if (!dents)
		1871	break;
		1872	}
		1873
1744	eio_dirent *oth = dents + dentoffs;	1874	ent = dents + dentoffs;
1745	eio_dirent *dir = dents;
1746		1875
1747	/* now partition dirs to the front, and non-dirs to the back */	1876	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1748	/* by walking from both sides and swapping if necessary */	1877	ent->namelen = len - 1;
1749	while (oth > dir)	1878	ent->inode = D_INO (entp);
		1879
		1880	inode_bits \|= ent->inode;
		1881
		1882	switch (D_TYPE (entp))
		1883	{
		1884	default:
		1885	ent->type = EIO_DT_UNKNOWN;
		1886	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1887	break;
		1888
		1889	#ifdef DT_FIFO
		1890	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1891	#endif
		1892	#ifdef DT_CHR
		1893	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1894	#endif
		1895	#ifdef DT_MPC
		1896	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1897	#endif
		1898	#ifdef DT_DIR
		1899	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1900	#endif
		1901	#ifdef DT_NAM
		1902	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1903	#endif
		1904	#ifdef DT_BLK
		1905	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1906	#endif
		1907	#ifdef DT_MPB
		1908	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1909	#endif
		1910	#ifdef DT_REG
		1911	case DT_REG: ent->type = EIO_DT_REG; break;
		1912	#endif
		1913	#ifdef DT_NWK
		1914	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1915	#endif
		1916	#ifdef DT_CMP
		1917	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1918	#endif
		1919	#ifdef DT_LNK
		1920	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1921	#endif
		1922	#ifdef DT_SOCK
		1923	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1924	#endif
		1925	#ifdef DT_DOOR
		1926	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1927	#endif
		1928	#ifdef DT_WHT
		1929	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1930	#endif
		1931	}
		1932
		1933	ent->score = 7;
		1934
		1935	if (flags & EIO_READDIR_DIRS_FIRST)
		1936	{
		1937	if (ent->type == EIO_DT_UNKNOWN)
1750	{	1938	{
1751	if (dir->type == EIO_DT_DIR)	1939	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1752	++dir;	1940	ent->score = 1;
1753	else if ((--oth)->type == EIO_DT_DIR)	1941	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1754	{	1942	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	}	1943	}
1760		1944	else if (ent->type == EIO_DT_DIR)
1761	/* now sort the dirs only (dirs all have the same score) */	1945	ent->score = 0;
1762	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1763	}	1946	}
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	}	1947	}
1784		1948
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;	1949	namesoffs += len;
1876	++dentoffs;	1950	++dentoffs;
1877	}	1951	}
1878		1952
1879	if (EIO_CANCELLED (req))	1953	if (EIO_CANCELLED (req))
1880	{	1954	{
1881	errno = ECANCELED;	1955	errno = ECANCELED;
1882	break;	1956	break;
1883	}	1957	}
1884		1958
1885	#ifdef _WIN32	1959	#ifdef _WIN32
1886	if (!FindNextFile (dirp, &entp))	1960	if (!FindNextFile (dirp, &entp))
1887	{	1961	{
1888	FindClose (dirp);	1962	FindClose (dirp);
1889	dirp = 0;	1963	dirp = 0;
1890	}	1964	}
1891	#endif	1965	#endif
		1966	}
		1967	}
		1968
		1969	/*****************************************************************************/
		1970	/* working directory stuff */
		1971
		1972	#if HAVE_AT
		1973
		1974	#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD)
		1975
		1976	#ifndef O_SEARCH
		1977	# define O_SEARCH O_RDONLY
		1978	#endif
		1979
		1980	eio_wd
		1981	eio_wd_open_sync (eio_wd wd, const char *path)
		1982	{
		1983	int fd = openat (WD2FD (wd), path, O_CLOEXEC \| O_SEARCH \| O_DIRECTORY);
		1984
		1985	return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
		1986	}
		1987
		1988	static eio_wd
		1989	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		1990	{
		1991	return eio_wd_open_sync (wd, path);
		1992	}
		1993
		1994	void
		1995	eio_wd_close_sync (eio_wd wd)
		1996	{
		1997	int fd = WD2FD (wd);
		1998
		1999	if (fd >= 0)
		2000	close (fd);
		2001	}
		2002
		2003	static int
		2004	eio__truncateat (int dirfd, const char *path, off_t length)
		2005	{
		2006	int fd = openat (dirfd, path, O_WRONLY \| O_CLOEXEC);
		2007	int res;
		2008
		2009	if (fd < 0)
		2010	return fd;
		2011
		2012	res = ftruncate (fd, length);
		2013	close (fd);
		2014	return res;
		2015	}
		2016
		2017	static int
		2018	eio__statvfsat (int dirfd, const char path, struct statvfs buf)
		2019	{
		2020	int fd = openat (dirfd, path, O_SEARCH \| O_CLOEXEC);
		2021	int res;
		2022
		2023	if (fd < 0)
		2024	return fd;
		2025
		2026	res = fstatvfs (fd, buf);
		2027	close (fd);
		2028	return res;
		2029
		2030	}
		2031
		2032	#else
		2033
		2034	/* on legacy systems, we represent the working directories simply by their path strings */
		2035
		2036	static const char *
		2037	wd_expand (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2038	{
		2039	if (!wd \|\| *path == '/')
		2040	return path;
		2041
		2042	{
		2043	int l1 = strlen ((const char *)wd);
		2044	int l2 = strlen (path);
		2045
		2046	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2047
		2048	memcpy (res, wd, l1);
		2049	res [l1] = '/';
		2050	memcpy (res + l1 + 1, path, l2 + 1);
		2051
		2052	return res;
		2053	}
		2054	}
		2055
		2056	static eio_wd
		2057	eio__wd_open_sync (struct tmpbuf tmpbuf, eio_wd wd, const char path)
		2058	{
		2059	if (path == '/') / absolute paths ignore wd */
		2060	path = strdup (path);
		2061	else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
		2062	return wd;
		2063	else
		2064	{
		2065	int len = eio__realpath (tmpbuf, wd, path);
		2066
		2067	path = EIO_INVALID_WD;
		2068
		2069	if (len >= 0)
		2070	{
		2071	((char *)tmpbuf->ptr)[len] = 0;
		2072	path = strdup (tmpbuf->ptr);
1892	}	2073	}
		2074	}
		2075
		2076	if (!path)
		2077	path = EIO_INVALID_WD;
		2078
		2079	return (eio_wd)path;
1893	}	2080	}
		2081
		2082	eio_wd
		2083	eio_wd_open_sync (eio_wd wd, const char *path)
		2084	{
		2085	struct tmpbuf tmpbuf = { 0 };
		2086	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2087	free (tmpbuf.ptr);
		2088
		2089	return wd;
		2090	}
		2091
		2092	void
		2093	eio_wd_close_sync (eio_wd wd)
		2094	{
		2095	if (wd != EIO_INVALID_WD)
		2096	free (wd);
		2097	}
		2098
		2099	#endif
1894		2100
1895	/*****************************************************************************/	2101	/*****************************************************************************/
1896		2102
1897	#define ALLOC(len) \	2103	#define ALLOC(len) \
1898	if (!req->ptr2) \	2104	if (!req->ptr2) \
…		…
1913	{	2119	{
1914	ETP_REQ *req;	2120	ETP_REQ *req;
1915	struct timespec ts;	2121	struct timespec ts;
1916	etp_worker self = (etp_worker )thr_arg;	2122	etp_worker self = (etp_worker )thr_arg;
1917		2123
		2124	#if HAVE_PRCTL_SET_NAME
		2125	prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
		2126	#endif
		2127
1918	/* try to distribute timeouts somewhat evenly */	2128	/* try to distribute timeouts somewhat evenly */
1919	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2129	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1920		2130
1921	for (;;)	2131	for (;;)
1922	{	2132	{
…		…
1924		2134
1925	X_LOCK (reqlock);	2135	X_LOCK (reqlock);
1926		2136
1927	for (;;)	2137	for (;;)
1928	{	2138	{
1929	self->req = req = reqq_shift (&req_queue);	2139	req = reqq_shift (&req_queue);
1930		2140
1931	if (req)	2141	if (req)
1932	break;	2142	break;
1933		2143
1934	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2144	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1972	++npending;	2182	++npending;
1973		2183
1974	if (!reqq_push (&res_queue, req) && want_poll_cb)	2184	if (!reqq_push (&res_queue, req) && want_poll_cb)
1975	want_poll_cb ();	2185	want_poll_cb ();
1976		2186
1977	self->req = 0;
1978	etp_worker_clear (self);	2187	etp_worker_clear (self);
1979		2188
1980	X_UNLOCK (reslock);	2189	X_UNLOCK (reslock);
1981	}	2190	}
1982		2191
1983	quit:	2192	quit:
		2193	free (req);
		2194
1984	X_LOCK (wrklock);	2195	X_LOCK (wrklock);
1985	etp_worker_free (self);	2196	etp_worker_free (self);
1986	X_UNLOCK (wrklock);	2197	X_UNLOCK (wrklock);
1987		2198
1988	return 0;	2199	return 0;
…		…
1991	/*****************************************************************************/	2202	/*****************************************************************************/
1992		2203
1993	int ecb_cold	2204	int ecb_cold
1994	eio_init (void (want_poll)(void), void (done_poll)(void))	2205	eio_init (void (want_poll)(void), void (done_poll)(void))
1995	{	2206	{
		2207	#if !HAVE_PREADWRITE
		2208	X_MUTEX_CREATE (preadwritelock);
		2209	#endif
		2210
1996	return etp_init (want_poll, done_poll);	2211	return etp_init (want_poll, done_poll);
1997	}	2212	}
1998		2213
1999	ecb_inline void	2214	ecb_inline void
2000	eio_api_destroy (eio_req *req)	2215	eio_api_destroy (eio_req *req)
…		…
2027	}	2242	}
2028		2243
2029	static void	2244	static void
2030	eio_execute (etp_worker self, eio_req req)	2245	eio_execute (etp_worker self, eio_req req)
2031	{	2246	{
		2247	#if HAVE_AT
		2248	int dirfd;
		2249	#else
		2250	const char *path;
		2251	#endif
		2252
2032	if (ecb_expect_false (EIO_CANCELLED (req)))	2253	if (ecb_expect_false (EIO_CANCELLED (req)))
2033	{	2254	{
2034	req->result = -1;	2255	req->result = -1;
2035	req->errorno = ECANCELED;	2256	req->errorno = ECANCELED;
2036	return;	2257	return;
2037	}	2258	}
2038		2259
		2260	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2261	{
		2262	req->result = -1;
		2263	req->errorno = ENOENT;
		2264	return;
		2265	}
		2266
		2267	if (req->type >= EIO_OPEN)
		2268	{
		2269	#if HAVE_AT
		2270	dirfd = WD2FD (req->wd);
		2271	#else
		2272	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2273	#endif
		2274	}
		2275
2039	switch (req->type)	2276	switch (req->type)
2040	{	2277	{
		2278	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2279	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2280	break;
		2281	case EIO_WD_CLOSE: req->result = 0;
		2282	eio_wd_close_sync (req->wd); break;
		2283
2041	case EIO_READ: ALLOC (req->size);	2284	case EIO_READ: ALLOC (req->size);
2042	req->result = req->offs >= 0	2285	req->result = req->offs >= 0
2043	? pread (req->int1, req->ptr2, req->size, req->offs)	2286	? pread (req->int1, req->ptr2, req->size, req->offs)
2044	: read (req->int1, req->ptr2, req->size); break;	2287	: read (req->int1, req->ptr2, req->size); break;
2045	case EIO_WRITE: req->result = req->offs >= 0	2288	case EIO_WRITE: req->result = req->offs >= 0
2046	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2289	? pwrite (req->int1, req->ptr2, req->size, req->offs)
2047	: write (req->int1, req->ptr2, req->size); break;	2290	: write (req->int1, req->ptr2, req->size); break;
2048		2291
2049	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2292	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;	2293	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
		2294
		2295	#if HAVE_AT
2051		2296
2052	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2297	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2053	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2298	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2054	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2299	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2300	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2301	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2302	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2303	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2304	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2305
		2306	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2307	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2308	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2309	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break;
		2310	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break;
		2311	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2312	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2313	case EIO_READLINK: ALLOC (PATH_MAX);
		2314	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2315	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2316	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2317	case EIO_UTIME:
		2318	case EIO_FUTIME:
		2319	{
		2320	struct timespec ts[2];
		2321	struct timespec *times;
		2322
		2323	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2324	{
		2325	ts[0].tv_sec = req->nv1;
		2326	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2327	ts[1].tv_sec = req->nv2;
		2328	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2329
		2330	times = ts;
		2331	}
		2332	else
		2333	times = 0;
		2334
		2335	req->result = req->type == EIO_FUTIME
		2336	? futimens (req->int1, times)
		2337	: utimensat (dirfd, req->ptr1, times, 0);
		2338	}
		2339	break;
		2340
		2341	#else
		2342
		2343	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2344	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2345	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2055	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2346	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2347	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2348	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2349	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2350	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2351
		2352	case EIO_UNLINK: req->result = unlink (path ); break;
		2353	case EIO_RMDIR: req->result = rmdir (path ); break;
		2354	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2355	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2356	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2357	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2358	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2359	case EIO_READLINK: ALLOC (PATH_MAX);
		2360	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2361	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2362	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2363
		2364	case EIO_UTIME:
		2365	case EIO_FUTIME:
		2366	{
		2367	struct timeval tv[2];
		2368	struct timeval *times;
		2369
		2370	if (req->nv1 != -1. \|\| req->nv2 != -1.)
		2371	{
		2372	tv[0].tv_sec = req->nv1;
		2373	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2374	tv[1].tv_sec = req->nv2;
		2375	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2376
		2377	times = tv;
		2378	}
		2379	else
		2380	times = 0;
		2381
		2382	req->result = req->type == EIO_FUTIME
		2383	? futimes (req->int1, times)
		2384	: utimes (req->ptr1, times);
		2385	}
		2386	break;
		2387
		2388	#endif
		2389
		2390	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2391	{
		2392	ALLOC (req->result);
		2393	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2394	}
		2395	break;
		2396
2056	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2397	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2057	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2398	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2058		2399
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));	2400	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2062	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2401	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2063		2402
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;	2403	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;	2404	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;	2405	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2070		2406
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;	2407	case EIO_CLOSE: req->result = close (req->int1); break;
2073	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2408	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;	2409	case EIO_SYNC: req->result = 0; sync (); break;
2088	case EIO_FSYNC: req->result = fsync (req->int1); break;	2410	case EIO_FSYNC: req->result = fsync (req->int1); break;
2089	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2411	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2412	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2413	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;	2414	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2091	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2415	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2092	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2416	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2093	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2417	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;	2418	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2096		2419
2097	case EIO_READDIR: eio__scandir (req, self); break;	2420	case EIO_READDIR: eio__scandir (req); break;
2098		2421
2099	case EIO_BUSY:	2422	case EIO_BUSY:
2100	#ifdef _WIN32	2423	#ifdef _WIN32
2101	Sleep (req->nv1 * 1e3);	2424	Sleep (req->nv1 * 1e3);
2102	#else	2425	#else
…		…
2109	req->result = select (0, 0, 0, 0, &tv);	2432	req->result = select (0, 0, 0, 0, &tv);
2110	}	2433	}
2111	#endif	2434	#endif
2112	break;	2435	break;
2113		2436
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:	2437	case EIO_GROUP:
2139	abort (); /* handled in eio_request */	2438	abort (); /* handled in eio_request */
2140		2439
2141	case EIO_NOP:	2440	case EIO_NOP:
2142	req->result = 0;	2441	req->result = 0;
…		…
2180	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2479	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2181	{	2480	{
2182	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2481	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2183	}	2482	}
2184		2483
		2484	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
		2485	{
		2486	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2487	}
		2488
		2489	eio_req eio_syncfs (int fd, int pri, eio_cb cb, void data)
		2490	{
		2491	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2492	}
		2493
		2494	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		2495	{
		2496	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2497	}
		2498
2185	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2499	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2186	{	2500	{
2187	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2501	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2188	}	2502	}
2189		2503
…		…
2195	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)	2509	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
2196	{	2510	{
2197	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2511	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2198	}	2512	}
2199		2513
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)	2514	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)
2206	{	2515	{
2207	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2516	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	}	2517	}
2214		2518
2215	eio_req eio_close (int fd, int pri, eio_cb cb, void data)	2519	eio_req eio_close (int fd, int pri, eio_cb cb, void data)
2216	{	2520	{
2217	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2521	REQ (EIO_CLOSE); req->int1 = fd; SEND;
…		…
2445	/* misc garbage */	2749	/* misc garbage */
2446		2750
2447	eio_ssize_t	2751	eio_ssize_t
2448	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2752	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2449	{	2753	{
2450	etp_worker wrk;
2451	eio_ssize_t ret;
2452
2453	wrk.dbuf = 0;
2454
2455	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2754	return eio__sendfile (ofd, ifd, offset, count);
2456
2457	if (wrk.dbuf)
2458	free (wrk.dbuf);
2459
2460	return ret;
2461	}	2755	}
2462		2756

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.92 by root, Sun Jul 17 18:27:17 2011 UTC vs. Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.92 by root, Sun Jul 17 18:27:17 2011 UTC vs.
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC