[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.99 by root, Tue Jul 26 11:07:08 2011 UTC

…		…
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
102	#ifdef EIO_STRUCT_STATI64	110	#ifdef EIO_STRUCT_STATI64
103	#define stat(path,buf) _stati64 (path,buf)	111	#define stat(path,buf) _stati64 (path,buf)
104	#define fstat(fd,buf) _fstati64 (path,buf)	112	#define fstat(fd,buf) _fstati64 (fd,buf)
105	#endif	113	#endif
106	#define lstat(path,buf) stat (path,buf)	114	#define lstat(path,buf) stat (path,buf)
107	#define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))	115	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
108	#define mkdir(path,mode) _mkdir (path)	116	#define mkdir(path,mode) _mkdir (path)
109	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))	117	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
110		118
		119	#define chmod(path,mode) _chmod (path, mode)
		120	#define dup(fd) _dup (fd)
		121	#define dup2(fd1,fd2) _dup2 (fd1, fd2)
		122
		123	#define fchmod(fd,mode) EIO_ENOSYS ()
111	#define chown(path,uid,gid) EIO_ENOSYS ()	124	#define chown(path,uid,gid) EIO_ENOSYS ()
112	#define fchown(fd,uid,gid) EIO_ENOSYS ()	125	#define fchown(fd,uid,gid) EIO_ENOSYS ()
113	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */	126	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
114	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */	127	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
115	#define mknod(path,mode,dev) EIO_ENOSYS ()	128	#define mknod(path,mode,dev) EIO_ENOSYS ()
116	#define sync() EIO_ENOSYS ()	129	#define sync() EIO_ENOSYS ()
		130	#define readlink(path,buf,s) EIO_ENOSYS ()
		131	#define statvfs(path,buf) EIO_ENOSYS ()
		132	#define fstatvfs(fd,buf) EIO_ENOSYS ()
		133
		134	/* rename() uses MoveFile, which fails to overwrite */
		135	#define rename(old,neu) eio__rename (old, neu)
		136
		137	static int
		138	eio__rename (const char old, const char neu)
		139	{
		140	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		141	return 0;
		142
		143	/* should steal _dosmaperr */
		144	switch (GetLastError ())
		145	{
		146	case ERROR_FILE_NOT_FOUND:
		147	case ERROR_PATH_NOT_FOUND:
		148	case ERROR_INVALID_DRIVE:
		149	case ERROR_NO_MORE_FILES:
		150	case ERROR_BAD_NETPATH:
		151	case ERROR_BAD_NET_NAME:
		152	case ERROR_BAD_PATHNAME:
		153	case ERROR_FILENAME_EXCED_RANGE:
		154	errno = ENOENT;
		155	break;
		156
		157	default:
		158	errno = EACCES;
		159	break;
		160	}
		161
		162	return -1;
		163	}
117		164
118	/* we could even stat and see if it exists */	165	/* we could even stat and see if it exists */
119	static int	166	static int
120	symlink (const char old, const char neu)	167	symlink (const char old, const char neu)
121	{	168	{
		169	#if WINVER >= 0x0600
122	if (CreateSymbolicLink (neu, old, 1))	170	if (CreateSymbolicLink (neu, old, 1))
123	return 0;	171	return 0;
124		172
125	if (CreateSymbolicLink (neu, old, 0))	173	if (CreateSymbolicLink (neu, old, 0))
126	return 0;	174	return 0;
		175	#endif
127		176
128	return EIO_ERRNO (ENOENT, -1);	177	return EIO_ERRNO (ENOENT, -1);
129	}	178	}
		179
		180	/* POSIX API only */
		181	#define CreateHardLink(neu,old,flags) 0
		182	#define CreateSymbolicLink(neu,old,flags) 0
		183
		184	struct statvfs
		185	{
		186	int dummy;
		187	};
		188
		189	#define DT_DIR EIO_DT_DIR
		190	#define DT_REG EIO_DT_REG
		191	#define D_NAME(entp) entp.cFileName
		192	#define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
130		193
131	#else	194	#else
132		195
133	#include <sys/time.h>	196	#include <sys/time.h>
134	#include <sys/select.h>	197	#include <sys/select.h>
135	#include <sys/statvfs.h>	198	#include <sys/statvfs.h>
136	#include <unistd.h>	199	#include <unistd.h>
137	#include <utime.h>
138	#include <signal.h>	200	#include <signal.h>
139	#include <dirent.h>	201	#include <dirent.h>
140		202
141	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES	203	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
142	#include <sys/mman.h>	204	#include <sys/mman.h>
143	#endif	205	#endif
		206
		207	#define D_NAME(entp) entp->d_name
144		208
145	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	209	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
146	#if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__	210	#if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__
147	#define _DIRENT_HAVE_D_TYPE /* sigh */	211	#define _DIRENT_HAVE_D_TYPE /* sigh */
148	#define D_INO(de) (de)->d_fileno	212	#define D_INO(de) (de)->d_fileno
…		…
162		226
163	#ifndef EIO_STRUCT_DIRENT	227	#ifndef EIO_STRUCT_DIRENT
164	#define EIO_STRUCT_DIRENT struct dirent	228	#define EIO_STRUCT_DIRENT struct dirent
165	#endif	229	#endif
166		230
		231	#endif
		232
		233	#if HAVE_UTIMES
		234	# include <utime.h>
		235	#endif
		236
		237	#if HAVE_SYS_SYSCALL_H
		238	# include <sys/syscall.h>
		239	#endif
		240
		241	#if HAVE_SYS_PRCTL_H
		242	# include <sys/prctl.h>
167	#endif	243	#endif
168		244
169	#if HAVE_SENDFILE	245	#if HAVE_SENDFILE
170	# if __linux	246	# if __linux
171	# include <sys/sendfile.h>	247	# include <sys/sendfile.h>
…		…
186	#endif	262	#endif
187	#ifndef D_INO	263	#ifndef D_INO
188	# define D_INO(de) 0	264	# define D_INO(de) 0
189	#endif	265	#endif
190	#ifndef D_NAMLEN	266	#ifndef D_NAMLEN
191	# define D_NAMLEN(de) strlen ((de)->d_name)	267	# define D_NAMLEN(entp) strlen (D_NAME (entp))
192	#endif	268	#endif
193		269
194	/* used for struct dirent, AIX doesn't provide it */	270	/* used for struct dirent, AIX doesn't provide it */
195	#ifndef NAME_MAX	271	#ifndef NAME_MAX
196	# define NAME_MAX 4096	272	# define NAME_MAX 4096
…		…
203		279
204	/* buffer size for various temporary buffers */	280	/* buffer size for various temporary buffers */
205	#define EIO_BUFSIZE 65536	281	#define EIO_BUFSIZE 65536
206		282
207	#define dBUF \	283	#define dBUF \
208	char *eio_buf; \
209	ETP_WORKER_LOCK (self); \
210	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	284	char *eio_buf = malloc (EIO_BUFSIZE); \
211	ETP_WORKER_UNLOCK (self); \
212	errno = ENOMEM; \	285	errno = ENOMEM; \
213	if (!eio_buf) \	286	if (!eio_buf) \
214	return -1;	287	return -1
		288
		289	#define FUBd \
		290	free (eio_buf)
215		291
216	#define EIO_TICKS ((1000000 + 1023) >> 10)	292	#define EIO_TICKS ((1000000 + 1023) >> 10)
217		293
218	#define ETP_PRI_MIN EIO_PRI_MIN	294	#define ETP_PRI_MIN EIO_PRI_MIN
219	#define ETP_PRI_MAX EIO_PRI_MAX	295	#define ETP_PRI_MAX EIO_PRI_MAX
…		…
225	static int eio_finish (eio_req *req);	301	static int eio_finish (eio_req *req);
226	#define ETP_FINISH(req) eio_finish (req)	302	#define ETP_FINISH(req) eio_finish (req)
227	static void eio_execute (struct etp_worker self, eio_req req);	303	static void eio_execute (struct etp_worker self, eio_req req);
228	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	304	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
229		305
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	/*****************************************************************************/	306	/*****************************************************************************/
248		307
249	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	308	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250		309
251	/* calculate time difference in ~1/EIO_TICKS of a second */	310	/* calculate time difference in ~1/EIO_TICKS of a second */
…		…
279	/*	338	/*
280	* make our pread/pwrite emulation safe against themselves, but not against	339	* make our pread/pwrite emulation safe against themselves, but not against
281	* normal read/write by using a mutex. slows down execution a lot,	340	* normal read/write by using a mutex. slows down execution a lot,
282	* but that's your problem, not mine.	341	* but that's your problem, not mine.
283	*/	342	*/
284	static xmutex_t preadwritelock = X_MUTEX_INIT;	343	static xmutex_t preadwritelock;
285	#endif	344	#endif
286		345
287	typedef struct etp_worker	346	typedef struct etp_worker
288	{	347	{
289	/* locked by wrklock */	348	/* locked by wrklock */
…		…
292	xthread_t tid;	351	xthread_t tid;
293		352
294	/* locked by reslock, reqlock or wrklock */	353	/* locked by reslock, reqlock or wrklock */
295	ETP_REQ req; / currently processed request */	354	ETP_REQ req; / currently processed request */
296		355
		356	#ifdef ETP_WORKER_COMMON
297	ETP_WORKER_COMMON	357	ETP_WORKER_COMMON
		358	#endif
298	} etp_worker;	359	} etp_worker;
299		360
300	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	361	static etp_worker wrk_first; /* NOT etp */
301		362
302	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	363	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	364	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304		365
305	/* worker threads management */	366	/* worker threads management */
306		367
307	static void ecb_cold	368	static void ecb_cold
308	etp_worker_clear (etp_worker *wrk)	369	etp_worker_clear (etp_worker *wrk)
309	{	370	{
310	ETP_WORKER_CLEAR (wrk);
311	}	371	}
312		372
313	static void ecb_cold	373	static void ecb_cold
314	etp_worker_free (etp_worker *wrk)	374	etp_worker_free (etp_worker *wrk)
315	{	375	{
…		…
376	} etp_reqq;	436	} etp_reqq;
377		437
378	static etp_reqq req_queue;	438	static etp_reqq req_queue;
379	static etp_reqq res_queue;	439	static etp_reqq res_queue;
380		440
		441	static void ecb_noinline ecb_cold
		442	reqq_init (etp_reqq *q)
		443	{
		444	int pri;
		445
		446	for (pri = 0; pri < ETP_NUM_PRI; ++pri)
		447	q->qs[pri] = q->qe[pri] = 0;
		448
		449	q->size = 0;
		450	}
		451
381	static int ecb_noinline	452	static int ecb_noinline
382	reqq_push (etp_reqq q, ETP_REQ req)	453	reqq_push (etp_reqq q, ETP_REQ req)
383	{	454	{
384	int pri = req->pri;	455	int pri = req->pri;
385	req->next = 0;	456	req->next = 0;
…		…
419	}	490	}
420		491
421	abort ();	492	abort ();
422	}	493	}
423		494
424	static void ecb_cold	495	static int ecb_cold
425	etp_thread_init (void)	496	etp_init (void (want_poll)(void), void (done_poll)(void))
426	{	497	{
427	#if !HAVE_PREADWRITE
428	X_MUTEX_CREATE (preadwritelock);
429	#endif
430	X_MUTEX_CREATE (wrklock);	498	X_MUTEX_CREATE (wrklock);
431	X_MUTEX_CREATE (reslock);	499	X_MUTEX_CREATE (reslock);
432	X_MUTEX_CREATE (reqlock);	500	X_MUTEX_CREATE (reqlock);
433	X_COND_CREATE (reqwait);	501	X_COND_CREATE (reqwait);
434	}
435		502
436	static void ecb_cold	503	reqq_init (&req_queue);
437	etp_atfork_prepare (void)	504	reqq_init (&res_queue);
438	{
439	}
440		505
441	static void ecb_cold	506	wrk_first.next =
442	etp_atfork_parent (void)	507	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		508
468	started = 0;	509	started = 0;
469	idle = 0;	510	idle = 0;
470	nreqs = 0;	511	nreqs = 0;
471	nready = 0;	512	nready = 0;
472	npending = 0;	513	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		514
491	want_poll_cb = want_poll;	515	want_poll_cb = want_poll;
492	done_poll_cb = done_poll;	516	done_poll_cb = done_poll;
493		517
494	return 0;	518	return 0;
…		…
952	#if !HAVE_FDATASYNC	976	#if !HAVE_FDATASYNC
953	# undef fdatasync	977	# undef fdatasync
954	# define fdatasync(fd) fsync (fd)	978	# define fdatasync(fd) fsync (fd)
955	#endif	979	#endif
956		980
		981	static int
		982	eio__syncfs (int fd)
		983	{
		984	int res;
		985
		986	#if HAVE_SYS_SYNCFS
		987	res = (int)syscall (__NR_syncfs, (int)(fd));
		988	#else
		989	res = -1;
		990	errno = ENOSYS;
		991	#endif
		992
		993	if (res < 0 && errno == ENOSYS && fd >= 0)
		994	sync ();
		995
		996	return res;
		997	}
		998
957	/* sync_file_range always needs emulation */	999	/* sync_file_range always needs emulation */
958	static int	1000	static int
959	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1001	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
960	{	1002	{
961	#if HAVE_SYNC_FILE_RANGE	1003	#if HAVE_SYNC_FILE_RANGE
…		…
1010	pread (fd, eio_buf, len, offset);	1052	pread (fd, eio_buf, len, offset);
1011	offset += len;	1053	offset += len;
1012	todo -= len;	1054	todo -= len;
1013	}	1055	}
1014		1056
		1057	FUBd;
		1058
1015	errno = 0;	1059	errno = 0;
1016	return count;	1060	return count;
1017	}	1061	}
1018		1062
1019	#endif	1063	#endif
1020		1064
1021	/* sendfile always needs emulation */	1065	/* sendfile always needs emulation */
1022	static eio_ssize_t	1066	static eio_ssize_t
1023	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1067	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024	{	1068	{
1025	eio_ssize_t written = 0;	1069	eio_ssize_t written = 0;
1026	eio_ssize_t res;	1070	eio_ssize_t res;
1027		1071
1028	if (!count)	1072	if (!count)
…		…
1126	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK	1170	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK
1127	/* BSDs */	1171	/* BSDs */
1128	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */	1172	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129	\|\| errno == ENOTSUP	1173	\|\| errno == ENOTSUP
1130	#endif	1174	#endif
		1175	#ifdef EOPNOTSUPP /* windows */
1131	\|\| errno == EOPNOTSUPP /* BSDs */	1176	\|\| errno == EOPNOTSUPP /* BSDs */
		1177	#endif
1132	#if __solaris	1178	#if __solaris
1133	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE	1179	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE
1134	#endif	1180	#endif
1135	)	1181	)
1136	)	1182	)
…		…
1162		1208
1163	offset += cnt;	1209	offset += cnt;
1164	res += cnt;	1210	res += cnt;
1165	count -= cnt;	1211	count -= cnt;
1166	}	1212	}
		1213
		1214	FUBd;
1167	}	1215	}
1168		1216
1169	return res;	1217	return res;
1170	}	1218	}
1171		1219
…		…
1461		1509
1462	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */	1510	#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 */	1511	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464		1512
1465	static void	1513	static void
1466	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1514	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467	{	1515	{
1468	unsigned char bits [9 + sizeof (ino_t) * 8];	1516	unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469	unsigned char *bit = bits;	1517	unsigned char *bit = bits;
1470		1518
1471	assert (CHAR_BIT == 8);	1519	assert (CHAR_BIT == 8);
1472	assert (sizeof (eio_dirent) * 8 < 256);	1520	assert (sizeof (eio_dirent) * 8 < 256);
1473	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */	1521	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
…		…
1475		1523
1476	if (size <= EIO_SORT_FAST)	1524	if (size <= EIO_SORT_FAST)
1477	return;	1525	return;
1478		1526
1479	/* first prepare an array of bits to test in our radix sort */	1527	/* 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 */	1528	/* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481	/* inode_bits must contain all inodes ORed together */	1529	/* inode_bits must contain all inodes ORed together */
1482	/* which is used to skip bits that are 0 everywhere, which is very common */	1530	/* which is used to skip bits that are 0 everywhere, which is very common */
1483	{	1531	{
1484	ino_t endianness;	1532	eio_ino_t endianness;
1485	int i, j;	1533	int i, j;
1486		1534
1487	/* we store the byte offset of byte n into byte n of "endianness" */	1535	/* we store the byte offset of byte n into byte n of "endianness" */
1488	for (i = 0; i < sizeof (ino_t); ++i)	1536	for (i = 0; i < sizeof (eio_ino_t); ++i)
1489	((unsigned char *)&endianness)[i] = i;	1537	((unsigned char *)&endianness)[i] = i;
1490		1538
1491	*bit++ = 0;	1539	*bit++ = 0;
1492		1540
1493	for (i = 0; i < sizeof (ino_t); ++i)	1541	for (i = 0; i < sizeof (eio_ino_t); ++i)
1494	{	1542	{
1495	/* shifting off the byte offsets out of "endianness" */	1543	/* shifting off the byte offsets out of "endianness" */
1496	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;	1544	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497	endianness >>= 8;	1545	endianness >>= 8;
1498		1546
1499	for (j = 0; j < 8; ++j)	1547	for (j = 0; j < 8; ++j)
1500	if (inode_bits & (((ino_t)1) << (i * 8 + j)))	1548	if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501	*bit++ = offs + j;	1549	*bit++ = offs + j;
1502	}	1550	}
1503		1551
1504	for (j = 0; j < 8; ++j)	1552	for (j = 0; j < 8; ++j)
1505	if (score_bits & (1 << j))	1553	if (score_bits & (1 << j))
1506	bit++ = offsetof (eio_dirent, score) 8 + j;	1554	bit++ = offsetof (eio_dirent, score) 8 + j;
1507	}	1555	}
1508		1556
1509	/* now actually do the sorting (a variant of MSD radix sort) */	1557	/* now actually do the sorting (a variant of MSD radix sort) */
1510	{	1558	{
1511	eio_dirent base_stk [9 + sizeof (ino_t) 8], *base;	1559	eio_dirent base_stk [9 + sizeof (eio_ino_t) 8], *base;
1512	eio_dirent end_stk [9 + sizeof (ino_t) 8], *end;	1560	eio_dirent end_stk [9 + sizeof (eio_ino_t) 8], *end;
1513	unsigned char bit_stk [9 + sizeof (ino_t) 8];	1561	unsigned char bit_stk [9 + sizeof (eio_ino_t) 8];
1514	int stk_idx = 0;	1562	int stk_idx = 0;
1515		1563
1516	base_stk [stk_idx] = dents;	1564	base_stk [stk_idx] = dents;
1517	end_stk [stk_idx] = dents + size;	1565	end_stk [stk_idx] = dents + size;
1518	bit_stk [stk_idx] = bit - 1;	1566	bit_stk [stk_idx] = bit - 1;
…		…
1597	}	1645	}
1598	}	1646	}
1599	}	1647	}
1600		1648
1601	static void	1649	static void
1602	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1650	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603	{	1651	{
1604	if (size <= 1)	1652	if (size <= 1)
1605	return; /* our insertion sort relies on size > 0 */	1653	return; /* our insertion sort relies on size > 0 */
1606		1654
1607	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */	1655	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
…		…
1615		1663
1616	/* read a full directory */	1664	/* read a full directory */
1617	static void	1665	static void
1618	eio__scandir (eio_req req, etp_worker self)	1666	eio__scandir (eio_req req, etp_worker self)
1619	{	1667	{
1620	DIR *dirp;
1621	EIO_STRUCT_DIRENT *entp;
1622	char name, names;	1668	char name, names;
1623	int namesalloc = 4096;	1669	int namesalloc = 4096 - sizeof (void ) 4;
1624	int namesoffs = 0;	1670	int namesoffs = 0;
1625	int flags = req->int1;	1671	int flags = req->int1;
1626	eio_dirent *dents = 0;	1672	eio_dirent *dents = 0;
1627	int dentalloc = 128;	1673	int dentalloc = 128;
1628	int dentoffs = 0;	1674	int dentoffs = 0;
1629	ino_t inode_bits = 0;	1675	eio_ino_t inode_bits = 0;
		1676	#ifdef _WIN32
		1677	HANDLE dirp;
		1678	WIN32_FIND_DATA entp;
		1679	#else
		1680	DIR *dirp;
		1681	EIO_STRUCT_DIRENT *entp;
		1682	#endif
1630		1683
1631	req->result = -1;	1684	req->result = -1;
1632		1685
1633	if (!(flags & EIO_READDIR_DENTS))	1686	if (!(flags & EIO_READDIR_DENTS))
1634	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);	1687	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
1635		1688
1636	X_LOCK (wrklock);	1689	#ifdef _WIN32
1637	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1690	{
		1691	int len = strlen ((const char *)req->ptr1);
		1692	char *path = malloc (MAX_PATH);
		1693	const char *fmt;
		1694
		1695	if (!len)
		1696	fmt = "./*";
		1697	else if (((const char )req->ptr1)[len - 1] == '/' \|\| ((const char )req->ptr1)[len - 1] == '\\')
		1698	fmt = "%s*";
		1699	else
		1700	fmt = "%s/*";
		1701
		1702	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
		1703	dirp = FindFirstFile (path, &entp);
		1704	free (path);
		1705
		1706	if (dirp == INVALID_HANDLE_VALUE)
		1707	{
		1708	dirp = 0;
		1709
		1710	/* should steal _dosmaperr */
		1711	switch (GetLastError ())
		1712	{
		1713	case ERROR_FILE_NOT_FOUND:
		1714	req->result = 0;
		1715	break;
		1716
		1717	case ERROR_INVALID_NAME:
		1718	case ERROR_PATH_NOT_FOUND:
		1719	case ERROR_NO_MORE_FILES:
		1720	errno = ENOENT;
		1721	break;
		1722
		1723	case ERROR_NOT_ENOUGH_MEMORY:
		1724	errno = ENOMEM;
		1725	break;
		1726
		1727	default:
		1728	errno = EINVAL;
		1729	break;
		1730	}
		1731	}
		1732	}
		1733	#else
1638	self->dirp = dirp = opendir (req->ptr1);	1734	dirp = opendir (req->ptr1);
		1735	#endif
1639		1736
1640	if (req->flags & EIO_FLAG_PTR1_FREE)	1737	if (req->flags & EIO_FLAG_PTR1_FREE)
1641	free (req->ptr1);	1738	free (req->ptr1);
1642		1739
1643	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;	1740	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
1644	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1741	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645	req->ptr2 = names = malloc (namesalloc);	1742	req->ptr2 = names = malloc (namesalloc);
1646	X_UNLOCK (wrklock);
1647		1743
1648	if (dirp && names && (!flags \|\| dents))	1744	if (dirp && names && (!flags \|\| dents))
1649	for (;;)	1745	for (;;)
1650	{	1746	{
		1747	int done;
		1748
		1749	#ifdef _WIN32
		1750	done = !dirp;
		1751	#else
1651	errno = 0;	1752	errno = 0;
1652	entp = readdir (dirp);	1753	entp = readdir (dirp);
		1754	done = !entp;
		1755	#endif
1653		1756
1654	if (!entp)	1757	if (done)
1655	{	1758	{
		1759	#ifndef _WIN32
		1760	int old_errno = errno;
		1761	closedir (dirp);
		1762	errno = old_errno;
		1763
1656	if (errno)	1764	if (errno)
1657	break;	1765	break;
		1766	#endif
1658		1767
1659	/* sort etc. */	1768	/* sort etc. */
1660	req->int1 = flags;	1769	req->int1 = flags;
1661	req->result = dentoffs;	1770	req->result = dentoffs;
1662		1771
…		…
1691		1800
1692	break;	1801	break;
1693	}	1802	}
1694		1803
1695	/* now add the entry to our list(s) */	1804	/* now add the entry to our list(s) */
1696	name = entp->d_name;	1805	name = D_NAME (entp);
1697		1806
1698	/* skip . and .. entries */	1807	/* skip . and .. entries */
1699	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1808	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
1700	{	1809	{
1701	int len = D_NAMLEN (entp) + 1;	1810	int len = D_NAMLEN (entp) + 1;
1702		1811
1703	while (ecb_expect_false (namesoffs + len > namesalloc))	1812	while (ecb_expect_false (namesoffs + len > namesalloc))
1704	{	1813	{
1705	namesalloc *= 2;	1814	namesalloc *= 2;
1706	X_LOCK (wrklock);
1707	req->ptr2 = names = realloc (names, namesalloc);	1815	req->ptr2 = names = realloc (names, namesalloc);
1708	X_UNLOCK (wrklock);
1709		1816
1710	if (!names)	1817	if (!names)
1711	break;	1818	break;
1712	}	1819	}
1713		1820
…		…
1718	struct eio_dirent *ent;	1825	struct eio_dirent *ent;
1719		1826
1720	if (ecb_expect_false (dentoffs == dentalloc))	1827	if (ecb_expect_false (dentoffs == dentalloc))
1721	{	1828	{
1722	dentalloc *= 2;	1829	dentalloc *= 2;
1723	X_LOCK (wrklock);
1724	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));	1830	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725	X_UNLOCK (wrklock);
1726		1831
1727	if (!dents)	1832	if (!dents)
1728	break;	1833	break;
1729	}	1834	}
1730		1835
…		…
1810	if (EIO_CANCELLED (req))	1915	if (EIO_CANCELLED (req))
1811	{	1916	{
1812	errno = ECANCELED;	1917	errno = ECANCELED;
1813	break;	1918	break;
1814	}	1919	}
		1920
		1921	#ifdef _WIN32
		1922	if (!FindNextFile (dirp, &entp))
		1923	{
		1924	FindClose (dirp);
		1925	dirp = 0;
		1926	}
		1927	#endif
1815	}	1928	}
1816	}	1929	}
1817		1930
1818	/*****************************************************************************/	1931	/*****************************************************************************/
1819		1932
…		…
1835	X_THREAD_PROC (etp_proc)	1948	X_THREAD_PROC (etp_proc)
1836	{	1949	{
1837	ETP_REQ *req;	1950	ETP_REQ *req;
1838	struct timespec ts;	1951	struct timespec ts;
1839	etp_worker self = (etp_worker )thr_arg;	1952	etp_worker self = (etp_worker )thr_arg;
1840	int timeout;	1953
		1954	#if HAVE_PRCTL_SET_NAME
		1955	prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
		1956	#endif
1841		1957
1842	/* try to distribute timeouts somewhat evenly */	1958	/* try to distribute timeouts somewhat evenly */
1843	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	1959	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844		1960
1845	for (;;)	1961	for (;;)
…		…
1915	/*****************************************************************************/	2031	/*****************************************************************************/
1916		2032
1917	int ecb_cold	2033	int ecb_cold
1918	eio_init (void (want_poll)(void), void (done_poll)(void))	2034	eio_init (void (want_poll)(void), void (done_poll)(void))
1919	{	2035	{
		2036	#if !HAVE_PREADWRITE
		2037	X_MUTEX_CREATE (preadwritelock);
		2038	#endif
		2039
1920	return etp_init (want_poll, done_poll);	2040	return etp_init (want_poll, done_poll);
1921	}	2041	}
1922		2042
1923	ecb_inline void	2043	ecb_inline void
1924	eio_api_destroy (eio_req *req)	2044	eio_api_destroy (eio_req *req)
…		…
1969	case EIO_WRITE: req->result = req->offs >= 0	2089	case EIO_WRITE: req->result = req->offs >= 0
1970	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2090	? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971	: write (req->int1, req->ptr2, req->size); break;	2091	: write (req->int1, req->ptr2, req->size); break;
1972		2092
1973	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2093	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;	2094	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1975		2095
1976	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2096	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2097	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1978	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2098	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2099	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
…		…
2009	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;	2129	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2010		2130
2011	case EIO_SYNC: req->result = 0; sync (); break;	2131	case EIO_SYNC: req->result = 0; sync (); break;
2012	case EIO_FSYNC: req->result = fsync (req->int1); break;	2132	case EIO_FSYNC: req->result = fsync (req->int1); break;
2013	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2133	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2134	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2135	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;	2136	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2015	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2137	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2016	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2138	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2017	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2139	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;	2140	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2020		2141
2021	case EIO_READDIR: eio__scandir (req, self); break;	2142	case EIO_READDIR: eio__scandir (req, self); break;
2022		2143
2023	case EIO_BUSY:	2144	case EIO_BUSY:
…		…
2104	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2225	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2105	{	2226	{
2106	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2227	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2107	}	2228	}
2108		2229
		2230	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
		2231	{
		2232	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2233	}
		2234
		2235	eio_req eio_syncfs (int fd, int pri, eio_cb cb, void data)
		2236	{
		2237	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2238	}
		2239
		2240	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		2241	{
		2242	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2243	}
		2244
2109	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2245	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2110	{	2246	{
2111	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2247	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2112	}	2248	}
2113		2249
…		…
2119	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)	2255	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
2120	{	2256	{
2121	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2257	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2122	}	2258	}
2123		2259
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)	2260	eio_req eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void data)
2130	{	2261	{
2131	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2262	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	}	2263	}
2138		2264
2139	eio_req eio_close (int fd, int pri, eio_cb cb, void data)	2265	eio_req eio_close (int fd, int pri, eio_cb cb, void data)
2140	{	2266	{
2141	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2267	REQ (EIO_CLOSE); req->int1 = fd; SEND;
…		…
2369	/* misc garbage */	2495	/* misc garbage */
2370		2496
2371	eio_ssize_t	2497	eio_ssize_t
2372	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2498	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373	{	2499	{
2374	etp_worker wrk;
2375	eio_ssize_t ret;
2376
2377	wrk.dbuf = 0;
2378
2379	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2500	return eio__sendfile (ofd, ifd, offset, count);
2380
2381	if (wrk.dbuf)
2382	free (wrk.dbuf);
2383
2384	return ret;
2385	}	2501	}
2386		2502

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.99 by root, Tue Jul 26 11:07:08 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.99 by root, Tue Jul 26 11:07:08 2011 UTC