ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/libeio/eio.c

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

Diff Legend

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