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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.34 by root, Sat Jun 6 19:57:22 2009 UTC vs.
Revision 1.64 by root, Thu May 26 04:05:18 2011 UTC

…		…
1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libeio@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010,2011 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	*
49	#include <stdlib.h>	49	#include <stdlib.h>
50	#include <string.h>	50	#include <string.h>
51	#include <errno.h>	51	#include <errno.h>
52	#include <sys/types.h>	52	#include <sys/types.h>
53	#include <sys/stat.h>	53	#include <sys/stat.h>
		54	#include <sys/statvfs.h>
54	#include <limits.h>	55	#include <limits.h>
55	#include <fcntl.h>	56	#include <fcntl.h>
56	#include <assert.h>	57	#include <assert.h>
57		58
58	#ifndef EIO_FINISH	59	#ifndef EIO_FINISH
…		…
78	# include <unistd.h>	79	# include <unistd.h>
79	# include <utime.h>	80	# include <utime.h>
80	# include <signal.h>	81	# include <signal.h>
81	# include <dirent.h>	82	# include <dirent.h>
82		83
		84	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
		85	# include <sys/mman.h>
		86	#endif
		87
83	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	88	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
84	# if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)	89	# if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__
85	# define _DIRENT_HAVE_D_TYPE /* sigh */	90	# define _DIRENT_HAVE_D_TYPE /* sigh */
86	# define D_INO(de) (de)->d_fileno	91	# define D_INO(de) (de)->d_fileno
87	# define D_NAMLEN(de) (de)->d_namlen	92	# define D_NAMLEN(de) (de)->d_namlen
88	# elif defined(__linux) \|\| defined(d_ino) \|\| _XOPEN_SOURCE >= 600	93	# elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600
89	# define D_INO(de) (de)->d_ino	94	# define D_INO(de) (de)->d_ino
90	# endif	95	# endif
91		96
92	#ifdef _D_EXACT_NAMLEN	97	#ifdef _D_EXACT_NAMLEN
93	# undef D_NAMLEN	98	# undef D_NAMLEN
…		…
105	#endif	110	#endif
106		111
107	#if HAVE_SENDFILE	112	#if HAVE_SENDFILE
108	# if __linux	113	# if __linux
109	# include <sys/sendfile.h>	114	# include <sys/sendfile.h>
110	# elif __freebsd	115	# elif __FreeBSD__ \|\| defined __APPLE__
111	# include <sys/socket.h>	116	# include <sys/socket.h>
112	# include <sys/uio.h>	117	# include <sys/uio.h>
113	# elif __hpux	118	# elif __hpux
114	# include <sys/socket.h>	119	# include <sys/socket.h>
115	# elif __solaris /* not yet */	120	# elif __solaris
116	# include <sys/sendfile.h>	121	# include <sys/sendfile.h>
117	# else	122	# else
118	# error sendfile support requested but not available	123	# error sendfile support requested but not available
119	# endif	124	# endif
120	#endif	125	#endif
…		…
127	#endif	132	#endif
128	#ifndef D_NAMLEN	133	#ifndef D_NAMLEN
129	# define D_NAMLEN(de) strlen ((de)->d_name)	134	# define D_NAMLEN(de) strlen ((de)->d_name)
130	#endif	135	#endif
131		136
132	/* number of seconds after which an idle threads exit */
133	#define IDLE_TIMEOUT 10
134
135	/* used for struct dirent, AIX doesn't provide it */	137	/* used for struct dirent, AIX doesn't provide it */
136	#ifndef NAME_MAX	138	#ifndef NAME_MAX
137	# define NAME_MAX 4096	139	# define NAME_MAX 4096
		140	#endif
		141
		142	/* used for readlink etc. */
		143	#ifndef PATH_MAX
		144	# define PATH_MAX 4096
138	#endif	145	#endif
139		146
140	/* buffer size for various temporary buffers */	147	/* buffer size for various temporary buffers */
141	#define EIO_BUFSIZE 65536	148	#define EIO_BUFSIZE 65536
142		149
…		…
195		202
196	/*****************************************************************************/	203	/*****************************************************************************/
197		204
198	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	205	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
199		206
200	/* calculcate time difference in ~1/EIO_TICKS of a second */	207	/* calculate time difference in ~1/EIO_TICKS of a second */
201	static int tvdiff (struct timeval tv1, struct timeval tv2)	208	static int tvdiff (struct timeval tv1, struct timeval tv2)
202	{	209	{
203	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	210	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
204	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	211	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
205	}	212	}
…		…
213	static unsigned int max_poll_reqs; /* reslock */	220	static unsigned int max_poll_reqs; /* reslock */
214		221
215	static volatile unsigned int nreqs; /* reqlock */	222	static volatile unsigned int nreqs; /* reqlock */
216	static volatile unsigned int nready; /* reqlock */	223	static volatile unsigned int nready; /* reqlock */
217	static volatile unsigned int npending; /* reqlock */	224	static volatile unsigned int npending; /* reqlock */
218	static volatile unsigned int max_idle = 4;	225	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
		226	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
219		227
220	static mutex_t wrklock = X_MUTEX_INIT;	228	static xmutex_t wrklock;
221	static mutex_t reslock = X_MUTEX_INIT;	229	static xmutex_t reslock;
222	static mutex_t reqlock = X_MUTEX_INIT;	230	static xmutex_t reqlock;
223	static cond_t reqwait = X_COND_INIT;	231	static xcond_t reqwait;
224		232
225	#if !HAVE_PREADWRITE	233	#if !HAVE_PREADWRITE
226	/*	234	/*
227	* make our pread/pwrite emulation safe against themselves, but not against	235	* make our pread/pwrite emulation safe against themselves, but not against
228	* normal read/write by using a mutex. slows down execution a lot,	236	* normal read/write by using a mutex. slows down execution a lot,
229	* but that's your problem, not mine.	237	* but that's your problem, not mine.
230	*/	238	*/
231	static mutex_t preadwritelock = X_MUTEX_INIT;	239	static xmutex_t preadwritelock = X_MUTEX_INIT;
232	#endif	240	#endif
233		241
234	typedef struct etp_worker	242	typedef struct etp_worker
235	{	243	{
236	/* locked by wrklock */	244	/* locked by wrklock */
237	struct etp_worker prev, next;	245	struct etp_worker prev, next;
238		246
239	thread_t tid;	247	xthread_t tid;
240		248
241	/* locked by reslock, reqlock or wrklock */	249	/* locked by reslock, reqlock or wrklock */
242	ETP_REQ req; / currently processed request */	250	ETP_REQ req; / currently processed request */
243		251
244	ETP_WORKER_COMMON	252	ETP_WORKER_COMMON
…		…
358	}	366	}
359		367
360	abort ();	368	abort ();
361	}	369	}
362		370
		371	static void etp_thread_init (void)
		372	{
		373	X_MUTEX_CREATE (wrklock);
		374	X_MUTEX_CREATE (reslock);
		375	X_MUTEX_CREATE (reqlock);
		376	X_COND_CREATE (reqwait);
		377	}
		378
363	static void etp_atfork_prepare (void)	379	static void etp_atfork_prepare (void)
364	{	380	{
365	X_LOCK (wrklock);	381	X_LOCK (wrklock);
366	X_LOCK (reqlock);	382	X_LOCK (reqlock);
367	X_LOCK (reslock);	383	X_LOCK (reslock);
…		…
405	idle = 0;	421	idle = 0;
406	nreqs = 0;	422	nreqs = 0;
407	nready = 0;	423	nready = 0;
408	npending = 0;	424	npending = 0;
409		425
410	etp_atfork_parent ();	426	etp_thread_init ();
411	}	427	}
412		428
413	static void	429	static void
414	etp_once_init (void)	430	etp_once_init (void)
415	{	431	{
		432	etp_thread_init ();
416	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);	433	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
417	}	434	}
418		435
419	static int	436	static int
420	etp_init (void (want_poll)(void), void (done_poll)(void))	437	etp_init (void (want_poll)(void), void (done_poll)(void))
…		…
597	}	614	}
598		615
599	static void etp_set_max_poll_time (double nseconds)	616	static void etp_set_max_poll_time (double nseconds)
600	{	617	{
601	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	618	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
602	max_poll_time = nseconds;	619	max_poll_time = nseconds * EIO_TICKS;
603	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);	620	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
604	}	621	}
605		622
606	static void etp_set_max_poll_reqs (unsigned int maxreqs)	623	static void etp_set_max_poll_reqs (unsigned int maxreqs)
607	{	624	{
…		…
611	}	628	}
612		629
613	static void etp_set_max_idle (unsigned int nthreads)	630	static void etp_set_max_idle (unsigned int nthreads)
614	{	631	{
615	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	632	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
616	max_idle = nthreads <= 0 ? 1 : nthreads;	633	max_idle = nthreads;
		634	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
		635	}
		636
		637	static void etp_set_idle_timeout (unsigned int seconds)
		638	{
		639	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
		640	idle_timeout = seconds;
617	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	641	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
618	}	642	}
619		643
620	static void etp_set_min_parallel (unsigned int nthreads)	644	static void etp_set_min_parallel (unsigned int nthreads)
621	{	645	{
…		…
749	void eio_set_max_idle (unsigned int nthreads)	773	void eio_set_max_idle (unsigned int nthreads)
750	{	774	{
751	etp_set_max_idle (nthreads);	775	etp_set_max_idle (nthreads);
752	}	776	}
753		777
		778	void eio_set_idle_timeout (unsigned int seconds)
		779	{
		780	etp_set_idle_timeout (seconds);
		781	}
		782
754	void eio_set_min_parallel (unsigned int nthreads)	783	void eio_set_min_parallel (unsigned int nthreads)
755	{	784	{
756	etp_set_min_parallel (nthreads);	785	etp_set_min_parallel (nthreads);
757	}	786	}
758		787
…		…
806		835
807	return res;	836	return res;
808	}	837	}
809	#endif	838	#endif
810		839
811	#ifndef HAVE_FUTIMES	840	#ifndef HAVE_UTIMES
812		841
813	# undef utimes	842	# undef utimes
814	# undef futimes
815	# define utimes(path,times) eio__utimes (path, times)	843	# define utimes(path,times) eio__utimes (path, times)
816	# define futimes(fd,times) eio__futimes (fd, times)
817		844
818	static int	845	static int
819	eio__utimes (const char *filename, const struct timeval times[2])	846	eio__utimes (const char *filename, const struct timeval times[2])
820	{	847	{
821	if (times)	848	if (times)
…		…
828	return utime (filename, &buf);	855	return utime (filename, &buf);
829	}	856	}
830	else	857	else
831	return utime (filename, 0);	858	return utime (filename, 0);
832	}	859	}
		860
		861	#endif
		862
		863	#ifndef HAVE_FUTIMES
		864
		865	# undef futimes
		866	# define futimes(fd,times) eio__futimes (fd, times)
833		867
834	static int eio__futimes (int fd, const struct timeval tv[2])	868	static int eio__futimes (int fd, const struct timeval tv[2])
835	{	869	{
836	errno = ENOSYS;	870	errno = ENOSYS;
837	return -1;	871	return -1;
…		…
866	if (!res \|\| errno != ENOSYS)	900	if (!res \|\| errno != ENOSYS)
867	return res;	901	return res;
868	#endif	902	#endif
869		903
870	/* even though we could play tricks with the flags, it's better to always	904	/* even though we could play tricks with the flags, it's better to always
871	* call fdatasync, as thta matches the expectation of it's users best */	905	* call fdatasync, as that matches the expectation of its users best */
872	return fdatasync (fd);	906	return fdatasync (fd);
873	}	907	}
874		908
875	#if !HAVE_READAHEAD	909	#if !HAVE_READAHEAD
876	# undef readahead	910	# undef readahead
…		…
908		942
909	#if HAVE_SENDFILE	943	#if HAVE_SENDFILE
910	# if __linux	944	# if __linux
911	res = sendfile (ofd, ifd, &offset, count);	945	res = sendfile (ofd, ifd, &offset, count);
912		946
913	# elif __freebsd	947	# elif __FreeBSD__
914	/*	948	/*
915	* Of course, the freebsd sendfile is a dire hack with no thoughts	949	* Of course, the freebsd sendfile is a dire hack with no thoughts
916	* wasted on making it similar to other I/O functions.	950	* wasted on making it similar to other I/O functions.
917	*/	951	*/
918	{	952	{
919	off_t sbytes;	953	off_t sbytes;
920	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);	954	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
921		955
922	if (res < 0 && sbytes)	956	#if 0 /* according to the manpage, this is correct, but broken behaviour */
923	/* maybe only on EAGAIN: as usual, the manpage leaves you guessing */	957	/* freebsd' sendfile will return 0 on success */
		958	/* freebsd 8 documents it as only setting sbytes on EINTR and EAGAIN, but /
		959	/* not on e.g. EIO or EPIPE - sounds broken */
		960	if ((res < 0 && (errno == EAGAIN \|\| errno == EINTR) && sbytes) \|\| res == 0)
		961	res = sbytes;
		962	#endif
		963
		964	/* according to source inspection, this is correct, and useful behaviour */
		965	if (sbytes)
		966	res = sbytes;
		967	}
		968
		969	# elif defined (__APPLE__)
		970
		971	{
		972	off_t sbytes = count;
		973	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
		974
		975	/* according to the manpage, sbytes is always valid */
		976	if (sbytes)
924	res = sbytes;	977	res = sbytes;
925	}	978	}
926		979
927	# elif __hpux	980	# elif __hpux
928	res = sendfile (ofd, ifd, offset, count, 0, 0);	981	res = sendfile (ofd, ifd, offset, count, 0, 0);
…		…
942	if (res < 0 && sbytes)	995	if (res < 0 && sbytes)
943	res = sbytes;	996	res = sbytes;
944	}	997	}
945		998
946	# endif	999	# endif
		1000
		1001	#elif defined (_WIN32)
		1002
		1003	/* does not work, just for documentation of what would need to be done */
		1004	{
		1005	HANDLE h = TO_SOCKET (ifd);
		1006	SetFilePointer (h, offset, 0, FILE_BEGIN);
		1007	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
		1008	}
		1009
947	#else	1010	#else
948	res = -1;	1011	res = -1;
949	errno = ENOSYS;	1012	errno = ENOSYS;
950	#endif	1013	#endif
951		1014
952	if (res < 0	1015	if (res < 0
953	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK	1016	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK
		1017	/* BSDs */
		1018	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
		1019	\|\| errno == ENOTSUP
		1020	#endif
		1021	\|\| errno == EOPNOTSUPP /* BSDs */
954	#if __solaris	1022	#if __solaris
955	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE	1023	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE
956	#endif	1024	#endif
957	)	1025	)
958	)	1026	)
…		…
989	}	1057	}
990		1058
991	return res;	1059	return res;
992	}	1060	}
993		1061
994	static int	1062	static signed char
995	eio_dent_cmp (const void a_, const void b_)	1063	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
996	{	1064	{
997	const eio_dirent a = (const eio_dirent )a_;	1065	return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
998	const eio_dirent b = (const eio_dirent )b_;	1066	: a->inode < b->inode ? -1
		1067	: a->inode > b->inode ? 1
		1068	: 0;
		1069	}
999		1070
1000	return (int)b->score - (int)a->score ? (int)b->score - (int)a->score	1071	#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1001	: a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; /* int might be < ino_t */	1072
		1073	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
		1074	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
		1075
		1076	static void
		1077	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
		1078	{
		1079	unsigned char bits [9 + sizeof (ino_t) * 8];
		1080	unsigned char *bit = bits;
		1081
		1082	assert (CHAR_BIT == 8);
		1083	assert (sizeof (eio_dirent) * 8 < 256);
		1084	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
		1085	assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
		1086
		1087	if (size <= EIO_SORT_FAST)
		1088	return;
		1089
		1090	/* first prepare an array of bits to test in our radix sort */
		1091	/* try to take endianness into account, as well as differences in ino_t sizes */
		1092	/* inode_bits must contain all inodes ORed together */
		1093	/* which is used to skip bits that are 0 everywhere, which is very common */
		1094	{
		1095	ino_t endianness;
		1096	int i, j;
		1097
		1098	/* we store the byte offset of byte n into byte n of "endianness" */
		1099	for (i = 0; i < sizeof (ino_t); ++i)
		1100	((unsigned char *)&endianness)[i] = i;
		1101
		1102	*bit++ = 0;
		1103
		1104	for (i = 0; i < sizeof (ino_t); ++i)
		1105	{
		1106	/* shifting off the byte offsets out of "endianness" */
		1107	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
		1108	endianness >>= 8;
		1109
		1110	for (j = 0; j < 8; ++j)
		1111	if (inode_bits & (((ino_t)1) << (i * 8 + j)))
		1112	*bit++ = offs + j;
		1113	}
		1114
		1115	for (j = 0; j < 8; ++j)
		1116	if (score_bits & (1 << j))
		1117	bit++ = offsetof (eio_dirent, score) 8 + j;
		1118	}
		1119
		1120	/* now actually do the sorting (a variant of MSD radix sort) */
		1121	{
		1122	eio_dirent base_stk [9 + sizeof (ino_t) 8], *base;
		1123	eio_dirent end_stk [9 + sizeof (ino_t) 8], *end;
		1124	unsigned char bit_stk [9 + sizeof (ino_t) 8];
		1125	int stk_idx = 0;
		1126
		1127	base_stk [stk_idx] = dents;
		1128	end_stk [stk_idx] = dents + size;
		1129	bit_stk [stk_idx] = bit - 1;
		1130
		1131	do
		1132	{
		1133	base = base_stk [stk_idx];
		1134	end = end_stk [stk_idx];
		1135	bit = bit_stk [stk_idx];
		1136
		1137	for (;;)
		1138	{
		1139	unsigned char O = *bit >> 3;
		1140	unsigned char M = 1 << (*bit & 7);
		1141
		1142	eio_dirent *a = base;
		1143	eio_dirent *b = end;
		1144
		1145	if (b - a < EIO_SORT_CUTOFF)
		1146	break;
		1147
		1148	/* now bit-partition the array on the bit */
		1149	/* this ugly asymmetric loop seems to perform much better than typical */
		1150	/* partition algos found in the literature */
		1151	do
		1152	if (!(((unsigned char *)a)[O] & M))
		1153	++a;
		1154	else if (!(((unsigned char *)--b)[O] & M))
		1155	{
		1156	eio_dirent tmp = a; a = b; b = tmp;
		1157	++a;
		1158	}
		1159	while (b > a);
		1160
		1161	/* next bit, or stop, if no bits left in this path */
		1162	if (!*--bit)
		1163	break;
		1164
		1165	base_stk [stk_idx] = a;
		1166	end_stk [stk_idx] = end;
		1167	bit_stk [stk_idx] = bit;
		1168	++stk_idx;
		1169
		1170	end = a;
		1171	}
		1172	}
		1173	while (stk_idx--);
		1174	}
		1175	}
		1176
		1177	static void
		1178	eio_dent_insertion_sort (eio_dirent *dents, int size)
		1179	{
		1180	/* first move the smallest element to the front, to act as a sentinel */
		1181	{
		1182	int i;
		1183	eio_dirent *min = dents;
		1184
		1185	/* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
		1186	for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
		1187	if (EIO_DENT_CMP (dents [i], <, *min))
		1188	min = &dents [i];
		1189
		1190	/* swap elements 0 and j (minimum) */
		1191	{
		1192	eio_dirent tmp = dents; dents = min; min = tmp;
		1193	}
		1194	}
		1195
		1196	/* then do standard insertion sort, assuming that all elements are >= dents [0] */
		1197	{
		1198	eio_dirent i, j;
		1199
		1200	for (i = dents + 1; i < dents + size; ++i)
		1201	{
		1202	eio_dirent value = *i;
		1203
		1204	for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
		1205	j [1] = j [0];
		1206
		1207	j [1] = value;
		1208	}
		1209	}
		1210	}
		1211
		1212	static void
		1213	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
		1214	{
		1215	if (size <= 1)
		1216	return; /* our insertion sort relies on size > 0 */
		1217
		1218	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
		1219	/* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
		1220	eio_dent_radix_sort (dents, size, score_bits, inode_bits);
		1221
		1222	/* use an insertion sort at the end, or for small arrays, */
		1223	/* as insertion sort is more efficient for small partitions */
		1224	eio_dent_insertion_sort (dents, size);
1002	}	1225	}
1003		1226
1004	/* read a full directory */	1227	/* read a full directory */
1005	static void	1228	static void
1006	eio__scandir (eio_req req, etp_worker self)	1229	eio__scandir (eio_req req, etp_worker self)
1007	{	1230	{
1008	DIR *dirp;	1231	DIR *dirp;
1009	EIO_STRUCT_DIRENT *entp;	1232	EIO_STRUCT_DIRENT *entp;
1010	unsigned char name, names;	1233	char name, names;
1011	int namesalloc = 4096;	1234	int namesalloc = 4096;
1012	int namesoffs = 0;	1235	int namesoffs = 0;
1013	int flags = req->int1;	1236	int flags = req->int1;
1014	eio_dirent *dents = 0;	1237	eio_dirent *dents = 0;
1015	int dentalloc = 128;	1238	int dentalloc = 128;
1016	int dentoffs = 0;	1239	int dentoffs = 0;
		1240	ino_t inode_bits = 0;
1017		1241
1018	req->result = -1;	1242	req->result = -1;
1019		1243
1020	if (!(flags & EIO_READDIR_DENTS))	1244	if (!(flags & EIO_READDIR_DENTS))
1021	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);	1245	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
1022		1246
1023	X_LOCK (wrklock);	1247	X_LOCK (wrklock);
1024	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1248	/* the corresponding closedir is in ETP_WORKER_CLEAR */
1025	self->dirp = dirp = opendir (req->ptr1);	1249	self->dirp = dirp = opendir (req->ptr1);
		1250
1026	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1251	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1027	req->ptr1 = names = malloc (namesalloc);
1028	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1252	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
		1253	req->ptr2 = names = malloc (namesalloc);
1029	X_UNLOCK (wrklock);	1254	X_UNLOCK (wrklock);
1030		1255
1031	if (dirp && names && (!flags \|\| dents))	1256	if (dirp && names && (!flags \|\| dents))
1032	for (;;)	1257	for (;;)
1033	{	1258	{
…		…
1041		1266
1042	/* sort etc. */	1267	/* sort etc. */
1043	req->int1 = flags;	1268	req->int1 = flags;
1044	req->result = dentoffs;	1269	req->result = dentoffs;
1045		1270
1046	if (dents)
1047	{
1048	eio_dirent *ent = dents + dentoffs;
1049
1050	while (ent > dents)
1051	(--ent)->name = names + (size_t)ent->name;
1052	}
1053
1054	if (flags & EIO_READDIR_STAT_ORDER	1271	if (flags & EIO_READDIR_STAT_ORDER)
1055	\|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN)))	1272	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1056	{
1057	/* pray your qsort doesn't use quicksort */
1058	qsort (dents, dentoffs, sizeof (dents), eio_dent_cmp); / score depends of DIRS_FIRST */
1059	}
1060	else if (flags & EIO_READDIR_DIRS_FIRST)	1273	else if (flags & EIO_READDIR_DIRS_FIRST)
		1274	if (flags & EIO_READDIR_FOUND_UNKNOWN)
		1275	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
		1276	else
1061	{	1277	{
1062	/* in this case, all is known, and we just put dirs first and sort them */	1278	/* in this case, all is known, and we just put dirs first and sort them */
1063	eio_dirent *ent = dents + dentoffs;	1279	eio_dirent *oth = dents + dentoffs;
1064	eio_dirent *dir = dents;	1280	eio_dirent *dir = dents;
1065		1281
		1282	/* now partition dirs to the front, and non-dirs to the back */
		1283	/* by walking from both sides and swapping if necessary */
1066	while (ent > dir)	1284	while (oth > dir)
1067	{	1285	{
1068	if (dir->type == DT_DIR)	1286	if (dir->type == EIO_DT_DIR)
1069	++dir;	1287	++dir;
1070	else
1071	{
1072	--ent;
1073
1074	if (ent->type == DT_DIR)	1288	else if ((--oth)->type == EIO_DT_DIR)
1075	{	1289	{
1076	eio_dirent tmp = *dir;	1290	eio_dirent tmp = dir; dir = oth; oth = tmp;
1077	dir = ent;
1078	*ent = tmp;
1079		1291
1080	++dir;	1292	++dir;
1081	}	1293	}
1082	}	1294	}
		1295
		1296	/* now sort the dirs only (dirs all have the same score) */
		1297	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1083	}	1298	}
1084
1085	/* now sort the dirs only */
1086	qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp);
1087	}
1088
1089	/* only provide the names array unless DENTS is specified */
1090	if (!(flags & EIO_READDIR_DENTS))
1091	{
1092	X_LOCK (wrklock);
1093	assert (!dents);
1094	req->ptr1 = 0;
1095	req->ptr2 = names;
1096	X_UNLOCK (wrklock);
1097	}
1098		1299
1099	break;	1300	break;
1100	}	1301	}
1101		1302
1102	/* now add the entry to our list(s) */	1303	/* now add the entry to our list(s) */
…		…
1109		1310
1110	while (expect_false (namesoffs + len > namesalloc))	1311	while (expect_false (namesoffs + len > namesalloc))
1111	{	1312	{
1112	namesalloc *= 2;	1313	namesalloc *= 2;
1113	X_LOCK (wrklock);	1314	X_LOCK (wrklock);
1114	req->ptr1 = names = realloc (names, namesalloc);	1315	req->ptr2 = names = realloc (names, namesalloc);
1115	X_UNLOCK (wrklock);	1316	X_UNLOCK (wrklock);
1116		1317
1117	if (!names)	1318	if (!names)
1118	break;	1319	break;
1119	}	1320	}
…		…
1126		1327
1127	if (expect_false (dentoffs == dentalloc))	1328	if (expect_false (dentoffs == dentalloc))
1128	{	1329	{
1129	dentalloc *= 2;	1330	dentalloc *= 2;
1130	X_LOCK (wrklock);	1331	X_LOCK (wrklock);
1131	req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));	1332	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1132	X_UNLOCK (wrklock);	1333	X_UNLOCK (wrklock);
1133		1334
1134	if (!dents)	1335	if (!dents)
1135	break;	1336	break;
1136	}	1337	}
1137		1338
1138	ent = dents + dentoffs;	1339	ent = dents + dentoffs;
1139		1340
1140	ent->name = (char )(size_t)namesoffs; / rather dirtily we store the offset in the pointer */	1341	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1141	ent->namelen = len - 1;	1342	ent->namelen = len - 1;
1142	ent->inode = D_INO (entp);	1343	ent->inode = D_INO (entp);
		1344
		1345	inode_bits \|= ent->inode;
1143		1346
1144	switch (D_TYPE (entp))	1347	switch (D_TYPE (entp))
1145	{	1348	{
1146	default:	1349	default:
1147	ent->type = EIO_DT_UNKNOWN;	1350	ent->type = EIO_DT_UNKNOWN;
…		…
1190	#ifdef DT_WHT	1393	#ifdef DT_WHT
1191	case DT_WHT: ent->type = EIO_DT_WHT; break;	1394	case DT_WHT: ent->type = EIO_DT_WHT; break;
1192	#endif	1395	#endif
1193	}	1396	}
1194		1397
1195	ent->score = 0;	1398	ent->score = 7;
1196		1399
1197	if (flags & EIO_READDIR_DIRS_FIRST)	1400	if (flags & EIO_READDIR_DIRS_FIRST)
1198	{	1401	{
1199	if (ent->type == EIO_DT_UNKNOWN)	1402	if (ent->type == EIO_DT_UNKNOWN)
1200	{	1403	{
1201	if (name == '.') / leading dots are likely directories, and, in any case, rare */	1404	if (name == '.') / leading dots are likely directories, and, in any case, rare */
1202	ent->score = 98;	1405	ent->score = 1;
1203	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */	1406	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1204	ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */	1407	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1205	}	1408	}
1206	else if (ent->type == EIO_DT_DIR)	1409	else if (ent->type == EIO_DT_DIR)
1207	ent->score = 100;	1410	ent->score = 0;
1208	}	1411	}
1209	}	1412	}
1210		1413
1211	namesoffs += len;	1414	namesoffs += len;
1212	++dentoffs;	1415	++dentoffs;
1213	}	1416	}
		1417
		1418	if (EIO_CANCELLED (req))
		1419	{
		1420	errno = ECANCELED;
		1421	break;
		1422	}
1214	}	1423	}
1215	else
1216	req->result = -1;
1217	}	1424	}
		1425
		1426	#ifdef PAGESIZE
		1427	# define eio_pagesize() PAGESIZE
		1428	#else
		1429	static intptr_t
		1430	eio_pagesize (void)
		1431	{
		1432	static intptr_t page;
		1433
		1434	if (!page)
		1435	page = sysconf (_SC_PAGESIZE);
		1436
		1437	return page;
		1438	}
		1439	#endif
		1440
		1441	static void
		1442	eio_page_align (void *addr, size_t length)
		1443	{
		1444	intptr_t mask = eio_pagesize () - 1;
		1445
		1446	/* round down addr */
		1447	intptr_t adj = mask & (intptr_t)*addr;
		1448
		1449	addr = (void )((intptr_t)*addr - adj);
		1450	*length += adj;
		1451
		1452	/* round up length */
		1453	length = (length + mask) & ~mask;
		1454	}
		1455
		1456	#if !_POSIX_MEMLOCK
		1457	# define eio__mlockall(a) ((errno = ENOSYS), -1)
		1458	#else
		1459
		1460	static int
		1461	eio__mlockall (int flags)
		1462	{
		1463	#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
		1464	extern int mallopt (int, int);
		1465	mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
		1466	#endif
		1467
		1468	if (EIO_MCL_CURRENT != MCL_CURRENT
		1469	\|\| EIO_MCL_FUTURE != MCL_FUTURE)
		1470	{
		1471	flags = 0
		1472	\| (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
		1473	\| (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
		1474	}
		1475
		1476	return mlockall (flags);
		1477	}
		1478	#endif
		1479
		1480	#if !_POSIX_MEMLOCK_RANGE
		1481	# define eio__mlock(a,b) ((errno = ENOSYS), -1)
		1482	#else
		1483
		1484	static int
		1485	eio__mlock (void *addr, size_t length)
		1486	{
		1487	eio_page_align (&addr, &length);
		1488
		1489	return mlock (addr, length);
		1490	}
		1491
		1492	#endif
1218		1493
1219	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)	1494	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1220	# undef msync
1221	# define msync(a,b,c) ((errno = ENOSYS), -1)	1495	# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
		1496	#else
		1497
		1498	int
		1499	eio__msync (void *mem, size_t len, int flags)
		1500	{
		1501	eio_page_align (&mem, &len);
		1502
		1503	if (EIO_MS_ASYNC != MS_SYNC
		1504	\|\| EIO_MS_INVALIDATE != MS_INVALIDATE
		1505	\|\| EIO_MS_SYNC != MS_SYNC)
		1506	{
		1507	flags = 0
		1508	\| (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
		1509	\| (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
		1510	\| (flags & EIO_MS_SYNC ? MS_SYNC : 0);
		1511	}
		1512
		1513	return msync (mem, len, flags);
		1514	}
		1515
1222	#endif	1516	#endif
1223		1517
1224	int	1518	int
1225	eio__mtouch (void *mem, size_t len, int flags)	1519	eio__mtouch (void *mem, size_t len, int flags)
1226	{	1520	{
		1521	eio_page_align (&mem, &len);
		1522
		1523	{
1227	intptr_t addr = (intptr_t)mem;	1524	intptr_t addr = (intptr_t)mem;
1228	intptr_t end = addr + len;	1525	intptr_t end = addr + len;
1229	#ifdef PAGESIZE	1526	intptr_t page = eio_pagesize ();
1230	const intptr_t page = PAGESIZE;
1231	#else
1232	static intptr_t page;
1233		1527
1234	if (!page)
1235	page = sysconf (_SC_PAGESIZE);
1236	#endif
1237
1238	addr &= ~(page - 1); /* assume page size is always a power of two */
1239
1240	if (addr < end)	1528	if (addr < end)
1241	if (flags) /* modify */	1529	if (flags & EIO_MT_MODIFY) /* modify */
1242	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);	1530	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);
1243	else	1531	else
1244	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);	1532	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);
		1533	}
1245		1534
1246	return 0;	1535	return 0;
1247	}	1536	}
1248		1537
1249	/*****************************************************************************/	1538	/*****************************************************************************/
…		…
1283	if (req)	1572	if (req)
1284	break;	1573	break;
1285		1574
1286	++idle;	1575	++idle;
1287		1576
1288	ts.tv_sec = time (0) + IDLE_TIMEOUT;	1577	ts.tv_sec = time (0) + idle_timeout;
1289	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)	1578	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1290	{	1579	{
1291	if (idle > max_idle)	1580	if (idle > max_idle)
1292	{	1581	{
1293	--idle;	1582	--idle;
…		…
1372	return 0; \	1661	return 0; \
1373	}	1662	}
1374		1663
1375	static void eio_execute (etp_worker self, eio_req req)	1664	static void eio_execute (etp_worker self, eio_req req)
1376	{	1665	{
1377	errno = 0;
1378
1379	switch (req->type)	1666	switch (req->type)
1380	{	1667	{
1381	case EIO_READ: ALLOC (req->size);	1668	case EIO_READ: ALLOC (req->size);
1382	req->result = req->offs >= 0	1669	req->result = req->offs >= 0
1383	? pread (req->int1, req->ptr2, req->size, req->offs)	1670	? pread (req->int1, req->ptr2, req->size, req->offs)
…		…
1394	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1681	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1395	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	1682	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1396	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1683	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1397	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	1684	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1398		1685
		1686	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		1687	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		1688	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		1689	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		1690
1399	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;	1691	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1400	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	1692	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1401	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;	1693	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1402	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	1694	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1403	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;	1695	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
…		…
1410	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;	1702	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1411	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;	1703	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1412	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;	1704	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1413	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;	1705	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1414	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;	1706	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1415	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;	1707	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1416		1708
1417	case EIO_READLINK: ALLOC (NAME_MAX);	1709	case EIO_READLINK: ALLOC (PATH_MAX);
1418	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	1710	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1419		1711
1420	case EIO_SYNC: req->result = 0; sync (); break;	1712	case EIO_SYNC: req->result = 0; sync (); break;
1421	case EIO_FSYNC: req->result = fsync (req->int1); break;	1713	case EIO_FSYNC: req->result = fsync (req->int1); break;
1422	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1714	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1423	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;	1715	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1424	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;	1716	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1717	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
		1718	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1425	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;	1719	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1426		1720
1427	case EIO_READDIR: eio__scandir (req, self); break;	1721	case EIO_READDIR: eio__scandir (req, self); break;
1428		1722
1429	case EIO_BUSY:	1723	case EIO_BUSY:
1430	#ifdef _WIN32	1724	#ifdef _WIN32
1431	Sleep (req->nv1 * 1000.);	1725	Sleep (req->nv1 * 1e3);
1432	#else	1726	#else
1433	{	1727	{
1434	struct timeval tv;	1728	struct timeval tv;
1435		1729
1436	tv.tv_sec = req->nv1;	1730	tv.tv_sec = req->nv1;
1437	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;	1731	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1438		1732
1439	req->result = select (0, 0, 0, 0, &tv);	1733	req->result = select (0, 0, 0, 0, &tv);
1440	}	1734	}
1441	#endif	1735	#endif
1442	break;	1736	break;
…		…
1457	times = tv;	1751	times = tv;
1458	}	1752	}
1459	else	1753	else
1460	times = 0;	1754	times = 0;
1461		1755
1462
1463	req->result = req->type == EIO_FUTIME	1756	req->result = req->type == EIO_FUTIME
1464	? futimes (req->int1, times)	1757	? futimes (req->int1, times)
1465	: utimes (req->ptr1, times);	1758	: utimes (req->ptr1, times);
1466	}	1759	}
1467	break;	1760	break;
…		…
1476	case EIO_CUSTOM:	1769	case EIO_CUSTOM:
1477	((void ()(eio_req ))req->feed) (req);	1770	((void ()(eio_req ))req->feed) (req);
1478	break;	1771	break;
1479		1772
1480	default:	1773	default:
		1774	errno = ENOSYS;
1481	req->result = -1;	1775	req->result = -1;
1482	break;	1776	break;
1483	}	1777	}
1484		1778
1485	req->errorno = errno;	1779	req->errorno = errno;
…		…
1515	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	1809	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1516	{	1810	{
1517	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	1811	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1518	}	1812	}
1519		1813
		1814	eio_req eio_mlock (void addr, size_t length, int pri, eio_cb cb, void *data)
		1815	{
		1816	REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
		1817	}
		1818
		1819	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
		1820	{
		1821	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
		1822	}
		1823
1520	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)	1824	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
1521	{	1825	{
1522	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;	1826	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1523	}	1827	}
1524		1828
…		…
1548	}	1852	}
1549		1853
1550	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)	1854	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)
1551	{	1855	{
1552	REQ (EIO_FSTAT); req->int1 = fd; SEND;	1856	REQ (EIO_FSTAT); req->int1 = fd; SEND;
		1857	}
		1858
		1859	eio_req eio_fstatvfs (int fd, int pri, eio_cb cb, void data)
		1860	{
		1861	REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1553	}	1862	}
1554		1863
1555	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)	1864	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)
1556	{	1865	{
1557	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;	1866	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
…		…
1631	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)	1940	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)
1632	{	1941	{
1633	return eio__1path (EIO_LSTAT, path, pri, cb, data);	1942	return eio__1path (EIO_LSTAT, path, pri, cb, data);
1634	}	1943	}
1635		1944
		1945	eio_req eio_statvfs (const char path, int pri, eio_cb cb, void *data)
		1946	{
		1947	return eio__1path (EIO_STATVFS, path, pri, cb, data);
		1948	}
		1949
1636	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)	1950	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)
1637	{	1951	{
1638	return eio__1path (EIO_UNLINK, path, pri, cb, data);	1952	return eio__1path (EIO_UNLINK, path, pri, cb, data);
1639	}	1953	}
1640		1954
…		…
1648	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;	1962	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1649	}	1963	}
1650		1964
1651	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1965	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1652	{	1966	{
1653	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	1967	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1654	}	1968	}
1655		1969
1656	static eio_req *	1970	static eio_req *
1657	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)	1971	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1658	{	1972	{
…		…
1742	/* misc garbage */	2056	/* misc garbage */
1743		2057
1744	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2058	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1745	{	2059	{
1746	etp_worker wrk;	2060	etp_worker wrk;
		2061	ssize_t ret;
1747		2062
1748	wrk.dbuf = 0;	2063	wrk.dbuf = 0;
1749		2064
1750	eio__sendfile (ofd, ifd, offset, count, &wrk);	2065	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1751		2066
1752	if (wrk.dbuf)	2067	if (wrk.dbuf)
1753	free (wrk.dbuf);	2068	free (wrk.dbuf);
1754	}
1755		2069
		2070	return ret;
		2071	}
		2072

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.34 by root, Sat Jun 6 19:57:22 2009 UTC vs. Revision 1.64 by root, Thu May 26 04:05:18 2011 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.34 by root, Sat Jun 6 19:57:22 2009 UTC vs.
Revision 1.64 by root, Thu May 26 04:05:18 2011 UTC