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

Comparing libeio/eio.c (file contents):
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC vs.
Revision 1.103 by root, Thu Sep 15 13:20:54 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>
…		…
67	#endif	67	#endif
68		68
69	#ifndef ECANCELED	69	#ifndef ECANCELED
70	# define ECANCELED EDOM	70	# define ECANCELED EDOM
71	#endif	71	#endif
		72	#ifndef ELOOP
		73	# define ELOOP EDOM
		74	#endif
		75
		76	#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
		77	# define ENOTSOCK WSAENOTSOCK
		78	#endif
72		79
73	static void eio_destroy (eio_req *req);	80	static void eio_destroy (eio_req *req);
74		81
75	#ifndef EIO_FINISH	82	#ifndef EIO_FINISH
76	# 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
…		…
95		102
96	#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)	103	#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
97		104
98	#ifdef _WIN32	105	#ifdef _WIN32
99		106
		107	#undef PAGESIZE
100	#define PAGESIZE 4096 /* GetSystemInfo? */	108	#define PAGESIZE 4096 /* GetSystemInfo? */
101		109
		110	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		111
102	#ifdef EIO_STRUCT_STATI64	112	#ifdef EIO_STRUCT_STATI64
		113	/* look at perl's non-sloppy stat */
103	#define stat(path,buf) _stati64 (path,buf)	114	#define stat(path,buf) _stati64 (path,buf)
104	#define fstat(fd,buf) _fstati64 (path,buf)	115	#define fstat(fd,buf) _fstati64 (fd,buf)
105	#endif	116	#endif
106	#define lstat(path,buf) stat (path,buf)	117	#define lstat(path,buf) stat (path,buf)
107	#define fsync(fd) (FlushFileBuffers (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))
108	#define mkdir(path,mode) _mkdir (path)	119	#define mkdir(path,mode) _mkdir (path)
109	#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))
110		121
		122	#define chmod(path,mode) _chmod (path, mode)
		123	#define dup(fd) _dup (fd)
		124	#define dup2(fd1,fd2) _dup2 (fd1, fd2)
		125
		126	#define fchmod(fd,mode) EIO_ENOSYS ()
111	#define chown(path,uid,gid) EIO_ENOSYS ()	127	#define chown(path,uid,gid) EIO_ENOSYS ()
112	#define fchown(fd,uid,gid) EIO_ENOSYS ()	128	#define fchown(fd,uid,gid) EIO_ENOSYS ()
113	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */	129	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
114	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */	130	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
115	#define mknod(path,mode,dev) EIO_ENOSYS ()	131	#define mknod(path,mode,dev) EIO_ENOSYS ()
116	#define sync() EIO_ENOSYS ()	132	#define sync() EIO_ENOSYS ()
		133	#define readlink(path,buf,s) EIO_ENOSYS ()
		134	#define statvfs(path,buf) EIO_ENOSYS ()
		135	#define fstatvfs(fd,buf) EIO_ENOSYS ()
		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	}
117		167
118	/* we could even stat and see if it exists */	168	/* we could even stat and see if it exists */
119	static int	169	static int
120	symlink (const char old, const char neu)	170	symlink (const char old, const char neu)
121	{	171	{
		172	#if WINVER >= 0x0600
122	if (CreateSymbolicLink (neu, old, 1))	173	if (CreateSymbolicLink (neu, old, 1))
123	return 0;	174	return 0;
124		175
125	if (CreateSymbolicLink (neu, old, 0))	176	if (CreateSymbolicLink (neu, old, 0))
126	return 0;	177	return 0;
		178	#endif
127		179
128	return EIO_ERRNO (ENOENT, -1);	180	return EIO_ERRNO (ENOENT, -1);
129	}	181	}
		182
		183	/* POSIX API only */
		184	#define CreateHardLink(neu,old,flags) 0
		185	#define CreateSymbolicLink(neu,old,flags) 0
		186
		187	struct statvfs
		188	{
		189	int dummy;
		190	};
		191
		192	#define DT_DIR EIO_DT_DIR
		193	#define DT_REG EIO_DT_REG
		194	#define D_NAME(entp) entp.cFileName
		195	#define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
130		196
131	#else	197	#else
132		198
133	#include <sys/time.h>	199	#include <sys/time.h>
134	#include <sys/select.h>	200	#include <sys/select.h>
135	#include <sys/statvfs.h>	201	#include <sys/statvfs.h>
136	#include <unistd.h>	202	#include <unistd.h>
137	#include <utime.h>
138	#include <signal.h>	203	#include <signal.h>
139	#include <dirent.h>	204	#include <dirent.h>
140		205
141	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES	206	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
142	#include <sys/mman.h>	207	#include <sys/mman.h>
143	#endif	208	#endif
		209
		210	#define D_NAME(entp) entp->d_name
144		211
145	/* 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 */
146	#if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__	213	#if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__
147	#define _DIRENT_HAVE_D_TYPE /* sigh */	214	#define _DIRENT_HAVE_D_TYPE /* sigh */
148	#define D_INO(de) (de)->d_fileno	215	#define D_INO(de) (de)->d_fileno
…		…
162		229
163	#ifndef EIO_STRUCT_DIRENT	230	#ifndef EIO_STRUCT_DIRENT
164	#define EIO_STRUCT_DIRENT struct dirent	231	#define EIO_STRUCT_DIRENT struct dirent
165	#endif	232	#endif
166		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>
167	#endif	246	#endif
168		247
169	#if HAVE_SENDFILE	248	#if HAVE_SENDFILE
170	# if __linux	249	# if __linux
171	# include <sys/sendfile.h>	250	# include <sys/sendfile.h>
…		…
186	#endif	265	#endif
187	#ifndef D_INO	266	#ifndef D_INO
188	# define D_INO(de) 0	267	# define D_INO(de) 0
189	#endif	268	#endif
190	#ifndef D_NAMLEN	269	#ifndef D_NAMLEN
191	# define D_NAMLEN(de) strlen ((de)->d_name)	270	# define D_NAMLEN(entp) strlen (D_NAME (entp))
192	#endif	271	#endif
193		272
194	/* used for struct dirent, AIX doesn't provide it */	273	/* used for struct dirent, AIX doesn't provide it */
195	#ifndef NAME_MAX	274	#ifndef NAME_MAX
196	# define NAME_MAX 4096	275	# define NAME_MAX 4096
…		…
203		282
204	/* buffer size for various temporary buffers */	283	/* buffer size for various temporary buffers */
205	#define EIO_BUFSIZE 65536	284	#define EIO_BUFSIZE 65536
206		285
207	#define dBUF \	286	#define dBUF \
208	char *eio_buf; \
209	ETP_WORKER_LOCK (self); \
210	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	287	char *eio_buf = malloc (EIO_BUFSIZE); \
211	ETP_WORKER_UNLOCK (self); \
212	errno = ENOMEM; \	288	errno = ENOMEM; \
213	if (!eio_buf) \	289	if (!eio_buf) \
214	return -1;	290	return -1
		291
		292	#define FUBd \
		293	free (eio_buf)
215		294
216	#define EIO_TICKS ((1000000 + 1023) >> 10)	295	#define EIO_TICKS ((1000000 + 1023) >> 10)
217		296
218	#define ETP_PRI_MIN EIO_PRI_MIN	297	#define ETP_PRI_MIN EIO_PRI_MIN
219	#define ETP_PRI_MAX EIO_PRI_MAX	298	#define ETP_PRI_MAX EIO_PRI_MAX
…		…
225	static int eio_finish (eio_req *req);	304	static int eio_finish (eio_req *req);
226	#define ETP_FINISH(req) eio_finish (req)	305	#define ETP_FINISH(req) eio_finish (req)
227	static void eio_execute (struct etp_worker self, eio_req req);	306	static void eio_execute (struct etp_worker self, eio_req req);
228	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	307	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
229		308
230	#define ETP_WORKER_CLEAR(req) \
231	if (wrk->dbuf) \
232	{ \
233	free (wrk->dbuf); \
234	wrk->dbuf = 0; \
235	} \
236	\
237	if (wrk->dirp) \
238	{ \
239	closedir (wrk->dirp); \
240	wrk->dirp = 0; \
241	}
242
243	#define ETP_WORKER_COMMON \
244	void *dbuf; \
245	DIR *dirp;
246
247	/*****************************************************************************/	309	/*****************************************************************************/
248		310
249	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	311	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250		312
251	/* calculate time difference in ~1/EIO_TICKS of a second */	313	/* calculate time difference in ~1/EIO_TICKS of a second */
…		…
262	static void (*done_poll_cb) (void);	324	static void (*done_poll_cb) (void);
263		325
264	static unsigned int max_poll_time; /* reslock */	326	static unsigned int max_poll_time; /* reslock */
265	static unsigned int max_poll_reqs; /* reslock */	327	static unsigned int max_poll_reqs; /* reslock */
266		328
267	static volatile unsigned int nreqs; /* reqlock */	329	static unsigned int nreqs; /* reqlock */
268	static volatile unsigned int nready; /* reqlock */	330	static unsigned int nready; /* reqlock */
269	static volatile unsigned int npending; /* reqlock */	331	static unsigned int npending; /* reqlock */
270	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	332	static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
271	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */	333	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
272		334
273	static xmutex_t wrklock;	335	static xmutex_t wrklock;
274	static xmutex_t reslock;	336	static xmutex_t reslock;
275	static xmutex_t reqlock;	337	static xmutex_t reqlock;
276	static xcond_t reqwait;	338	static xcond_t reqwait;
…		…
279	/*	341	/*
280	* make our pread/pwrite emulation safe against themselves, but not against	342	* make our pread/pwrite emulation safe against themselves, but not against
281	* normal read/write by using a mutex. slows down execution a lot,	343	* normal read/write by using a mutex. slows down execution a lot,
282	* but that's your problem, not mine.	344	* but that's your problem, not mine.
283	*/	345	*/
284	static xmutex_t preadwritelock = X_MUTEX_INIT;	346	static xmutex_t preadwritelock;
285	#endif	347	#endif
286		348
287	typedef struct etp_worker	349	typedef struct etp_worker
288	{	350	{
289	/* locked by wrklock */	351	/* locked by wrklock */
…		…
292	xthread_t tid;	354	xthread_t tid;
293		355
294	/* locked by reslock, reqlock or wrklock */	356	/* locked by reslock, reqlock or wrklock */
295	ETP_REQ req; / currently processed request */	357	ETP_REQ req; / currently processed request */
296		358
		359	#ifdef ETP_WORKER_COMMON
297	ETP_WORKER_COMMON	360	ETP_WORKER_COMMON
		361	#endif
298	} etp_worker;	362	} etp_worker;
299		363
300	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	364	static etp_worker wrk_first; /* NOT etp */
301		365
302	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	366	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	367	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304		368
305	/* worker threads management */	369	/* worker threads management */
306		370
307	static void ecb_cold	371	static void ecb_cold
308	etp_worker_clear (etp_worker *wrk)	372	etp_worker_clear (etp_worker *wrk)
309	{	373	{
310	ETP_WORKER_CLEAR (wrk);
311	}	374	}
312		375
313	static void ecb_cold	376	static void ecb_cold
314	etp_worker_free (etp_worker *wrk)	377	etp_worker_free (etp_worker *wrk)
315	{	378	{
…		…
376	} etp_reqq;	439	} etp_reqq;
377		440
378	static etp_reqq req_queue;	441	static etp_reqq req_queue;
379	static etp_reqq res_queue;	442	static etp_reqq res_queue;
380		443
		444	static void ecb_noinline ecb_cold
		445	reqq_init (etp_reqq *q)
		446	{
		447	int pri;
		448
		449	for (pri = 0; pri < ETP_NUM_PRI; ++pri)
		450	q->qs[pri] = q->qe[pri] = 0;
		451
		452	q->size = 0;
		453	}
		454
381	static int ecb_noinline	455	static int ecb_noinline
382	reqq_push (etp_reqq q, ETP_REQ req)	456	reqq_push (etp_reqq q, ETP_REQ req)
383	{	457	{
384	int pri = req->pri;	458	int pri = req->pri;
385	req->next = 0;	459	req->next = 0;
…		…
419	}	493	}
420		494
421	abort ();	495	abort ();
422	}	496	}
423		497
424	static void ecb_cold	498	static int ecb_cold
425	etp_thread_init (void)	499	etp_init (void (want_poll)(void), void (done_poll)(void))
426	{	500	{
427	#if !HAVE_PREADWRITE
428	X_MUTEX_CREATE (preadwritelock);
429	#endif
430	X_MUTEX_CREATE (wrklock);	501	X_MUTEX_CREATE (wrklock);
431	X_MUTEX_CREATE (reslock);	502	X_MUTEX_CREATE (reslock);
432	X_MUTEX_CREATE (reqlock);	503	X_MUTEX_CREATE (reqlock);
433	X_COND_CREATE (reqwait);	504	X_COND_CREATE (reqwait);
434	}
435		505
436	static void ecb_cold	506	reqq_init (&req_queue);
437	etp_atfork_prepare (void)	507	reqq_init (&res_queue);
438	{
439	}
440		508
441	static void ecb_cold	509	wrk_first.next =
442	etp_atfork_parent (void)	510	wrk_first.prev = &wrk_first;
443	{
444	}
445
446	static void ecb_cold
447	etp_atfork_child (void)
448	{
449	ETP_REQ *prv;
450
451	while ((prv = reqq_shift (&req_queue)))
452	ETP_DESTROY (prv);
453
454	while ((prv = reqq_shift (&res_queue)))
455	ETP_DESTROY (prv);
456
457	while (wrk_first.next != &wrk_first)
458	{
459	etp_worker *wrk = wrk_first.next;
460
461	if (wrk->req)
462	ETP_DESTROY (wrk->req);
463
464	etp_worker_clear (wrk);
465	etp_worker_free (wrk);
466	}
467		511
468	started = 0;	512	started = 0;
469	idle = 0;	513	idle = 0;
470	nreqs = 0;	514	nreqs = 0;
471	nready = 0;	515	nready = 0;
472	npending = 0;	516	npending = 0;
473
474	etp_thread_init ();
475	}
476
477	static void ecb_cold
478	etp_once_init (void)
479	{
480	etp_thread_init ();
481	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
482	}
483
484	static int ecb_cold
485	etp_init (void (want_poll)(void), void (done_poll)(void))
486	{
487	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
488
489	pthread_once (&doinit, etp_once_init);
490		517
491	want_poll_cb = want_poll;	518	want_poll_cb = want_poll;
492	done_poll_cb = done_poll;	519	done_poll_cb = done_poll;
493		520
494	return 0;	521	return 0;
…		…
952	#if !HAVE_FDATASYNC	979	#if !HAVE_FDATASYNC
953	# undef fdatasync	980	# undef fdatasync
954	# define fdatasync(fd) fsync (fd)	981	# define fdatasync(fd) fsync (fd)
955	#endif	982	#endif
956		983
		984	static int
		985	eio__syncfs (int fd)
		986	{
		987	int res;
		988
		989	#if HAVE_SYS_SYNCFS
		990	res = (int)syscall (__NR_syncfs, (int)(fd));
		991	#else
		992	res = -1;
		993	errno = ENOSYS;
		994	#endif
		995
		996	if (res < 0 && errno == ENOSYS && fd >= 0)
		997	sync ();
		998
		999	return res;
		1000	}
		1001
957	/* sync_file_range always needs emulation */	1002	/* sync_file_range always needs emulation */
958	static int	1003	static int
959	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1004	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
960	{	1005	{
961	#if HAVE_SYNC_FILE_RANGE	1006	#if HAVE_SYNC_FILE_RANGE
…		…
1010	pread (fd, eio_buf, len, offset);	1055	pread (fd, eio_buf, len, offset);
1011	offset += len;	1056	offset += len;
1012	todo -= len;	1057	todo -= len;
1013	}	1058	}
1014		1059
		1060	FUBd;
		1061
1015	errno = 0;	1062	errno = 0;
1016	return count;	1063	return count;
1017	}	1064	}
1018		1065
1019	#endif	1066	#endif
1020		1067
1021	/* sendfile always needs emulation */	1068	/* sendfile always needs emulation */
1022	static eio_ssize_t	1069	static eio_ssize_t
1023	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1070	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024	{	1071	{
1025	eio_ssize_t written = 0;	1072	eio_ssize_t written = 0;
1026	eio_ssize_t res;	1073	eio_ssize_t res;
1027		1074
1028	if (!count)	1075	if (!count)
…		…
1126	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK	1173	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK
1127	/* BSDs */	1174	/* BSDs */
1128	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */	1175	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129	\|\| errno == ENOTSUP	1176	\|\| errno == ENOTSUP
1130	#endif	1177	#endif
		1178	#ifdef EOPNOTSUPP /* windows */
1131	\|\| errno == EOPNOTSUPP /* BSDs */	1179	\|\| errno == EOPNOTSUPP /* BSDs */
		1180	#endif
1132	#if __solaris	1181	#if __solaris
1133	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE	1182	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE
1134	#endif	1183	#endif
1135	)	1184	)
1136	)	1185	)
…		…
1162		1211
1163	offset += cnt;	1212	offset += cnt;
1164	res += cnt;	1213	res += cnt;
1165	count -= cnt;	1214	count -= cnt;
1166	}	1215	}
		1216
		1217	FUBd;
1167	}	1218	}
1168		1219
1169	return res;	1220	return res;
1170	}	1221	}
1171		1222
…		…
1461		1512
1462	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */	1513	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1463	#define EIO_SORT_FAST 60 /* when to only use insertion sort */	1514	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464		1515
1465	static void	1516	static void
1466	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1517	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467	{	1518	{
1468	unsigned char bits [9 + sizeof (ino_t) * 8];	1519	unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469	unsigned char *bit = bits;	1520	unsigned char *bit = bits;
1470		1521
1471	assert (CHAR_BIT == 8);	1522	assert (CHAR_BIT == 8);
1472	assert (sizeof (eio_dirent) * 8 < 256);	1523	assert (sizeof (eio_dirent) * 8 < 256);
1473	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */	1524	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
…		…
1475		1526
1476	if (size <= EIO_SORT_FAST)	1527	if (size <= EIO_SORT_FAST)
1477	return;	1528	return;
1478		1529
1479	/* first prepare an array of bits to test in our radix sort */	1530	/* first prepare an array of bits to test in our radix sort */
1480	/* try to take endianness into account, as well as differences in ino_t sizes */	1531	/* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481	/* inode_bits must contain all inodes ORed together */	1532	/* inode_bits must contain all inodes ORed together */
1482	/* which is used to skip bits that are 0 everywhere, which is very common */	1533	/* which is used to skip bits that are 0 everywhere, which is very common */
1483	{	1534	{
1484	ino_t endianness;	1535	eio_ino_t endianness;
1485	int i, j;	1536	int i, j;
1486		1537
1487	/* we store the byte offset of byte n into byte n of "endianness" */	1538	/* we store the byte offset of byte n into byte n of "endianness" */
1488	for (i = 0; i < sizeof (ino_t); ++i)	1539	for (i = 0; i < sizeof (eio_ino_t); ++i)
1489	((unsigned char *)&endianness)[i] = i;	1540	((unsigned char *)&endianness)[i] = i;
1490		1541
1491	*bit++ = 0;	1542	*bit++ = 0;
1492		1543
1493	for (i = 0; i < sizeof (ino_t); ++i)	1544	for (i = 0; i < sizeof (eio_ino_t); ++i)
1494	{	1545	{
1495	/* shifting off the byte offsets out of "endianness" */	1546	/* shifting off the byte offsets out of "endianness" */
1496	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;	1547	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497	endianness >>= 8;	1548	endianness >>= 8;
1498		1549
1499	for (j = 0; j < 8; ++j)	1550	for (j = 0; j < 8; ++j)
1500	if (inode_bits & (((ino_t)1) << (i * 8 + j)))	1551	if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501	*bit++ = offs + j;	1552	*bit++ = offs + j;
1502	}	1553	}
1503		1554
1504	for (j = 0; j < 8; ++j)	1555	for (j = 0; j < 8; ++j)
1505	if (score_bits & (1 << j))	1556	if (score_bits & (1 << j))
1506	bit++ = offsetof (eio_dirent, score) 8 + j;	1557	bit++ = offsetof (eio_dirent, score) 8 + j;
1507	}	1558	}
1508		1559
1509	/* now actually do the sorting (a variant of MSD radix sort) */	1560	/* now actually do the sorting (a variant of MSD radix sort) */
1510	{	1561	{
1511	eio_dirent base_stk [9 + sizeof (ino_t) 8], *base;	1562	eio_dirent base_stk [9 + sizeof (eio_ino_t) 8], *base;
1512	eio_dirent end_stk [9 + sizeof (ino_t) 8], *end;	1563	eio_dirent end_stk [9 + sizeof (eio_ino_t) 8], *end;
1513	unsigned char bit_stk [9 + sizeof (ino_t) 8];	1564	unsigned char bit_stk [9 + sizeof (eio_ino_t) 8];
1514	int stk_idx = 0;	1565	int stk_idx = 0;
1515		1566
1516	base_stk [stk_idx] = dents;	1567	base_stk [stk_idx] = dents;
1517	end_stk [stk_idx] = dents + size;	1568	end_stk [stk_idx] = dents + size;
1518	bit_stk [stk_idx] = bit - 1;	1569	bit_stk [stk_idx] = bit - 1;
…		…
1597	}	1648	}
1598	}	1649	}
1599	}	1650	}
1600		1651
1601	static void	1652	static void
1602	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1653	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603	{	1654	{
1604	if (size <= 1)	1655	if (size <= 1)
1605	return; /* our insertion sort relies on size > 0 */	1656	return; /* our insertion sort relies on size > 0 */
1606		1657
1607	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */	1658	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
…		…
1615		1666
1616	/* read a full directory */	1667	/* read a full directory */
1617	static void	1668	static void
1618	eio__scandir (eio_req req, etp_worker self)	1669	eio__scandir (eio_req req, etp_worker self)
1619	{	1670	{
1620	DIR *dirp;
1621	EIO_STRUCT_DIRENT *entp;
1622	char name, names;	1671	char name, names;
1623	int namesalloc = 4096;	1672	int namesalloc = 4096 - sizeof (void ) 4;
1624	int namesoffs = 0;	1673	int namesoffs = 0;
1625	int flags = req->int1;	1674	int flags = req->int1;
1626	eio_dirent *dents = 0;	1675	eio_dirent *dents = 0;
1627	int dentalloc = 128;	1676	int dentalloc = 128;
1628	int dentoffs = 0;	1677	int dentoffs = 0;
1629	ino_t inode_bits = 0;	1678	eio_ino_t inode_bits = 0;
		1679	#ifdef _WIN32
		1680	HANDLE dirp;
		1681	WIN32_FIND_DATA entp;
		1682	#else
		1683	DIR *dirp;
		1684	EIO_STRUCT_DIRENT *entp;
		1685	#endif
1630		1686
1631	req->result = -1;	1687	req->result = -1;
1632		1688
1633	if (!(flags & EIO_READDIR_DENTS))	1689	if (!(flags & EIO_READDIR_DENTS))
1634	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);	1690	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
1635		1691
1636	X_LOCK (wrklock);	1692	#ifdef _WIN32
1637	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1693	{
		1694	int len = strlen ((const char *)req->ptr1);
		1695	char *path = malloc (MAX_PATH);
		1696	const char *fmt;
		1697
		1698	if (!len)
		1699	fmt = "./*";
		1700	else if (((const char )req->ptr1)[len - 1] == '/' \|\| ((const char )req->ptr1)[len - 1] == '\\')
		1701	fmt = "%s*";
		1702	else
		1703	fmt = "%s/*";
		1704
		1705	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
		1706	dirp = FindFirstFile (path, &entp);
		1707	free (path);
		1708
		1709	if (dirp == INVALID_HANDLE_VALUE)
		1710	{
		1711	/* should steal _dosmaperr */
		1712	switch (GetLastError ())
		1713	{
		1714	case ERROR_FILE_NOT_FOUND:
		1715	req->result = 0;
		1716	break;
		1717
		1718	case ERROR_INVALID_NAME:
		1719	case ERROR_PATH_NOT_FOUND:
		1720	case ERROR_NO_MORE_FILES:
		1721	errno = ENOENT;
		1722	break;
		1723
		1724	case ERROR_NOT_ENOUGH_MEMORY:
		1725	errno = ENOMEM;
		1726	break;
		1727
		1728	default:
		1729	errno = EINVAL;
		1730	break;
		1731	}
		1732
		1733	return;
		1734	}
		1735	}
		1736	#else
1638	self->dirp = dirp = opendir (req->ptr1);	1737	dirp = opendir (req->ptr1);
		1738
		1739	if (!dirp)
		1740	return;
		1741	#endif
1639		1742
1640	if (req->flags & EIO_FLAG_PTR1_FREE)	1743	if (req->flags & EIO_FLAG_PTR1_FREE)
1641	free (req->ptr1);	1744	free (req->ptr1);
1642		1745
1643	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1746	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1644	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1747	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645	req->ptr2 = names = malloc (namesalloc);	1748	req->ptr2 = names = malloc (namesalloc);
1646	X_UNLOCK (wrklock);
1647		1749
1648	if (dirp && names && (!flags \|\| dents))	1750	if (!names \|\| (flags && !dents))
		1751	return;
		1752
1649	for (;;)	1753	for (;;)
1650	{	1754	{
		1755	int done;
		1756
		1757	#ifdef _WIN32
		1758	done = !dirp;
		1759	#else
1651	errno = 0;	1760	errno = 0;
1652	entp = readdir (dirp);	1761	entp = readdir (dirp);
		1762	done = !entp;
		1763	#endif
1653		1764
1654	if (!entp)	1765	if (done)
1655	{	1766	{
		1767	#ifndef _WIN32
		1768	int old_errno = errno;
		1769	closedir (dirp);
		1770	errno = old_errno;
		1771
1656	if (errno)	1772	if (errno)
1657	break;	1773	break;
		1774	#endif
1658		1775
1659	/* sort etc. */	1776	/* sort etc. */
1660	req->int1 = flags;	1777	req->int1 = flags;
1661	req->result = dentoffs;	1778	req->result = dentoffs;
1662		1779
1663	if (flags & EIO_READDIR_STAT_ORDER)	1780	if (flags & EIO_READDIR_STAT_ORDER)
1664	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1781	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1665	else if (flags & EIO_READDIR_DIRS_FIRST)	1782	else if (flags & EIO_READDIR_DIRS_FIRST)
1666	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1783	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1667	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1784	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1668	else	1785	else
		1786	{
		1787	/* in this case, all is known, and we just put dirs first and sort them */
		1788	eio_dirent *oth = dents + dentoffs;
		1789	eio_dirent *dir = dents;
		1790
		1791	/* now partition dirs to the front, and non-dirs to the back */
		1792	/* by walking from both sides and swapping if necessary */
		1793	while (oth > dir)
		1794	{
		1795	if (dir->type == EIO_DT_DIR)
		1796	++dir;
		1797	else if ((--oth)->type == EIO_DT_DIR)
		1798	{
		1799	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1800
		1801	++dir;
		1802	}
		1803	}
		1804
		1805	/* now sort the dirs only (dirs all have the same score) */
		1806	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1807	}
		1808
		1809	break;
		1810	}
		1811
		1812	/* now add the entry to our list(s) */
		1813	name = D_NAME (entp);
		1814
		1815	/* skip . and .. entries */
		1816	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
		1817	{
		1818	int len = D_NAMLEN (entp) + 1;
		1819
		1820	while (ecb_expect_false (namesoffs + len > namesalloc))
		1821	{
		1822	namesalloc *= 2;
		1823	req->ptr2 = names = realloc (names, namesalloc);
		1824
		1825	if (!names)
		1826	break;
		1827	}
		1828
		1829	memcpy (names + namesoffs, name, len);
		1830
		1831	if (dents)
		1832	{
		1833	struct eio_dirent *ent;
		1834
		1835	if (ecb_expect_false (dentoffs == dentalloc))
1669	{	1836	{
1670	/* in this case, all is known, and we just put dirs first and sort them */	1837	dentalloc *= 2;
		1838	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1839
		1840	if (!dents)
		1841	break;
		1842	}
		1843
1671	eio_dirent *oth = dents + dentoffs;	1844	ent = dents + dentoffs;
1672	eio_dirent *dir = dents;
1673		1845
1674	/* now partition dirs to the front, and non-dirs to the back */	1846	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1675	/* by walking from both sides and swapping if necessary */	1847	ent->namelen = len - 1;
1676	while (oth > dir)	1848	ent->inode = D_INO (entp);
		1849
		1850	inode_bits \|= ent->inode;
		1851
		1852	switch (D_TYPE (entp))
		1853	{
		1854	default:
		1855	ent->type = EIO_DT_UNKNOWN;
		1856	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1857	break;
		1858
		1859	#ifdef DT_FIFO
		1860	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1861	#endif
		1862	#ifdef DT_CHR
		1863	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1864	#endif
		1865	#ifdef DT_MPC
		1866	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1867	#endif
		1868	#ifdef DT_DIR
		1869	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1870	#endif
		1871	#ifdef DT_NAM
		1872	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1873	#endif
		1874	#ifdef DT_BLK
		1875	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1876	#endif
		1877	#ifdef DT_MPB
		1878	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1879	#endif
		1880	#ifdef DT_REG
		1881	case DT_REG: ent->type = EIO_DT_REG; break;
		1882	#endif
		1883	#ifdef DT_NWK
		1884	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1885	#endif
		1886	#ifdef DT_CMP
		1887	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1888	#endif
		1889	#ifdef DT_LNK
		1890	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1891	#endif
		1892	#ifdef DT_SOCK
		1893	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1894	#endif
		1895	#ifdef DT_DOOR
		1896	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1897	#endif
		1898	#ifdef DT_WHT
		1899	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1900	#endif
		1901	}
		1902
		1903	ent->score = 7;
		1904
		1905	if (flags & EIO_READDIR_DIRS_FIRST)
		1906	{
		1907	if (ent->type == EIO_DT_UNKNOWN)
1677	{	1908	{
1678	if (dir->type == EIO_DT_DIR)	1909	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1679	++dir;	1910	ent->score = 1;
1680	else if ((--oth)->type == EIO_DT_DIR)	1911	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1681	{	1912	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1682	eio_dirent tmp = dir; dir = oth; oth = tmp;
1683
1684	++dir;
1685	}
1686	}	1913	}
1687		1914	else if (ent->type == EIO_DT_DIR)
1688	/* now sort the dirs only (dirs all have the same score) */	1915	ent->score = 0;
1689	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1690	}	1916	}
1691
1692	break;
1693	}
1694
1695	/* now add the entry to our list(s) */
1696	name = entp->d_name;
1697
1698	/* skip . and .. entries */
1699	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
1700	{
1701	int len = D_NAMLEN (entp) + 1;
1702
1703	while (ecb_expect_false (namesoffs + len > namesalloc))
1704	{
1705	namesalloc *= 2;
1706	X_LOCK (wrklock);
1707	req->ptr2 = names = realloc (names, namesalloc);
1708	X_UNLOCK (wrklock);
1709
1710	if (!names)
1711	break;
1712	}	1917	}
1713		1918
1714	memcpy (names + namesoffs, name, len);
1715
1716	if (dents)
1717	{
1718	struct eio_dirent *ent;
1719
1720	if (ecb_expect_false (dentoffs == dentalloc))
1721	{
1722	dentalloc *= 2;
1723	X_LOCK (wrklock);
1724	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725	X_UNLOCK (wrklock);
1726
1727	if (!dents)
1728	break;
1729	}
1730
1731	ent = dents + dentoffs;
1732
1733	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1734	ent->namelen = len - 1;
1735	ent->inode = D_INO (entp);
1736
1737	inode_bits \|= ent->inode;
1738
1739	switch (D_TYPE (entp))
1740	{
1741	default:
1742	ent->type = EIO_DT_UNKNOWN;
1743	flags \|= EIO_READDIR_FOUND_UNKNOWN;
1744	break;
1745
1746	#ifdef DT_FIFO
1747	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1748	#endif
1749	#ifdef DT_CHR
1750	case DT_CHR: ent->type = EIO_DT_CHR; break;
1751	#endif
1752	#ifdef DT_MPC
1753	case DT_MPC: ent->type = EIO_DT_MPC; break;
1754	#endif
1755	#ifdef DT_DIR
1756	case DT_DIR: ent->type = EIO_DT_DIR; break;
1757	#endif
1758	#ifdef DT_NAM
1759	case DT_NAM: ent->type = EIO_DT_NAM; break;
1760	#endif
1761	#ifdef DT_BLK
1762	case DT_BLK: ent->type = EIO_DT_BLK; break;
1763	#endif
1764	#ifdef DT_MPB
1765	case DT_MPB: ent->type = EIO_DT_MPB; break;
1766	#endif
1767	#ifdef DT_REG
1768	case DT_REG: ent->type = EIO_DT_REG; break;
1769	#endif
1770	#ifdef DT_NWK
1771	case DT_NWK: ent->type = EIO_DT_NWK; break;
1772	#endif
1773	#ifdef DT_CMP
1774	case DT_CMP: ent->type = EIO_DT_CMP; break;
1775	#endif
1776	#ifdef DT_LNK
1777	case DT_LNK: ent->type = EIO_DT_LNK; break;
1778	#endif
1779	#ifdef DT_SOCK
1780	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1781	#endif
1782	#ifdef DT_DOOR
1783	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1784	#endif
1785	#ifdef DT_WHT
1786	case DT_WHT: ent->type = EIO_DT_WHT; break;
1787	#endif
1788	}
1789
1790	ent->score = 7;
1791
1792	if (flags & EIO_READDIR_DIRS_FIRST)
1793	{
1794	if (ent->type == EIO_DT_UNKNOWN)
1795	{
1796	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1797	ent->score = 1;
1798	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1799	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1800	}
1801	else if (ent->type == EIO_DT_DIR)
1802	ent->score = 0;
1803	}
1804	}
1805
1806	namesoffs += len;	1919	namesoffs += len;
1807	++dentoffs;	1920	++dentoffs;
1808	}	1921	}
1809		1922
1810	if (EIO_CANCELLED (req))	1923	if (EIO_CANCELLED (req))
1811	{	1924	{
1812	errno = ECANCELED;	1925	errno = ECANCELED;
1813	break;	1926	break;
1814	}	1927	}
		1928
		1929	#ifdef _WIN32
		1930	if (!FindNextFile (dirp, &entp))
		1931	{
		1932	FindClose (dirp);
		1933	dirp = 0;
1815	}	1934	}
		1935	#endif
		1936	}
1816	}	1937	}
1817		1938
1818	/*****************************************************************************/	1939	/*****************************************************************************/
1819		1940
1820	#define ALLOC(len) \	1941	#define ALLOC(len) \
…		…
1835	X_THREAD_PROC (etp_proc)	1956	X_THREAD_PROC (etp_proc)
1836	{	1957	{
1837	ETP_REQ *req;	1958	ETP_REQ *req;
1838	struct timespec ts;	1959	struct timespec ts;
1839	etp_worker self = (etp_worker )thr_arg;	1960	etp_worker self = (etp_worker )thr_arg;
1840	int timeout;	1961
		1962	#if HAVE_PRCTL_SET_NAME
		1963	prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
		1964	#endif
1841		1965
1842	/* try to distribute timeouts somewhat evenly */	1966	/* try to distribute timeouts somewhat evenly */
1843	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	1967	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844		1968
1845	for (;;)	1969	for (;;)
…		…
1915	/*****************************************************************************/	2039	/*****************************************************************************/
1916		2040
1917	int ecb_cold	2041	int ecb_cold
1918	eio_init (void (want_poll)(void), void (done_poll)(void))	2042	eio_init (void (want_poll)(void), void (done_poll)(void))
1919	{	2043	{
		2044	#if !HAVE_PREADWRITE
		2045	X_MUTEX_CREATE (preadwritelock);
		2046	#endif
		2047
1920	return etp_init (want_poll, done_poll);	2048	return etp_init (want_poll, done_poll);
1921	}	2049	}
1922		2050
1923	ecb_inline void	2051	ecb_inline void
1924	eio_api_destroy (eio_req *req)	2052	eio_api_destroy (eio_req *req)
…		…
1969	case EIO_WRITE: req->result = req->offs >= 0	2097	case EIO_WRITE: req->result = req->offs >= 0
1970	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2098	? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971	: write (req->int1, req->ptr2, req->size); break;	2099	: write (req->int1, req->ptr2, req->size); break;
1972		2100
1973	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2101	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1974	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;	2102	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1975		2103
1976	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2104	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2105	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1978	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2106	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2107	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
…		…
2009	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;	2137	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2010		2138
2011	case EIO_SYNC: req->result = 0; sync (); break;	2139	case EIO_SYNC: req->result = 0; sync (); break;
2012	case EIO_FSYNC: req->result = fsync (req->int1); break;	2140	case EIO_FSYNC: req->result = fsync (req->int1); break;
2013	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2141	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2142	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2143	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2014	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	2144	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2015	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2145	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2016	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2146	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2017	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2147	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2018	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2019	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	2148	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2020		2149
2021	case EIO_READDIR: eio__scandir (req, self); break;	2150	case EIO_READDIR: eio__scandir (req, self); break;
2022		2151
2023	case EIO_BUSY:	2152	case EIO_BUSY:
…		…
2104	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2233	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2105	{	2234	{
2106	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2235	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2107	}	2236	}
2108		2237
		2238	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
		2239	{
		2240	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2241	}
		2242
		2243	eio_req eio_syncfs (int fd, int pri, eio_cb cb, void data)
		2244	{
		2245	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2246	}
		2247
		2248	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		2249	{
		2250	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2251	}
		2252
2109	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2253	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2110	{	2254	{
2111	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2255	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2112	}	2256	}
2113		2257
…		…
2119	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)	2263	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
2120	{	2264	{
2121	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2265	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2122	}	2266	}
2123		2267
2124	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
2125	{
2126	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2127	}
2128
2129	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)	2268	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)
2130	{	2269	{
2131	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2270	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2132	}
2133
2134	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
2135	{
2136	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2137	}	2271	}
2138		2272
2139	eio_req eio_close (int fd, int pri, eio_cb cb, void data)	2273	eio_req eio_close (int fd, int pri, eio_cb cb, void data)
2140	{	2274	{
2141	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2275	REQ (EIO_CLOSE); req->int1 = fd; SEND;
…		…
2369	/* misc garbage */	2503	/* misc garbage */
2370		2504
2371	eio_ssize_t	2505	eio_ssize_t
2372	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2506	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373	{	2507	{
2374	etp_worker wrk;
2375	eio_ssize_t ret;
2376
2377	wrk.dbuf = 0;
2378
2379	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2508	return eio__sendfile (ofd, ifd, offset, count);
2380
2381	if (wrk.dbuf)
2382	free (wrk.dbuf);
2383
2384	return ret;
2385	}	2509	}
2386		2510

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC vs. Revision 1.103 by root, Thu Sep 15 13:20:54 2011 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC vs.
Revision 1.103 by root, Thu Sep 15 13:20:54 2011 UTC