ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/libeio/eio.c

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

Diff Legend

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