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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.24 by root, Tue Sep 30 13:17:32 2008 UTC vs.
Revision 1.63 by root, Thu May 26 03:51:55 2011 UTC

…		…
1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008 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	*
36	* provisions above, a recipient may use your version of this file under	36	* provisions above, a recipient may use your version of this file under
37	* either the BSD or the GPL.	37	* either the BSD or the GPL.
38	*/	38	*/
39		39
40	#include "eio.h"	40	#include "eio.h"
		41
		42	#ifdef EIO_STACKSIZE
		43	# define XTHREAD_STACKSIZE EIO_STACKSIZE
		44	#endif
41	#include "xthread.h"	45	#include "xthread.h"
42		46
43	#include <errno.h>	47	#include <errno.h>
44	#include <stddef.h>	48	#include <stddef.h>
45	#include <stdlib.h>	49	#include <stdlib.h>
46	#include <string.h>	50	#include <string.h>
47	#include <errno.h>	51	#include <errno.h>
48	#include <sys/types.h>	52	#include <sys/types.h>
49	#include <sys/stat.h>	53	#include <sys/stat.h>
		54	#include <sys/statvfs.h>
50	#include <limits.h>	55	#include <limits.h>
51	#include <fcntl.h>	56	#include <fcntl.h>
52	#include <assert.h>	57	#include <assert.h>
53		58
54	#ifndef EIO_FINISH	59	#ifndef EIO_FINISH
…		…
64	#endif	69	#endif
65		70
66	#ifdef _WIN32	71	#ifdef _WIN32
67		72
68	/doh/	73	/doh/
69
70	#else	74	#else
71		75
72	# include "config.h"	76	# include "config.h"
73	# include <sys/time.h>	77	# include <sys/time.h>
74	# include <sys/select.h>	78	# include <sys/select.h>
75	# include <unistd.h>	79	# include <unistd.h>
76	# include <utime.h>	80	# include <utime.h>
77	# include <signal.h>	81	# include <signal.h>
78	# include <dirent.h>	82	# include <dirent.h>
79		83
		84	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
		85	# include <sys/mman.h>
		86	#endif
		87
		88	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		89	# if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__
		90	# define _DIRENT_HAVE_D_TYPE /* sigh */
		91	# define D_INO(de) (de)->d_fileno
		92	# define D_NAMLEN(de) (de)->d_namlen
		93	# elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600
		94	# define D_INO(de) (de)->d_ino
		95	# endif
		96
		97	#ifdef _D_EXACT_NAMLEN
		98	# undef D_NAMLEN
		99	# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
		100	#endif
		101
		102	# ifdef _DIRENT_HAVE_D_TYPE
		103	# define D_TYPE(de) (de)->d_type
		104	# endif
		105
80	# ifndef EIO_STRUCT_DIRENT	106	# ifndef EIO_STRUCT_DIRENT
81	# define EIO_STRUCT_DIRENT struct dirent	107	# define EIO_STRUCT_DIRENT struct dirent
82	# endif	108	# endif
83		109
84	#endif	110	#endif
85		111
86	#if HAVE_SENDFILE	112	#if HAVE_SENDFILE
87	# if __linux	113	# if __linux
88	# include <sys/sendfile.h>	114	# include <sys/sendfile.h>
89	# elif __freebsd	115	# elif __FreeBSD__ \|\| defined __APPLE__
90	# include <sys/socket.h>	116	# include <sys/socket.h>
91	# include <sys/uio.h>	117	# include <sys/uio.h>
92	# elif __hpux	118	# elif __hpux
93	# include <sys/socket.h>	119	# include <sys/socket.h>
94	# elif __solaris /* not yet */	120	# elif __solaris
95	# include <sys/sendfile.h>	121	# include <sys/sendfile.h>
96	# else	122	# else
97	# error sendfile support requested but not available	123	# error sendfile support requested but not available
98	# endif	124	# endif
99	#endif	125	#endif
100		126
101	/* number of seconds after which an idle threads exit */	127	#ifndef D_TYPE
102	#define IDLE_TIMEOUT 10	128	# define D_TYPE(de) 0
		129	#endif
		130	#ifndef D_INO
		131	# define D_INO(de) 0
		132	#endif
		133	#ifndef D_NAMLEN
		134	# define D_NAMLEN(de) strlen ((de)->d_name)
		135	#endif
103		136
104	/* used for struct dirent, AIX doesn't provide it */	137	/* used for struct dirent, AIX doesn't provide it */
105	#ifndef NAME_MAX	138	#ifndef NAME_MAX
106	# 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
107	#endif	145	#endif
108		146
109	/* buffer size for various temporary buffers */	147	/* buffer size for various temporary buffers */
110	#define EIO_BUFSIZE 65536	148	#define EIO_BUFSIZE 65536
111		149
…		…
155	if (wrk->dirp) \	193	if (wrk->dirp) \
156	{ \	194	{ \
157	closedir (wrk->dirp); \	195	closedir (wrk->dirp); \
158	wrk->dirp = 0; \	196	wrk->dirp = 0; \
159	}	197	}
		198
160	#define ETP_WORKER_COMMON \	199	#define ETP_WORKER_COMMON \
161	void *dbuf; \	200	void *dbuf; \
162	DIR *dirp;	201	DIR *dirp;
163		202
164	/*****************************************************************************/	203	/*****************************************************************************/
165		204
166	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	205	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
167		206
168	/* calculcate time difference in ~1/EIO_TICKS of a second */	207	/* calculate time difference in ~1/EIO_TICKS of a second */
169	static int tvdiff (struct timeval tv1, struct timeval tv2)	208	static int tvdiff (struct timeval tv1, struct timeval tv2)
170	{	209	{
171	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	210	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
172	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	211	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
173	}	212	}
…		…
181	static unsigned int max_poll_reqs; /* reslock */	220	static unsigned int max_poll_reqs; /* reslock */
182		221
183	static volatile unsigned int nreqs; /* reqlock */	222	static volatile unsigned int nreqs; /* reqlock */
184	static volatile unsigned int nready; /* reqlock */	223	static volatile unsigned int nready; /* reqlock */
185	static volatile unsigned int npending; /* reqlock */	224	static volatile unsigned int npending; /* reqlock */
186	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 */
187		227
188	static mutex_t wrklock = X_MUTEX_INIT;	228	static xmutex_t wrklock;
189	static mutex_t reslock = X_MUTEX_INIT;	229	static xmutex_t reslock;
190	static mutex_t reqlock = X_MUTEX_INIT;	230	static xmutex_t reqlock;
191	static cond_t reqwait = X_COND_INIT;	231	static xcond_t reqwait;
192		232
193	#if !HAVE_PREADWRITE	233	#if !HAVE_PREADWRITE
194	/*	234	/*
195	* make our pread/pwrite emulation safe against themselves, but not against	235	* make our pread/pwrite emulation safe against themselves, but not against
196	* 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,
197	* but that's your problem, not mine.	237	* but that's your problem, not mine.
198	*/	238	*/
199	static mutex_t preadwritelock = X_MUTEX_INIT;	239	static xmutex_t preadwritelock = X_MUTEX_INIT;
200	#endif	240	#endif
201		241
202	typedef struct etp_worker	242	typedef struct etp_worker
203	{	243	{
204	/* locked by wrklock */	244	/* locked by wrklock */
205	struct etp_worker prev, next;	245	struct etp_worker prev, next;
206		246
207	thread_t tid;	247	xthread_t tid;
208		248
209	/* locked by reslock, reqlock or wrklock */	249	/* locked by reslock, reqlock or wrklock */
210	ETP_REQ req; / currently processed request */	250	ETP_REQ req; / currently processed request */
211		251
212	ETP_WORKER_COMMON	252	ETP_WORKER_COMMON
…		…
326	}	366	}
327		367
328	abort ();	368	abort ();
329	}	369	}
330		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
331	static void etp_atfork_prepare (void)	379	static void etp_atfork_prepare (void)
332	{	380	{
333	X_LOCK (wrklock);	381	X_LOCK (wrklock);
334	X_LOCK (reqlock);	382	X_LOCK (reqlock);
335	X_LOCK (reslock);	383	X_LOCK (reslock);
…		…
373	idle = 0;	421	idle = 0;
374	nreqs = 0;	422	nreqs = 0;
375	nready = 0;	423	nready = 0;
376	npending = 0;	424	npending = 0;
377		425
378	etp_atfork_parent ();	426	etp_thread_init ();
379	}	427	}
380		428
381	static void	429	static void
382	etp_once_init (void)	430	etp_once_init (void)
383	{	431	{
		432	etp_thread_init ();
384	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);
385	}	434	}
386		435
387	static int	436	static int
388	etp_init (void (want_poll)(void), void (done_poll)(void))	437	etp_init (void (want_poll)(void), void (done_poll)(void))
…		…
565	}	614	}
566		615
567	static void etp_set_max_poll_time (double nseconds)	616	static void etp_set_max_poll_time (double nseconds)
568	{	617	{
569	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	618	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
570	max_poll_time = nseconds;	619	max_poll_time = nseconds * EIO_TICKS;
571	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);	620	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
572	}	621	}
573		622
574	static void etp_set_max_poll_reqs (unsigned int maxreqs)	623	static void etp_set_max_poll_reqs (unsigned int maxreqs)
575	{	624	{
…		…
579	}	628	}
580		629
581	static void etp_set_max_idle (unsigned int nthreads)	630	static void etp_set_max_idle (unsigned int nthreads)
582	{	631	{
583	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	632	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
584	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;
585	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	641	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
586	}	642	}
587		643
588	static void etp_set_min_parallel (unsigned int nthreads)	644	static void etp_set_min_parallel (unsigned int nthreads)
589	{	645	{
…		…
604		660
605	static void grp_try_feed (eio_req *grp)	661	static void grp_try_feed (eio_req *grp)
606	{	662	{
607	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	663	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
608	{	664	{
609	int old_len = grp->size;	665	grp->flags &= ~EIO_FLAG_GROUPADD;
610		666
611	EIO_FEED (grp);	667	EIO_FEED (grp);
612		668
613	/* stop if no progress has been made */	669	/* stop if no progress has been made */
614	if (old_len == grp->size)	670	if (!(grp->flags & EIO_FLAG_GROUPADD))
615	{	671	{
616	grp->feed = 0;	672	grp->feed = 0;
617	break;	673	break;
618	}	674	}
619	}	675	}
…		…
717	void eio_set_max_idle (unsigned int nthreads)	773	void eio_set_max_idle (unsigned int nthreads)
718	{	774	{
719	etp_set_max_idle (nthreads);	775	etp_set_max_idle (nthreads);
720	}	776	}
721		777
		778	void eio_set_idle_timeout (unsigned int seconds)
		779	{
		780	etp_set_idle_timeout (seconds);
		781	}
		782
722	void eio_set_min_parallel (unsigned int nthreads)	783	void eio_set_min_parallel (unsigned int nthreads)
723	{	784	{
724	etp_set_min_parallel (nthreads);	785	etp_set_min_parallel (nthreads);
725	}	786	}
726		787
…		…
736		797
737	/*****************************************************************************/	798	/*****************************************************************************/
738	/* work around various missing functions */	799	/* work around various missing functions */
739		800
740	#if !HAVE_PREADWRITE	801	#if !HAVE_PREADWRITE
		802	# undef pread
		803	# undef pwrite
741	# define pread eio__pread	804	# define pread eio__pread
742	# define pwrite eio__pwrite	805	# define pwrite eio__pwrite
743		806
744	static ssize_t	807	static ssize_t
745	eio__pread (int fd, void *buf, size_t count, off_t offset)	808	eio__pread (int fd, void *buf, size_t count, off_t offset)
…		…
765		828
766	X_LOCK (preadwritelock);	829	X_LOCK (preadwritelock);
767	ooffset = lseek (fd, 0, SEEK_CUR);	830	ooffset = lseek (fd, 0, SEEK_CUR);
768	lseek (fd, offset, SEEK_SET);	831	lseek (fd, offset, SEEK_SET);
769	res = write (fd, buf, count);	832	res = write (fd, buf, count);
770	lseek (fd, offset, SEEK_SET);	833	lseek (fd, ooffset, SEEK_SET);
771	X_UNLOCK (preadwritelock);	834	X_UNLOCK (preadwritelock);
772		835
773	return res;	836	return res;
774	}	837	}
775	#endif	838	#endif
776		839
777	#ifndef HAVE_FUTIMES	840	#ifndef HAVE_UTIMES
778		841
		842	# undef utimes
779	# define utimes(path,times) eio__utimes (path, times)	843	# define utimes(path,times) eio__utimes (path, times)
780	# define futimes(fd,times) eio__futimes (fd, times)
781		844
782	static int	845	static int
783	eio__utimes (const char *filename, const struct timeval times[2])	846	eio__utimes (const char *filename, const struct timeval times[2])
784	{	847	{
785	if (times)	848	if (times)
…		…
793	}	856	}
794	else	857	else
795	return utime (filename, 0);	858	return utime (filename, 0);
796	}	859	}
797		860
		861	#endif
		862
		863	#ifndef HAVE_FUTIMES
		864
		865	# undef futimes
		866	# define futimes(fd,times) eio__futimes (fd, times)
		867
798	static int eio__futimes (int fd, const struct timeval tv[2])	868	static int eio__futimes (int fd, const struct timeval tv[2])
799	{	869	{
800	errno = ENOSYS;	870	errno = ENOSYS;
801	return -1;	871	return -1;
802	}	872	}
803		873
804	#endif	874	#endif
805		875
806	#if !HAVE_FDATASYNC	876	#if !HAVE_FDATASYNC
		877	# undef fdatasync
807	# define fdatasync fsync	878	# define fdatasync(fd) fsync (fd)
808	#endif	879	#endif
		880
		881	/* sync_file_range always needs emulation */
		882	int
		883	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
		884	{
		885	#if HAVE_SYNC_FILE_RANGE
		886	int res;
		887
		888	if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
		889	\|\| EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
		890	\|\| EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
		891	{
		892	flags = 0
		893	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
		894	\| (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
		895	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
		896	}
		897
		898	res = sync_file_range (fd, offset, nbytes, flags);
		899
		900	if (!res \|\| errno != ENOSYS)
		901	return res;
		902	#endif
		903
		904	/* even though we could play tricks with the flags, it's better to always
		905	* call fdatasync, as that matches the expectation of its users best */
		906	return fdatasync (fd);
		907	}
809		908
810	#if !HAVE_READAHEAD	909	#if !HAVE_READAHEAD
		910	# undef readahead
811	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	911	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
812		912
813	static ssize_t	913	static ssize_t
814	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)	914	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
815	{	915	{
…		…
842		942
843	#if HAVE_SENDFILE	943	#if HAVE_SENDFILE
844	# if __linux	944	# if __linux
845	res = sendfile (ofd, ifd, &offset, count);	945	res = sendfile (ofd, ifd, &offset, count);
846		946
847	# elif __freebsd	947	# elif __FreeBSD__
848	/*	948	/*
849	* 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
850	* wasted on making it similar to other I/O functions.	950	* wasted on making it similar to other I/O functions.
851	*/	951	*/
852	{	952	{
853	off_t sbytes;	953	off_t sbytes;
854	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);	954	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
855		955
856	if (res < 0 && sbytes)	956	#if 0 /* according to the manpage, this is correct, but broken behaviour */
857	/* 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)
858	res = sbytes;	977	res = sbytes;
859	}	978	}
860		979
861	# elif __hpux	980	# elif __hpux
862	res = sendfile (ofd, ifd, offset, count, 0, 0);	981	res = sendfile (ofd, ifd, offset, count, 0, 0);
…		…
876	if (res < 0 && sbytes)	995	if (res < 0 && sbytes)
877	res = sbytes;	996	res = sbytes;
878	}	997	}
879		998
880	# 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
881	#else	1010	#else
882	res = -1;	1011	res = -1;
883	errno = ENOSYS;	1012	errno = ENOSYS;
884	#endif	1013	#endif
885		1014
886	if (res < 0	1015	if (res < 0
887	&& (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 */
888	#if __solaris	1022	#if __solaris
889	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE	1023	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE
890	#endif	1024	#endif
891	)	1025	)
892	)	1026	)
…		…
923	}	1057	}
924		1058
925	return res;	1059	return res;
926	}	1060	}
927		1061
		1062	static signed char
		1063	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
		1064	{
		1065	return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
		1066	: a->inode < b->inode ? -1
		1067	: a->inode > b->inode ? 1
		1068	: 0;
		1069	}
		1070
		1071	#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
		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);
		1225	}
		1226
928	/* read a full directory */	1227	/* read a full directory */
929	static void	1228	static void
930	eio__scandir (eio_req req, etp_worker self)	1229	eio__scandir (eio_req req, etp_worker self)
931	{	1230	{
932	DIR *dirp;	1231	DIR *dirp;
933	EIO_STRUCT_DIRENT *entp;	1232	EIO_STRUCT_DIRENT *entp;
934	char name, names;	1233	char name, names;
935	int memlen = 4096;	1234	int namesalloc = 4096;
936	int memofs = 0;	1235	int namesoffs = 0;
		1236	int flags = req->int1;
		1237	eio_dirent *dents = 0;
		1238	int dentalloc = 128;
937	int res = 0;	1239	int dentoffs = 0;
		1240	ino_t inode_bits = 0;
		1241
		1242	req->result = -1;
		1243
		1244	if (!(flags & EIO_READDIR_DENTS))
		1245	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
938		1246
939	X_LOCK (wrklock);	1247	X_LOCK (wrklock);
940	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1248	/* the corresponding closedir is in ETP_WORKER_CLEAR */
941	self->dirp = dirp = opendir (req->ptr1);	1249	self->dirp = dirp = opendir (req->ptr1);
		1250
942	req->flags \|= EIO_FLAG_PTR2_FREE;	1251	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
		1252	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
943	req->ptr2 = names = malloc (memlen);	1253	req->ptr2 = names = malloc (namesalloc);
944	X_UNLOCK (wrklock);	1254	X_UNLOCK (wrklock);
945		1255
946	if (dirp && names)	1256	if (dirp && names && (!flags \|\| dents))
947	for (;;)	1257	for (;;)
948	{	1258	{
949	errno = 0;	1259	errno = 0;
950	entp = readdir (dirp);	1260	entp = readdir (dirp);
951		1261
952	if (!entp)	1262	if (!entp)
		1263	{
		1264	if (errno)
		1265	break;
		1266
		1267	/* sort etc. */
		1268	req->int1 = flags;
		1269	req->result = dentoffs;
		1270
		1271	if (flags & EIO_READDIR_STAT_ORDER)
		1272	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
		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
		1277	{
		1278	/* in this case, all is known, and we just put dirs first and sort them */
		1279	eio_dirent *oth = dents + dentoffs;
		1280	eio_dirent *dir = dents;
		1281
		1282	/* now partition dirs to the front, and non-dirs to the back */
		1283	/* by walking from both sides and swapping if necessary */
		1284	/* also clear score, so it doesn't influence sorting */
		1285	while (oth > dir)
		1286	{
		1287	if (dir->type == EIO_DT_DIR)
		1288	++dir;
		1289	else if ((--oth)->type == EIO_DT_DIR)
		1290	{
		1291	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1292
		1293	++dir;
		1294	}
		1295	}
		1296
		1297	/* now sort the dirs only */
		1298	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1299	}
		1300
953	break;	1301	break;
		1302	}
954		1303
		1304	/* now add the entry to our list(s) */
955	name = entp->d_name;	1305	name = entp->d_name;
956		1306
		1307	/* skip . and .. entries */
957	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1308	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
958	{	1309	{
959	int len = strlen (name) + 1;	1310	int len = D_NAMLEN (entp) + 1;
960		1311
961	res++;	1312	while (expect_false (namesoffs + len > namesalloc))
962
963	while (memofs + len > memlen)
964	{	1313	{
965	memlen *= 2;	1314	namesalloc *= 2;
966	X_LOCK (wrklock);	1315	X_LOCK (wrklock);
967	req->ptr2 = names = realloc (names, memlen);	1316	req->ptr2 = names = realloc (names, namesalloc);
968	X_UNLOCK (wrklock);	1317	X_UNLOCK (wrklock);
969		1318
970	if (!names)	1319	if (!names)
971	break;	1320	break;
972	}	1321	}
973		1322
974	memcpy (names + memofs, name, len);	1323	memcpy (names + namesoffs, name, len);
		1324
		1325	if (dents)
		1326	{
		1327	struct eio_dirent *ent;
		1328
		1329	if (expect_false (dentoffs == dentalloc))
		1330	{
		1331	dentalloc *= 2;
		1332	X_LOCK (wrklock);
		1333	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1334	X_UNLOCK (wrklock);
		1335
		1336	if (!dents)
		1337	break;
		1338	}
		1339
		1340	ent = dents + dentoffs;
		1341
		1342	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
		1343	ent->namelen = len - 1;
		1344	ent->inode = D_INO (entp);
		1345
		1346	inode_bits \|= ent->inode;
		1347
		1348	switch (D_TYPE (entp))
		1349	{
		1350	default:
		1351	ent->type = EIO_DT_UNKNOWN;
		1352	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1353	break;
		1354
		1355	#ifdef DT_FIFO
		1356	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1357	#endif
		1358	#ifdef DT_CHR
		1359	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1360	#endif
		1361	#ifdef DT_MPC
		1362	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1363	#endif
		1364	#ifdef DT_DIR
		1365	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1366	#endif
		1367	#ifdef DT_NAM
		1368	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1369	#endif
		1370	#ifdef DT_BLK
		1371	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1372	#endif
		1373	#ifdef DT_MPB
		1374	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1375	#endif
		1376	#ifdef DT_REG
		1377	case DT_REG: ent->type = EIO_DT_REG; break;
		1378	#endif
		1379	#ifdef DT_NWK
		1380	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1381	#endif
		1382	#ifdef DT_CMP
		1383	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1384	#endif
		1385	#ifdef DT_LNK
		1386	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1387	#endif
		1388	#ifdef DT_SOCK
		1389	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1390	#endif
		1391	#ifdef DT_DOOR
		1392	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1393	#endif
		1394	#ifdef DT_WHT
		1395	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1396	#endif
		1397	}
		1398
		1399	ent->score = 7;
		1400
		1401	if (flags & EIO_READDIR_DIRS_FIRST)
		1402	{
		1403	if (ent->type == EIO_DT_UNKNOWN)
		1404	{
		1405	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1406	ent->score = 1;
		1407	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1408	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
		1409	}
		1410	else if (ent->type == EIO_DT_DIR)
		1411	ent->score = 0;
		1412	}
		1413	}
		1414
975	memofs += len;	1415	namesoffs += len;
		1416	++dentoffs;
		1417	}
		1418
		1419	if (EIO_CANCELLED (req))
		1420	{
		1421	errno = ECANCELED;
		1422	break;
976	}	1423	}
977	}	1424	}
978
979	if (errno)
980	res = -1;
981
982	req->result = res;
983	}	1425	}
		1426
		1427	#ifdef PAGESIZE
		1428	# define eio_pagesize() PAGESIZE
		1429	#else
		1430	static intptr_t
		1431	eio_pagesize (void)
		1432	{
		1433	static intptr_t page;
		1434
		1435	if (!page)
		1436	page = sysconf (_SC_PAGESIZE);
		1437
		1438	return page;
		1439	}
		1440	#endif
		1441
		1442	static void
		1443	eio_page_align (void *addr, size_t length)
		1444	{
		1445	intptr_t mask = eio_pagesize () - 1;
		1446
		1447	/* round down addr */
		1448	intptr_t adj = mask & (intptr_t)*addr;
		1449
		1450	addr = (void )((intptr_t)*addr - adj);
		1451	*length += adj;
		1452
		1453	/* round up length */
		1454	length = (length + mask) & ~mask;
		1455	}
		1456
		1457	#if !_POSIX_MEMLOCK
		1458	# define eio__mlockall(a) ((errno = ENOSYS), -1)
		1459	#else
		1460
		1461	static int
		1462	eio__mlockall (int flags)
		1463	{
		1464	#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
		1465	extern int mallopt (int, int);
		1466	mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
		1467	#endif
		1468
		1469	if (EIO_MCL_CURRENT != MCL_CURRENT
		1470	\|\| EIO_MCL_FUTURE != MCL_FUTURE)
		1471	{
		1472	flags = 0
		1473	\| (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
		1474	\| (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
		1475	}
		1476
		1477	return mlockall (flags);
		1478	}
		1479	#endif
		1480
		1481	#if !_POSIX_MEMLOCK_RANGE
		1482	# define eio__mlock(a,b) ((errno = ENOSYS), -1)
		1483	#else
		1484
		1485	static int
		1486	eio__mlock (void *addr, size_t length)
		1487	{
		1488	eio_page_align (&addr, &length);
		1489
		1490	return mlock (addr, length);
		1491	}
		1492
		1493	#endif
984		1494
985	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)	1495	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
986	# define msync(a,b,c) ENOSYS	1496	# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
		1497	#else
		1498
		1499	int
		1500	eio__msync (void *mem, size_t len, int flags)
		1501	{
		1502	eio_page_align (&mem, &len);
		1503
		1504	if (EIO_MS_ASYNC != MS_SYNC
		1505	\|\| EIO_MS_INVALIDATE != MS_INVALIDATE
		1506	\|\| EIO_MS_SYNC != MS_SYNC)
		1507	{
		1508	flags = 0
		1509	\| (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
		1510	\| (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
		1511	\| (flags & EIO_MS_SYNC ? MS_SYNC : 0);
		1512	}
		1513
		1514	return msync (mem, len, flags);
		1515	}
		1516
987	#endif	1517	#endif
988		1518
989	int	1519	int
990	eio__mtouch (void *mem, size_t len, int flags)	1520	eio__mtouch (void *mem, size_t len, int flags)
991	{	1521	{
		1522	eio_page_align (&mem, &len);
		1523
		1524	{
992	intptr_t addr = (intptr_t)mem;	1525	intptr_t addr = (intptr_t)mem;
993	intptr_t end = addr + len;	1526	intptr_t end = addr + len;
994	#ifdef PAGESIZE	1527	intptr_t page = eio_pagesize ();
995	const intptr_t page = PAGESIZE;
996	#else
997	static intptr_t page;
998		1528
999	if (!page)
1000	page = sysconf (_SC_PAGESIZE);
1001	#endif
1002
1003	addr &= ~(page - 1); /* assume page size is always a power of two */
1004
1005	if (addr < end)	1529	if (addr < end)
1006	if (flags) /* modify */	1530	if (flags & EIO_MT_MODIFY) /* modify */
1007	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);	1531	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);
1008	else	1532	else
1009	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);	1533	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);
		1534	}
1010		1535
1011	return 0;	1536	return 0;
1012	}	1537	}
1013		1538
1014	/*****************************************************************************/	1539	/*****************************************************************************/
…		…
1048	if (req)	1573	if (req)
1049	break;	1574	break;
1050		1575
1051	++idle;	1576	++idle;
1052		1577
1053	ts.tv_sec = time (0) + IDLE_TIMEOUT;	1578	ts.tv_sec = time (0) + idle_timeout;
1054	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)	1579	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1055	{	1580	{
1056	if (idle > max_idle)	1581	if (idle > max_idle)
1057	{	1582	{
1058	--idle;	1583	--idle;
…		…
1137	return 0; \	1662	return 0; \
1138	}	1663	}
1139		1664
1140	static void eio_execute (etp_worker self, eio_req req)	1665	static void eio_execute (etp_worker self, eio_req req)
1141	{	1666	{
1142	errno = 0;
1143
1144	switch (req->type)	1667	switch (req->type)
1145	{	1668	{
1146	case EIO_READ: ALLOC (req->size);	1669	case EIO_READ: ALLOC (req->size);
1147	req->result = req->offs >= 0	1670	req->result = req->offs >= 0
1148	? pread (req->int1, req->ptr2, req->size, req->offs)	1671	? pread (req->int1, req->ptr2, req->size, req->offs)
…		…
1159	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1682	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1160	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	1683	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1161	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1684	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1162	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	1685	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1163		1686
		1687	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		1688	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		1689	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		1690	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		1691
1164	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;	1692	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1165	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	1693	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1166	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;	1694	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1167	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	1695	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1168	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;	1696	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
…		…
1175	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;	1703	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1176	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;	1704	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1177	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;	1705	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1178	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;	1706	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1179	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;	1707	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1180	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;	1708	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1181		1709
1182	case EIO_READLINK: ALLOC (NAME_MAX);	1710	case EIO_READLINK: ALLOC (PATH_MAX);
1183	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	1711	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1184		1712
1185	case EIO_SYNC: req->result = 0; sync (); break;	1713	case EIO_SYNC: req->result = 0; sync (); break;
1186	case EIO_FSYNC: req->result = fsync (req->int1); break;	1714	case EIO_FSYNC: req->result = fsync (req->int1); break;
1187	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1715	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1188	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;	1716	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1189	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;	1717	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1718	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
		1719	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
		1720	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1190		1721
1191	case EIO_READDIR: eio__scandir (req, self); break;	1722	case EIO_READDIR: eio__scandir (req, self); break;
1192		1723
1193	case EIO_BUSY:	1724	case EIO_BUSY:
1194	#ifdef _WIN32	1725	#ifdef _WIN32
1195	Sleep (req->nv1 * 1000.);	1726	Sleep (req->nv1 * 1e3);
1196	#else	1727	#else
1197	{	1728	{
1198	struct timeval tv;	1729	struct timeval tv;
1199		1730
1200	tv.tv_sec = req->nv1;	1731	tv.tv_sec = req->nv1;
1201	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;	1732	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1202		1733
1203	req->result = select (0, 0, 0, 0, &tv);	1734	req->result = select (0, 0, 0, 0, &tv);
1204	}	1735	}
1205	#endif	1736	#endif
1206	break;	1737	break;
…		…
1221	times = tv;	1752	times = tv;
1222	}	1753	}
1223	else	1754	else
1224	times = 0;	1755	times = 0;
1225		1756
1226
1227	req->result = req->type == EIO_FUTIME	1757	req->result = req->type == EIO_FUTIME
1228	? futimes (req->int1, times)	1758	? futimes (req->int1, times)
1229	: utimes (req->ptr1, times);	1759	: utimes (req->ptr1, times);
1230	}	1760	}
		1761	break;
1231		1762
1232	case EIO_GROUP:	1763	case EIO_GROUP:
1233	abort (); /* handled in eio_request */	1764	abort (); /* handled in eio_request */
1234		1765
1235	case EIO_NOP:	1766	case EIO_NOP:
…		…
1239	case EIO_CUSTOM:	1770	case EIO_CUSTOM:
1240	((void ()(eio_req ))req->feed) (req);	1771	((void ()(eio_req ))req->feed) (req);
1241	break;	1772	break;
1242		1773
1243	default:	1774	default:
		1775	errno = ENOSYS;
1244	req->result = -1;	1776	req->result = -1;
1245	break;	1777	break;
1246	}	1778	}
1247		1779
1248	req->errorno = errno;	1780	req->errorno = errno;
…		…
1278	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	1810	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1279	{	1811	{
1280	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	1812	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1281	}	1813	}
1282		1814
		1815	eio_req eio_mlock (void addr, size_t length, int pri, eio_cb cb, void *data)
		1816	{
		1817	REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
		1818	}
		1819
		1820	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
		1821	{
		1822	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
		1823	}
		1824
		1825	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1826	{
		1827	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1828	}
		1829
1283	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1830	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1284	{	1831	{
1285	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1832	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1286	}	1833	}
1287		1834
…		…
1306	}	1853	}
1307		1854
1308	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)	1855	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)
1309	{	1856	{
1310	REQ (EIO_FSTAT); req->int1 = fd; SEND;	1857	REQ (EIO_FSTAT); req->int1 = fd; SEND;
		1858	}
		1859
		1860	eio_req eio_fstatvfs (int fd, int pri, eio_cb cb, void data)
		1861	{
		1862	REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1311	}	1863	}
1312		1864
1313	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)	1865	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)
1314	{	1866	{
1315	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;	1867	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
…		…
1389	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)	1941	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)
1390	{	1942	{
1391	return eio__1path (EIO_LSTAT, path, pri, cb, data);	1943	return eio__1path (EIO_LSTAT, path, pri, cb, data);
1392	}	1944	}
1393		1945
		1946	eio_req eio_statvfs (const char path, int pri, eio_cb cb, void *data)
		1947	{
		1948	return eio__1path (EIO_STATVFS, path, pri, cb, data);
		1949	}
		1950
1394	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)	1951	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)
1395	{	1952	{
1396	return eio__1path (EIO_UNLINK, path, pri, cb, data);	1953	return eio__1path (EIO_UNLINK, path, pri, cb, data);
1397	}	1954	}
1398		1955
1399	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1956	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1400	{	1957	{
1401	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1958	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1402	}	1959	}
1403		1960
1404	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1961	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1405	{	1962	{
1406	return eio__1path (EIO_READDIR, path, pri, cb, data);	1963	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1407	}	1964	}
1408		1965
1409	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1966	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1410	{	1967	{
1411	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	1968	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1412	}	1969	}
1413		1970
1414	static eio_req *	1971	static eio_req *
1415	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)	1972	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1416	{	1973	{
…		…
1480		2037
1481	void eio_grp_add (eio_req grp, eio_req req)	2038	void eio_grp_add (eio_req grp, eio_req req)
1482	{	2039	{
1483	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	2040	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1484		2041
		2042	grp->flags \|= EIO_FLAG_GROUPADD;
		2043
1485	++grp->size;	2044	++grp->size;
1486	req->grp = grp;	2045	req->grp = grp;
1487		2046
1488	req->grp_prev = 0;	2047	req->grp_prev = 0;
1489	req->grp_next = grp->grp_first;	2048	req->grp_next = grp->grp_first;
…		…
1498	/* misc garbage */	2057	/* misc garbage */
1499		2058
1500	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2059	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1501	{	2060	{
1502	etp_worker wrk;	2061	etp_worker wrk;
		2062	ssize_t ret;
1503		2063
1504	wrk.dbuf = 0;	2064	wrk.dbuf = 0;
1505		2065
1506	eio__sendfile (ofd, ifd, offset, count, &wrk);	2066	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1507		2067
1508	if (wrk.dbuf)	2068	if (wrk.dbuf)
1509	free (wrk.dbuf);	2069	free (wrk.dbuf);
1510	}
1511		2070
		2071	return ret;
		2072	}
		2073

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.24 by root, Tue Sep 30 13:17:32 2008 UTC vs. Revision 1.63 by root, Thu May 26 03:51:55 2011 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.24 by root, Tue Sep 30 13:17:32 2008 UTC vs.
Revision 1.63 by root, Thu May 26 03:51:55 2011 UTC