ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/libeio/eio.c

Comparing libeio/eio.c (file contents):
Revision 1.92 by root, Sun Jul 17 18:27:17 2011 UTC vs.
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 UTC

1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016 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	*
10	* 1. Redistributions of source code must retain the above copyright notice,	10	* 1. Redistributions of source code must retain the above copyright notice,
11	* this list of conditions and the following disclaimer.	11	* this list of conditions and the following disclaimer.
12	*	12	*
13	* 2. Redistributions in binary form must reproduce the above copyright	13	* 2. Redistributions in binary form must reproduce the above copyright
14	* notice, this list of conditions and the following disclaimer in the	14	* notice, this list of conditions and the following disclaimer in the
15	* documentation and/or other materials provided with the distribution.	15	* documentation and/or other materials provided with the distribution.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED	17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-	18	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19	* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO	19	* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20	* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-	20	* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21	* CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,	21	* CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
…		…
42	#endif	42	#endif
43		43
44	#include "eio.h"	44	#include "eio.h"
45	#include "ecb.h"	45	#include "ecb.h"
46		46
47	#ifdef EIO_STACKSIZE
48	# define XTHREAD_STACKSIZE EIO_STACKSIZE
49	#endif
50	#include "xthread.h"
51
52	#include <errno.h>	47	#include <errno.h>
53	#include <stddef.h>	48	#include <stddef.h>
54	#include <stdlib.h>	49	#include <stdlib.h>
55	#include <string.h>	50	#include <string.h>
56	#include <errno.h>	51	#include <errno.h>
…		…
71	#endif	66	#endif
72	#ifndef ELOOP	67	#ifndef ELOOP
73	# define ELOOP EDOM	68	# define ELOOP EDOM
74	#endif	69	#endif
75		70
		71	#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
		72	# define ENOTSOCK WSAENOTSOCK
		73	#endif
		74
76	static void eio_destroy (eio_req *req);	75	static void eio_destroy (eio_req *req);
77		76
78	#ifndef EIO_FINISH	77	#ifndef EIO_FINISH
79	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0	78	# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
80	#endif	79	#endif
…		…
101	#ifdef _WIN32	100	#ifdef _WIN32
102		101
103	#undef PAGESIZE	102	#undef PAGESIZE
104	#define PAGESIZE 4096 /* GetSystemInfo? */	103	#define PAGESIZE 4096 /* GetSystemInfo? */
105		104
		105	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		106
106	#ifdef EIO_STRUCT_STATI64	107	#ifdef EIO_STRUCT_STATI64
		108	/* look at perl's non-sloppy stat */
107	#define stat(path,buf) _stati64 (path,buf)	109	#define stat(path,buf) _stati64 (path,buf)
108	#define fstat(fd,buf) _fstati64 (path,buf)	110	#define fstat(fd,buf) _fstati64 (fd,buf)
109	#endif	111	#endif
110	#define lstat(path,buf) stat (path,buf)	112	#define lstat(path,buf) stat (path,buf)
111	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))	113	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
112	#define mkdir(path,mode) _mkdir (path)	114	#define mkdir(path,mode) _mkdir (path)
113	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))	115	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
114		116
115	#define chmod(path,mode) _chmod (path, mode)	117	#define chmod(path,mode) _chmod (path, mode)
116	#define dup(fd) _dup (fd)	118	#define dup(fd) _dup (fd)
117	#define dup2(fd1,fd2) _dup2 (fd1, fd2)	119	#define dup2(fd1,fd2) _dup2 (fd1, fd2)
		120	#define pipe(fds) _pipe (fds, 4096, O_BINARY)
118		121
		122	#define fcntl(fd,cmd,arg) EIO_ENOSYS ()
		123	#define ioctl(fd,cmd,arg) EIO_ENOSYS ()
119	#define fchmod(fd,mode) EIO_ENOSYS ()	124	#define fchmod(fd,mode) EIO_ENOSYS ()
120	#define chown(path,uid,gid) EIO_ENOSYS ()	125	#define chown(path,uid,gid) EIO_ENOSYS ()
121	#define fchown(fd,uid,gid) EIO_ENOSYS ()	126	#define fchown(fd,uid,gid) EIO_ENOSYS ()
122	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */	127	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
123	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */	128	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
…		…
125	#define sync() EIO_ENOSYS ()	130	#define sync() EIO_ENOSYS ()
126	#define readlink(path,buf,s) EIO_ENOSYS ()	131	#define readlink(path,buf,s) EIO_ENOSYS ()
127	#define statvfs(path,buf) EIO_ENOSYS ()	132	#define statvfs(path,buf) EIO_ENOSYS ()
128	#define fstatvfs(fd,buf) EIO_ENOSYS ()	133	#define fstatvfs(fd,buf) EIO_ENOSYS ()
129		134
		135	#define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
		136	#define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
		137
		138	#if __GNUC__
		139	typedef long long eio_off_t; /* signed for compatibility to msvc */
		140	#else
		141	typedef __int64 eio_off_t; /* unsigned not supported by msvc */
		142	#endif
		143
		144	static eio_ssize_t
		145	eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
		146	{
		147	OVERLAPPED o = { 0 };
		148	DWORD got;
		149
		150	o.Offset = offset;
		151	o.OffsetHigh = offset >> 32;
		152
		153	return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
		154	? got : -1;
		155	}
		156
		157	static eio_ssize_t
		158	eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
		159	{
		160	OVERLAPPED o = { 0 };
		161	DWORD got;
		162
		163	o.Offset = offset;
		164	o.OffsetHigh = offset >> 32;
		165
		166	return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
		167	? got : -1;
		168	}
		169
		170	/* rename() uses MoveFile, which fails to overwrite */
		171	#define rename(old,neu) eio__rename (old, neu)
		172
		173	static int
		174	eio__rename (const char *old, const char *neu)
		175	{
		176	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		177	return 0;
		178
		179	/* should steal _dosmaperr */
		180	switch (GetLastError ())
		181	{
		182	case ERROR_FILE_NOT_FOUND:
		183	case ERROR_PATH_NOT_FOUND:
		184	case ERROR_INVALID_DRIVE:
		185	case ERROR_NO_MORE_FILES:
		186	case ERROR_BAD_NETPATH:
		187	case ERROR_BAD_NET_NAME:
		188	case ERROR_BAD_PATHNAME:
		189	case ERROR_FILENAME_EXCED_RANGE:
		190	errno = ENOENT;
		191	break;
		192
		193	default:
		194	errno = EACCES;
		195	break;
		196	}
		197
		198	return -1;
		199	}
		200
130	/* we could even stat and see if it exists */	201	/* we could even stat and see if it exists */
131	static int	202	static int
132	symlink (const char *old, const char *neu)	203	symlink (const char *old, const char *neu)
133	{	204	{
134	#if WINVER >= 0x0600	205	#if WINVER >= 0x0600
		206	int flags;
		207
		208	/* This tries out all combinations of SYMBOLIC_LINK_FLAG_DIRECTORY
		209	* and SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE,
		210	* with directory first.
		211	*/
		212	for (flags = 3; flags >= 0; --flags)
135	if (CreateSymbolicLink (neu, old, 1))	213	if (CreateSymbolicLink (neu, old, flags))
136	return 0;	214	return 0;
137
138	if (CreateSymbolicLink (neu, old, 0))
139	return 0;
140	#endif	215	#endif
141		216
142	return EIO_ERRNO (ENOENT, -1);	217	return EIO_ERRNO (ENOENT, -1);
143	}	218	}
144		219
145	/* POSIX API only */	220	/* POSIX API only, causing trouble for win32 apps */
146	#define CreateHardLink(neu,old,flags) 0	221	#define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
147	#define CreateSymbolicLink(neu,old,flags) 0	222	#define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
148		223
149	struct statvfs	224	struct statvfs
150	{	225	{
151	int dummy;	226	int dummy;
152	};	227	};
…		…
158		233
159	#else	234	#else
160		235
161	#include <sys/time.h>	236	#include <sys/time.h>
162	#include <sys/select.h>	237	#include <sys/select.h>
163	#include <sys/statvfs.h>
164	#include <unistd.h>	238	#include <unistd.h>
165	#include <utime.h>
166	#include <signal.h>	239	#include <signal.h>
167	#include <dirent.h>	240	#include <dirent.h>
		241
		242	#ifdef ANDROID
		243	#include <sys/vfs.h>
		244	#define statvfs statfs
		245	#define fstatvfs fstatfs
		246	#include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
		247	#else
		248	#include <sys/statvfs.h>
		249	#endif
168		250
169	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES	251	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
170	#include <sys/mman.h>	252	#include <sys/mman.h>
171	#endif	253	#endif
172		254
173	#define D_NAME(entp) entp->d_name	255	#define D_NAME(entp) entp->d_name
174		256
175	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	257	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
176	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__	258	#if __FreeBSD__ || __NetBSD__ || __OpenBSD__
177	#define _DIRENT_HAVE_D_TYPE /* sigh */	259	#define _DIRENT_HAVE_D_TYPE /* sigh */
178	#define D_INO(de) (de)->d_fileno	260	#define D_INO(de) (de)->d_fileno
179	#define D_NAMLEN(de) (de)->d_namlen	261	#define D_NAMLEN(de) (de)->d_namlen
180	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600	262	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
181	#define D_INO(de) (de)->d_ino	263	#define D_INO(de) (de)->d_ino
…		…
192		274
193	#ifndef EIO_STRUCT_DIRENT	275	#ifndef EIO_STRUCT_DIRENT
194	#define EIO_STRUCT_DIRENT struct dirent	276	#define EIO_STRUCT_DIRENT struct dirent
195	#endif	277	#endif
196		278
		279	#endif
		280
		281	#if HAVE_UTIMES
		282	# include <utime.h>
		283	#endif
		284
		285	#if HAVE_SYS_SYSCALL_H
		286	# include <sys/syscall.h>
197	#endif	287	#endif
198		288
199	#if HAVE_SENDFILE	289	#if HAVE_SENDFILE
200	# if __linux	290	# if __linux
201	# include <sys/sendfile.h>	291	# include <sys/sendfile.h>
…		…
226	# define NAME_MAX 4096	316	# define NAME_MAX 4096
227	#endif	317	#endif
228		318
229	/* used for readlink etc. */	319	/* used for readlink etc. */
230	#ifndef PATH_MAX	320	#ifndef PATH_MAX
231	# define PATH_MAX 4096	321	# define PATH_MAX 0
232	#endif	322	#endif
		323
		324	#ifndef EIO_PATH_MIN
		325	# define EIO_PATH_MIN 8160
		326	#endif
		327
		328	#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
233		329
234	/* buffer size for various temporary buffers */	330	/* buffer size for various temporary buffers */
235	#define EIO_BUFSIZE 65536	331	#define EIO_BUFSIZE 65536
236		332
237	#define dBUF \	333	#define dBUF \
238	char *eio_buf; \
239	ETP_WORKER_LOCK (self); \
240	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	334	char *eio_buf = malloc (EIO_BUFSIZE); \
241	ETP_WORKER_UNLOCK (self); \
242	errno = ENOMEM; \	335	errno = ENOMEM; \
243	if (!eio_buf) \	336	if (!eio_buf) \
244	return -1;	337	return -1
245		338
246	#define EIO_TICKS ((1000000 + 1023) >> 10)	339	#define FUBd \
		340	free (eio_buf)
		341
		342	/*****************************************************************************/
		343
		344	struct etp_tmpbuf;
		345
		346	#if _POSIX_VERSION >= 200809L
		347	#define HAVE_AT 1
		348	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		349	#ifndef O_SEARCH
		350	#define O_SEARCH O_RDONLY
		351	#endif
		352	#else
		353	#define HAVE_AT 0
		354	static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
		355	#endif
		356
		357	struct eio_pwd
		358	{
		359	#if HAVE_AT
		360	int fd;
		361	#endif
		362	int len;
		363	char str[1]; /* actually, a 0-terminated canonical path */
		364	};
		365
		366	/*****************************************************************************/
247		367
248	#define ETP_PRI_MIN EIO_PRI_MIN	368	#define ETP_PRI_MIN EIO_PRI_MIN
249	#define ETP_PRI_MAX EIO_PRI_MAX	369	#define ETP_PRI_MAX EIO_PRI_MAX
250		370
		371	#define ETP_TYPE_QUIT -1
		372	#define ETP_TYPE_GROUP EIO_GROUP
		373
		374	static void eio_nop_callback (void) { }
		375	static void (*eio_want_poll_cb)(void) = eio_nop_callback;
		376	static void (*eio_done_poll_cb)(void) = eio_nop_callback;
		377
		378	#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
		379	#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
		380
251	struct etp_worker;	381	struct etp_worker;
252
253	#define ETP_REQ eio_req	382	#define ETP_REQ eio_req
254	#define ETP_DESTROY(req) eio_destroy (req)	383	#define ETP_DESTROY(req) eio_destroy (req)
255	static int eio_finish (eio_req *req);	384	static int eio_finish (eio_req *req);
256	#define ETP_FINISH(req) eio_finish (req)	385	#define ETP_FINISH(req) eio_finish (req)
257	static void eio_execute (struct etp_worker *self, eio_req *req);	386	static void eio_execute (struct etp_worker *self, eio_req *req);
258	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	387	#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
259		388
260	#define ETP_WORKER_CLEAR(req) \	389	#include "etp.c"
261	if (wrk->dbuf) \
262	{ \
263	free (wrk->dbuf); \
264	wrk->dbuf = 0; \
265	}
266		390
267	#define ETP_WORKER_COMMON \	391	static struct etp_pool eio_pool;
268	void *dbuf;	392	#define EIO_POOL (&eio_pool)
269
270	/*****************************************************************************/
271
272	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273
274	/* calculate time difference in ~1/EIO_TICKS of a second */
275	ecb_inline int
276	tvdiff (struct timeval *tv1, struct timeval *tv2)
277	{
278	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
279	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
280	}
281
282	static unsigned int started, idle, wanted = 4;
283
284	static void (*want_poll_cb) (void);
285	static void (*done_poll_cb) (void);
286
287	static unsigned int max_poll_time; /* reslock */
288	static unsigned int max_poll_reqs; /* reslock */
289
290	static volatile unsigned int nreqs; /* reqlock */
291	static volatile unsigned int nready; /* reqlock */
292	static volatile unsigned int npending; /* reqlock */
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 */
295
296	static xmutex_t wrklock;
297	static xmutex_t reslock;
298	static xmutex_t reqlock;
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 = X_MUTEX_INIT;
308	#endif
309
310	typedef struct etp_worker
311	{
312	/* locked by wrklock */
313	struct etp_worker *prev, *next;
314
315	xthread_t tid;
316
317	/* locked by reslock, reqlock or wrklock */
318	ETP_REQ *req; /* currently processed request */
319
320	ETP_WORKER_COMMON
321	} etp_worker;
322
323	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */
324
325	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
326	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
327
328	/* worker threads management */
329
330	static void ecb_cold
331	etp_worker_clear (etp_worker *wrk)
332	{
333	ETP_WORKER_CLEAR (wrk);
334	}
335
336	static void ecb_cold
337	etp_worker_free (etp_worker *wrk)
338	{
339	wrk->next->prev = wrk->prev;
340	wrk->prev->next = wrk->next;
341
342	free (wrk);
343	}
344
345	static unsigned int
346	etp_nreqs (void)
347	{
348	int retval;
349	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
350	retval = nreqs;
351	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
352	return retval;
353	}
354
355	static unsigned int
356	etp_nready (void)
357	{
358	unsigned int retval;
359
360	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
361	retval = nready;
362	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
363
364	return retval;
365	}
366
367	static unsigned int
368	etp_npending (void)
369	{
370	unsigned int retval;
371
372	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
373	retval = npending;
374	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
375
376	return retval;
377	}
378
379	static unsigned int
380	etp_nthreads (void)
381	{
382	unsigned int retval;
383
384	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
385	retval = started;
386	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
387
388	return retval;
389	}
390
391	/*
392	* a somewhat faster data structure might be nice, but
393	* with 8 priorities this actually needs <20 insns
394	* per shift, the most expensive operation.
395	*/
396	typedef struct {
397	ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
398	int size;
399	} etp_reqq;
400
401	static etp_reqq req_queue;
402	static etp_reqq res_queue;
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
416	reqq_push (etp_reqq *q, ETP_REQ *req)
417	{
418	int pri = req->pri;
419	req->next = 0;
420
421	if (q->qe[pri])
422	{
423	q->qe[pri]->next = req;
424	q->qe[pri] = req;
425	}
426	else
427	q->qe[pri] = q->qs[pri] = req;
428
429	return q->size++;
430	}
431
432	static ETP_REQ * ecb_noinline
433	reqq_shift (etp_reqq *q)
434	{
435	int pri;
436
437	if (!q->size)
438	return 0;
439
440	--q->size;
441
442	for (pri = ETP_NUM_PRI; pri--; )
443	{
444	eio_req *req = q->qs[pri];
445
446	if (req)
447	{
448	if (!(q->qs[pri] = (eio_req *)req->next))
449	q->qe[pri] = 0;
450
451	return req;
452	}
453	}
454
455	abort ();
456	}
457
458	static void ecb_cold
459	etp_thread_init (void)
460	{
461	#if !HAVE_PREADWRITE
462	X_MUTEX_CREATE (preadwritelock);
463	#endif
464	X_MUTEX_CREATE (wrklock);
465	X_MUTEX_CREATE (reslock);
466	X_MUTEX_CREATE (reqlock);
467	X_COND_CREATE (reqwait);
468	}
469
470	static void ecb_cold
471	etp_atfork_child (void)
472	{
473	reqq_init (&req_queue);
474	reqq_init (&res_queue);
475
476	wrk_first.next =
477	wrk_first.prev = &wrk_first;
478
479	started = 0;
480	idle = 0;
481	nreqs = 0;
482	nready = 0;
483	npending = 0;
484
485	etp_thread_init ();
486	}
487
488	static void ecb_cold
489	etp_once_init (void)
490	{
491	etp_thread_init ();
492	X_THREAD_ATFORK (0, 0, etp_atfork_child);
493	}
494
495	static int ecb_cold
496	etp_init (void (*want_poll)(void), void (*done_poll)(void))
497	{
498	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
499
500	pthread_once (&doinit, etp_once_init);
501
502	want_poll_cb = want_poll;
503	done_poll_cb = done_poll;
504
505	return 0;
506	}
507
508	X_THREAD_PROC (etp_proc);
509
510	static void ecb_cold
511	etp_start_thread (void)
512	{
513	etp_worker *wrk = calloc (1, sizeof (etp_worker));
514
515	/*TODO*/
516	assert (("unable to allocate worker thread data", wrk));
517
518	X_LOCK (wrklock);
519
520	if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
521	{
522	wrk->prev = &wrk_first;
523	wrk->next = wrk_first.next;
524	wrk_first.next->prev = wrk;
525	wrk_first.next = wrk;
526	++started;
527	}
528	else
529	free (wrk);
530
531	X_UNLOCK (wrklock);
532	}
533
534	static void
535	etp_maybe_start_thread (void)
536	{
537	if (ecb_expect_true (etp_nthreads () >= wanted))
538	return;
539
540	/* todo: maybe use idle here, but might be less exact */
541	if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
542	return;
543
544	etp_start_thread ();
545	}
546
547	static void ecb_cold
548	etp_end_thread (void)
549	{
550	eio_req *req = calloc (1, sizeof (eio_req));
551
552	req->type = -1;
553	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
554
555	X_LOCK (reqlock);
556	reqq_push (&req_queue, req);
557	X_COND_SIGNAL (reqwait);
558	X_UNLOCK (reqlock);
559
560	X_LOCK (wrklock);
561	--started;
562	X_UNLOCK (wrklock);
563	}
564
565	static int
566	etp_poll (void)
567	{
568	unsigned int maxreqs;
569	unsigned int maxtime;
570	struct timeval tv_start, tv_now;
571
572	X_LOCK (reslock);
573	maxreqs = max_poll_reqs;
574	maxtime = max_poll_time;
575	X_UNLOCK (reslock);
576
577	if (maxtime)
578	gettimeofday (&tv_start, 0);
579
580	for (;;)
581	{
582	ETP_REQ *req;
583
584	etp_maybe_start_thread ();
585
586	X_LOCK (reslock);
587	req = reqq_shift (&res_queue);
588
589	if (req)
590	{
591	--npending;
592
593	if (!res_queue.size && done_poll_cb)
594	done_poll_cb ();
595	}
596
597	X_UNLOCK (reslock);
598
599	if (!req)
600	return 0;
601
602	X_LOCK (reqlock);
603	--nreqs;
604	X_UNLOCK (reqlock);
605
606	if (ecb_expect_false (req->type == EIO_GROUP && req->size))
607	{
608	req->int1 = 1; /* mark request as delayed */
609	continue;
610	}
611	else
612	{
613	int res = ETP_FINISH (req);
614	if (ecb_expect_false (res))
615	return res;
616	}
617
618	if (ecb_expect_false (maxreqs && !--maxreqs))
619	break;
620
621	if (maxtime)
622	{
623	gettimeofday (&tv_now, 0);
624
625	if (tvdiff (&tv_start, &tv_now) >= maxtime)
626	break;
627	}
628	}
629
630	errno = EAGAIN;
631	return -1;
632	}
633
634	static void
635	etp_cancel (ETP_REQ *req)
636	{
637	req->cancelled = 1;
638
639	eio_grp_cancel (req);
640	}
641
642	static void
643	etp_submit (ETP_REQ *req)
644	{
645	req->pri -= ETP_PRI_MIN;
646
647	if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
648	if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
649
650	if (ecb_expect_false (req->type == EIO_GROUP))
651	{
652	/* I hope this is worth it :/ */
653	X_LOCK (reqlock);
654	++nreqs;
655	X_UNLOCK (reqlock);
656
657	X_LOCK (reslock);
658
659	++npending;
660
661	if (!reqq_push (&res_queue, req) && want_poll_cb)
662	want_poll_cb ();
663
664	X_UNLOCK (reslock);
665	}
666	else
667	{
668	X_LOCK (reqlock);
669	++nreqs;
670	++nready;
671	reqq_push (&req_queue, req);
672	X_COND_SIGNAL (reqwait);
673	X_UNLOCK (reqlock);
674
675	etp_maybe_start_thread ();
676	}
677	}
678
679	static void ecb_cold
680	etp_set_max_poll_time (double nseconds)
681	{
682	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
683	max_poll_time = nseconds * EIO_TICKS;
684	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
685	}
686
687	static void ecb_cold
688	etp_set_max_poll_reqs (unsigned int maxreqs)
689	{
690	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
691	max_poll_reqs = maxreqs;
692	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
693	}
694
695	static void ecb_cold
696	etp_set_max_idle (unsigned int nthreads)
697	{
698	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
699	max_idle = nthreads;
700	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
701	}
702
703	static void ecb_cold
704	etp_set_idle_timeout (unsigned int seconds)
705	{
706	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
707	idle_timeout = seconds;
708	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
709	}
710
711	static void ecb_cold
712	etp_set_min_parallel (unsigned int nthreads)
713	{
714	if (wanted < nthreads)
715	wanted = nthreads;
716	}
717
718	static void ecb_cold
719	etp_set_max_parallel (unsigned int nthreads)
720	{
721	if (wanted > nthreads)
722	wanted = nthreads;
723
724	while (started > wanted)
725	etp_end_thread ();
726	}
727		393
728	/*****************************************************************************/	394	/*****************************************************************************/
729		395
730	static void	396	static void
731	grp_try_feed (eio_req *grp)	397	grp_try_feed (eio_req *grp)
732	{	398	{
733	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	399	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
734	{	400	{
735	grp->flags &= ~EIO_FLAG_GROUPADD;	401	grp->flags &= ~ETP_FLAG_GROUPADD;
736		402
737	EIO_FEED (grp);	403	EIO_FEED (grp);
738		404
739	/* stop if no progress has been made */	405	/* stop if no progress has been made */
740	if (!(grp->flags & EIO_FLAG_GROUPADD))	406	if (!(grp->flags & ETP_FLAG_GROUPADD))
741	{	407	{
742	grp->feed = 0;	408	grp->feed = 0;
743	break;	409	break;
744	}	410	}
745	}	411	}
…		…
752		418
753	/* call feeder, if applicable */	419	/* call feeder, if applicable */
754	grp_try_feed (grp);	420	grp_try_feed (grp);
755		421
756	/* finish, if done */	422	/* finish, if done */
757	if (!grp->size && grp->int1)	423	if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
758	return eio_finish (grp);	424	return eio_finish (grp);
759	else	425	else
760	return 0;	426	return 0;
761	}	427	}
762		428
…		…
798	}	464	}
799		465
800	void	466	void
801	eio_grp_cancel (eio_req *grp)	467	eio_grp_cancel (eio_req *grp)
802	{	468	{
803	for (grp = grp->grp_first; grp; grp = grp->grp_next)	469	etp_grp_cancel (EIO_POOL, grp);
804	eio_cancel (grp);
805	}	470	}
806		471
807	void	472	void
808	eio_cancel (eio_req *req)	473	eio_cancel (eio_req *req)
809	{	474	{
810	etp_cancel (req);	475	etp_cancel (EIO_POOL, req);
811	}	476	}
812		477
813	void	478	void
814	eio_submit (eio_req *req)	479	eio_submit (eio_req *req)
815	{	480	{
816	etp_submit (req);	481	etp_submit (EIO_POOL, req);
817	}	482	}
818		483
819	unsigned int	484	unsigned int
820	eio_nreqs (void)	485	eio_nreqs (void)
821	{	486	{
822	return etp_nreqs ();	487	return etp_nreqs (EIO_POOL);
823	}	488	}
824		489
825	unsigned int	490	unsigned int
826	eio_nready (void)	491	eio_nready (void)
827	{	492	{
828	return etp_nready ();	493	return etp_nready (EIO_POOL);
829	}	494	}
830		495
831	unsigned int	496	unsigned int
832	eio_npending (void)	497	eio_npending (void)
833	{	498	{
834	return etp_npending ();	499	return etp_npending (EIO_POOL);
835	}	500	}
836		501
837	unsigned int ecb_cold	502	unsigned int ecb_cold
838	eio_nthreads (void)	503	eio_nthreads (void)
839	{	504	{
840	return etp_nthreads ();	505	return etp_nthreads (EIO_POOL);
841	}	506	}
842		507
843	void ecb_cold	508	void ecb_cold
844	eio_set_max_poll_time (double nseconds)	509	eio_set_max_poll_time (double nseconds)
845	{	510	{
846	etp_set_max_poll_time (nseconds);	511	etp_set_max_poll_time (EIO_POOL, nseconds);
847	}	512	}
848		513
849	void ecb_cold	514	void ecb_cold
850	eio_set_max_poll_reqs (unsigned int maxreqs)	515	eio_set_max_poll_reqs (unsigned int maxreqs)
851	{	516	{
852	etp_set_max_poll_reqs (maxreqs);	517	etp_set_max_poll_reqs (EIO_POOL, maxreqs);
853	}	518	}
854		519
855	void ecb_cold	520	void ecb_cold
856	eio_set_max_idle (unsigned int nthreads)	521	eio_set_max_idle (unsigned int nthreads)
857	{	522	{
858	etp_set_max_idle (nthreads);	523	etp_set_max_idle (EIO_POOL, nthreads);
859	}	524	}
860		525
861	void ecb_cold	526	void ecb_cold
862	eio_set_idle_timeout (unsigned int seconds)	527	eio_set_idle_timeout (unsigned int seconds)
863	{	528	{
864	etp_set_idle_timeout (seconds);	529	etp_set_idle_timeout (EIO_POOL, seconds);
865	}	530	}
866		531
867	void ecb_cold	532	void ecb_cold
868	eio_set_min_parallel (unsigned int nthreads)	533	eio_set_min_parallel (unsigned int nthreads)
869	{	534	{
870	etp_set_min_parallel (nthreads);	535	etp_set_min_parallel (EIO_POOL, nthreads);
871	}	536	}
872		537
873	void ecb_cold	538	void ecb_cold
874	eio_set_max_parallel (unsigned int nthreads)	539	eio_set_max_parallel (unsigned int nthreads)
875	{	540	{
876	etp_set_max_parallel (nthreads);	541	etp_set_max_parallel (EIO_POOL, nthreads);
877	}	542	}
878		543
879	int eio_poll (void)	544	int eio_poll (void)
880	{	545	{
881	return etp_poll ();	546	return etp_poll (EIO_POOL);
882	}	547	}
883		548
884	/*****************************************************************************/	549	/*****************************************************************************/
885	/* work around various missing functions */	550	/* work around various missing functions */
886
887	#if !HAVE_PREADWRITE
888	# undef pread
889	# undef pwrite
890	# define pread eio__pread
891	# define pwrite eio__pwrite
892
893	static eio_ssize_t
894	eio__pread (int fd, void *buf, size_t count, off_t offset)
895	{
896	eio_ssize_t res;
897	off_t ooffset;
898
899	X_LOCK (preadwritelock);
900	ooffset = lseek (fd, 0, SEEK_CUR);
901	lseek (fd, offset, SEEK_SET);
902	res = read (fd, buf, count);
903	lseek (fd, ooffset, SEEK_SET);
904	X_UNLOCK (preadwritelock);
905
906	return res;
907	}
908
909	static eio_ssize_t
910	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
911	{
912	eio_ssize_t res;
913	off_t ooffset;
914
915	X_LOCK (preadwritelock);
916	ooffset = lseek (fd, 0, SEEK_CUR);
917	lseek (fd, offset, SEEK_SET);
918	res = write (fd, buf, count);
919	lseek (fd, ooffset, SEEK_SET);
920	X_UNLOCK (preadwritelock);
921
922	return res;
923	}
924	#endif
925		551
926	#ifndef HAVE_UTIMES	552	#ifndef HAVE_UTIMES
927		553
928	# undef utimes	554	# undef utimes
929	# define utimes(path,times) eio__utimes (path, times)	555	# define utimes(path,times) eio__utimes (path, times)
…		…
962		588
963	#if !HAVE_FDATASYNC	589	#if !HAVE_FDATASYNC
964	# undef fdatasync	590	# undef fdatasync
965	# define fdatasync(fd) fsync (fd)	591	# define fdatasync(fd) fsync (fd)
966	#endif	592	#endif
		593
		594	static int
		595	eio__syncfs (int fd)
		596	{
		597	int res;
		598
		599	#if HAVE_SYS_SYNCFS
		600	res = (int)syscall (__NR_syncfs, (int)(fd));
		601	#else
		602	res = EIO_ENOSYS ();
		603	#endif
		604
		605	if (res < 0 && errno == ENOSYS && fd >= 0)
		606	sync ();
		607
		608	return res;
		609	}
967		610
968	/* sync_file_range always needs emulation */	611	/* sync_file_range always needs emulation */
969	static int	612	static int
970	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	613	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
971	{	614	{
…		…
994	}	637	}
995		638
996	static int	639	static int
997	eio__fallocate (int fd, int mode, off_t offset, size_t len)	640	eio__fallocate (int fd, int mode, off_t offset, size_t len)
998	{	641	{
999	#if HAVE_FALLOCATE	642	#if HAVE_LINUX_FALLOCATE
1000	return fallocate (fd, mode, offset, len);	643	return fallocate (fd, mode, offset, len);
1001	#else	644	#else
1002	errno = ENOSYS;	645	return EIO_ENOSYS ();
1003	return -1;
1004	#endif	646	#endif
1005	}	647	}
1006		648
1007	#if !HAVE_READAHEAD	649	#if !HAVE_READAHEAD
1008	# undef readahead	650	# undef readahead
…		…
1021	pread (fd, eio_buf, len, offset);	663	pread (fd, eio_buf, len, offset);
1022	offset += len;	664	offset += len;
1023	todo -= len;	665	todo -= len;
1024	}	666	}
1025		667
1026	errno = 0;	668	FUBd;
		669
		670	/* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
		671	/* but not for e.g. EIO or eof, so we also never fail */
1027	return count;	672	return 0;
1028	}	673	}
1029		674
1030	#endif	675	#endif
1031		676
1032	/* sendfile always needs emulation */	677	/* sendfile always needs emulation */
1033	static eio_ssize_t	678	static eio_ssize_t
1034	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	679	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1035	{	680	{
1036	eio_ssize_t written = 0;	681	eio_ssize_t written = 0;
1037	eio_ssize_t res;	682	eio_ssize_t res;
1038		683
1039	if (!count)	684	if (!count)
…		…
1067		712
1068	/* according to source inspection, this is correct, and useful behaviour */	713	/* according to source inspection, this is correct, and useful behaviour */
1069	if (sbytes)	714	if (sbytes)
1070	res = sbytes;	715	res = sbytes;
1071		716
1072	# elif defined (__APPLE__)	717	# elif defined __APPLE__
1073	off_t sbytes = count;	718	off_t sbytes = count;
1074	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	719	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1075		720
1076	/* according to the manpage, sbytes is always valid */	721	/* according to the manpage, sbytes is always valid */
1077	if (sbytes)	722	if (sbytes)
…		…
1104	HANDLE h = TO_SOCKET (ifd);	749	HANDLE h = TO_SOCKET (ifd);
1105	SetFilePointer (h, offset, 0, FILE_BEGIN);	750	SetFilePointer (h, offset, 0, FILE_BEGIN);
1106	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);	751	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1107		752
1108	#else	753	#else
1109	res = -1;	754	res = EIO_ENOSYS ();
1110	errno = ENOSYS;
1111	#endif	755	#endif
1112		756
1113	/* we assume sendfile can copy at least 128mb in one go */	757	/* we assume sendfile can copy at least 128mb in one go */
1114	if (res <= 128 * 1024 * 1024)	758	if (res <= 128 * 1024 * 1024)
1115	{	759	{
…		…
1175		819
1176	offset += cnt;	820	offset += cnt;
1177	res += cnt;	821	res += cnt;
1178	count -= cnt;	822	count -= cnt;
1179	}	823	}
		824
		825	FUBd;
1180	}	826	}
1181		827
1182	return res;	828	return res;
1183	}	829	}
1184		830
…		…
1300		946
1301	/*****************************************************************************/	947	/*****************************************************************************/
1302	/* requests implemented outside eio_execute, because they are so large */	948	/* requests implemented outside eio_execute, because they are so large */
1303		949
1304	static void	950	static void
1305	eio__realpath (eio_req *req, etp_worker *self)	951	eio__lseek (eio_req *req)
1306	{	952	{
1307	char *rel = req->ptr1;	953	/* this usually gets optimised away completely, or your compiler sucks, */
		954	/* or the whence constants really are not 0, 1, 2 */
		955	int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
		956	: req->int2 == EIO_SEEK_CUR ? SEEK_CUR
		957	: req->int2 == EIO_SEEK_END ? SEEK_END
		958	: req->int2;
		959
		960	req->offs = lseek (req->int1, req->offs, whence);
		961	req->result = req->offs == (off_t)-1 ? -1 : 0;
		962	}
		963
		964	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
		965	static int
		966	eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
		967	{
1308	char *res;	968	char *res;
		969	const char *rel = path;
1309	char *tmp1, *tmp2;	970	char *tmp1, *tmp2;
1310	#if SYMLOOP_MAX > 32	971	#if SYMLOOP_MAX > 32
1311	int symlinks = SYMLOOP_MAX;	972	int symlinks = SYMLOOP_MAX;
1312	#else	973	#else
1313	int symlinks = 32;	974	int symlinks = 32;
1314	#endif	975	#endif
1315		976
1316	req->result = -1;
1317
1318	errno = EINVAL;	977	errno = EINVAL;
1319	if (!rel)	978	if (!rel)
1320	return;	979	return -1;
1321		980
1322	errno = ENOENT;	981	errno = ENOENT;
1323	if (!*rel)	982	if (!*rel)
1324	return;	983	return -1;
1325		984
1326	if (!req->ptr2)	985	res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
1327	{	986	#ifdef _WIN32
1328	X_LOCK (wrklock);	987	if (_access (rel, 4) != 0)
1329	req->flags |= EIO_FLAG_PTR2_FREE;
1330	X_UNLOCK (wrklock);
1331	req->ptr2 = malloc (PATH_MAX * 3);
1332
1333	errno = ENOMEM;
1334	if (!req->ptr2)
1335	return;	988	return -1;
1336	}
1337		989
1338	res = req->ptr2;	990	symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
		991
		992	errno = ENAMETOOLONG;
		993	if (symlinks >= EIO_PATH_MAX * 3)
		994	return -1;
		995
		996	errno = EIO;
		997	if (symlinks <= 0)
		998	return -1;
		999
		1000	return symlinks;
		1001
		1002	#else
1339	tmp1 = res + PATH_MAX;	1003	tmp1 = res + EIO_PATH_MAX;
1340	tmp2 = tmp1 + PATH_MAX;	1004	tmp2 = tmp1 + EIO_PATH_MAX;
1341		1005
1342	#if 0 /* disabled, the musl way to do things is just too racy */	1006	#if 0 /* disabled, the musl way to do things is just too racy */
1343	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1007	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1344	/* on linux we may be able to ask the kernel */	1008	/* on linux we may be able to ask the kernel */
1345	{	1009	{
1346	int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);	1010	int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1347		1011
1348	if (fd >= 0)	1012	if (fd >= 0)
1349	{	1013	{
1350	sprintf (tmp1, "/proc/self/fd/%d", fd);	1014	sprintf (tmp1, "/proc/self/fd/%d", fd);
1351	req->result = readlink (tmp1, res, PATH_MAX);	1015	req->result = readlink (tmp1, res, EIO_PATH_MAX);
		1016	/* here we should probably stat the open file and the disk file, to make sure they still match */
1352	close (fd);	1017	close (fd);
1353
1354	/* here we should probably stat the open file and the disk file, to make sure they still match */
1355		1018
1356	if (req->result > 0)	1019	if (req->result > 0)
1357	goto done;	1020	goto done;
1358	}	1021	}
1359	else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)	1022	else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1360	return;	1023	return -1;
1361	}	1024	}
1362	#endif	1025	#endif
1363	#endif	1026	#endif
1364		1027
1365	if (*rel != '/')	1028	if (*rel != '/')
1366	{	1029	{
1367	if (!getcwd (res, PATH_MAX))	1030	int len;
		1031
		1032	errno = ENOENT;
		1033	if (wd == EIO_INVALID_WD)
1368	return;	1034	return -1;
		1035
		1036	if (wd == EIO_CWD)
		1037	{
		1038	if (!getcwd (res, EIO_PATH_MAX))
		1039	return -1;
		1040
		1041	len = strlen (res);
		1042	}
		1043	else
		1044	memcpy (res, wd->str, len = wd->len);
1369		1045
1370	if (res [1]) /* only use if not / */	1046	if (res [1]) /* only use if not / */
1371	res += strlen (res);	1047	res += len;
1372	}	1048	}
1373		1049
1374	while (*rel)	1050	while (*rel)
1375	{	1051	{
1376	eio_ssize_t len, linklen;	1052	eio_ssize_t len, linklen;
1377	char *beg = rel;	1053	const char *beg = rel;
1378		1054
1379	while (*rel && *rel != '/')	1055	while (*rel && *rel != '/')
1380	++rel;	1056	++rel;
1381		1057
1382	len = rel - beg;	1058	len = rel - beg;
…		…
1394		1070
1395	if (beg [1] == '.' && len == 2)	1071	if (beg [1] == '.' && len == 2)
1396	{	1072	{
1397	/* .. - back up one component, if possible */	1073	/* .. - back up one component, if possible */
1398		1074
1399	while (res != req->ptr2)	1075	while (res != tmpbuf->ptr)
1400	if (*--res == '/')	1076	if (*--res == '/')
1401	break;	1077	break;
1402		1078
1403	continue;	1079	continue;
1404	}	1080	}
1405	}	1081	}
1406		1082
1407	errno = ENAMETOOLONG;	1083	errno = ENAMETOOLONG;
1408	if (res + 1 + len + 1 >= tmp1)	1084	if (res + 1 + len + 1 >= tmp1)
1409	return;	1085	return -1;
1410		1086
1411	/* copy one component */	1087	/* copy one component */
1412	*res = '/';	1088	*res = '/';
1413	memcpy (res + 1, beg, len);	1089	memcpy (res + 1, beg, len);
1414		1090
1415	/* zero-terminate, for readlink */	1091	/* zero-terminate, for readlink */
1416	res [len + 1] = 0;	1092	res [len + 1] = 0;
1417		1093
1418	/* now check if it's a symlink */	1094	/* now check if it's a symlink */
1419	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1095	linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1420		1096
1421	if (linklen < 0)	1097	if (linklen < 0)
1422	{	1098	{
1423	if (errno != EINVAL)	1099	if (errno != EINVAL)
1424	return;	1100	return -1;
1425		1101
1426	/* it's a normal directory. hopefully */	1102	/* it's a normal directory. hopefully */
1427	res += len + 1;	1103	res += len + 1;
1428	}	1104	}
1429	else	1105	else
1430	{	1106	{
1431	/* yay, it was a symlink - build new path in tmp2 */	1107	/* yay, it was a symlink - build new path in tmp2 */
1432	int rellen = strlen (rel);	1108	int rellen = strlen (rel);
1433		1109
1434	errno = ENAMETOOLONG;	1110	errno = ENAMETOOLONG;
1435	if (linklen + 1 + rellen >= PATH_MAX)	1111	if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1436	return;	1112	return -1;
1437		1113
1438	errno = ELOOP;	1114	errno = ELOOP;
1439	if (!--symlinks)	1115	if (!--symlinks)
1440	return;	1116	return -1;
1441		1117
1442	if (*tmp1 == '/')	1118	if (*tmp1 == '/')
1443	res = req->ptr2; /* symlink resolves to an absolute path */	1119	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1444		1120
1445	/* we need to be careful, as rel might point into tmp2 already */	1121	/* we need to be careful, as rel might point into tmp2 already */
1446	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1122	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1447	tmp2 [linklen] = '/';	1123	tmp2 [linklen] = '/';
1448	memcpy (tmp2, tmp1, linklen);	1124	memcpy (tmp2, tmp1, linklen);
…		…
1450	rel = tmp2;	1126	rel = tmp2;
1451	}	1127	}
1452	}	1128	}
1453		1129
1454	/* special case for the lone root path */	1130	/* special case for the lone root path */
1455	if (res == req->ptr2)	1131	if (res == tmpbuf->ptr)
1456	*res++ = '/';	1132	*res++ = '/';
1457		1133
1458	req->result = res - (char *)req->ptr2;	1134	return res - (char *)tmpbuf->ptr;
1459		1135	#endif
1460	done:
1461	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1462	}	1136	}
1463		1137
1464	static signed char	1138	static signed char
1465	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1139	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1466	{	1140	{
…		…
1654	#ifdef _WIN32	1328	#ifdef _WIN32
1655	{	1329	{
1656	int len = strlen ((const char *)req->ptr1);	1330	int len = strlen ((const char *)req->ptr1);
1657	char *path = malloc (MAX_PATH);	1331	char *path = malloc (MAX_PATH);
1658	const char *fmt;	1332	const char *fmt;
		1333	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1659		1334
1660	if (!len)	1335	if (!len)
1661	fmt = "./*";	1336	fmt = "./*";
1662	else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')	1337	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1663	fmt = "%s*";	1338	fmt = "%s*";
1664	else	1339	else
1665	fmt = "%s/*";	1340	fmt = "%s/*";
1666		1341
1667	_snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);	1342	_snprintf (path, MAX_PATH, fmt, reqpath);
1668	dirp = FindFirstFile (path, &entp);	1343	dirp = FindFirstFile (path, &entp);
1669	free (path);	1344	free (path);
1670		1345
1671	if (dirp == INVALID_HANDLE_VALUE)	1346	if (dirp == INVALID_HANDLE_VALUE)
1672	{	1347	{
1673	dirp = 0;	1348	/* should steal _dosmaperr */
1674
1675	switch (GetLastError ())	1349	switch (GetLastError ())
1676	{	1350	{
1677	case ERROR_FILE_NOT_FOUND:	1351	case ERROR_FILE_NOT_FOUND:
1678	req->result = 0;	1352	req->result = 0;
1679	break;	1353	break;
1680		1354
1681	case ERROR_INVALID_NAME:	1355	case ERROR_INVALID_NAME:
1682	case ERROR_PATH_NOT_FOUND:	1356	case ERROR_PATH_NOT_FOUND:
1683	case ERROR_NO_MORE_FILES:	1357	case ERROR_NO_MORE_FILES:
1684	errno = ENOENT;	1358	errno = ENOENT;
1685	break;	1359	break;
1686		1360
1687	case ERROR_NOT_ENOUGH_MEMORY:	1361	case ERROR_NOT_ENOUGH_MEMORY:
1688	errno = ENOMEM;	1362	errno = ENOMEM;
1689	break;	1363	break;
1690		1364
1691	default:	1365	default:
1692	errno = EINVAL;	1366	errno = EINVAL;
1693	break;	1367	break;
1694	}	1368	}
		1369
		1370	return;
1695	}	1371	}
1696	}	1372	}
1697	#else	1373	#else
		1374	#if HAVE_AT
		1375	if (req->wd)
		1376	{
		1377	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		1378
		1379	if (fd < 0)
		1380	return;
		1381
		1382	dirp = fdopendir (fd);
		1383
		1384	if (!dirp)
		1385	close (fd);
		1386	}
		1387	else
1698	dirp = opendir (req->ptr1);	1388	dirp = opendir (req->ptr1);
		1389	#else
		1390	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1391	#endif
		1392
		1393	if (!dirp)
		1394	return;
1699	#endif	1395	#endif
1700		1396
1701	if (req->flags & EIO_FLAG_PTR1_FREE)	1397	if (req->flags & EIO_FLAG_PTR1_FREE)
1702	free (req->ptr1);	1398	free (req->ptr1);
1703		1399
1704	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1400	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1705	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1401	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1706	req->ptr2 = names = malloc (namesalloc);	1402	req->ptr2 = names = malloc (namesalloc);
1707		1403
1708	if (dirp && names && (!flags || dents))	1404	if (!names || (flags && !dents))
		1405	return;
		1406
1709	for (;;)	1407	for (;;)
1710	{	1408	{
1711	int done;	1409	int done;
1712		1410
1713	#ifdef _WIN32	1411	#ifdef _WIN32
1714	done = !dirp;	1412	done = !dirp;
1715	#else	1413	#else
1716	errno = 0;	1414	errno = 0;
1717	entp = readdir (dirp);	1415	entp = readdir (dirp);
1718	done = !entp;	1416	done = !entp;
1719	#endif	1417	#endif
1720		1418
1721	if (done)	1419	if (done)
1722	{	1420	{
1723	#ifndef _WIN32	1421	#ifndef _WIN32
1724	int old_errno = errno;	1422	int old_errno = errno;
1725	closedir (dirp);	1423	closedir (dirp);
1726	errno = old_errno;	1424	errno = old_errno;
1727		1425
1728	if (errno)	1426	if (errno)
1729	break;	1427	break;
1730	#endif	1428	#endif
1731		1429
1732	/* sort etc. */	1430	/* sort etc. */
1733	req->int1 = flags;	1431	req->int1 = flags;
1734	req->result = dentoffs;	1432	req->result = dentoffs;
1735		1433
1736	if (flags & EIO_READDIR_STAT_ORDER)	1434	if (flags & EIO_READDIR_STAT_ORDER)
1737	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1435	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1738	else if (flags & EIO_READDIR_DIRS_FIRST)	1436	else if (flags & EIO_READDIR_DIRS_FIRST)
1739	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1437	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1740	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1438	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1741	else	1439	else
		1440	{
		1441	/* in this case, all is known, and we just put dirs first and sort them */
		1442	eio_dirent *oth = dents + dentoffs;
		1443	eio_dirent *dir = dents;
		1444
		1445	/* now partition dirs to the front, and non-dirs to the back */
		1446	/* by walking from both sides and swapping if necessary */
		1447	while (oth > dir)
		1448	{
		1449	if (dir->type == EIO_DT_DIR)
		1450	++dir;
		1451	else if ((--oth)->type == EIO_DT_DIR)
		1452	{
		1453	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
		1454
		1455	++dir;
		1456	}
		1457	}
		1458
		1459	/* now sort the dirs only (dirs all have the same score) */
		1460	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1461	}
		1462
		1463	break;
		1464	}
		1465
		1466	/* now add the entry to our list(s) */
		1467	name = D_NAME (entp);
		1468
		1469	/* skip . and .. entries */
		1470	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		1471	{
		1472	int len = D_NAMLEN (entp) + 1;
		1473
		1474	while (ecb_expect_false (namesoffs + len > namesalloc))
		1475	{
		1476	namesalloc *= 2;
		1477	req->ptr2 = names = realloc (names, namesalloc);
		1478
		1479	if (!names)
		1480	break;
		1481	}
		1482
		1483	memcpy (names + namesoffs, name, len);
		1484
		1485	if (dents)
		1486	{
		1487	struct eio_dirent *ent;
		1488
		1489	if (ecb_expect_false (dentoffs == dentalloc))
1742	{	1490	{
1743	/* in this case, all is known, and we just put dirs first and sort them */	1491	dentalloc *= 2;
		1492	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1493
		1494	if (!dents)
		1495	break;
		1496	}
		1497
1744	eio_dirent *oth = dents + dentoffs;	1498	ent = dents + dentoffs;
1745	eio_dirent *dir = dents;
1746		1499
1747	/* now partition dirs to the front, and non-dirs to the back */	1500	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1748	/* by walking from both sides and swapping if necessary */	1501	ent->namelen = len - 1;
1749	while (oth > dir)	1502	ent->inode = D_INO (entp);
		1503
		1504	inode_bits |= ent->inode;
		1505
		1506	switch (D_TYPE (entp))
		1507	{
		1508	default:
		1509	ent->type = EIO_DT_UNKNOWN;
		1510	flags |= EIO_READDIR_FOUND_UNKNOWN;
		1511	break;
		1512
		1513	#ifdef DT_FIFO
		1514	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1515	#endif
		1516	#ifdef DT_CHR
		1517	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1518	#endif
		1519	#ifdef DT_MPC
		1520	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1521	#endif
		1522	#ifdef DT_DIR
		1523	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1524	#endif
		1525	#ifdef DT_NAM
		1526	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1527	#endif
		1528	#ifdef DT_BLK
		1529	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1530	#endif
		1531	#ifdef DT_MPB
		1532	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1533	#endif
		1534	#ifdef DT_REG
		1535	case DT_REG: ent->type = EIO_DT_REG; break;
		1536	#endif
		1537	#ifdef DT_NWK
		1538	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1539	#endif
		1540	#ifdef DT_CMP
		1541	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1542	#endif
		1543	#ifdef DT_LNK
		1544	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1545	#endif
		1546	#ifdef DT_SOCK
		1547	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1548	#endif
		1549	#ifdef DT_DOOR
		1550	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1551	#endif
		1552	#ifdef DT_WHT
		1553	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1554	#endif
		1555	}
		1556
		1557	ent->score = 7;
		1558
		1559	if (flags & EIO_READDIR_DIRS_FIRST)
		1560	{
		1561	if (ent->type == EIO_DT_UNKNOWN)
1750	{	1562	{
1751	if (dir->type == EIO_DT_DIR)	1563	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1752	++dir;	1564	ent->score = 1;
1753	else if ((--oth)->type == EIO_DT_DIR)	1565	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1754	{	1566	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1755	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1756
1757	++dir;
1758	}
1759	}	1567	}
1760		1568	else if (ent->type == EIO_DT_DIR)
1761	/* now sort the dirs only (dirs all have the same score) */	1569	ent->score = 0;
1762	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1763	}	1570	}
1764
1765	break;
1766	}
1767
1768	/* now add the entry to our list(s) */
1769	name = D_NAME (entp);
1770
1771	/* skip . and .. entries */
1772	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1773	{
1774	int len = D_NAMLEN (entp) + 1;
1775
1776	while (ecb_expect_false (namesoffs + len > namesalloc))
1777	{
1778	namesalloc *= 2;
1779	req->ptr2 = names = realloc (names, namesalloc);
1780
1781	if (!names)
1782	break;
1783	}	1571	}
1784		1572
1785	memcpy (names + namesoffs, name, len);
1786
1787	if (dents)
1788	{
1789	struct eio_dirent *ent;
1790
1791	if (ecb_expect_false (dentoffs == dentalloc))
1792	{
1793	dentalloc *= 2;
1794	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1795
1796	if (!dents)
1797	break;
1798	}
1799
1800	ent = dents + dentoffs;
1801
1802	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1803	ent->namelen = len - 1;
1804	ent->inode = D_INO (entp);
1805
1806	inode_bits |= ent->inode;
1807
1808	switch (D_TYPE (entp))
1809	{
1810	default:
1811	ent->type = EIO_DT_UNKNOWN;
1812	flags |= EIO_READDIR_FOUND_UNKNOWN;
1813	break;
1814
1815	#ifdef DT_FIFO
1816	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1817	#endif
1818	#ifdef DT_CHR
1819	case DT_CHR: ent->type = EIO_DT_CHR; break;
1820	#endif
1821	#ifdef DT_MPC
1822	case DT_MPC: ent->type = EIO_DT_MPC; break;
1823	#endif
1824	#ifdef DT_DIR
1825	case DT_DIR: ent->type = EIO_DT_DIR; break;
1826	#endif
1827	#ifdef DT_NAM
1828	case DT_NAM: ent->type = EIO_DT_NAM; break;
1829	#endif
1830	#ifdef DT_BLK
1831	case DT_BLK: ent->type = EIO_DT_BLK; break;
1832	#endif
1833	#ifdef DT_MPB
1834	case DT_MPB: ent->type = EIO_DT_MPB; break;
1835	#endif
1836	#ifdef DT_REG
1837	case DT_REG: ent->type = EIO_DT_REG; break;
1838	#endif
1839	#ifdef DT_NWK
1840	case DT_NWK: ent->type = EIO_DT_NWK; break;
1841	#endif
1842	#ifdef DT_CMP
1843	case DT_CMP: ent->type = EIO_DT_CMP; break;
1844	#endif
1845	#ifdef DT_LNK
1846	case DT_LNK: ent->type = EIO_DT_LNK; break;
1847	#endif
1848	#ifdef DT_SOCK
1849	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1850	#endif
1851	#ifdef DT_DOOR
1852	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1853	#endif
1854	#ifdef DT_WHT
1855	case DT_WHT: ent->type = EIO_DT_WHT; break;
1856	#endif
1857	}
1858
1859	ent->score = 7;
1860
1861	if (flags & EIO_READDIR_DIRS_FIRST)
1862	{
1863	if (ent->type == EIO_DT_UNKNOWN)
1864	{
1865	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1866	ent->score = 1;
1867	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1868	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1869	}
1870	else if (ent->type == EIO_DT_DIR)
1871	ent->score = 0;
1872	}
1873	}
1874
1875	namesoffs += len;	1573	namesoffs += len;
1876	++dentoffs;	1574	++dentoffs;
1877	}	1575	}
1878		1576
1879	if (EIO_CANCELLED (req))	1577	if (EIO_CANCELLED (req))
1880	{	1578	{
1881	errno = ECANCELED;	1579	errno = ECANCELED;
1882	break;	1580	break;
1883	}	1581	}
1884		1582
1885	#ifdef _WIN32	1583	#ifdef _WIN32
1886	if (!FindNextFile (dirp, &entp))	1584	if (!FindNextFile (dirp, &entp))
1887	{	1585	{
1888	FindClose (dirp);	1586	FindClose (dirp);
1889	dirp = 0;	1587	dirp = 0;
1890	}	1588	}
1891	#endif	1589	#endif
1892	}	1590	}
1893	}	1591	}
		1592
		1593	/*****************************************************************************/
		1594	/* working directory stuff */
		1595	/* various deficiencies in the posix 2008 api force us to */
		1596	/* keep the absolute path in string form at all times */
		1597	/* fuck yeah. */
		1598
		1599	#if !HAVE_AT
		1600
		1601	/* a bit like realpath, but usually faster because it doesn'T have to return */
		1602	/* an absolute or canonical path */
		1603	static const char *
		1604	wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
		1605	{
		1606	if (!wd || *path == '/')
		1607	return path;
		1608
		1609	if (path [0] == '.' && !path [1])
		1610	return wd->str;
		1611
		1612	{
		1613	int l1 = wd->len;
		1614	int l2 = strlen (path);
		1615
		1616	char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
		1617
		1618	memcpy (res, wd->str, l1);
		1619	res [l1] = '/';
		1620	memcpy (res + l1 + 1, path, l2 + 1);
		1621
		1622	return res;
		1623	}
		1624	}
		1625
		1626	#endif
		1627
		1628	static eio_wd
		1629	eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
		1630	{
		1631	int fd;
		1632	eio_wd res;
		1633	int len = eio__realpath (tmpbuf, wd, path);
		1634
		1635	if (len < 0)
		1636	return EIO_INVALID_WD;
		1637
		1638	#if HAVE_AT
		1639	fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		1640
		1641	if (fd < 0)
		1642	return EIO_INVALID_WD;
		1643	#endif
		1644
		1645	res = malloc (sizeof (*res) + len); /* one extra 0-byte */
		1646
		1647	#if HAVE_AT
		1648	res->fd = fd;
		1649	#endif
		1650
		1651	res->len = len;
		1652	memcpy (res->str, tmpbuf->ptr, len);
		1653	res->str [len] = 0;
		1654
		1655	return res;
		1656	}
		1657
		1658	eio_wd
		1659	eio_wd_open_sync (eio_wd wd, const char *path)
		1660	{
		1661	struct etp_tmpbuf tmpbuf = { };
		1662	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		1663	free (tmpbuf.ptr);
		1664
		1665	return wd;
		1666	}
		1667
		1668	void
		1669	eio_wd_close_sync (eio_wd wd)
		1670	{
		1671	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		1672	{
		1673	#if HAVE_AT
		1674	close (wd->fd);
		1675	#endif
		1676	free (wd);
		1677	}
		1678	}
		1679
		1680	#if HAVE_AT
		1681
		1682	/* they forgot these */
		1683
		1684	static int
		1685	eio__truncateat (int dirfd, const char *path, off_t length)
		1686	{
		1687	int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
		1688	int res;
		1689
		1690	if (fd < 0)
		1691	return fd;
		1692
		1693	res = ftruncate (fd, length);
		1694	close (fd);
		1695	return res;
		1696	}
		1697
		1698	static int
		1699	eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
		1700	{
		1701	int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
		1702	int res;
		1703
		1704	if (fd < 0)
		1705	return fd;
		1706
		1707	res = fstatvfs (fd, buf);
		1708	close (fd);
		1709	return res;
		1710
		1711	}
		1712
		1713	#endif
1894		1714
1895	/*****************************************************************************/	1715	/*****************************************************************************/
1896		1716
1897	#define ALLOC(len) \	1717	#define ALLOC(len) \
1898	if (!req->ptr2) \	1718	if (!req->ptr2) \
1899	{ \	1719	{ \
1900	X_LOCK (wrklock); \	1720	X_LOCK (EIO_POOL->wrklock); \
1901	req->flags |= EIO_FLAG_PTR2_FREE; \	1721	req->flags |= EIO_FLAG_PTR2_FREE; \
1902	X_UNLOCK (wrklock); \	1722	X_UNLOCK (EIO_POOL->wrklock); \
1903	req->ptr2 = malloc (len); \	1723	req->ptr2 = malloc (len); \
1904	if (!req->ptr2) \	1724	if (!req->ptr2) \
1905	{ \	1725	{ \
1906	errno = ENOMEM; \	1726	errno = ENOMEM; \
1907	req->result = -1; \	1727	req->result = -1; \
1908	break; \	1728	break; \
1909	} \	1729	} \
1910	}	1730	}
1911		1731
1912	X_THREAD_PROC (etp_proc)
1913	{
1914	ETP_REQ *req;
1915	struct timespec ts;
1916	etp_worker *self = (etp_worker *)thr_arg;
1917
1918	/* try to distribute timeouts somewhat evenly */
1919	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1920
1921	for (;;)
1922	{
1923	ts.tv_sec = 0;
1924
1925	X_LOCK (reqlock);
1926
1927	for (;;)
1928	{
1929	self->req = req = reqq_shift (&req_queue);
1930
1931	if (req)
1932	break;
1933
1934	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1935	{
1936	X_UNLOCK (reqlock);
1937	X_LOCK (wrklock);
1938	--started;
1939	X_UNLOCK (wrklock);
1940	goto quit;
1941	}
1942
1943	++idle;
1944
1945	if (idle <= max_idle)
1946	/* we are allowed to idle, so do so without any timeout */
1947	X_COND_WAIT (reqwait, reqlock);
1948	else
1949	{
1950	/* initialise timeout once */
1951	if (!ts.tv_sec)
1952	ts.tv_sec = time (0) + idle_timeout;
1953
1954	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1955	ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1956	}
1957
1958	--idle;
1959	}
1960
1961	--nready;
1962
1963	X_UNLOCK (reqlock);
1964
1965	if (req->type < 0)
1966	goto quit;
1967
1968	ETP_EXECUTE (self, req);
1969
1970	X_LOCK (reslock);
1971
1972	++npending;
1973
1974	if (!reqq_push (&res_queue, req) && want_poll_cb)
1975	want_poll_cb ();
1976
1977	self->req = 0;
1978	etp_worker_clear (self);
1979
1980	X_UNLOCK (reslock);
1981	}
1982
1983	quit:
1984	X_LOCK (wrklock);
1985	etp_worker_free (self);
1986	X_UNLOCK (wrklock);
1987
1988	return 0;
1989	}
1990
1991	/*****************************************************************************/	1732	/*****************************************************************************/
1992		1733
1993	int ecb_cold	1734	int ecb_cold
1994	eio_init (void (*want_poll)(void), void (*done_poll)(void))	1735	eio_init (void (*want_poll)(void), void (*done_poll)(void))
1995	{	1736	{
1996	return etp_init (want_poll, done_poll);	1737	eio_want_poll_cb = want_poll;
		1738	eio_done_poll_cb = done_poll;
		1739
		1740	return etp_init (EIO_POOL, 0, 0, 0);
1997	}	1741	}
1998		1742
1999	ecb_inline void	1743	ecb_inline void
2000	eio_api_destroy (eio_req *req)	1744	eio_api_destroy (eio_req *req)
2001	{	1745	{
2002	free (req);	1746	free (req);
2003	}	1747	}
2004		1748
2005	#define REQ(rtype) \	1749	#define REQ(rtype) \
2006	eio_req *req; \	1750	eio_req *req; \
2007	\	1751	\
2008	req = (eio_req *)calloc (1, sizeof *req); \	1752	req = (eio_req *)calloc (1, sizeof *req); \
2009	if (!req) \	1753	if (!req) \
2010	return 0; \	1754	return 0; \
…		…
2024	{ \	1768	{ \
2025	eio_api_destroy (req); \	1769	eio_api_destroy (req); \
2026	return 0; \	1770	return 0; \
2027	}	1771	}
2028		1772
		1773	#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
		1774
2029	static void	1775	static void
2030	eio_execute (etp_worker *self, eio_req *req)	1776	eio_execute (etp_worker *self, eio_req *req)
2031	{	1777	{
		1778	#if HAVE_AT
		1779	int dirfd;
		1780	#else
		1781	const char *path;
		1782	#endif
		1783
2032	if (ecb_expect_false (EIO_CANCELLED (req)))	1784	if (ecb_expect_false (EIO_CANCELLED (req)))
2033	{	1785	{
2034	req->result = -1;	1786	req->result = -1;
2035	req->errorno = ECANCELED;	1787	req->errorno = ECANCELED;
2036	return;	1788	return;
2037	}	1789	}
2038		1790
		1791	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		1792	{
		1793	req->result = -1;
		1794	req->errorno = ENOENT;
		1795	return;
		1796	}
		1797
		1798	if (req->type >= EIO_OPEN)
		1799	{
		1800	#if HAVE_AT
		1801	dirfd = WD2FD (req->wd);
		1802	#else
		1803	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		1804	#endif
		1805	}
		1806
2039	switch (req->type)	1807	switch (req->type)
2040	{	1808	{
		1809	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		1810	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		1811	break;
		1812	case EIO_WD_CLOSE: req->result = 0;
		1813	eio_wd_close_sync (req->wd); break;
		1814
		1815	case EIO_SEEK: eio__lseek (req); break;
2041	case EIO_READ: ALLOC (req->size);	1816	case EIO_READ: ALLOC (req->size);
2042	req->result = req->offs >= 0	1817	req->result = req->offs >= 0
2043	? pread (req->int1, req->ptr2, req->size, req->offs)	1818	? pread (req->int1, req->ptr2, req->size, req->offs)
2044	: read (req->int1, req->ptr2, req->size); break;	1819	: read (req->int1, req->ptr2, req->size); break;
2045	case EIO_WRITE: req->result = req->offs >= 0	1820	case EIO_WRITE: req->result = req->offs >= 0
2046	? pwrite (req->int1, req->ptr2, req->size, req->offs)	1821	? pwrite (req->int1, req->ptr2, req->size, req->offs)
2047	: write (req->int1, req->ptr2, req->size); break;	1822	: write (req->int1, req->ptr2, req->size); break;
2048		1823
		1824	case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
		1825	case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
		1826
2049	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	1827	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2050	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;	1828	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
		1829
		1830	#if HAVE_AT
2051		1831
2052	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1832	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2053	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	1833	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2054	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1834	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		1835	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		1836	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		1837	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		1838	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		1839	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		1840
		1841	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		1842	case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
		1843	req->result = req->wd && SINGLEDOT (req->ptr1)
		1844	? rmdir (req->wd->str)
		1845	: unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		1846	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		1847	case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
		1848	req->result = req->wd && SINGLEDOT (req->ptr1)
		1849	? rename (req->wd->str, req->ptr2)
		1850	: renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		1851	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		1852	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		1853	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		1854	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		1855	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		1856	case EIO_READLINK: ALLOC (EIO_PATH_MAX);
		1857	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
		1858	if (req->result == EIO_PATH_MAX)
		1859	{
		1860	req->result = -1;
		1861	errno = ENAMETOOLONG;
		1862	}
		1863	break;
		1864	case EIO_UTIME:
		1865	case EIO_FUTIME:
		1866	{
		1867	struct timespec ts[2];
		1868	struct timespec *times;
		1869
		1870	if (req->nv1 != -1. || req->nv2 != -1.)
		1871	{
		1872	ts[0].tv_sec = req->nv1;
		1873	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		1874	ts[1].tv_sec = req->nv2;
		1875	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		1876
		1877	times = ts;
		1878	}
		1879	else
		1880	times = 0;
		1881
		1882	req->result = req->type == EIO_FUTIME
		1883	? futimens (req->int1, times)
		1884	: utimensat (dirfd, req->ptr1, times, 0);
		1885	}
		1886	break;
		1887
		1888	#else
		1889
		1890	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		1891	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		1892	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2055	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	1893	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		1894	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		1895	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		1896	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		1897	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		1898
		1899	case EIO_UNLINK: req->result = unlink (path ); break;
		1900	case EIO_RMDIR: req->result = rmdir (path ); break;
		1901	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		1902	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		1903	case EIO_LINK: req->result = link (path , req->ptr2); break;
		1904	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		1905	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		1906	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		1907	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		1908	case EIO_READLINK: ALLOC (EIO_PATH_MAX);
		1909	req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
		1910	if (req->result == EIO_PATH_MAX)
		1911	{
		1912	req->result = -1;
		1913	errno = ENAMETOOLONG;
		1914	}
		1915	break;
		1916
		1917	case EIO_UTIME:
		1918	case EIO_FUTIME:
		1919	{
		1920	struct timeval tv[2];
		1921	struct timeval *times;
		1922
		1923	if (req->nv1 != -1. || req->nv2 != -1.)
		1924	{
		1925	tv[0].tv_sec = req->nv1;
		1926	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		1927	tv[1].tv_sec = req->nv2;
		1928	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		1929
		1930	times = tv;
		1931	}
		1932	else
		1933	times = 0;
		1934
		1935	req->result = req->type == EIO_FUTIME
		1936	? futimes (req->int1, times)
		1937	: utimes (req->ptr1, times);
		1938	}
		1939	break;
		1940
		1941	#endif
		1942
		1943	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		1944	{
		1945	ALLOC (req->result);
		1946	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		1947	}
		1948	break;
		1949
2056	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1950	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2057	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	1951	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2058		1952
2059	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2060	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2061	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	1953	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2062	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	1954	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2063		1955
2064	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2065	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	1956	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2066	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2067	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	1957	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2068	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2069	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	1958	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2070		1959
2071	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2072	case EIO_CLOSE: req->result = close (req->int1); break;	1960	case EIO_CLOSE: req->result = close (req->int1); break;
2073	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	1961	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2074	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2075	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2076	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2077	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2078	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2079	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2080	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2081
2082	case EIO_REALPATH: eio__realpath (req, self); break;
2083
2084	case EIO_READLINK: ALLOC (PATH_MAX);
2085	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2086
2087	case EIO_SYNC: req->result = 0; sync (); break;	1962	case EIO_SYNC: req->result = 0; sync (); break;
2088	case EIO_FSYNC: req->result = fsync (req->int1); break;	1963	case EIO_FSYNC: req->result = fsync (req->int1); break;
2089	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1964	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		1965	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		1966	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2090	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	1967	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2091	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	1968	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2092	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	1969	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2093	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	1970	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2094	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2095	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;	1971	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2096		1972
2097	case EIO_READDIR: eio__scandir (req, self); break;	1973	case EIO_READDIR: eio__scandir (req, self); break;
2098		1974
2099	case EIO_BUSY:	1975	case EIO_BUSY:
…		…
2109	req->result = select (0, 0, 0, 0, &tv);	1985	req->result = select (0, 0, 0, 0, &tv);
2110	}	1986	}
2111	#endif	1987	#endif
2112	break;	1988	break;
2113		1989
2114	case EIO_UTIME:	1990	#if 0
2115	case EIO_FUTIME:
2116	{
2117	struct timeval tv[2];
2118	struct timeval *times;
2119
2120	if (req->nv1 != -1. || req->nv2 != -1.)
2121	{
2122	tv[0].tv_sec = req->nv1;
2123	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2124	tv[1].tv_sec = req->nv2;
2125	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2126
2127	times = tv;
2128	}
2129	else
2130	times = 0;
2131
2132	req->result = req->type == EIO_FUTIME
2133	? futimes (req->int1, times)
2134	: utimes (req->ptr1, times);
2135	}
2136	break;
2137
2138	case EIO_GROUP:	1991	case EIO_GROUP:
2139	abort (); /* handled in eio_request */	1992	abort (); /* handled in eio_request */
		1993	#endif
2140		1994
2141	case EIO_NOP:	1995	case EIO_NOP:
2142	req->result = 0;	1996	req->result = 0;
2143	break;	1997	break;
2144		1998
2145	case EIO_CUSTOM:	1999	case EIO_CUSTOM:
2146	req->feed (req);	2000	req->feed (req);
2147	break;	2001	break;
2148		2002
2149	default:	2003	default:
2150	errno = ENOSYS;
2151	req->result = -1;	2004	req->result = EIO_ENOSYS ();
2152	break;	2005	break;
2153	}	2006	}
2154		2007
2155	req->errorno = errno;	2008	req->errorno = errno;
2156	}	2009	}
2157		2010
2158	#ifndef EIO_NO_WRAPPERS	2011	#ifndef EIO_NO_WRAPPERS
2159		2012
		2013	eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
		2014	{
		2015	REQ (EIO_WD_OPEN); PATH; SEND;
		2016	}
		2017
		2018	eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
		2019	{
		2020	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2021	}
		2022
2160	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2023	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2161	{	2024	{
2162	REQ (EIO_NOP); SEND;	2025	REQ (EIO_NOP); SEND;
2163	}	2026	}
2164		2027
…		…
2180	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2043	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2181	{	2044	{
2182	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2045	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2183	}	2046	}
2184		2047
		2048	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
		2049	{
		2050	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2051	}
		2052
		2053	eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
		2054	{
		2055	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2056	}
		2057
		2058	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
		2059	{
		2060	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2061	}
		2062
2185	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2063	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2186	{	2064	{
2187	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2065	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2188	}	2066	}
2189		2067
…		…
2195	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)	2073	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2196	{	2074	{
2197	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2075	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2198	}	2076	}
2199		2077
2200	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2201	{
2202	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2203	}
2204
2205	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)	2078	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2206	{	2079	{
2207	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2080	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2208	}	2081	}
2209		2082
2210	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2211	{
2212	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2213	}
2214
2215	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)	2083	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2216	{	2084	{
2217	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2085	REQ (EIO_CLOSE); req->int1 = fd; SEND;
2218	}	2086	}
2219		2087
2220	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)	2088	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2221	{	2089	{
2222	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;	2090	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2223	}	2091	}
2224		2092
		2093	eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
		2094	{
		2095	REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
		2096	}
		2097
2225	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)	2098	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2226	{	2099	{
2227	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;	2100	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2228	}	2101	}
2229		2102
2230	eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)	2103	eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2231	{	2104	{
2232	REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;	2105	REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
		2106	}
		2107
		2108	eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
		2109	{
		2110	REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
		2111	}
		2112
		2113	eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
		2114	{
		2115	REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2233	}	2116	}
2234		2117
2235	eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)	2118	eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2236	{	2119	{
2237	REQ (EIO_FSTAT); req->int1 = fd; SEND;	2120	REQ (EIO_FSTAT); req->int1 = fd; SEND;
…		…
2425	void	2308	void
2426	eio_grp_add (eio_req *grp, eio_req *req)	2309	eio_grp_add (eio_req *grp, eio_req *req)
2427	{	2310	{
2428	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	2311	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2429		2312
2430	grp->flags |= EIO_FLAG_GROUPADD;	2313	grp->flags |= ETP_FLAG_GROUPADD;
2431		2314
2432	++grp->size;	2315	++grp->size;
2433	req->grp = grp;	2316	req->grp = grp;
2434		2317
2435	req->grp_prev = 0;	2318	req->grp_prev = 0;
…		…
2445	/* misc garbage */	2328	/* misc garbage */
2446		2329
2447	eio_ssize_t	2330	eio_ssize_t
2448	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2331	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2449	{	2332	{
2450	etp_worker wrk;
2451	eio_ssize_t ret;
2452
2453	wrk.dbuf = 0;
2454
2455	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2333	return eio__sendfile (ofd, ifd, offset, count);
2456
2457	if (wrk.dbuf)
2458	free (wrk.dbuf);
2459
2460	return ret;
2461	}	2334	}
2462		2335

Diff Legend

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