ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/libeio/eio.c

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

Diff Legend

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