ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/libeio/eio.c

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.33 by root, Sat Jun 6 19:44:17 2009 UTC vs.
Revision 1.91 by root, Sun Jul 17 04:20:04 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	*
…		…
35	* and other provisions required by the GPL. If you do not delete the	35	* and other provisions required by the GPL. If you do not delete the
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	#ifndef _WIN32
		41	# include "config.h"
		42	#endif
		43
40	#include "eio.h"	44	#include "eio.h"
		45	#include "ecb.h"
41		46
42	#ifdef EIO_STACKSIZE	47	#ifdef EIO_STACKSIZE
43	# define XTHREAD_STACKSIZE EIO_STACKSIZE	48	# define XTHREAD_STACKSIZE EIO_STACKSIZE
44	#endif	49	#endif
45	#include "xthread.h"	50	#include "xthread.h"
…		…
53	#include <sys/stat.h>	58	#include <sys/stat.h>
54	#include <limits.h>	59	#include <limits.h>
55	#include <fcntl.h>	60	#include <fcntl.h>
56	#include <assert.h>	61	#include <assert.h>
57		62
		63	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
		64	/* intptr_t only comes from stdint.h, says idiot openbsd coder */
		65	#if HAVE_STDINT_H
		66	# include <stdint.h>
		67	#endif
		68
		69	#ifndef ECANCELED
		70	# define ECANCELED EDOM
		71	#endif
		72	#ifndef ELOOP
		73	# define ELOOP EDOM
		74	#endif
		75
		76	static void eio_destroy (eio_req *req);
		77
58	#ifndef EIO_FINISH	78	#ifndef EIO_FINISH
59	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0	79	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
60	#endif	80	#endif
61		81
62	#ifndef EIO_DESTROY	82	#ifndef EIO_DESTROY
…		…
65		85
66	#ifndef EIO_FEED	86	#ifndef EIO_FEED
67	# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)	87	# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
68	#endif	88	#endif
69		89
		90	#ifndef EIO_FD_TO_WIN32_HANDLE
		91	# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
		92	#endif
		93	#ifndef EIO_WIN32_HANDLE_TO_FD
		94	# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
		95	#endif
		96
		97	#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
		98
		99	#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
		100
70	#ifdef _WIN32	101	#ifdef _WIN32
71		102
72	/*doh*/	103	#undef PAGESIZE
		104	#define PAGESIZE 4096 /* GetSystemInfo? */
		105
		106	#ifdef EIO_STRUCT_STATI64
		107	#define stat(path,buf) _stati64 (path,buf)
		108	#define fstat(fd,buf) _fstati64 (path,buf)
		109	#endif
		110	#define lstat(path,buf) stat (path,buf)
		111	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
		112	#define mkdir(path,mode) _mkdir (path)
		113	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
		114
		115	#define chmod(path,mode) _chmod (path, mode)
		116	#define dup(fd) _dup (fd)
		117	#define dup2(fd1,fd2) _dup2 (fd1, fd2)
		118
		119	#define fchmod(fd,mode) EIO_ENOSYS ()
		120	#define chown(path,uid,gid) EIO_ENOSYS ()
		121	#define fchown(fd,uid,gid) EIO_ENOSYS ()
		122	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
		123	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
		124	#define mknod(path,mode,dev) EIO_ENOSYS ()
		125	#define sync() EIO_ENOSYS ()
		126	#define readlink(path,buf,s) EIO_ENOSYS ()
		127	#define statvfs(path,buf) EIO_ENOSYS ()
		128	#define fstatvfs(fd,buf) EIO_ENOSYS ()
		129
		130	/* we could even stat and see if it exists */
		131	static int
		132	symlink (const char *old, const char *neu)
		133	{
		134	#if WINVER >= 0x0600
		135	if (CreateSymbolicLink (neu, old, 1))
		136	return 0;
		137
		138	if (CreateSymbolicLink (neu, old, 0))
		139	return 0;
		140	#endif
		141
		142	return EIO_ERRNO (ENOENT, -1);
		143	}
		144
		145	/* POSIX API only */
		146	#define CreateHardLink(neu,old,flags) 0
		147	#define CreateSymbolicLink(neu,old,flags) 0
		148
		149	struct statvfs
		150	{
		151	int dummy;
		152	};
		153
		154	#define DT_DIR EIO_DT_DIR
		155	#define DT_REG EIO_DT_REG
		156	#define D_NAME(entp) entp.cFileName
		157	#define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
		158
73	#else	159	#else
74		160
75	# include "config.h"
76	# include <sys/time.h>	161	#include <sys/time.h>
77	# include <sys/select.h>	162	#include <sys/select.h>
		163	#include <sys/statvfs.h>
78	# include <unistd.h>	164	#include <unistd.h>
79	# include <utime.h>	165	#include <utime.h>
80	# include <signal.h>	166	#include <signal.h>
81	# include <dirent.h>	167	#include <dirent.h>
82		168
		169	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
		170	#include <sys/mman.h>
		171	#endif
		172
		173	#define D_NAME(entp) entp->d_name
		174
83	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	175	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
84	# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)	176	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
85	# define _DIRENT_HAVE_D_TYPE /* sigh */	177	#define _DIRENT_HAVE_D_TYPE /* sigh */
86	# define D_INO(de) (de)->d_fileno	178	#define D_INO(de) (de)->d_fileno
87	# define D_NAMLEN(de) (de)->d_namlen	179	#define D_NAMLEN(de) (de)->d_namlen
88	# elif defined(__linux) || defined(d_ino) || _XOPEN_SOURCE >= 600	180	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
89	# define D_INO(de) (de)->d_ino	181	#define D_INO(de) (de)->d_ino
90	# endif	182	#endif
91		183
92	#ifdef _D_EXACT_NAMLEN	184	#ifdef _D_EXACT_NAMLEN
93	# undef D_NAMLEN	185	#undef D_NAMLEN
94	# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)	186	#define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
95	#endif	187	#endif
96		188
97	# ifdef _DIRENT_HAVE_D_TYPE	189	#ifdef _DIRENT_HAVE_D_TYPE
98	# define D_TYPE(de) (de)->d_type	190	#define D_TYPE(de) (de)->d_type
99	# endif	191	#endif
100		192
101	# ifndef EIO_STRUCT_DIRENT	193	#ifndef EIO_STRUCT_DIRENT
102	# define EIO_STRUCT_DIRENT struct dirent	194	#define EIO_STRUCT_DIRENT struct dirent
103	# endif	195	#endif
104		196
105	#endif	197	#endif
106		198
107	#if HAVE_SENDFILE	199	#if HAVE_SENDFILE
108	# if __linux	200	# if __linux
109	# include <sys/sendfile.h>	201	# include <sys/sendfile.h>
110	# elif __freebsd	202	# elif __FreeBSD__ || defined __APPLE__
111	# include <sys/socket.h>	203	# include <sys/socket.h>
112	# include <sys/uio.h>	204	# include <sys/uio.h>
113	# elif __hpux	205	# elif __hpux
114	# include <sys/socket.h>	206	# include <sys/socket.h>
115	# elif __solaris /* not yet */	207	# elif __solaris
116	# include <sys/sendfile.h>	208	# include <sys/sendfile.h>
117	# else	209	# else
118	# error sendfile support requested but not available	210	# error sendfile support requested but not available
119	# endif	211	# endif
120	#endif	212	#endif
…		…
124	#endif	216	#endif
125	#ifndef D_INO	217	#ifndef D_INO
126	# define D_INO(de) 0	218	# define D_INO(de) 0
127	#endif	219	#endif
128	#ifndef D_NAMLEN	220	#ifndef D_NAMLEN
129	# define D_NAMLEN(de) strlen ((de)->d_name)	221	# define D_NAMLEN(entp) strlen (D_NAME (entp))
130	#endif	222	#endif
131
132	/* number of seconds after which an idle threads exit */
133	#define IDLE_TIMEOUT 10
134		223
135	/* used for struct dirent, AIX doesn't provide it */	224	/* used for struct dirent, AIX doesn't provide it */
136	#ifndef NAME_MAX	225	#ifndef NAME_MAX
137	# define NAME_MAX 4096	226	# define NAME_MAX 4096
		227	#endif
		228
		229	/* used for readlink etc. */
		230	#ifndef PATH_MAX
		231	# define PATH_MAX 4096
138	#endif	232	#endif
139		233
140	/* buffer size for various temporary buffers */	234	/* buffer size for various temporary buffers */
141	#define EIO_BUFSIZE 65536	235	#define EIO_BUFSIZE 65536
142		236
…		…
149	if (!eio_buf) \	243	if (!eio_buf) \
150	return -1;	244	return -1;
151		245
152	#define EIO_TICKS ((1000000 + 1023) >> 10)	246	#define EIO_TICKS ((1000000 + 1023) >> 10)
153		247
154	/*****************************************************************************/
155
156	#if __GNUC__ >= 3
157	# define expect(expr,value) __builtin_expect ((expr),(value))
158	#else
159	# define expect(expr,value) (expr)
160	#endif
161
162	#define expect_false(expr) expect ((expr) != 0, 0)
163	#define expect_true(expr) expect ((expr) != 0, 1)
164
165	/*****************************************************************************/
166
167	#define ETP_PRI_MIN EIO_PRI_MIN	248	#define ETP_PRI_MIN EIO_PRI_MIN
168	#define ETP_PRI_MAX EIO_PRI_MAX	249	#define ETP_PRI_MAX EIO_PRI_MAX
169		250
170	struct etp_worker;	251	struct etp_worker;
171		252
…		…
179	#define ETP_WORKER_CLEAR(req) \	260	#define ETP_WORKER_CLEAR(req) \
180	if (wrk->dbuf) \	261	if (wrk->dbuf) \
181	{ \	262	{ \
182	free (wrk->dbuf); \	263	free (wrk->dbuf); \
183	wrk->dbuf = 0; \	264	wrk->dbuf = 0; \
184	} \
185	\
186	if (wrk->dirp) \
187	{ \
188	closedir (wrk->dirp); \
189	wrk->dirp = 0; \
190	}	265	}
191		266
192	#define ETP_WORKER_COMMON \	267	#define ETP_WORKER_COMMON \
193	void *dbuf; \	268	void *dbuf;
194	DIR *dirp;
195		269
196	/*****************************************************************************/	270	/*****************************************************************************/
197		271
198	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	272	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
199		273
200	/* calculcate time difference in ~1/EIO_TICKS of a second */	274	/* calculate time difference in ~1/EIO_TICKS of a second */
		275	ecb_inline int
201	static int tvdiff (struct timeval *tv1, struct timeval *tv2)	276	tvdiff (struct timeval *tv1, struct timeval *tv2)
202	{	277	{
203	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	278	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
204	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	279	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
205	}	280	}
206		281
…		…
213	static unsigned int max_poll_reqs; /* reslock */	288	static unsigned int max_poll_reqs; /* reslock */
214		289
215	static volatile unsigned int nreqs; /* reqlock */	290	static volatile unsigned int nreqs; /* reqlock */
216	static volatile unsigned int nready; /* reqlock */	291	static volatile unsigned int nready; /* reqlock */
217	static volatile unsigned int npending; /* reqlock */	292	static volatile unsigned int npending; /* reqlock */
218	static volatile unsigned int max_idle = 4;	293	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
		294	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
219		295
220	static mutex_t wrklock = X_MUTEX_INIT;	296	static xmutex_t wrklock;
221	static mutex_t reslock = X_MUTEX_INIT;	297	static xmutex_t reslock;
222	static mutex_t reqlock = X_MUTEX_INIT;	298	static xmutex_t reqlock;
223	static cond_t reqwait = X_COND_INIT;	299	static xcond_t reqwait;
224		300
225	#if !HAVE_PREADWRITE	301	#if !HAVE_PREADWRITE
226	/*	302	/*
227	* make our pread/pwrite emulation safe against themselves, but not against	303	* make our pread/pwrite emulation safe against themselves, but not against
228	* normal read/write by using a mutex. slows down execution a lot,	304	* normal read/write by using a mutex. slows down execution a lot,
229	* but that's your problem, not mine.	305	* but that's your problem, not mine.
230	*/	306	*/
231	static mutex_t preadwritelock = X_MUTEX_INIT;	307	static xmutex_t preadwritelock = X_MUTEX_INIT;
232	#endif	308	#endif
233		309
234	typedef struct etp_worker	310	typedef struct etp_worker
235	{	311	{
236	/* locked by wrklock */	312	/* locked by wrklock */
237	struct etp_worker *prev, *next;	313	struct etp_worker *prev, *next;
238		314
239	thread_t tid;	315	xthread_t tid;
240		316
241	/* locked by reslock, reqlock or wrklock */	317	/* locked by reslock, reqlock or wrklock */
242	ETP_REQ *req; /* currently processed request */	318	ETP_REQ *req; /* currently processed request */
243		319
244	ETP_WORKER_COMMON	320	ETP_WORKER_COMMON
…		…
249	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	325	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
250	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	326	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
251		327
252	/* worker threads management */	328	/* worker threads management */
253		329
		330	static void ecb_cold
254	static void etp_worker_clear (etp_worker *wrk)	331	etp_worker_clear (etp_worker *wrk)
255	{	332	{
256	ETP_WORKER_CLEAR (wrk);	333	ETP_WORKER_CLEAR (wrk);
257	}	334	}
258		335
		336	static void ecb_cold
259	static void etp_worker_free (etp_worker *wrk)	337	etp_worker_free (etp_worker *wrk)
260	{	338	{
261	wrk->next->prev = wrk->prev;	339	wrk->next->prev = wrk->prev;
262	wrk->prev->next = wrk->next;	340	wrk->prev->next = wrk->next;
263		341
264	free (wrk);	342	free (wrk);
265	}	343	}
266		344
267	static unsigned int etp_nreqs (void)	345	static unsigned int
		346	etp_nreqs (void)
268	{	347	{
269	int retval;	348	int retval;
270	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	349	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
271	retval = nreqs;	350	retval = nreqs;
272	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	351	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
273	return retval;	352	return retval;
274	}	353	}
275		354
276	static unsigned int etp_nready (void)	355	static unsigned int
		356	etp_nready (void)
277	{	357	{
278	unsigned int retval;	358	unsigned int retval;
279		359
280	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	360	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
281	retval = nready;	361	retval = nready;
282	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	362	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
283		363
284	return retval;	364	return retval;
285	}	365	}
286		366
287	static unsigned int etp_npending (void)	367	static unsigned int
		368	etp_npending (void)
288	{	369	{
289	unsigned int retval;	370	unsigned int retval;
290		371
291	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	372	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
292	retval = npending;	373	retval = npending;
293	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	374	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
294		375
295	return retval;	376	return retval;
296	}	377	}
297		378
298	static unsigned int etp_nthreads (void)	379	static unsigned int
		380	etp_nthreads (void)
299	{	381	{
300	unsigned int retval;	382	unsigned int retval;
301		383
302	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	384	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
303	retval = started;	385	retval = started;
…		…
317	} etp_reqq;	399	} etp_reqq;
318		400
319	static etp_reqq req_queue;	401	static etp_reqq req_queue;
320	static etp_reqq res_queue;	402	static etp_reqq res_queue;
321		403
		404	static void ecb_noinline ecb_cold
		405	reqq_init (etp_reqq *q)
		406	{
		407	int pri;
		408
		409	for (pri = 0; pri < ETP_NUM_PRI; ++pri)
		410	q->qs[pri] = q->qe[pri] = 0;
		411
		412	q->size = 0;
		413	}
		414
		415	static int ecb_noinline
322	static int reqq_push (etp_reqq *q, ETP_REQ *req)	416	reqq_push (etp_reqq *q, ETP_REQ *req)
323	{	417	{
324	int pri = req->pri;	418	int pri = req->pri;
325	req->next = 0;	419	req->next = 0;
326		420
327	if (q->qe[pri])	421	if (q->qe[pri])
…		…
333	q->qe[pri] = q->qs[pri] = req;	427	q->qe[pri] = q->qs[pri] = req;
334		428
335	return q->size++;	429	return q->size++;
336	}	430	}
337		431
		432	static ETP_REQ * ecb_noinline
338	static ETP_REQ *reqq_shift (etp_reqq *q)	433	reqq_shift (etp_reqq *q)
339	{	434	{
340	int pri;	435	int pri;
341		436
342	if (!q->size)	437	if (!q->size)
343	return 0;	438	return 0;
…		…
358	}	453	}
359		454
360	abort ();	455	abort ();
361	}	456	}
362		457
363	static void etp_atfork_prepare (void)	458	static void ecb_cold
		459	etp_thread_init (void)
364	{	460	{
365	X_LOCK (wrklock);
366	X_LOCK (reqlock);
367	X_LOCK (reslock);
368	#if !HAVE_PREADWRITE	461	#if !HAVE_PREADWRITE
369	X_LOCK (preadwritelock);
370	#endif
371	}
372
373	static void etp_atfork_parent (void)
374	{
375	#if !HAVE_PREADWRITE
376	X_UNLOCK (preadwritelock);	462	X_MUTEX_CREATE (preadwritelock);
377	#endif	463	#endif
378	X_UNLOCK (reslock);	464	X_MUTEX_CREATE (wrklock);
379	X_UNLOCK (reqlock);	465	X_MUTEX_CREATE (reslock);
380	X_UNLOCK (wrklock);	466	X_MUTEX_CREATE (reqlock);
		467	X_COND_CREATE (reqwait);
381	}	468	}
382		469
		470	static void ecb_cold
383	static void etp_atfork_child (void)	471	etp_atfork_child (void)
384	{	472	{
385	ETP_REQ *prv;	473	reqq_init (&req_queue);
		474	reqq_init (&res_queue);
386		475
387	while ((prv = reqq_shift (&req_queue)))	476	wrk_first.next =
388	ETP_DESTROY (prv);	477	wrk_first.prev = &wrk_first;
389
390	while ((prv = reqq_shift (&res_queue)))
391	ETP_DESTROY (prv);
392
393	while (wrk_first.next != &wrk_first)
394	{
395	etp_worker *wrk = wrk_first.next;
396
397	if (wrk->req)
398	ETP_DESTROY (wrk->req);
399
400	etp_worker_clear (wrk);
401	etp_worker_free (wrk);
402	}
403		478
404	started = 0;	479	started = 0;
405	idle = 0;	480	idle = 0;
406	nreqs = 0;	481	nreqs = 0;
407	nready = 0;	482	nready = 0;
408	npending = 0;	483	npending = 0;
409		484
410	etp_atfork_parent ();	485	etp_thread_init ();
411	}	486	}
412		487
413	static void	488	static void ecb_cold
414	etp_once_init (void)	489	etp_once_init (void)
415	{	490	{
416	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);	491	etp_thread_init ();
		492	X_THREAD_ATFORK (0, 0, etp_atfork_child);
417	}	493	}
418		494
419	static int	495	static int ecb_cold
420	etp_init (void (*want_poll)(void), void (*done_poll)(void))	496	etp_init (void (*want_poll)(void), void (*done_poll)(void))
421	{	497	{
422	static pthread_once_t doinit = PTHREAD_ONCE_INIT;	498	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
423		499
424	pthread_once (&doinit, etp_once_init);	500	pthread_once (&doinit, etp_once_init);
…		…
429	return 0;	505	return 0;
430	}	506	}
431		507
432	X_THREAD_PROC (etp_proc);	508	X_THREAD_PROC (etp_proc);
433		509
		510	static void ecb_cold
434	static void etp_start_thread (void)	511	etp_start_thread (void)
435	{	512	{
436	etp_worker *wrk = calloc (1, sizeof (etp_worker));	513	etp_worker *wrk = calloc (1, sizeof (etp_worker));
437		514
438	/*TODO*/	515	/*TODO*/
439	assert (("unable to allocate worker thread data", wrk));	516	assert (("unable to allocate worker thread data", wrk));
…		…
452	free (wrk);	529	free (wrk);
453		530
454	X_UNLOCK (wrklock);	531	X_UNLOCK (wrklock);
455	}	532	}
456		533
		534	static void
457	static void etp_maybe_start_thread (void)	535	etp_maybe_start_thread (void)
458	{	536	{
459	if (expect_true (etp_nthreads () >= wanted))	537	if (ecb_expect_true (etp_nthreads () >= wanted))
460	return;	538	return;
461		539
462	/* todo: maybe use idle here, but might be less exact */	540	/* todo: maybe use idle here, but might be less exact */
463	if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))	541	if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
464	return;	542	return;
465		543
466	etp_start_thread ();	544	etp_start_thread ();
467	}	545	}
468		546
		547	static void ecb_cold
469	static void etp_end_thread (void)	548	etp_end_thread (void)
470	{	549	{
471	eio_req *req = calloc (1, sizeof (eio_req));	550	eio_req *req = calloc (1, sizeof (eio_req));
472		551
473	req->type = -1;	552	req->type = -1;
474	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	553	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
…		…
481	X_LOCK (wrklock);	560	X_LOCK (wrklock);
482	--started;	561	--started;
483	X_UNLOCK (wrklock);	562	X_UNLOCK (wrklock);
484	}	563	}
485		564
486	static int etp_poll (void)	565	static int
		566	etp_poll (void)
487	{	567	{
488	unsigned int maxreqs;	568	unsigned int maxreqs;
489	unsigned int maxtime;	569	unsigned int maxtime;
490	struct timeval tv_start, tv_now;	570	struct timeval tv_start, tv_now;
491		571
…		…
521		601
522	X_LOCK (reqlock);	602	X_LOCK (reqlock);
523	--nreqs;	603	--nreqs;
524	X_UNLOCK (reqlock);	604	X_UNLOCK (reqlock);
525		605
526	if (expect_false (req->type == EIO_GROUP && req->size))	606	if (ecb_expect_false (req->type == EIO_GROUP && req->size))
527	{	607	{
528	req->int1 = 1; /* mark request as delayed */	608	req->int1 = 1; /* mark request as delayed */
529	continue;	609	continue;
530	}	610	}
531	else	611	else
532	{	612	{
533	int res = ETP_FINISH (req);	613	int res = ETP_FINISH (req);
534	if (expect_false (res))	614	if (ecb_expect_false (res))
535	return res;	615	return res;
536	}	616	}
537		617
538	if (expect_false (maxreqs && !--maxreqs))	618	if (ecb_expect_false (maxreqs && !--maxreqs))
539	break;	619	break;
540		620
541	if (maxtime)	621	if (maxtime)
542	{	622	{
543	gettimeofday (&tv_now, 0);	623	gettimeofday (&tv_now, 0);
…		…
549		629
550	errno = EAGAIN;	630	errno = EAGAIN;
551	return -1;	631	return -1;
552	}	632	}
553		633
		634	static void
554	static void etp_cancel (ETP_REQ *req)	635	etp_cancel (ETP_REQ *req)
555	{	636	{
556	X_LOCK (wrklock);	637	req->cancelled = 1;
557	req->flags |= EIO_FLAG_CANCELLED;
558	X_UNLOCK (wrklock);
559		638
560	eio_grp_cancel (req);	639	eio_grp_cancel (req);
561	}	640	}
562		641
		642	static void
563	static void etp_submit (ETP_REQ *req)	643	etp_submit (ETP_REQ *req)
564	{	644	{
565	req->pri -= ETP_PRI_MIN;	645	req->pri -= ETP_PRI_MIN;
566		646
567	if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;	647	if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
568	if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	648	if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
569		649
570	if (expect_false (req->type == EIO_GROUP))	650	if (ecb_expect_false (req->type == EIO_GROUP))
571	{	651	{
572	/* I hope this is worth it :/ */	652	/* I hope this is worth it :/ */
573	X_LOCK (reqlock);	653	X_LOCK (reqlock);
574	++nreqs;	654	++nreqs;
575	X_UNLOCK (reqlock);	655	X_UNLOCK (reqlock);
…		…
594		674
595	etp_maybe_start_thread ();	675	etp_maybe_start_thread ();
596	}	676	}
597	}	677	}
598		678
		679	static void ecb_cold
599	static void etp_set_max_poll_time (double nseconds)	680	etp_set_max_poll_time (double nseconds)
600	{	681	{
601	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	682	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
602	max_poll_time = nseconds;	683	max_poll_time = nseconds * EIO_TICKS;
603	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);	684	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
604	}	685	}
605		686
		687	static void ecb_cold
606	static void etp_set_max_poll_reqs (unsigned int maxreqs)	688	etp_set_max_poll_reqs (unsigned int maxreqs)
607	{	689	{
608	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	690	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
609	max_poll_reqs = maxreqs;	691	max_poll_reqs = maxreqs;
610	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);	692	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
611	}	693	}
612		694
		695	static void ecb_cold
613	static void etp_set_max_idle (unsigned int nthreads)	696	etp_set_max_idle (unsigned int nthreads)
614	{	697	{
615	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	698	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
616	max_idle = nthreads <= 0 ? 1 : nthreads;	699	max_idle = nthreads;
617	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	700	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
618	}	701	}
619		702
		703	static void ecb_cold
		704	etp_set_idle_timeout (unsigned int seconds)
		705	{
		706	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
		707	idle_timeout = seconds;
		708	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
		709	}
		710
		711	static void ecb_cold
620	static void etp_set_min_parallel (unsigned int nthreads)	712	etp_set_min_parallel (unsigned int nthreads)
621	{	713	{
622	if (wanted < nthreads)	714	if (wanted < nthreads)
623	wanted = nthreads;	715	wanted = nthreads;
624	}	716	}
625		717
		718	static void ecb_cold
626	static void etp_set_max_parallel (unsigned int nthreads)	719	etp_set_max_parallel (unsigned int nthreads)
627	{	720	{
628	if (wanted > nthreads)	721	if (wanted > nthreads)
629	wanted = nthreads;	722	wanted = nthreads;
630		723
631	while (started > wanted)	724	while (started > wanted)
632	etp_end_thread ();	725	etp_end_thread ();
633	}	726	}
634		727
635	/*****************************************************************************/	728	/*****************************************************************************/
636		729
		730	static void
637	static void grp_try_feed (eio_req *grp)	731	grp_try_feed (eio_req *grp)
638	{	732	{
639	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	733	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
640	{	734	{
641	grp->flags &= ~EIO_FLAG_GROUPADD;	735	grp->flags &= ~EIO_FLAG_GROUPADD;
642		736
…		…
649	break;	743	break;
650	}	744	}
651	}	745	}
652	}	746	}
653		747
		748	static int
654	static int grp_dec (eio_req *grp)	749	grp_dec (eio_req *grp)
655	{	750	{
656	--grp->size;	751	--grp->size;
657		752
658	/* call feeder, if applicable */	753	/* call feeder, if applicable */
659	grp_try_feed (grp);	754	grp_try_feed (grp);
…		…
663	return eio_finish (grp);	758	return eio_finish (grp);
664	else	759	else
665	return 0;	760	return 0;
666	}	761	}
667		762
		763	static void
668	void eio_destroy (eio_req *req)	764	eio_destroy (eio_req *req)
669	{	765	{
670	if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);	766	if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
671	if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);	767	if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
672		768
673	EIO_DESTROY (req);	769	EIO_DESTROY (req);
674	}	770	}
675		771
		772	static int
676	static int eio_finish (eio_req *req)	773	eio_finish (eio_req *req)
677	{	774	{
678	int res = EIO_FINISH (req);	775	int res = EIO_FINISH (req);
679		776
680	if (req->grp)	777	if (req->grp)
681	{	778	{
…		…
689	if (grp->grp_first == req)	786	if (grp->grp_first == req)
690	grp->grp_first = req->grp_next;	787	grp->grp_first = req->grp_next;
691		788
692	res2 = grp_dec (grp);	789	res2 = grp_dec (grp);
693		790
694	if (!res && res2)	791	if (!res)
695	res = res2;	792	res = res2;
696	}	793	}
697		794
698	eio_destroy (req);	795	eio_destroy (req);
699		796
700	return res;	797	return res;
701	}	798	}
702		799
		800	void
703	void eio_grp_cancel (eio_req *grp)	801	eio_grp_cancel (eio_req *grp)
704	{	802	{
705	for (grp = grp->grp_first; grp; grp = grp->grp_next)	803	for (grp = grp->grp_first; grp; grp = grp->grp_next)
706	eio_cancel (grp);	804	eio_cancel (grp);
707	}	805	}
708		806
		807	void
709	void eio_cancel (eio_req *req)	808	eio_cancel (eio_req *req)
710	{	809	{
711	etp_cancel (req);	810	etp_cancel (req);
712	}	811	}
713		812
		813	void
714	void eio_submit (eio_req *req)	814	eio_submit (eio_req *req)
715	{	815	{
716	etp_submit (req);	816	etp_submit (req);
717	}	817	}
718		818
719	unsigned int eio_nreqs (void)	819	unsigned int
		820	eio_nreqs (void)
720	{	821	{
721	return etp_nreqs ();	822	return etp_nreqs ();
722	}	823	}
723		824
724	unsigned int eio_nready (void)	825	unsigned int
		826	eio_nready (void)
725	{	827	{
726	return etp_nready ();	828	return etp_nready ();
727	}	829	}
728		830
729	unsigned int eio_npending (void)	831	unsigned int
		832	eio_npending (void)
730	{	833	{
731	return etp_npending ();	834	return etp_npending ();
732	}	835	}
733		836
734	unsigned int eio_nthreads (void)	837	unsigned int ecb_cold
		838	eio_nthreads (void)
735	{	839	{
736	return etp_nthreads ();	840	return etp_nthreads ();
737	}	841	}
738		842
		843	void ecb_cold
739	void eio_set_max_poll_time (double nseconds)	844	eio_set_max_poll_time (double nseconds)
740	{	845	{
741	etp_set_max_poll_time (nseconds);	846	etp_set_max_poll_time (nseconds);
742	}	847	}
743		848
		849	void ecb_cold
744	void eio_set_max_poll_reqs (unsigned int maxreqs)	850	eio_set_max_poll_reqs (unsigned int maxreqs)
745	{	851	{
746	etp_set_max_poll_reqs (maxreqs);	852	etp_set_max_poll_reqs (maxreqs);
747	}	853	}
748		854
		855	void ecb_cold
749	void eio_set_max_idle (unsigned int nthreads)	856	eio_set_max_idle (unsigned int nthreads)
750	{	857	{
751	etp_set_max_idle (nthreads);	858	etp_set_max_idle (nthreads);
752	}	859	}
753		860
		861	void ecb_cold
		862	eio_set_idle_timeout (unsigned int seconds)
		863	{
		864	etp_set_idle_timeout (seconds);
		865	}
		866
		867	void ecb_cold
754	void eio_set_min_parallel (unsigned int nthreads)	868	eio_set_min_parallel (unsigned int nthreads)
755	{	869	{
756	etp_set_min_parallel (nthreads);	870	etp_set_min_parallel (nthreads);
757	}	871	}
758		872
		873	void ecb_cold
759	void eio_set_max_parallel (unsigned int nthreads)	874	eio_set_max_parallel (unsigned int nthreads)
760	{	875	{
761	etp_set_max_parallel (nthreads);	876	etp_set_max_parallel (nthreads);
762	}	877	}
763		878
764	int eio_poll (void)	879	int eio_poll (void)
…		…
773	# undef pread	888	# undef pread
774	# undef pwrite	889	# undef pwrite
775	# define pread eio__pread	890	# define pread eio__pread
776	# define pwrite eio__pwrite	891	# define pwrite eio__pwrite
777		892
778	static ssize_t	893	static eio_ssize_t
779	eio__pread (int fd, void *buf, size_t count, off_t offset)	894	eio__pread (int fd, void *buf, size_t count, off_t offset)
780	{	895	{
781	ssize_t res;	896	eio_ssize_t res;
782	off_t ooffset;	897	off_t ooffset;
783		898
784	X_LOCK (preadwritelock);	899	X_LOCK (preadwritelock);
785	ooffset = lseek (fd, 0, SEEK_CUR);	900	ooffset = lseek (fd, 0, SEEK_CUR);
786	lseek (fd, offset, SEEK_SET);	901	lseek (fd, offset, SEEK_SET);
…		…
789	X_UNLOCK (preadwritelock);	904	X_UNLOCK (preadwritelock);
790		905
791	return res;	906	return res;
792	}	907	}
793		908
794	static ssize_t	909	static eio_ssize_t
795	eio__pwrite (int fd, void *buf, size_t count, off_t offset)	910	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
796	{	911	{
797	ssize_t res;	912	eio_ssize_t res;
798	off_t ooffset;	913	off_t ooffset;
799		914
800	X_LOCK (preadwritelock);	915	X_LOCK (preadwritelock);
801	ooffset = lseek (fd, 0, SEEK_CUR);	916	ooffset = lseek (fd, 0, SEEK_CUR);
802	lseek (fd, offset, SEEK_SET);	917	lseek (fd, offset, SEEK_SET);
…		…
806		921
807	return res;	922	return res;
808	}	923	}
809	#endif	924	#endif
810		925
811	#ifndef HAVE_FUTIMES	926	#ifndef HAVE_UTIMES
812		927
813	# undef utimes	928	# undef utimes
814	# undef futimes
815	# define utimes(path,times) eio__utimes (path, times)	929	# define utimes(path,times) eio__utimes (path, times)
816	# define futimes(fd,times) eio__futimes (fd, times)
817		930
818	static int	931	static int
819	eio__utimes (const char *filename, const struct timeval times[2])	932	eio__utimes (const char *filename, const struct timeval times[2])
820	{	933	{
821	if (times)	934	if (times)
…		…
829	}	942	}
830	else	943	else
831	return utime (filename, 0);	944	return utime (filename, 0);
832	}	945	}
833		946
		947	#endif
		948
		949	#ifndef HAVE_FUTIMES
		950
		951	# undef futimes
		952	# define futimes(fd,times) eio__futimes (fd, times)
		953
		954	static int
834	static int eio__futimes (int fd, const struct timeval tv[2])	955	eio__futimes (int fd, const struct timeval tv[2])
835	{	956	{
836	errno = ENOSYS;	957	errno = ENOSYS;
837	return -1;	958	return -1;
838	}	959	}
839		960
…		…
843	# undef fdatasync	964	# undef fdatasync
844	# define fdatasync(fd) fsync (fd)	965	# define fdatasync(fd) fsync (fd)
845	#endif	966	#endif
846		967
847	/* sync_file_range always needs emulation */	968	/* sync_file_range always needs emulation */
848	int	969	static int
849	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	970	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
850	{	971	{
851	#if HAVE_SYNC_FILE_RANGE	972	#if HAVE_SYNC_FILE_RANGE
852	int res;	973	int res;
853		974
…		…
866	if (!res || errno != ENOSYS)	987	if (!res || errno != ENOSYS)
867	return res;	988	return res;
868	#endif	989	#endif
869		990
870	/* even though we could play tricks with the flags, it's better to always	991	/* 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 */	992	* call fdatasync, as that matches the expectation of its users best */
872	return fdatasync (fd);	993	return fdatasync (fd);
		994	}
		995
		996	static int
		997	eio__fallocate (int fd, int mode, off_t offset, size_t len)
		998	{
		999	#if HAVE_FALLOCATE
		1000	return fallocate (fd, mode, offset, len);
		1001	#else
		1002	errno = ENOSYS;
		1003	return -1;
		1004	#endif
873	}	1005	}
874		1006
875	#if !HAVE_READAHEAD	1007	#if !HAVE_READAHEAD
876	# undef readahead	1008	# undef readahead
877	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	1009	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
878		1010
879	static ssize_t	1011	static eio_ssize_t
880	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)	1012	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
881	{	1013	{
882	size_t todo = count;	1014	size_t todo = count;
883	dBUF;	1015	dBUF;
884		1016
…		…
896	}	1028	}
897		1029
898	#endif	1030	#endif
899		1031
900	/* sendfile always needs emulation */	1032	/* sendfile always needs emulation */
901	static ssize_t	1033	static eio_ssize_t
902	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1034	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
903	{	1035	{
		1036	eio_ssize_t written = 0;
904	ssize_t res;	1037	eio_ssize_t res;
905		1038
906	if (!count)	1039	if (!count)
907	return 0;	1040	return 0;
908		1041
		1042	for (;;)
		1043	{
		1044	#ifdef __APPLE__
		1045	# undef HAVE_SENDFILE /* broken, as everything on os x */
		1046	#endif
909	#if HAVE_SENDFILE	1047	#if HAVE_SENDFILE
910	# if __linux	1048	# if __linux
		1049	off_t soffset = offset;
911	res = sendfile (ofd, ifd, &offset, count);	1050	res = sendfile (ofd, ifd, &soffset, count);
912		1051
913	# elif __freebsd	1052	# elif __FreeBSD__
914	/*	1053	/*
915	* Of course, the freebsd sendfile is a dire hack with no thoughts	1054	* Of course, the freebsd sendfile is a dire hack with no thoughts
916	* wasted on making it similar to other I/O functions.	1055	* wasted on making it similar to other I/O functions.
917	*/	1056	*/
918	{
919	off_t sbytes;	1057	off_t sbytes;
920	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);	1058	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
921		1059
922	if (res < 0 && sbytes)	1060	#if 0 /* according to the manpage, this is correct, but broken behaviour */
923	/* maybe only on EAGAIN: as usual, the manpage leaves you guessing */	1061	/* freebsd' sendfile will return 0 on success */
		1062	/* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
		1063	/* not on e.g. EIO or EPIPE - sounds broken */
		1064	if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
924	res = sbytes;	1065	res = sbytes;
925	}	1066	#endif
		1067
		1068	/* according to source inspection, this is correct, and useful behaviour */
		1069	if (sbytes)
		1070	res = sbytes;
		1071
		1072	# elif defined (__APPLE__)
		1073	off_t sbytes = count;
		1074	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
		1075
		1076	/* according to the manpage, sbytes is always valid */
		1077	if (sbytes)
		1078	res = sbytes;
926		1079
927	# elif __hpux	1080	# elif __hpux
928	res = sendfile (ofd, ifd, offset, count, 0, 0);	1081	res = sendfile (ofd, ifd, offset, count, 0, 0);
929		1082
930	# elif __solaris	1083	# elif __solaris
931	{
932	struct sendfilevec vec;	1084	struct sendfilevec vec;
933	size_t sbytes;	1085	size_t sbytes;
934		1086
935	vec.sfv_fd = ifd;	1087	vec.sfv_fd = ifd;
936	vec.sfv_flag = 0;	1088	vec.sfv_flag = 0;
937	vec.sfv_off = offset;	1089	vec.sfv_off = offset;
938	vec.sfv_len = count;	1090	vec.sfv_len = count;
939		1091
940	res = sendfilev (ofd, &vec, 1, &sbytes);	1092	res = sendfilev (ofd, &vec, 1, &sbytes);
941		1093
942	if (res < 0 && sbytes)	1094	if (res < 0 && sbytes)
943	res = sbytes;	1095	res = sbytes;
944	}
945		1096
946	# endif	1097	# endif
		1098
		1099	#elif defined (_WIN32) && 0
		1100	/* does not work, just for documentation of what would need to be done */
		1101	/* actually, cannot be done like this, as TransmitFile changes the file offset, */
		1102	/* libeio guarantees that the file offset does not change, and windows */
		1103	/* has no way to get an independent handle to the same file description */
		1104	HANDLE h = TO_SOCKET (ifd);
		1105	SetFilePointer (h, offset, 0, FILE_BEGIN);
		1106	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
		1107
947	#else	1108	#else
948	res = -1;	1109	res = -1;
949	errno = ENOSYS;	1110	errno = ENOSYS;
950	#endif	1111	#endif
951		1112
		1113	/* we assume sendfile can copy at least 128mb in one go */
		1114	if (res <= 128 * 1024 * 1024)
		1115	{
		1116	if (res > 0)
		1117	written += res;
		1118
		1119	if (written)
		1120	return written;
		1121
		1122	break;
		1123	}
		1124	else
		1125	{
		1126	/* if we requested more, then probably the kernel was lazy */
		1127	written += res;
		1128	offset += res;
		1129	count -= res;
		1130
		1131	if (!count)
		1132	return written;
		1133	}
		1134	}
		1135
952	if (res < 0	1136	if (res < 0
953	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK	1137	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
		1138	/* BSDs */
		1139	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
		1140	|| errno == ENOTSUP
		1141	#endif
		1142	#ifdef EOPNOTSUPP /* windows */
		1143	|| errno == EOPNOTSUPP /* BSDs */
		1144	#endif
954	#if __solaris	1145	#if __solaris
955	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE	1146	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE
956	#endif	1147	#endif
957	)	1148	)
958	)	1149	)
…		…
962		1153
963	res = 0;	1154	res = 0;
964		1155
965	while (count)	1156	while (count)
966	{	1157	{
967	ssize_t cnt;	1158	eio_ssize_t cnt;
968		1159
969	cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);	1160	cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
970		1161
971	if (cnt <= 0)	1162	if (cnt <= 0)
972	{	1163	{
…		…
989	}	1180	}
990		1181
991	return res;	1182	return res;
992	}	1183	}
993		1184
		1185	#ifdef PAGESIZE
		1186	# define eio_pagesize() PAGESIZE
		1187	#else
		1188	static intptr_t
		1189	eio_pagesize (void)
		1190	{
		1191	static intptr_t page;
		1192
		1193	if (!page)
		1194	page = sysconf (_SC_PAGESIZE);
		1195
		1196	return page;
		1197	}
		1198	#endif
		1199
		1200	static void
		1201	eio_page_align (void **addr, size_t *length)
		1202	{
		1203	intptr_t mask = eio_pagesize () - 1;
		1204
		1205	/* round down addr */
		1206	intptr_t adj = mask & (intptr_t)*addr;
		1207
		1208	*addr = (void *)((intptr_t)*addr - adj);
		1209	*length += adj;
		1210
		1211	/* round up length */
		1212	*length = (*length + mask) & ~mask;
		1213	}
		1214
		1215	#if !_POSIX_MEMLOCK
		1216	# define eio__mlockall(a) EIO_ENOSYS ()
		1217	#else
		1218
994	static int	1219	static int
		1220	eio__mlockall (int flags)
		1221	{
		1222	#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
		1223	extern int mallopt (int, int);
		1224	mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
		1225	#endif
		1226
		1227	if (EIO_MCL_CURRENT != MCL_CURRENT
		1228	|| EIO_MCL_FUTURE != MCL_FUTURE)
		1229	{
		1230	flags = 0
		1231	| (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
		1232	| (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
		1233	}
		1234
		1235	return mlockall (flags);
		1236	}
		1237	#endif
		1238
		1239	#if !_POSIX_MEMLOCK_RANGE
		1240	# define eio__mlock(a,b) EIO_ENOSYS ()
		1241	#else
		1242
		1243	static int
		1244	eio__mlock (void *addr, size_t length)
		1245	{
		1246	eio_page_align (&addr, &length);
		1247
		1248	return mlock (addr, length);
		1249	}
		1250
		1251	#endif
		1252
		1253	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		1254	# define eio__msync(a,b,c) EIO_ENOSYS ()
		1255	#else
		1256
		1257	static int
		1258	eio__msync (void *mem, size_t len, int flags)
		1259	{
		1260	eio_page_align (&mem, &len);
		1261
		1262	if (EIO_MS_ASYNC != MS_SYNC
		1263	|| EIO_MS_INVALIDATE != MS_INVALIDATE
		1264	|| EIO_MS_SYNC != MS_SYNC)
		1265	{
		1266	flags = 0
		1267	| (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
		1268	| (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
		1269	| (flags & EIO_MS_SYNC ? MS_SYNC : 0);
		1270	}
		1271
		1272	return msync (mem, len, flags);
		1273	}
		1274
		1275	#endif
		1276
		1277	static int
		1278	eio__mtouch (eio_req *req)
		1279	{
		1280	void *mem = req->ptr2;
		1281	size_t len = req->size;
		1282	int flags = req->int1;
		1283
		1284	eio_page_align (&mem, &len);
		1285
		1286	{
		1287	intptr_t addr = (intptr_t)mem;
		1288	intptr_t end = addr + len;
		1289	intptr_t page = eio_pagesize ();
		1290
		1291	if (addr < end)
		1292	if (flags & EIO_MT_MODIFY) /* modify */
		1293	do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
		1294	else
		1295	do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
		1296	}
		1297
		1298	return 0;
		1299	}
		1300
		1301	/*****************************************************************************/
		1302	/* requests implemented outside eio_execute, because they are so large */
		1303
		1304	static void
		1305	eio__realpath (eio_req *req, etp_worker *self)
		1306	{
		1307	char *rel = req->ptr1;
		1308	char *res;
		1309	char *tmp1, *tmp2;
		1310	#if SYMLOOP_MAX > 32
		1311	int symlinks = SYMLOOP_MAX;
		1312	#else
		1313	int symlinks = 32;
		1314	#endif
		1315
		1316	req->result = -1;
		1317
		1318	errno = EINVAL;
		1319	if (!rel)
		1320	return;
		1321
		1322	errno = ENOENT;
		1323	if (!*rel)
		1324	return;
		1325
		1326	if (!req->ptr2)
		1327	{
		1328	X_LOCK (wrklock);
		1329	req->flags |= EIO_FLAG_PTR2_FREE;
		1330	X_UNLOCK (wrklock);
		1331	req->ptr2 = malloc (PATH_MAX * 3);
		1332
		1333	errno = ENOMEM;
		1334	if (!req->ptr2)
		1335	return;
		1336	}
		1337
		1338	res = req->ptr2;
		1339	tmp1 = res + PATH_MAX;
		1340	tmp2 = tmp1 + PATH_MAX;
		1341
		1342	#if 0 /* disabled, the musl way to do things is just too racy */
		1343	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
		1344	/* on linux we may be able to ask the kernel */
		1345	{
		1346	int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
		1347
		1348	if (fd >= 0)
		1349	{
		1350	sprintf (tmp1, "/proc/self/fd/%d", fd);
		1351	req->result = readlink (tmp1, res, PATH_MAX);
		1352	close (fd);
		1353
		1354	/* here we should probably stat the open file and the disk file, to make sure they still match */
		1355
		1356	if (req->result > 0)
		1357	goto done;
		1358	}
		1359	else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
		1360	return;
		1361	}
		1362	#endif
		1363	#endif
		1364
		1365	if (*rel != '/')
		1366	{
		1367	if (!getcwd (res, PATH_MAX))
		1368	return;
		1369
		1370	if (res [1]) /* only use if not / */
		1371	res += strlen (res);
		1372	}
		1373
		1374	while (*rel)
		1375	{
		1376	eio_ssize_t len, linklen;
		1377	char *beg = rel;
		1378
		1379	while (*rel && *rel != '/')
		1380	++rel;
		1381
		1382	len = rel - beg;
		1383
		1384	if (!len) /* skip slashes */
		1385	{
		1386	++rel;
		1387	continue;
		1388	}
		1389
		1390	if (beg [0] == '.')
		1391	{
		1392	if (len == 1)
		1393	continue; /* . - nop */
		1394
		1395	if (beg [1] == '.' && len == 2)
		1396	{
		1397	/* .. - back up one component, if possible */
		1398
		1399	while (res != req->ptr2)
		1400	if (*--res == '/')
		1401	break;
		1402
		1403	continue;
		1404	}
		1405	}
		1406
		1407	errno = ENAMETOOLONG;
		1408	if (res + 1 + len + 1 >= tmp1)
		1409	return;
		1410
		1411	/* copy one component */
		1412	*res = '/';
		1413	memcpy (res + 1, beg, len);
		1414
		1415	/* zero-terminate, for readlink */
		1416	res [len + 1] = 0;
		1417
		1418	/* now check if it's a symlink */
		1419	linklen = readlink (req->ptr2, tmp1, PATH_MAX);
		1420
		1421	if (linklen < 0)
		1422	{
		1423	if (errno != EINVAL)
		1424	return;
		1425
		1426	/* it's a normal directory. hopefully */
		1427	res += len + 1;
		1428	}
		1429	else
		1430	{
		1431	/* yay, it was a symlink - build new path in tmp2 */
		1432	int rellen = strlen (rel);
		1433
		1434	errno = ENAMETOOLONG;
		1435	if (linklen + 1 + rellen >= PATH_MAX)
		1436	return;
		1437
		1438	errno = ELOOP;
		1439	if (!--symlinks)
		1440	return;
		1441
		1442	if (*tmp1 == '/')
		1443	res = req->ptr2; /* symlink resolves to an absolute path */
		1444
		1445	/* we need to be careful, as rel might point into tmp2 already */
		1446	memmove (tmp2 + linklen + 1, rel, rellen + 1);
		1447	tmp2 [linklen] = '/';
		1448	memcpy (tmp2, tmp1, linklen);
		1449
		1450	rel = tmp2;
		1451	}
		1452	}
		1453
		1454	/* special case for the lone root path */
		1455	if (res == req->ptr2)
		1456	*res++ = '/';
		1457
		1458	req->result = res - (char *)req->ptr2;
		1459
		1460	done:
		1461	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
		1462	}
		1463
		1464	static signed char
995	eio_dent_cmp (const void *a_, const void *b_)	1465	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
996	{	1466	{
997	const eio_dirent *a = (const eio_dirent *)a_;	1467	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_;	1468	: a->inode < b->inode ? -1
		1469	: a->inode > b->inode ? 1
		1470	: 0;
		1471	}
999		1472
1000	return (int)b->score - (int)a->score ? (int)b->score - (int)a->score	1473	#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 */	1474
		1475	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
		1476	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
		1477
		1478	static void
		1479	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
		1480	{
		1481	unsigned char bits [9 + sizeof (eio_ino_t) * 8];
		1482	unsigned char *bit = bits;
		1483
		1484	assert (CHAR_BIT == 8);
		1485	assert (sizeof (eio_dirent) * 8 < 256);
		1486	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
		1487	assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
		1488
		1489	if (size <= EIO_SORT_FAST)
		1490	return;
		1491
		1492	/* first prepare an array of bits to test in our radix sort */
		1493	/* try to take endianness into account, as well as differences in eio_ino_t sizes */
		1494	/* inode_bits must contain all inodes ORed together */
		1495	/* which is used to skip bits that are 0 everywhere, which is very common */
		1496	{
		1497	eio_ino_t endianness;
		1498	int i, j;
		1499
		1500	/* we store the byte offset of byte n into byte n of "endianness" */
		1501	for (i = 0; i < sizeof (eio_ino_t); ++i)
		1502	((unsigned char *)&endianness)[i] = i;
		1503
		1504	*bit++ = 0;
		1505
		1506	for (i = 0; i < sizeof (eio_ino_t); ++i)
		1507	{
		1508	/* shifting off the byte offsets out of "endianness" */
		1509	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
		1510	endianness >>= 8;
		1511
		1512	for (j = 0; j < 8; ++j)
		1513	if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
		1514	*bit++ = offs + j;
		1515	}
		1516
		1517	for (j = 0; j < 8; ++j)
		1518	if (score_bits & (1 << j))
		1519	*bit++ = offsetof (eio_dirent, score) * 8 + j;
		1520	}
		1521
		1522	/* now actually do the sorting (a variant of MSD radix sort) */
		1523	{
		1524	eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
		1525	eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
		1526	unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
		1527	int stk_idx = 0;
		1528
		1529	base_stk [stk_idx] = dents;
		1530	end_stk [stk_idx] = dents + size;
		1531	bit_stk [stk_idx] = bit - 1;
		1532
		1533	do
		1534	{
		1535	base = base_stk [stk_idx];
		1536	end = end_stk [stk_idx];
		1537	bit = bit_stk [stk_idx];
		1538
		1539	for (;;)
		1540	{
		1541	unsigned char O = *bit >> 3;
		1542	unsigned char M = 1 << (*bit & 7);
		1543
		1544	eio_dirent *a = base;
		1545	eio_dirent *b = end;
		1546
		1547	if (b - a < EIO_SORT_CUTOFF)
		1548	break;
		1549
		1550	/* now bit-partition the array on the bit */
		1551	/* this ugly asymmetric loop seems to perform much better than typical */
		1552	/* partition algos found in the literature */
		1553	do
		1554	if (!(((unsigned char *)a)[O] & M))
		1555	++a;
		1556	else if (!(((unsigned char *)--b)[O] & M))
		1557	{
		1558	eio_dirent tmp = *a; *a = *b; *b = tmp;
		1559	++a;
		1560	}
		1561	while (b > a);
		1562
		1563	/* next bit, or stop, if no bits left in this path */
		1564	if (!*--bit)
		1565	break;
		1566
		1567	base_stk [stk_idx] = a;
		1568	end_stk [stk_idx] = end;
		1569	bit_stk [stk_idx] = bit;
		1570	++stk_idx;
		1571
		1572	end = a;
		1573	}
		1574	}
		1575	while (stk_idx--);
		1576	}
		1577	}
		1578
		1579	static void
		1580	eio_dent_insertion_sort (eio_dirent *dents, int size)
		1581	{
		1582	/* first move the smallest element to the front, to act as a sentinel */
		1583	{
		1584	int i;
		1585	eio_dirent *min = dents;
		1586
		1587	/* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
		1588	for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
		1589	if (EIO_DENT_CMP (dents [i], <, *min))
		1590	min = &dents [i];
		1591
		1592	/* swap elements 0 and j (minimum) */
		1593	{
		1594	eio_dirent tmp = *dents; *dents = *min; *min = tmp;
		1595	}
		1596	}
		1597
		1598	/* then do standard insertion sort, assuming that all elements are >= dents [0] */
		1599	{
		1600	eio_dirent *i, *j;
		1601
		1602	for (i = dents + 1; i < dents + size; ++i)
		1603	{
		1604	eio_dirent value = *i;
		1605
		1606	for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
		1607	j [1] = j [0];
		1608
		1609	j [1] = value;
		1610	}
		1611	}
		1612	}
		1613
		1614	static void
		1615	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
		1616	{
		1617	if (size <= 1)
		1618	return; /* our insertion sort relies on size > 0 */
		1619
		1620	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
		1621	/* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
		1622	eio_dent_radix_sort (dents, size, score_bits, inode_bits);
		1623
		1624	/* use an insertion sort at the end, or for small arrays, */
		1625	/* as insertion sort is more efficient for small partitions */
		1626	eio_dent_insertion_sort (dents, size);
1002	}	1627	}
1003		1628
1004	/* read a full directory */	1629	/* read a full directory */
1005	static void	1630	static void
1006	eio__scandir (eio_req *req, etp_worker *self)	1631	eio__scandir (eio_req *req, etp_worker *self)
1007	{	1632	{
1008	DIR *dirp;
1009	EIO_STRUCT_DIRENT *entp;
1010	unsigned char *name, *names;	1633	char *name, *names;
1011	int namesalloc = 4096;	1634	int namesalloc = 4096 - sizeof (void *) * 4;
1012	int namesoffs = 0;	1635	int namesoffs = 0;
1013	int flags = req->int1;	1636	int flags = req->int1;
1014	eio_dirent *dents = 0;	1637	eio_dirent *dents = 0;
1015	int dentalloc = 128;	1638	int dentalloc = 128;
1016	int dentoffs = 0;	1639	int dentoffs = 0;
		1640	eio_ino_t inode_bits = 0;
		1641	#ifdef _WIN32
		1642	HANDLE dirp;
		1643	WIN32_FIND_DATA entp;
		1644	#else
		1645	DIR *dirp;
		1646	EIO_STRUCT_DIRENT *entp;
		1647	#endif
1017		1648
1018	req->result = -1;	1649	req->result = -1;
1019		1650
1020	if (!(flags & EIO_READDIR_DENTS))	1651	if (!(flags & EIO_READDIR_DENTS))
1021	flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);	1652	flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1022		1653
1023	X_LOCK (wrklock);	1654	#ifdef _WIN32
1024	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1655	{
		1656	char *path = malloc (MAX_PATH);
		1657	_snprintf (path, MAX_PATH, "%s/*", (const char *)req->ptr1);
		1658	dirp = FindFirstFile (path, &entp);
		1659	free (path);
		1660
		1661	if (!dirp)
		1662	{
		1663	switch (GetLastError ())
		1664	{
		1665	case ERROR_FILE_NOT_FOUND:
		1666	req->result = 0;
		1667	break;
		1668
		1669	case ERROR_PATH_NOT_FOUND:
		1670	case ERROR_NO_MORE_FILES:
		1671	errno = ENOENT;
		1672	break;
		1673
		1674	case ERROR_NOT_ENOUGH_MEMORY:
		1675	errno = ENOMEM;
		1676	break;
		1677
		1678	default:
		1679	errno = EINVAL;
		1680	break;
		1681	}
		1682
		1683	}
		1684	}
		1685	#else
1025	self->dirp = dirp = opendir (req->ptr1);	1686	dirp = opendir (req->ptr1);
		1687	#endif
		1688
		1689	if (req->flags & EIO_FLAG_PTR1_FREE)
		1690	free (req->ptr1);
		1691
1026	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1692	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;	1693	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1029	X_UNLOCK (wrklock);	1694	req->ptr2 = names = malloc (namesalloc);
1030		1695
1031	if (dirp && names && (!flags || dents))	1696	if (dirp && names && (!flags || dents))
1032	for (;;)	1697	for (;;)
1033	{	1698	{
		1699	int more;
		1700
		1701	#ifdef _WIN32
		1702	more = dirp;
		1703	#else
1034	errno = 0;	1704	errno = 0;
1035	entp = readdir (dirp);	1705	entp = readdir (dirp);
		1706	more = entp;
		1707	#endif
1036		1708
1037	if (!entp)	1709	if (!more)
1038	{	1710	{
		1711	#ifndef _WIN32
		1712	int old_errno = errno;
		1713	closedir (dirp);
		1714	errno = old_errno;
		1715
1039	if (errno)	1716	if (errno)
1040	break;	1717	break;
		1718	#endif
1041		1719
1042	/* sort etc. */	1720	/* sort etc. */
1043	req->int1 = flags;	1721	req->int1 = flags;
1044	req->result = dentoffs;	1722	req->result = dentoffs;
1045		1723
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	1724	if (flags & EIO_READDIR_STAT_ORDER)
1055	|| !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN)))	1725	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)	1726	else if (flags & EIO_READDIR_DIRS_FIRST)
		1727	if (flags & EIO_READDIR_FOUND_UNKNOWN)
		1728	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
		1729	else
1061	{	1730	{
1062	/* in this case, all is known, and we just put dirs first and sort them */	1731	/* in this case, all is known, and we just put dirs first and sort them */
1063	eio_dirent *ent = dents + dentoffs;	1732	eio_dirent *oth = dents + dentoffs;
1064	eio_dirent *dir = dents;	1733	eio_dirent *dir = dents;
1065		1734
		1735	/* now partition dirs to the front, and non-dirs to the back */
		1736	/* by walking from both sides and swapping if necessary */
1066	while (ent > dir)	1737	while (oth > dir)
1067	{	1738	{
1068	if (dir->type == DT_DIR)	1739	if (dir->type == EIO_DT_DIR)
1069	++dir;	1740	++dir;
1070	else
1071	{
1072	--ent;
1073
1074	if (ent->type == DT_DIR)	1741	else if ((--oth)->type == EIO_DT_DIR)
1075	{	1742	{
1076	eio_dirent tmp = *dir;	1743	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1077	*dir = *ent;
1078	*ent = tmp;
1079		1744
1080	++dir;	1745	++dir;
1081	}	1746	}
1082	}	1747	}
		1748
		1749	/* now sort the dirs only (dirs all have the same score) */
		1750	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1083	}	1751	}
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		1752
1099	break;	1753	break;
1100	}	1754	}
1101		1755
1102	/* now add the entry to our list(s) */	1756	/* now add the entry to our list(s) */
1103	name = entp->d_name;	1757	name = D_NAME (entp);
1104		1758
1105	/* skip . and .. entries */	1759	/* skip . and .. entries */
1106	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))	1760	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1107	{	1761	{
1108	int len = D_NAMLEN (entp) + 1;	1762	int len = D_NAMLEN (entp) + 1;
1109		1763
1110	while (expect_false (namesoffs + len > namesalloc))	1764	while (ecb_expect_false (namesoffs + len > namesalloc))
1111	{	1765	{
1112	namesalloc *= 2;	1766	namesalloc *= 2;
1113	X_LOCK (wrklock);
1114	req->ptr1 = names = realloc (names, namesalloc);	1767	req->ptr2 = names = realloc (names, namesalloc);
1115	X_UNLOCK (wrklock);
1116		1768
1117	if (!names)	1769	if (!names)
1118	break;	1770	break;
1119	}	1771	}
1120		1772
…		…
1122		1774
1123	if (dents)	1775	if (dents)
1124	{	1776	{
1125	struct eio_dirent *ent;	1777	struct eio_dirent *ent;
1126		1778
1127	if (expect_false (dentoffs == dentalloc))	1779	if (ecb_expect_false (dentoffs == dentalloc))
1128	{	1780	{
1129	dentalloc *= 2;	1781	dentalloc *= 2;
1130	X_LOCK (wrklock);
1131	req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));	1782	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1132	X_UNLOCK (wrklock);
1133		1783
1134	if (!dents)	1784	if (!dents)
1135	break;	1785	break;
1136	}	1786	}
1137		1787
1138	ent = dents + dentoffs;	1788	ent = dents + dentoffs;
1139		1789
1140	ent->name = (char *)(size_t)namesoffs; /* rather dirtily we store the offset in the pointer */	1790	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1141	ent->namelen = len - 1;	1791	ent->namelen = len - 1;
1142	ent->inode = D_INO (entp);	1792	ent->inode = D_INO (entp);
		1793
		1794	inode_bits |= ent->inode;
1143		1795
1144	switch (D_TYPE (entp))	1796	switch (D_TYPE (entp))
1145	{	1797	{
1146	default:	1798	default:
1147	ent->type = EIO_DT_UNKNOWN;	1799	ent->type = EIO_DT_UNKNOWN;
…		…
1190	#ifdef DT_WHT	1842	#ifdef DT_WHT
1191	case DT_WHT: ent->type = EIO_DT_WHT; break;	1843	case DT_WHT: ent->type = EIO_DT_WHT; break;
1192	#endif	1844	#endif
1193	}	1845	}
1194		1846
1195	ent->score = 0;	1847	ent->score = 7;
1196		1848
1197	if (flags & EIO_READDIR_DIRS_FIRST)	1849	if (flags & EIO_READDIR_DIRS_FIRST)
1198	{	1850	{
1199	if (ent->type == EIO_DT_UNKNOWN)	1851	if (ent->type == EIO_DT_UNKNOWN)
1200	{	1852	{
1201	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */	1853	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1202	ent->score = 98;	1854	ent->score = 1;
1203	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */	1855	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1204	ent->score = len <= 2 ? len + 60 : len <= 4 ? 50 : len <= 7 ? 40 : 10; /* shorter == more likely dir, but avoid too many classes */	1856	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1205	}	1857	}
1206	else if (ent->type == EIO_DT_DIR)	1858	else if (ent->type == EIO_DT_DIR)
1207	ent->score = 100;	1859	ent->score = 0;
1208	}	1860	}
1209	}	1861	}
1210		1862
1211	namesoffs += len;	1863	namesoffs += len;
1212	++dentoffs;	1864	++dentoffs;
1213	}	1865	}
		1866
		1867	if (EIO_CANCELLED (req))
		1868	{
		1869	errno = ECANCELED;
		1870	break;
		1871	}
		1872
		1873	#ifdef _WIN32
		1874	if (!FindNextFile (dirp, &entp))
		1875	{
		1876	FindClose (dirp);
		1877	dirp = 0;
		1878	}
		1879	#endif
1214	}	1880	}
1215	else
1216	req->result = -1;
1217	}
1218
1219	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1220	# undef msync
1221	# define msync(a,b,c) ((errno = ENOSYS), -1)
1222	#endif
1223
1224	int
1225	eio__mtouch (void *mem, size_t len, int flags)
1226	{
1227	intptr_t addr = (intptr_t)mem;
1228	intptr_t end = addr + len;
1229	#ifdef PAGESIZE
1230	const intptr_t page = PAGESIZE;
1231	#else
1232	static intptr_t page;
1233
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)
1241	if (flags) /* modify */
1242	do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1243	else
1244	do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1245
1246	return 0;
1247	}	1881	}
1248		1882
1249	/*****************************************************************************/	1883	/*****************************************************************************/
1250		1884
1251	#define ALLOC(len) \	1885	#define ALLOC(len) \
…		…
1267	{	1901	{
1268	ETP_REQ *req;	1902	ETP_REQ *req;
1269	struct timespec ts;	1903	struct timespec ts;
1270	etp_worker *self = (etp_worker *)thr_arg;	1904	etp_worker *self = (etp_worker *)thr_arg;
1271		1905
1272	/* try to distribute timeouts somewhat randomly */	1906	/* try to distribute timeouts somewhat evenly */
1273	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	1907	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1274		1908
1275	for (;;)	1909	for (;;)
1276	{	1910	{
		1911	ts.tv_sec = 0;
		1912
1277	X_LOCK (reqlock);	1913	X_LOCK (reqlock);
1278		1914
1279	for (;;)	1915	for (;;)
1280	{	1916	{
1281	self->req = req = reqq_shift (&req_queue);	1917	self->req = req = reqq_shift (&req_queue);
1282		1918
1283	if (req)	1919	if (req)
1284	break;	1920	break;
1285		1921
		1922	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
		1923	{
		1924	X_UNLOCK (reqlock);
		1925	X_LOCK (wrklock);
		1926	--started;
		1927	X_UNLOCK (wrklock);
		1928	goto quit;
		1929	}
		1930
1286	++idle;	1931	++idle;
1287		1932
1288	ts.tv_sec = time (0) + IDLE_TIMEOUT;	1933	if (idle <= max_idle)
1289	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)	1934	/* we are allowed to idle, so do so without any timeout */
		1935	X_COND_WAIT (reqwait, reqlock);
		1936	else
1290	{	1937	{
1291	if (idle > max_idle)	1938	/* initialise timeout once */
1292	{	1939	if (!ts.tv_sec)
1293	--idle;	1940	ts.tv_sec = time (0) + idle_timeout;
1294	X_UNLOCK (reqlock);
1295	X_LOCK (wrklock);
1296	--started;
1297	X_UNLOCK (wrklock);
1298	goto quit;
1299	}
1300		1941
1301	/* we are allowed to idle, so do so without any timeout */
1302	X_COND_WAIT (reqwait, reqlock);	1942	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
		1943	ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1303	}	1944	}
1304		1945
1305	--idle;	1946	--idle;
1306	}	1947	}
1307		1948
…		…
1310	X_UNLOCK (reqlock);	1951	X_UNLOCK (reqlock);
1311		1952
1312	if (req->type < 0)	1953	if (req->type < 0)
1313	goto quit;	1954	goto quit;
1314		1955
1315	if (!EIO_CANCELLED (req))
1316	ETP_EXECUTE (self, req);	1956	ETP_EXECUTE (self, req);
1317		1957
1318	X_LOCK (reslock);	1958	X_LOCK (reslock);
1319		1959
1320	++npending;	1960	++npending;
1321		1961
…		…
1336	return 0;	1976	return 0;
1337	}	1977	}
1338		1978
1339	/*****************************************************************************/	1979	/*****************************************************************************/
1340		1980
		1981	int ecb_cold
1341	int eio_init (void (*want_poll)(void), void (*done_poll)(void))	1982	eio_init (void (*want_poll)(void), void (*done_poll)(void))
1342	{	1983	{
1343	return etp_init (want_poll, done_poll);	1984	return etp_init (want_poll, done_poll);
1344	}	1985	}
1345		1986
		1987	ecb_inline void
1346	static void eio_api_destroy (eio_req *req)	1988	eio_api_destroy (eio_req *req)
1347	{	1989	{
1348	free (req);	1990	free (req);
1349	}	1991	}
1350		1992
1351	#define REQ(rtype) \	1993	#define REQ(rtype) \
…		…
1370	{ \	2012	{ \
1371	eio_api_destroy (req); \	2013	eio_api_destroy (req); \
1372	return 0; \	2014	return 0; \
1373	}	2015	}
1374		2016
		2017	static void
1375	static void eio_execute (etp_worker *self, eio_req *req)	2018	eio_execute (etp_worker *self, eio_req *req)
1376	{	2019	{
1377	errno = 0;	2020	if (ecb_expect_false (EIO_CANCELLED (req)))
		2021	{
		2022	req->result = -1;
		2023	req->errorno = ECANCELED;
		2024	return;
		2025	}
1378		2026
1379	switch (req->type)	2027	switch (req->type)
1380	{	2028	{
1381	case EIO_READ: ALLOC (req->size);	2029	case EIO_READ: ALLOC (req->size);
1382	req->result = req->offs >= 0	2030	req->result = req->offs >= 0
…		…
1394	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2042	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1395	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2043	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1396	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2044	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1397	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2045	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1398		2046
		2047	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2048	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2049	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2050	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2051
1399	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;	2052	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;	2053	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;	2054	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;	2055	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;	2056	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
…		…
1410	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;	2063	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1411	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;	2064	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;	2065	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1413	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;	2066	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1414	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;	2067	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;	2068	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1416		2069
		2070	case EIO_REALPATH: eio__realpath (req, self); break;
		2071
1417	case EIO_READLINK: ALLOC (NAME_MAX);	2072	case EIO_READLINK: ALLOC (PATH_MAX);
1418	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	2073	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1419		2074
1420	case EIO_SYNC: req->result = 0; sync (); break;	2075	case EIO_SYNC: req->result = 0; sync (); break;
1421	case EIO_FSYNC: req->result = fsync (req->int1); break;	2076	case EIO_FSYNC: req->result = fsync (req->int1); break;
1422	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2077	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1423	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;	2078	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
		2079	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1424	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;	2080	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
		2081	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;	2082	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
		2083	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1426		2084
1427	case EIO_READDIR: eio__scandir (req, self); break;	2085	case EIO_READDIR: eio__scandir (req, self); break;
1428		2086
1429	case EIO_BUSY:	2087	case EIO_BUSY:
1430	#ifdef _WIN32	2088	#ifdef _WIN32
1431	Sleep (req->nv1 * 1000.);	2089	Sleep (req->nv1 * 1e3);
1432	#else	2090	#else
1433	{	2091	{
1434	struct timeval tv;	2092	struct timeval tv;
1435		2093
1436	tv.tv_sec = req->nv1;	2094	tv.tv_sec = req->nv1;
1437	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;	2095	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1438		2096
1439	req->result = select (0, 0, 0, 0, &tv);	2097	req->result = select (0, 0, 0, 0, &tv);
1440	}	2098	}
1441	#endif	2099	#endif
1442	break;	2100	break;
…		…
1457	times = tv;	2115	times = tv;
1458	}	2116	}
1459	else	2117	else
1460	times = 0;	2118	times = 0;
1461		2119
1462
1463	req->result = req->type == EIO_FUTIME	2120	req->result = req->type == EIO_FUTIME
1464	? futimes (req->int1, times)	2121	? futimes (req->int1, times)
1465	: utimes (req->ptr1, times);	2122	: utimes (req->ptr1, times);
1466	}	2123	}
1467	break;	2124	break;
…		…
1472	case EIO_NOP:	2129	case EIO_NOP:
1473	req->result = 0;	2130	req->result = 0;
1474	break;	2131	break;
1475		2132
1476	case EIO_CUSTOM:	2133	case EIO_CUSTOM:
1477	((void (*)(eio_req *))req->feed) (req);	2134	req->feed (req);
1478	break;	2135	break;
1479		2136
1480	default:	2137	default:
		2138	errno = ENOSYS;
1481	req->result = -1;	2139	req->result = -1;
1482	break;	2140	break;
1483	}	2141	}
1484		2142
1485	req->errorno = errno;	2143	req->errorno = errno;
…		…
1515	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2173	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1516	{	2174	{
1517	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2175	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1518	}	2176	}
1519		2177
		2178	eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
		2179	{
		2180	REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
		2181	}
		2182
		2183	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
		2184	{
		2185	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
		2186	}
		2187
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)	2188	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	{	2189	{
1522	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;	2190	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1523	}	2191	}
1524		2192
		2193	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
		2194	{
		2195	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
		2196	}
		2197
1525	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)	2198	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1526	{	2199	{
1527	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	2200	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1528	}	2201	}
1529		2202
…		…
1550	eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)	2223	eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1551	{	2224	{
1552	REQ (EIO_FSTAT); req->int1 = fd; SEND;	2225	REQ (EIO_FSTAT); req->int1 = fd; SEND;
1553	}	2226	}
1554		2227
		2228	eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
		2229	{
		2230	REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
		2231	}
		2232
1555	eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)	2233	eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1556	{	2234	{
1557	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;	2235	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1558	}	2236	}
1559		2237
…		…
1565	eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)	2243	eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1566	{	2244	{
1567	REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;	2245	REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1568	}	2246	}
1569		2247
1570	eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data)	2248	eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1571	{	2249	{
1572	REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;	2250	REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1573	}	2251	}
1574		2252
1575	eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)	2253	eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
…		…
1595	eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)	2273	eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1596	{	2274	{
1597	REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;	2275	REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1598	}	2276	}
1599		2277
1600	eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data)	2278	eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1601	{	2279	{
1602	REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;	2280	REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1603	}	2281	}
1604		2282
1605	eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)	2283	eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
…		…
1621	eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)	2299	eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1622	{	2300	{
1623	return eio__1path (EIO_READLINK, path, pri, cb, data);	2301	return eio__1path (EIO_READLINK, path, pri, cb, data);
1624	}	2302	}
1625		2303
		2304	eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
		2305	{
		2306	return eio__1path (EIO_REALPATH, path, pri, cb, data);
		2307	}
		2308
1626	eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)	2309	eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1627	{	2310	{
1628	return eio__1path (EIO_STAT, path, pri, cb, data);	2311	return eio__1path (EIO_STAT, path, pri, cb, data);
1629	}	2312	}
1630		2313
1631	eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)	2314	eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1632	{	2315	{
1633	return eio__1path (EIO_LSTAT, path, pri, cb, data);	2316	return eio__1path (EIO_LSTAT, path, pri, cb, data);
1634	}	2317	}
1635		2318
		2319	eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
		2320	{
		2321	return eio__1path (EIO_STATVFS, path, pri, cb, data);
		2322	}
		2323
1636	eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)	2324	eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1637	{	2325	{
1638	return eio__1path (EIO_UNLINK, path, pri, cb, data);	2326	return eio__1path (EIO_UNLINK, path, pri, cb, data);
1639	}	2327	}
1640		2328
…		…
1648	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;	2336	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1649	}	2337	}
1650		2338
1651	eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	2339	eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1652	{	2340	{
1653	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	2341	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1654	}	2342	}
1655		2343
1656	static eio_req *	2344	static eio_req *
1657	eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)	2345	eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1658	{	2346	{
…		…
1682	eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)	2370	eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1683	{	2371	{
1684	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	2372	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1685	}	2373	}
1686		2374
1687	eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)	2375	eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1688	{	2376	{
1689	REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND;	2377	REQ (EIO_CUSTOM); req->feed = execute; SEND;
1690	}	2378	}
1691		2379
1692	#endif	2380	#endif
1693		2381
1694	eio_req *eio_grp (eio_cb cb, void *data)	2382	eio_req *eio_grp (eio_cb cb, void *data)
…		…
1703	#undef SEND	2391	#undef SEND
1704		2392
1705	/*****************************************************************************/	2393	/*****************************************************************************/
1706	/* grp functions */	2394	/* grp functions */
1707		2395
		2396	void
1708	void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)	2397	eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
1709	{	2398	{
1710	grp->int2 = limit;	2399	grp->int2 = limit;
1711	grp->feed = feed;	2400	grp->feed = feed;
1712		2401
1713	grp_try_feed (grp);	2402	grp_try_feed (grp);
1714	}	2403	}
1715		2404
		2405	void
1716	void eio_grp_limit (eio_req *grp, int limit)	2406	eio_grp_limit (eio_req *grp, int limit)
1717	{	2407	{
1718	grp->int2 = limit;	2408	grp->int2 = limit;
1719		2409
1720	grp_try_feed (grp);	2410	grp_try_feed (grp);
1721	}	2411	}
1722		2412
		2413	void
1723	void eio_grp_add (eio_req *grp, eio_req *req)	2414	eio_grp_add (eio_req *grp, eio_req *req)
1724	{	2415	{
1725	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	2416	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1726		2417
1727	grp->flags |= EIO_FLAG_GROUPADD;	2418	grp->flags |= EIO_FLAG_GROUPADD;
1728		2419
…		…
1739	}	2430	}
1740		2431
1741	/*****************************************************************************/	2432	/*****************************************************************************/
1742	/* misc garbage */	2433	/* misc garbage */
1743		2434
		2435	eio_ssize_t
1744	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2436	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1745	{	2437	{
1746	etp_worker wrk;	2438	etp_worker wrk;
		2439	eio_ssize_t ret;
1747		2440
1748	wrk.dbuf = 0;	2441	wrk.dbuf = 0;
1749		2442
1750	eio__sendfile (ofd, ifd, offset, count, &wrk);	2443	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1751		2444
1752	if (wrk.dbuf)	2445	if (wrk.dbuf)
1753	free (wrk.dbuf);	2446	free (wrk.dbuf);
1754	}
1755		2447
		2448	return ret;
		2449	}
		2450

Diff Legend

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