ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/libeio/eio.c

Comparing libeio/eio.c (file contents):
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC vs.
Revision 1.118 by root, Mon Apr 2 17:53:27 2012 UTC

1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libeio@schmorp.de>
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without modifica-	7	* Redistribution and use in source and binary forms, with or without modifica-
8	* tion, are permitted provided that the following conditions are met:	8	* tion, are permitted provided that the following conditions are met:
9	*	9	*
…		…
43		43
44	#include "eio.h"	44	#include "eio.h"
45	#include "ecb.h"	45	#include "ecb.h"
46		46
47	#ifdef EIO_STACKSIZE	47	#ifdef EIO_STACKSIZE
48	# define XTHREAD_STACKSIZE EIO_STACKSIZE	48	# define X_STACKSIZE EIO_STACKSIZE
49	#endif	49	#endif
50	#include "xthread.h"	50	#include "xthread.h"
51		51
52	#include <errno.h>	52	#include <errno.h>
53	#include <stddef.h>	53	#include <stddef.h>
…		…
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>
171	#endif	208	#endif
172		209
173	#define D_NAME(entp) entp->d_name	210	#define D_NAME(entp) entp->d_name
174		211
175	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	212	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
176	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__	213	#if __FreeBSD__ || __NetBSD__ || __OpenBSD__
177	#define _DIRENT_HAVE_D_TYPE /* sigh */	214	#define _DIRENT_HAVE_D_TYPE /* sigh */
178	#define D_INO(de) (de)->d_fileno	215	#define D_INO(de) (de)->d_fileno
179	#define D_NAMLEN(de) (de)->d_namlen	216	#define D_NAMLEN(de) (de)->d_namlen
180	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600	217	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
181	#define D_INO(de) (de)->d_ino	218	#define D_INO(de) (de)->d_ino
…		…
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;
…		…
307	static xmutex_t preadwritelock;	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; /* 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	}
…		…
521	}	606	}
522		607
523	static void ecb_cold	608	static void ecb_cold
524	etp_end_thread (void)	609	etp_end_thread (void)
525	{	610	{
526	eio_req *req = calloc (1, sizeof (eio_req));	611	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
527		612
528	req->type = -1;	613	req->type = -1;
529	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	614	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
530		615
531	X_LOCK (reqlock);	616	X_LOCK (reqlock);
…		…
939	#if !HAVE_FDATASYNC	1024	#if !HAVE_FDATASYNC
940	# undef fdatasync	1025	# undef fdatasync
941	# define fdatasync(fd) fsync (fd)	1026	# define fdatasync(fd) fsync (fd)
942	#endif	1027	#endif
943		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
944	/* sync_file_range always needs emulation */	1047	/* sync_file_range always needs emulation */
945	static int	1048	static int
946	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)
947	{	1050	{
948	#if HAVE_SYNC_FILE_RANGE	1051	#if HAVE_SYNC_FILE_RANGE
…		…
997	pread (fd, eio_buf, len, offset);	1100	pread (fd, eio_buf, len, offset);
998	offset += len;	1101	offset += len;
999	todo -= len;	1102	todo -= len;
1000	}	1103	}
1001		1104
1002	errno = 0;	1105	FUBd;
		1106
		1107	/* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
		1108	/* but not for e.g. EIO or eof, so we also never fail */
1003	return count;	1109	return 0;
1004	}	1110	}
1005		1111
1006	#endif	1112	#endif
1007		1113
1008	/* sendfile always needs emulation */	1114	/* sendfile always needs emulation */
1009	static eio_ssize_t	1115	static eio_ssize_t
1010	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1116	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1011	{	1117	{
1012	eio_ssize_t written = 0;	1118	eio_ssize_t written = 0;
1013	eio_ssize_t res;	1119	eio_ssize_t res;
1014		1120
1015	if (!count)	1121	if (!count)
…		…
1043		1149
1044	/* according to source inspection, this is correct, and useful behaviour */	1150	/* according to source inspection, this is correct, and useful behaviour */
1045	if (sbytes)	1151	if (sbytes)
1046	res = sbytes;	1152	res = sbytes;
1047		1153
1048	# elif defined (__APPLE__)	1154	# elif defined __APPLE__
1049	off_t sbytes = count;	1155	off_t sbytes = count;
1050	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1156	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1051		1157
1052	/* according to the manpage, sbytes is always valid */	1158	/* according to the manpage, sbytes is always valid */
1053	if (sbytes)	1159	if (sbytes)
…		…
1151		1257
1152	offset += cnt;	1258	offset += cnt;
1153	res += cnt;	1259	res += cnt;
1154	count -= cnt;	1260	count -= cnt;
1155	}	1261	}
		1262
		1263	FUBd;
1156	}	1264	}
1157		1265
1158	return res;	1266	return res;
1159	}	1267	}
1160		1268
…		…
1276		1384
1277	/*****************************************************************************/	1385	/*****************************************************************************/
1278	/* requests implemented outside eio_execute, because they are so large */	1386	/* requests implemented outside eio_execute, because they are so large */
1279		1387
1280	static void	1388	static void
1281	eio__realpath (eio_req *req, etp_worker *self)	1389	eio__lseek (eio_req *req)
1282	{	1390	{
1283	char *rel = req->ptr1;	1391	/* this usually gets optimised away completely, or your compiler sucks, */
		1392	/* or the whence constants really are not 0, 1, 2 */
		1393	int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
		1394	: req->int2 == EIO_SEEK_CUR ? SEEK_CUR
		1395	: req->int2 == EIO_SEEK_END ? SEEK_END
		1396	: req->int2;
		1397
		1398	req->offs = lseek (req->int1, req->offs, whence);
		1399	req->result = req->offs == (off_t)-1 ? -1 : 0;
		1400	}
		1401
		1402	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
		1403	static int
		1404	eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		1405	{
		1406	const char *rel = path;
1284	char *res;	1407	char *res;
1285	char *tmp1, *tmp2;	1408	char *tmp1, *tmp2;
1286	#if SYMLOOP_MAX > 32	1409	#if SYMLOOP_MAX > 32
1287	int symlinks = SYMLOOP_MAX;	1410	int symlinks = SYMLOOP_MAX;
1288	#else	1411	#else
1289	int symlinks = 32;	1412	int symlinks = 32;
1290	#endif	1413	#endif
1291		1414
1292	req->result = -1;
1293
1294	errno = EINVAL;	1415	errno = EINVAL;
1295	if (!rel)	1416	if (!rel)
1296	return;	1417	return -1;
1297		1418
1298	errno = ENOENT;	1419	errno = ENOENT;
1299	if (!*rel)	1420	if (!*rel)
1300	return;	1421	return -1;
1301		1422
1302	if (!req->ptr2)	1423	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1303	{
1304	X_LOCK (wrklock);
1305	req->flags |= EIO_FLAG_PTR2_FREE;
1306	X_UNLOCK (wrklock);
1307	req->ptr2 = malloc (PATH_MAX * 3);
1308
1309	errno = ENOMEM;
1310	if (!req->ptr2)
1311	return;
1312	}
1313
1314	res = req->ptr2;
1315	tmp1 = res + PATH_MAX;	1424	tmp1 = res + PATH_MAX;
1316	tmp2 = tmp1 + PATH_MAX;	1425	tmp2 = tmp1 + PATH_MAX;
1317		1426
1318	#if 0 /* disabled, the musl way to do things is just too racy */	1427	#if 0 /* disabled, the musl way to do things is just too racy */
1319	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1428	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1338	#endif	1447	#endif
1339	#endif	1448	#endif
1340		1449
1341	if (*rel != '/')	1450	if (*rel != '/')
1342	{	1451	{
		1452	int len;
		1453
		1454	errno = ENOENT;
		1455	if (wd == EIO_INVALID_WD)
		1456	return -1;
		1457
		1458	if (wd == EIO_CWD)
		1459	{
1343	if (!getcwd (res, PATH_MAX))	1460	if (!getcwd (res, PATH_MAX))
1344	return;	1461	return -1;
		1462
		1463	len = strlen (res);
		1464	}
		1465	else
		1466	memcpy (res, wd->str, len = wd->len);
1345		1467
1346	if (res [1]) /* only use if not / */	1468	if (res [1]) /* only use if not / */
1347	res += strlen (res);	1469	res += len;
1348	}	1470	}
1349		1471
1350	while (*rel)	1472	while (*rel)
1351	{	1473	{
1352	eio_ssize_t len, linklen;	1474	eio_ssize_t len, linklen;
1353	char *beg = rel;	1475	const char *beg = rel;
1354		1476
1355	while (*rel && *rel != '/')	1477	while (*rel && *rel != '/')
1356	++rel;	1478	++rel;
1357		1479
1358	len = rel - beg;	1480	len = rel - beg;
…		…
1370		1492
1371	if (beg [1] == '.' && len == 2)	1493	if (beg [1] == '.' && len == 2)
1372	{	1494	{
1373	/* .. - back up one component, if possible */	1495	/* .. - back up one component, if possible */
1374		1496
1375	while (res != req->ptr2)	1497	while (res != tmpbuf->ptr)
1376	if (*--res == '/')	1498	if (*--res == '/')
1377	break;	1499	break;
1378		1500
1379	continue;	1501	continue;
1380	}	1502	}
1381	}	1503	}
1382		1504
1383	errno = ENAMETOOLONG;	1505	errno = ENAMETOOLONG;
1384	if (res + 1 + len + 1 >= tmp1)	1506	if (res + 1 + len + 1 >= tmp1)
1385	return;	1507	return -1;
1386		1508
1387	/* copy one component */	1509	/* copy one component */
1388	*res = '/';	1510	*res = '/';
1389	memcpy (res + 1, beg, len);	1511	memcpy (res + 1, beg, len);
1390		1512
1391	/* zero-terminate, for readlink */	1513	/* zero-terminate, for readlink */
1392	res [len + 1] = 0;	1514	res [len + 1] = 0;
1393		1515
1394	/* now check if it's a symlink */	1516	/* now check if it's a symlink */
1395	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1517	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1396		1518
1397	if (linklen < 0)	1519	if (linklen < 0)
1398	{	1520	{
1399	if (errno != EINVAL)	1521	if (errno != EINVAL)
1400	return;	1522	return -1;
1401		1523
1402	/* it's a normal directory. hopefully */	1524	/* it's a normal directory. hopefully */
1403	res += len + 1;	1525	res += len + 1;
1404	}	1526	}
1405	else	1527	else
…		…
1407	/* yay, it was a symlink - build new path in tmp2 */	1529	/* yay, it was a symlink - build new path in tmp2 */
1408	int rellen = strlen (rel);	1530	int rellen = strlen (rel);
1409		1531
1410	errno = ENAMETOOLONG;	1532	errno = ENAMETOOLONG;
1411	if (linklen + 1 + rellen >= PATH_MAX)	1533	if (linklen + 1 + rellen >= PATH_MAX)
1412	return;	1534	return -1;
1413		1535
1414	errno = ELOOP;	1536	errno = ELOOP;
1415	if (!--symlinks)	1537	if (!--symlinks)
1416	return;	1538	return -1;
1417		1539
1418	if (*tmp1 == '/')	1540	if (*tmp1 == '/')
1419	res = req->ptr2; /* symlink resolves to an absolute path */	1541	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1420		1542
1421	/* we need to be careful, as rel might point into tmp2 already */	1543	/* we need to be careful, as rel might point into tmp2 already */
1422	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1544	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1423	tmp2 [linklen] = '/';	1545	tmp2 [linklen] = '/';
1424	memcpy (tmp2, tmp1, linklen);	1546	memcpy (tmp2, tmp1, linklen);
…		…
1426	rel = tmp2;	1548	rel = tmp2;
1427	}	1549	}
1428	}	1550	}
1429		1551
1430	/* special case for the lone root path */	1552	/* special case for the lone root path */
1431	if (res == req->ptr2)	1553	if (res == tmpbuf->ptr)
1432	*res++ = '/';	1554	*res++ = '/';
1433		1555
1434	req->result = res - (char *)req->ptr2;	1556	return res - (char *)tmpbuf->ptr;
1435
1436	done:
1437	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1438	}	1557	}
1439		1558
1440	static signed char	1559	static signed char
1441	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1560	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1442	{	1561	{
…		…
1630	#ifdef _WIN32	1749	#ifdef _WIN32
1631	{	1750	{
1632	int len = strlen ((const char *)req->ptr1);	1751	int len = strlen ((const char *)req->ptr1);
1633	char *path = malloc (MAX_PATH);	1752	char *path = malloc (MAX_PATH);
1634	const char *fmt;	1753	const char *fmt;
		1754	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1635		1755
1636	if (!len)	1756	if (!len)
1637	fmt = "./*";	1757	fmt = "./*";
1638	else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')	1758	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1639	fmt = "%s*";	1759	fmt = "%s*";
1640	else	1760	else
1641	fmt = "%s/*";	1761	fmt = "%s/*";
1642		1762
1643	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1763	_snprintf (path, MAX_PATH, fmt, reqpath);
1644	dirp = FindFirstFile (path, &entp);	1764	dirp = FindFirstFile (path, &entp);
1645	free (path);	1765	free (path);
1646		1766
1647	if (dirp == INVALID_HANDLE_VALUE)	1767	if (dirp == INVALID_HANDLE_VALUE)
1648	{	1768	{
1649	dirp = 0;	1769	/* should steal _dosmaperr */
1650
1651	switch (GetLastError ())	1770	switch (GetLastError ())
1652	{	1771	{
1653	case ERROR_FILE_NOT_FOUND:	1772	case ERROR_FILE_NOT_FOUND:
1654	req->result = 0;	1773	req->result = 0;
1655	break;	1774	break;
1656		1775
1657	case ERROR_INVALID_NAME:	1776	case ERROR_INVALID_NAME:
1658	case ERROR_PATH_NOT_FOUND:	1777	case ERROR_PATH_NOT_FOUND:
1659	case ERROR_NO_MORE_FILES:	1778	case ERROR_NO_MORE_FILES:
1660	errno = ENOENT;	1779	errno = ENOENT;
1661	break;	1780	break;
1662		1781
1663	case ERROR_NOT_ENOUGH_MEMORY:	1782	case ERROR_NOT_ENOUGH_MEMORY:
1664	errno = ENOMEM;	1783	errno = ENOMEM;
1665	break;	1784	break;
1666		1785
1667	default:	1786	default:
1668	errno = EINVAL;	1787	errno = EINVAL;
1669	break;	1788	break;
1670	}	1789	}
		1790
		1791	return;
1671	}	1792	}
1672	}	1793	}
1673	#else	1794	#else
		1795	#if HAVE_AT
		1796	if (req->wd)
		1797	{
		1798	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		1799
		1800	if (fd < 0)
		1801	return;
		1802
		1803	dirp = fdopendir (fd);
		1804
		1805	if (!dirp)
		1806	close (fd);
		1807	}
		1808	else
1674	dirp = opendir (req->ptr1);	1809	dirp = opendir (req->ptr1);
		1810	#else
		1811	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1812	#endif
		1813
		1814	if (!dirp)
		1815	return;
1675	#endif	1816	#endif
1676		1817
1677	if (req->flags & EIO_FLAG_PTR1_FREE)	1818	if (req->flags & EIO_FLAG_PTR1_FREE)
1678	free (req->ptr1);	1819	free (req->ptr1);
1679		1820
1680	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1821	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1681	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1822	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1682	req->ptr2 = names = malloc (namesalloc);	1823	req->ptr2 = names = malloc (namesalloc);
1683		1824
1684	if (dirp && names && (!flags || dents))	1825	if (!names || (flags && !dents))
		1826	return;
		1827
1685	for (;;)	1828	for (;;)
1686	{	1829	{
1687	int done;	1830	int done;
1688		1831
1689	#ifdef _WIN32	1832	#ifdef _WIN32
1690	done = !dirp;	1833	done = !dirp;
1691	#else	1834	#else
1692	errno = 0;	1835	errno = 0;
1693	entp = readdir (dirp);	1836	entp = readdir (dirp);
1694	done = !entp;	1837	done = !entp;
1695	#endif	1838	#endif
1696		1839
1697	if (done)	1840	if (done)
1698	{	1841	{
1699	#ifndef _WIN32	1842	#ifndef _WIN32
1700	int old_errno = errno;	1843	int old_errno = errno;
1701	closedir (dirp);	1844	closedir (dirp);
1702	errno = old_errno;	1845	errno = old_errno;
1703		1846
1704	if (errno)	1847	if (errno)
1705	break;	1848	break;
1706	#endif	1849	#endif
1707		1850
1708	/* sort etc. */	1851	/* sort etc. */
1709	req->int1 = flags;	1852	req->int1 = flags;
1710	req->result = dentoffs;	1853	req->result = dentoffs;
1711		1854
1712	if (flags & EIO_READDIR_STAT_ORDER)	1855	if (flags & EIO_READDIR_STAT_ORDER)
1713	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1856	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1714	else if (flags & EIO_READDIR_DIRS_FIRST)	1857	else if (flags & EIO_READDIR_DIRS_FIRST)
1715	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1858	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1716	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1859	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1717	else	1860	else
		1861	{
		1862	/* in this case, all is known, and we just put dirs first and sort them */
		1863	eio_dirent *oth = dents + dentoffs;
		1864	eio_dirent *dir = dents;
		1865
		1866	/* now partition dirs to the front, and non-dirs to the back */
		1867	/* by walking from both sides and swapping if necessary */
		1868	while (oth > dir)
		1869	{
		1870	if (dir->type == EIO_DT_DIR)
		1871	++dir;
		1872	else if ((--oth)->type == EIO_DT_DIR)
		1873	{
		1874	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
		1875
		1876	++dir;
		1877	}
		1878	}
		1879
		1880	/* now sort the dirs only (dirs all have the same score) */
		1881	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1882	}
		1883
		1884	break;
		1885	}
		1886
		1887	/* now add the entry to our list(s) */
		1888	name = D_NAME (entp);
		1889
		1890	/* skip . and .. entries */
		1891	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		1892	{
		1893	int len = D_NAMLEN (entp) + 1;
		1894
		1895	while (ecb_expect_false (namesoffs + len > namesalloc))
		1896	{
		1897	namesalloc *= 2;
		1898	req->ptr2 = names = realloc (names, namesalloc);
		1899
		1900	if (!names)
		1901	break;
		1902	}
		1903
		1904	memcpy (names + namesoffs, name, len);
		1905
		1906	if (dents)
		1907	{
		1908	struct eio_dirent *ent;
		1909
		1910	if (ecb_expect_false (dentoffs == dentalloc))
1718	{	1911	{
1719	/* in this case, all is known, and we just put dirs first and sort them */	1912	dentalloc *= 2;
		1913	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1914
		1915	if (!dents)
		1916	break;
		1917	}
		1918
1720	eio_dirent *oth = dents + dentoffs;	1919	ent = dents + dentoffs;
1721	eio_dirent *dir = dents;
1722		1920
1723	/* now partition dirs to the front, and non-dirs to the back */	1921	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1724	/* by walking from both sides and swapping if necessary */	1922	ent->namelen = len - 1;
1725	while (oth > dir)	1923	ent->inode = D_INO (entp);
		1924
		1925	inode_bits |= ent->inode;
		1926
		1927	switch (D_TYPE (entp))
		1928	{
		1929	default:
		1930	ent->type = EIO_DT_UNKNOWN;
		1931	flags |= EIO_READDIR_FOUND_UNKNOWN;
		1932	break;
		1933
		1934	#ifdef DT_FIFO
		1935	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1936	#endif
		1937	#ifdef DT_CHR
		1938	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1939	#endif
		1940	#ifdef DT_MPC
		1941	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1942	#endif
		1943	#ifdef DT_DIR
		1944	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1945	#endif
		1946	#ifdef DT_NAM
		1947	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1948	#endif
		1949	#ifdef DT_BLK
		1950	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1951	#endif
		1952	#ifdef DT_MPB
		1953	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1954	#endif
		1955	#ifdef DT_REG
		1956	case DT_REG: ent->type = EIO_DT_REG; break;
		1957	#endif
		1958	#ifdef DT_NWK
		1959	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1960	#endif
		1961	#ifdef DT_CMP
		1962	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1963	#endif
		1964	#ifdef DT_LNK
		1965	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1966	#endif
		1967	#ifdef DT_SOCK
		1968	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1969	#endif
		1970	#ifdef DT_DOOR
		1971	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1972	#endif
		1973	#ifdef DT_WHT
		1974	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1975	#endif
		1976	}
		1977
		1978	ent->score = 7;
		1979
		1980	if (flags & EIO_READDIR_DIRS_FIRST)
		1981	{
		1982	if (ent->type == EIO_DT_UNKNOWN)
1726	{	1983	{
1727	if (dir->type == EIO_DT_DIR)	1984	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1728	++dir;	1985	ent->score = 1;
1729	else if ((--oth)->type == EIO_DT_DIR)	1986	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1730	{	1987	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1731	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1732
1733	++dir;
1734	}
1735	}	1988	}
1736		1989	else if (ent->type == EIO_DT_DIR)
1737	/* now sort the dirs only (dirs all have the same score) */	1990	ent->score = 0;
1738	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1739	}	1991	}
1740
1741	break;
1742	}
1743
1744	/* now add the entry to our list(s) */
1745	name = D_NAME (entp);
1746
1747	/* skip . and .. entries */
1748	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1749	{
1750	int len = D_NAMLEN (entp) + 1;
1751
1752	while (ecb_expect_false (namesoffs + len > namesalloc))
1753	{
1754	namesalloc *= 2;
1755	req->ptr2 = names = realloc (names, namesalloc);
1756
1757	if (!names)
1758	break;
1759	}	1992	}
1760		1993
1761	memcpy (names + namesoffs, name, len);
1762
1763	if (dents)
1764	{
1765	struct eio_dirent *ent;
1766
1767	if (ecb_expect_false (dentoffs == dentalloc))
1768	{
1769	dentalloc *= 2;
1770	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1771
1772	if (!dents)
1773	break;
1774	}
1775
1776	ent = dents + dentoffs;
1777
1778	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1779	ent->namelen = len - 1;
1780	ent->inode = D_INO (entp);
1781
1782	inode_bits |= ent->inode;
1783
1784	switch (D_TYPE (entp))
1785	{
1786	default:
1787	ent->type = EIO_DT_UNKNOWN;
1788	flags |= EIO_READDIR_FOUND_UNKNOWN;
1789	break;
1790
1791	#ifdef DT_FIFO
1792	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1793	#endif
1794	#ifdef DT_CHR
1795	case DT_CHR: ent->type = EIO_DT_CHR; break;
1796	#endif
1797	#ifdef DT_MPC
1798	case DT_MPC: ent->type = EIO_DT_MPC; break;
1799	#endif
1800	#ifdef DT_DIR
1801	case DT_DIR: ent->type = EIO_DT_DIR; break;
1802	#endif
1803	#ifdef DT_NAM
1804	case DT_NAM: ent->type = EIO_DT_NAM; break;
1805	#endif
1806	#ifdef DT_BLK
1807	case DT_BLK: ent->type = EIO_DT_BLK; break;
1808	#endif
1809	#ifdef DT_MPB
1810	case DT_MPB: ent->type = EIO_DT_MPB; break;
1811	#endif
1812	#ifdef DT_REG
1813	case DT_REG: ent->type = EIO_DT_REG; break;
1814	#endif
1815	#ifdef DT_NWK
1816	case DT_NWK: ent->type = EIO_DT_NWK; break;
1817	#endif
1818	#ifdef DT_CMP
1819	case DT_CMP: ent->type = EIO_DT_CMP; break;
1820	#endif
1821	#ifdef DT_LNK
1822	case DT_LNK: ent->type = EIO_DT_LNK; break;
1823	#endif
1824	#ifdef DT_SOCK
1825	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1826	#endif
1827	#ifdef DT_DOOR
1828	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1829	#endif
1830	#ifdef DT_WHT
1831	case DT_WHT: ent->type = EIO_DT_WHT; break;
1832	#endif
1833	}
1834
1835	ent->score = 7;
1836
1837	if (flags & EIO_READDIR_DIRS_FIRST)
1838	{
1839	if (ent->type == EIO_DT_UNKNOWN)
1840	{
1841	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1842	ent->score = 1;
1843	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1844	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1845	}
1846	else if (ent->type == EIO_DT_DIR)
1847	ent->score = 0;
1848	}
1849	}
1850
1851	namesoffs += len;	1994	namesoffs += len;
1852	++dentoffs;	1995	++dentoffs;
1853	}	1996	}
1854		1997
1855	if (EIO_CANCELLED (req))	1998	if (EIO_CANCELLED (req))
1856	{	1999	{
1857	errno = ECANCELED;	2000	errno = ECANCELED;
1858	break;	2001	break;
1859	}	2002	}
1860		2003
1861	#ifdef _WIN32	2004	#ifdef _WIN32
1862	if (!FindNextFile (dirp, &entp))	2005	if (!FindNextFile (dirp, &entp))
1863	{	2006	{
1864	FindClose (dirp);	2007	FindClose (dirp);
1865	dirp = 0;	2008	dirp = 0;
1866	}	2009	}
1867	#endif	2010	#endif
1868	}	2011	}
1869	}	2012	}
		2013
		2014	/*****************************************************************************/
		2015	/* working directory stuff */
		2016	/* various deficiencies in the posix 2008 api force us to */
		2017	/* keep the absolute path in string form at all times */
		2018	/* fuck yeah. */
		2019
		2020	#if !HAVE_AT
		2021
		2022	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2023	/* an absolute or canonical path */
		2024	static const char *
		2025	wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2026	{
		2027	if (!wd || *path == '/')
		2028	return path;
		2029
		2030	if (path [0] == '.' && !path [1])
		2031	return wd->str;
		2032
		2033	{
		2034	int l1 = wd->len;
		2035	int l2 = strlen (path);
		2036
		2037	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2038
		2039	memcpy (res, wd->str, l1);
		2040	res [l1] = '/';
		2041	memcpy (res + l1 + 1, path, l2 + 1);
		2042
		2043	return res;
		2044	}
		2045	}
		2046
		2047	#endif
		2048
		2049	static eio_wd
		2050	eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2051	{
		2052	int fd;
		2053	eio_wd res;
		2054	int len = eio__realpath (tmpbuf, wd, path);
		2055
		2056	if (len < 0)
		2057	return EIO_INVALID_WD;
		2058
		2059	#if HAVE_AT
		2060	fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		2061
		2062	if (fd < 0)
		2063	return EIO_INVALID_WD;
		2064	#endif
		2065
		2066	res = malloc (sizeof (*res) + len); /* one extra 0-byte */
		2067
		2068	#if HAVE_AT
		2069	res->fd = fd;
		2070	#endif
		2071
		2072	res->len = len;
		2073	memcpy (res->str, tmpbuf->ptr, len);
		2074	res->str [len] = 0;
		2075
		2076	return res;
		2077	}
		2078
		2079	eio_wd
		2080	eio_wd_open_sync (eio_wd wd, const char *path)
		2081	{
		2082	struct tmpbuf tmpbuf = { 0 };
		2083	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2084	free (tmpbuf.ptr);
		2085
		2086	return wd;
		2087	}
		2088
		2089	void
		2090	eio_wd_close_sync (eio_wd wd)
		2091	{
		2092	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2093	{
		2094	#if HAVE_AT
		2095	close (wd->fd);
		2096	#endif
		2097	free (wd);
		2098	}
		2099	}
		2100
		2101	#if HAVE_AT
		2102
		2103	/* they forgot these */
		2104
		2105	static int
		2106	eio__truncateat (int dirfd, const char *path, off_t length)
		2107	{
		2108	int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
		2109	int res;
		2110
		2111	if (fd < 0)
		2112	return fd;
		2113
		2114	res = ftruncate (fd, length);
		2115	close (fd);
		2116	return res;
		2117	}
		2118
		2119	static int
		2120	eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
		2121	{
		2122	int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
		2123	int res;
		2124
		2125	if (fd < 0)
		2126	return fd;
		2127
		2128	res = fstatvfs (fd, buf);
		2129	close (fd);
		2130	return res;
		2131
		2132	}
		2133
		2134	#endif
1870		2135
1871	/*****************************************************************************/	2136	/*****************************************************************************/
1872		2137
1873	#define ALLOC(len) \	2138	#define ALLOC(len) \
1874	if (!req->ptr2) \	2139	if (!req->ptr2) \
…		…
1883	req->result = -1; \	2148	req->result = -1; \
1884	break; \	2149	break; \
1885	} \	2150	} \
1886	}	2151	}
1887		2152
		2153	static void ecb_noinline ecb_cold
		2154	etp_proc_init (void)
		2155	{
		2156	#if HAVE_PRCTL_SET_NAME
		2157	/* provide a more sensible "thread name" */
		2158	char name[16 + 1];
		2159	const int namelen = sizeof (name) - 1;
		2160	int len;
		2161
		2162	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2163	name [namelen] = 0;
		2164	len = strlen (name);
		2165	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2166	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2167	#endif
		2168	}
		2169
1888	X_THREAD_PROC (etp_proc)	2170	X_THREAD_PROC (etp_proc)
1889	{	2171	{
1890	ETP_REQ *req;	2172	ETP_REQ *req;
1891	struct timespec ts;	2173	struct timespec ts;
1892	etp_worker *self = (etp_worker *)thr_arg;	2174	etp_worker *self = (etp_worker *)thr_arg;
1893		2175
		2176	etp_proc_init ();
		2177
1894	/* try to distribute timeouts somewhat evenly */	2178	/* try to distribute timeouts somewhat evenly */
1895	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2179	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1896		2180
1897	for (;;)	2181	for (;;)
1898	{	2182	{
…		…
1900		2184
1901	X_LOCK (reqlock);	2185	X_LOCK (reqlock);
1902		2186
1903	for (;;)	2187	for (;;)
1904	{	2188	{
1905	self->req = req = reqq_shift (&req_queue);	2189	req = reqq_shift (&req_queue);
1906		2190
1907	if (req)	2191	if (req)
1908	break;	2192	break;
1909		2193
1910	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2194	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1948	++npending;	2232	++npending;
1949		2233
1950	if (!reqq_push (&res_queue, req) && want_poll_cb)	2234	if (!reqq_push (&res_queue, req) && want_poll_cb)
1951	want_poll_cb ();	2235	want_poll_cb ();
1952		2236
1953	self->req = 0;
1954	etp_worker_clear (self);	2237	etp_worker_clear (self);
1955		2238
1956	X_UNLOCK (reslock);	2239	X_UNLOCK (reslock);
1957	}	2240	}
1958		2241
1959	quit:	2242	quit:
		2243	free (req);
		2244
1960	X_LOCK (wrklock);	2245	X_LOCK (wrklock);
1961	etp_worker_free (self);	2246	etp_worker_free (self);
1962	X_UNLOCK (wrklock);	2247	X_UNLOCK (wrklock);
1963		2248
1964	return 0;	2249	return 0;
…		…
2007	}	2292	}
2008		2293
2009	static void	2294	static void
2010	eio_execute (etp_worker *self, eio_req *req)	2295	eio_execute (etp_worker *self, eio_req *req)
2011	{	2296	{
		2297	#if HAVE_AT
		2298	int dirfd;
		2299	#else
		2300	const char *path;
		2301	#endif
		2302
2012	if (ecb_expect_false (EIO_CANCELLED (req)))	2303	if (ecb_expect_false (EIO_CANCELLED (req)))
2013	{	2304	{
2014	req->result = -1;	2305	req->result = -1;
2015	req->errorno = ECANCELED;	2306	req->errorno = ECANCELED;
2016	return;	2307	return;
2017	}	2308	}
2018		2309
		2310	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2311	{
		2312	req->result = -1;
		2313	req->errorno = ENOENT;
		2314	return;
		2315	}
		2316
		2317	if (req->type >= EIO_OPEN)
		2318	{
		2319	#if HAVE_AT
		2320	dirfd = WD2FD (req->wd);
		2321	#else
		2322	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2323	#endif
		2324	}
		2325
2019	switch (req->type)	2326	switch (req->type)
2020	{	2327	{
		2328	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2329	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2330	break;
		2331	case EIO_WD_CLOSE: req->result = 0;
		2332	eio_wd_close_sync (req->wd); break;
		2333
		2334	case EIO_SEEK: eio__lseek (req); break;
2021	case EIO_READ: ALLOC (req->size);	2335	case EIO_READ: ALLOC (req->size);
2022	req->result = req->offs >= 0	2336	req->result = req->offs >= 0
2023	? pread (req->int1, req->ptr2, req->size, req->offs)	2337	? pread (req->int1, req->ptr2, req->size, req->offs)
2024	: read (req->int1, req->ptr2, req->size); break;	2338	: read (req->int1, req->ptr2, req->size); break;
2025	case EIO_WRITE: req->result = req->offs >= 0	2339	case EIO_WRITE: req->result = req->offs >= 0
2026	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2340	? pwrite (req->int1, req->ptr2, req->size, req->offs)
2027	: write (req->int1, req->ptr2, req->size); break;	2341	: write (req->int1, req->ptr2, req->size); break;
2028		2342
2029	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2343	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2030	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;	2344	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
		2345
		2346	#if HAVE_AT
2031		2347
2032	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2348	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2033	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2349	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2034	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2350	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2351	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2352	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2353	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2354	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2355	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2356
		2357	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2358	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2359	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2360	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2361	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2362	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2363	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2364	case EIO_READLINK: ALLOC (PATH_MAX);
		2365	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2366	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2367	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2368	case EIO_UTIME:
		2369	case EIO_FUTIME:
		2370	{
		2371	struct timespec ts[2];
		2372	struct timespec *times;
		2373
		2374	if (req->nv1 != -1. || req->nv2 != -1.)
		2375	{
		2376	ts[0].tv_sec = req->nv1;
		2377	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2378	ts[1].tv_sec = req->nv2;
		2379	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2380
		2381	times = ts;
		2382	}
		2383	else
		2384	times = 0;
		2385
		2386	req->result = req->type == EIO_FUTIME
		2387	? futimens (req->int1, times)
		2388	: utimensat (dirfd, req->ptr1, times, 0);
		2389	}
		2390	break;
		2391
		2392	#else
		2393
		2394	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2395	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2396	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2035	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2397	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2398	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2399	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2400	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2401	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2402
		2403	case EIO_UNLINK: req->result = unlink (path ); break;
		2404	case EIO_RMDIR: req->result = rmdir (path ); break;
		2405	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2406	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2407	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2408	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2409	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2410	case EIO_READLINK: ALLOC (PATH_MAX);
		2411	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2412	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2413	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2414
		2415	case EIO_UTIME:
		2416	case EIO_FUTIME:
		2417	{
		2418	struct timeval tv[2];
		2419	struct timeval *times;
		2420
		2421	if (req->nv1 != -1. || req->nv2 != -1.)
		2422	{
		2423	tv[0].tv_sec = req->nv1;
		2424	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2425	tv[1].tv_sec = req->nv2;
		2426	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2427
		2428	times = tv;
		2429	}
		2430	else
		2431	times = 0;
		2432
		2433	req->result = req->type == EIO_FUTIME
		2434	? futimes (req->int1, times)
		2435	: utimes (req->ptr1, times);
		2436	}
		2437	break;
		2438
		2439	#endif
		2440
		2441	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2442	{
		2443	ALLOC (req->result);
		2444	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2445	}
		2446	break;
		2447
2036	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2448	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2037	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2449	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2038		2450
2039	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2040	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2041	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2451	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2042	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2452	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2043		2453
2044	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2045	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2454	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2046	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2047	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2455	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2048	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2049	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2456	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2050		2457
2051	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2052	case EIO_CLOSE: req->result = close (req->int1); break;	2458	case EIO_CLOSE: req->result = close (req->int1); break;
2053	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2459	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2054	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2055	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2056	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2057	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2058	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2059	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2060	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2061
2062	case EIO_REALPATH: eio__realpath (req, self); break;
2063
2064	case EIO_READLINK: ALLOC (PATH_MAX);
2065	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2066
2067	case EIO_SYNC: req->result = 0; sync (); break;	2460	case EIO_SYNC: req->result = 0; sync (); break;
2068	case EIO_FSYNC: req->result = fsync (req->int1); break;	2461	case EIO_FSYNC: req->result = fsync (req->int1); break;
2069	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2462	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2463	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2464	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2070	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	2465	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2071	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2466	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2072	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2467	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2073	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2468	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2074	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2075	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	2469	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2076		2470
2077	case EIO_READDIR: eio__scandir (req, self); break;	2471	case EIO_READDIR: eio__scandir (req, self); break;
2078		2472
2079	case EIO_BUSY:	2473	case EIO_BUSY:
…		…
2089	req->result = select (0, 0, 0, 0, &tv);	2483	req->result = select (0, 0, 0, 0, &tv);
2090	}	2484	}
2091	#endif	2485	#endif
2092	break;	2486	break;
2093		2487
2094	case EIO_UTIME:
2095	case EIO_FUTIME:
2096	{
2097	struct timeval tv[2];
2098	struct timeval *times;
2099
2100	if (req->nv1 != -1. || req->nv2 != -1.)
2101	{
2102	tv[0].tv_sec = req->nv1;
2103	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2104	tv[1].tv_sec = req->nv2;
2105	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2106
2107	times = tv;
2108	}
2109	else
2110	times = 0;
2111
2112	req->result = req->type == EIO_FUTIME
2113	? futimes (req->int1, times)
2114	: utimes (req->ptr1, times);
2115	}
2116	break;
2117
2118	case EIO_GROUP:	2488	case EIO_GROUP:
2119	abort (); /* handled in eio_request */	2489	abort (); /* handled in eio_request */
2120		2490
2121	case EIO_NOP:	2491	case EIO_NOP:
2122	req->result = 0;	2492	req->result = 0;
…		…
2135	req->errorno = errno;	2505	req->errorno = errno;
2136	}	2506	}
2137		2507
2138	#ifndef EIO_NO_WRAPPERS	2508	#ifndef EIO_NO_WRAPPERS
2139		2509
		2510	eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
		2511	{
		2512	REQ (EIO_WD_OPEN); PATH; SEND;
		2513	}
		2514
		2515	eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
		2516	{
		2517	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2518	}
		2519
2140	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2520	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2141	{	2521	{
2142	REQ (EIO_NOP); SEND;	2522	REQ (EIO_NOP); SEND;
2143	}	2523	}
2144		2524
…		…
2160	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2540	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2161	{	2541	{
2162	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2542	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2163	}	2543	}
2164		2544
		2545	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
		2546	{
		2547	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2548	}
		2549
		2550	eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
		2551	{
		2552	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2553	}
		2554
		2555	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
		2556	{
		2557	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2558	}
		2559
2165	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2560	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2166	{	2561	{
2167	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2562	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2168	}	2563	}
2169		2564
…		…
2175	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)	2570	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2176	{	2571	{
2177	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2572	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2178	}	2573	}
2179		2574
2180	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2181	{
2182	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2183	}
2184
2185	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)	2575	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2186	{	2576	{
2187	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2577	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2188	}	2578	}
2189		2579
2190	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2191	{
2192	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2193	}
2194
2195	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)	2580	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2196	{	2581	{
2197	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2582	REQ (EIO_CLOSE); req->int1 = fd; SEND;
2198	}	2583	}
2199		2584
2200	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)	2585	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2201	{	2586	{
2202	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;	2587	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
		2588	}
		2589
		2590	eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
		2591	{
		2592	REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2203	}	2593	}
2204		2594
2205	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)	2595	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2206	{	2596	{
2207	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;	2597	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
…		…
2425	/* misc garbage */	2815	/* misc garbage */
2426		2816
2427	eio_ssize_t	2817	eio_ssize_t
2428	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2818	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2429	{	2819	{
2430	etp_worker wrk;
2431	eio_ssize_t ret;
2432
2433	wrk.dbuf = 0;
2434
2435	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2820	return eio__sendfile (ofd, ifd, offset, count);
2436
2437	if (wrk.dbuf)
2438	free (wrk.dbuf);
2439
2440	return ret;
2441	}	2821	}
2442		2822

Diff Legend

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