ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/libeio/eio.c

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.80 by root, Tue Jul 5 18:59:28 2011 UTC vs.
Revision 1.114 by root, Fri Dec 30 07:38:00 2011 UTC

…		…
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>
54	#include <stdlib.h>	54	#include <stdlib.h>
55	#include <string.h>	55	#include <string.h>
56	#include <errno.h>	56	#include <errno.h>
57	#include <sys/types.h>	57	#include <sys/types.h>
58	#include <sys/stat.h>	58	#include <sys/stat.h>
59	#include <sys/statvfs.h>
60	#include <limits.h>	59	#include <limits.h>
61	#include <fcntl.h>	60	#include <fcntl.h>
62	#include <assert.h>	61	#include <assert.h>
63		62
64	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */	63	/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
…		…
68	#endif	67	#endif
69		68
70	#ifndef ECANCELED	69	#ifndef ECANCELED
71	# define ECANCELED EDOM	70	# define ECANCELED EDOM
72	#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
73		79
74	static void eio_destroy (eio_req *req);	80	static void eio_destroy (eio_req *req);
75		81
76	#ifndef EIO_FINISH	82	#ifndef EIO_FINISH
77	# 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
…		…
83		89
84	#ifndef EIO_FEED	90	#ifndef EIO_FEED
85	# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)	91	# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
86	#endif	92	#endif
87		93
		94	#ifndef EIO_FD_TO_WIN32_HANDLE
		95	# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
		96	#endif
		97	#ifndef EIO_WIN32_HANDLE_TO_FD
		98	# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
		99	#endif
		100
		101	#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
		102
		103	#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
		104
88	#ifdef _WIN32	105	#ifdef _WIN32
89		106
90	/*doh*/	107	#undef PAGESIZE
		108	#define PAGESIZE 4096 /* GetSystemInfo? */
		109
		110	/* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
		111
		112	#ifdef EIO_STRUCT_STATI64
		113	/* look at perl's non-sloppy stat */
		114	#define stat(path,buf) _stati64 (path,buf)
		115	#define fstat(fd,buf) _fstati64 (fd,buf)
		116	#endif
		117	#define lstat(path,buf) stat (path,buf)
		118	#define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
		119	#define mkdir(path,mode) _mkdir (path)
		120	#define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
		121
		122	#define chmod(path,mode) _chmod (path, mode)
		123	#define dup(fd) _dup (fd)
		124	#define dup2(fd1,fd2) _dup2 (fd1, fd2)
		125
		126	#define fchmod(fd,mode) EIO_ENOSYS ()
		127	#define chown(path,uid,gid) EIO_ENOSYS ()
		128	#define fchown(fd,uid,gid) EIO_ENOSYS ()
		129	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
		130	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
		131	#define mknod(path,mode,dev) EIO_ENOSYS ()
		132	#define sync() EIO_ENOSYS ()
		133	#define readlink(path,buf,s) EIO_ENOSYS ()
		134	#define statvfs(path,buf) EIO_ENOSYS ()
		135	#define fstatvfs(fd,buf) EIO_ENOSYS ()
		136
		137	/* rename() uses MoveFile, which fails to overwrite */
		138	#define rename(old,neu) eio__rename (old, neu)
		139
		140	static int
		141	eio__rename (const char *old, const char *neu)
		142	{
		143	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		144	return 0;
		145
		146	/* should steal _dosmaperr */
		147	switch (GetLastError ())
		148	{
		149	case ERROR_FILE_NOT_FOUND:
		150	case ERROR_PATH_NOT_FOUND:
		151	case ERROR_INVALID_DRIVE:
		152	case ERROR_NO_MORE_FILES:
		153	case ERROR_BAD_NETPATH:
		154	case ERROR_BAD_NET_NAME:
		155	case ERROR_BAD_PATHNAME:
		156	case ERROR_FILENAME_EXCED_RANGE:
		157	errno = ENOENT;
		158	break;
		159
		160	default:
		161	errno = EACCES;
		162	break;
		163	}
		164
		165	return -1;
		166	}
		167
		168	/* we could even stat and see if it exists */
		169	static int
		170	symlink (const char *old, const char *neu)
		171	{
		172	#if WINVER >= 0x0600
		173	if (CreateSymbolicLink (neu, old, 1))
		174	return 0;
		175
		176	if (CreateSymbolicLink (neu, old, 0))
		177	return 0;
		178	#endif
		179
		180	return EIO_ERRNO (ENOENT, -1);
		181	}
		182
		183	/* POSIX API only */
		184	#define CreateHardLink(neu,old,flags) 0
		185	#define CreateSymbolicLink(neu,old,flags) 0
		186
		187	struct statvfs
		188	{
		189	int dummy;
		190	};
		191
		192	#define DT_DIR EIO_DT_DIR
		193	#define DT_REG EIO_DT_REG
		194	#define D_NAME(entp) entp.cFileName
		195	#define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
		196
91	#else	197	#else
92		198
93	# include <sys/time.h>	199	#include <sys/time.h>
94	# include <sys/select.h>	200	#include <sys/select.h>
		201	#include <sys/statvfs.h>
95	# include <unistd.h>	202	#include <unistd.h>
		203	#include <signal.h>
		204	#include <dirent.h>
		205
		206	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
		207	#include <sys/mman.h>
		208	#endif
		209
		210	#define D_NAME(entp) entp->d_name
		211
		212	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		213	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
		214	#define _DIRENT_HAVE_D_TYPE /* sigh */
		215	#define D_INO(de) (de)->d_fileno
		216	#define D_NAMLEN(de) (de)->d_namlen
		217	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
		218	#define D_INO(de) (de)->d_ino
		219	#endif
		220
		221	#ifdef _D_EXACT_NAMLEN
		222	#undef D_NAMLEN
		223	#define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
		224	#endif
		225
		226	#ifdef _DIRENT_HAVE_D_TYPE
		227	#define D_TYPE(de) (de)->d_type
		228	#endif
		229
		230	#ifndef EIO_STRUCT_DIRENT
		231	#define EIO_STRUCT_DIRENT struct dirent
		232	#endif
		233
		234	#endif
		235
		236	#if HAVE_UTIMES
96	# include <utime.h>	237	# include <utime.h>
97	# include <signal.h>
98	# include <dirent.h>
99
100	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
101	# include <sys/mman.h>
102	#endif
103
104	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
105	# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
106	# define _DIRENT_HAVE_D_TYPE /* sigh */
107	# define D_INO(de) (de)->d_fileno
108	# define D_NAMLEN(de) (de)->d_namlen
109	# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
110	# define D_INO(de) (de)->d_ino
111	# endif	238	#endif
112		239
113	#ifdef _D_EXACT_NAMLEN	240	#if HAVE_SYS_SYSCALL_H
114	# undef D_NAMLEN	241	# include <sys/syscall.h>
115	# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
116	#endif
117
118	# ifdef _DIRENT_HAVE_D_TYPE
119	# define D_TYPE(de) (de)->d_type
120	# endif	242	#endif
121		243
122	# ifndef EIO_STRUCT_DIRENT	244	#if HAVE_SYS_PRCTL_H
123	# define EIO_STRUCT_DIRENT struct dirent	245	# include <sys/prctl.h>
124	# endif
125
126	#endif	246	#endif
127		247
128	#if HAVE_SENDFILE	248	#if HAVE_SENDFILE
129	# if __linux	249	# if __linux
130	# include <sys/sendfile.h>	250	# include <sys/sendfile.h>
…		…
145	#endif	265	#endif
146	#ifndef D_INO	266	#ifndef D_INO
147	# define D_INO(de) 0	267	# define D_INO(de) 0
148	#endif	268	#endif
149	#ifndef D_NAMLEN	269	#ifndef D_NAMLEN
150	# define D_NAMLEN(de) strlen ((de)->d_name)	270	# define D_NAMLEN(entp) strlen (D_NAME (entp))
151	#endif	271	#endif
152		272
153	/* used for struct dirent, AIX doesn't provide it */	273	/* used for struct dirent, AIX doesn't provide it */
154	#ifndef NAME_MAX	274	#ifndef NAME_MAX
155	# define NAME_MAX 4096	275	# define NAME_MAX 4096
…		…
162		282
163	/* buffer size for various temporary buffers */	283	/* buffer size for various temporary buffers */
164	#define EIO_BUFSIZE 65536	284	#define EIO_BUFSIZE 65536
165		285
166	#define dBUF \	286	#define dBUF \
167	char *eio_buf; \
168	ETP_WORKER_LOCK (self); \
169	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	287	char *eio_buf = malloc (EIO_BUFSIZE); \
170	ETP_WORKER_UNLOCK (self); \
171	errno = ENOMEM; \	288	errno = ENOMEM; \
172	if (!eio_buf) \	289	if (!eio_buf) \
173	return -1;	290	return -1
		291
		292	#define FUBd \
		293	free (eio_buf)
174		294
175	#define EIO_TICKS ((1000000 + 1023) >> 10)	295	#define EIO_TICKS ((1000000 + 1023) >> 10)
		296
		297	/*****************************************************************************/
		298
		299	struct tmpbuf
		300	{
		301	void *ptr;
		302	int len;
		303	};
		304
		305	static void *
		306	tmpbuf_get (struct tmpbuf *buf, int len)
		307	{
		308	if (buf->len < len)
		309	{
		310	free (buf->ptr);
		311	buf->ptr = malloc (buf->len = len);
		312	}
		313
		314	return buf->ptr;
		315	}
		316
		317	struct tmpbuf;
		318
		319	#if _POSIX_VERSION >= 200809L
		320	#define HAVE_AT 1
		321	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		322	#ifndef O_SEARCH
		323	#define O_SEARCH O_RDONLY
		324	#endif
		325	#else
		326	#define HAVE_AT 0
		327	static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
		328	#endif
		329
		330	struct eio_pwd
		331	{
		332	#if HAVE_AT
		333	int fd;
		334	#endif
		335	int len;
		336	char str[1]; /* actually, a 0-terminated canonical path */
		337	};
		338
		339	/*****************************************************************************/
176		340
177	#define ETP_PRI_MIN EIO_PRI_MIN	341	#define ETP_PRI_MIN EIO_PRI_MIN
178	#define ETP_PRI_MAX EIO_PRI_MAX	342	#define ETP_PRI_MAX EIO_PRI_MAX
179		343
180	struct etp_worker;	344	struct etp_worker;
…		…
184	static int eio_finish (eio_req *req);	348	static int eio_finish (eio_req *req);
185	#define ETP_FINISH(req) eio_finish (req)	349	#define ETP_FINISH(req) eio_finish (req)
186	static void eio_execute (struct etp_worker *self, eio_req *req);	350	static void eio_execute (struct etp_worker *self, eio_req *req);
187	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	351	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
188		352
189	#define ETP_WORKER_CLEAR(req) \
190	if (wrk->dbuf) \
191	{ \
192	free (wrk->dbuf); \
193	wrk->dbuf = 0; \
194	} \
195	\
196	if (wrk->dirp) \
197	{ \
198	closedir (wrk->dirp); \
199	wrk->dirp = 0; \
200	}
201
202	#define ETP_WORKER_COMMON \
203	void *dbuf; \
204	DIR *dirp;
205
206	/*****************************************************************************/	353	/*****************************************************************************/
207		354
208	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	355	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
209		356
210	/* calculate time difference in ~1/EIO_TICKS of a second */	357	/* calculate time difference in ~1/EIO_TICKS of a second */
…		…
221	static void (*done_poll_cb) (void);	368	static void (*done_poll_cb) (void);
222		369
223	static unsigned int max_poll_time; /* reslock */	370	static unsigned int max_poll_time; /* reslock */
224	static unsigned int max_poll_reqs; /* reslock */	371	static unsigned int max_poll_reqs; /* reslock */
225		372
226	static volatile unsigned int nreqs; /* reqlock */	373	static unsigned int nreqs; /* reqlock */
227	static volatile unsigned int nready; /* reqlock */	374	static unsigned int nready; /* reqlock */
228	static volatile unsigned int npending; /* reqlock */	375	static unsigned int npending; /* reqlock */
229	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	376	static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
230	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */	377	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
231		378
232	static xmutex_t wrklock;	379	static xmutex_t wrklock;
233	static xmutex_t reslock;	380	static xmutex_t reslock;
234	static xmutex_t reqlock;	381	static xmutex_t reqlock;
235	static xcond_t reqwait;	382	static xcond_t reqwait;
…		…
238	/*	385	/*
239	* make our pread/pwrite emulation safe against themselves, but not against	386	* make our pread/pwrite emulation safe against themselves, but not against
240	* normal read/write by using a mutex. slows down execution a lot,	387	* normal read/write by using a mutex. slows down execution a lot,
241	* but that's your problem, not mine.	388	* but that's your problem, not mine.
242	*/	389	*/
243	static xmutex_t preadwritelock = X_MUTEX_INIT;	390	static xmutex_t preadwritelock;
244	#endif	391	#endif
245		392
246	typedef struct etp_worker	393	typedef struct etp_worker
247	{	394	{
		395	struct tmpbuf tmpbuf;
		396
248	/* locked by wrklock */	397	/* locked by wrklock */
249	struct etp_worker *prev, *next;	398	struct etp_worker *prev, *next;
250		399
251	xthread_t tid;	400	xthread_t tid;
252		401
253	/* locked by reslock, reqlock or wrklock */	402	#ifdef ETP_WORKER_COMMON
254	ETP_REQ *req; /* currently processed request */
255
256	ETP_WORKER_COMMON	403	ETP_WORKER_COMMON
		404	#endif
257	} etp_worker;	405	} etp_worker;
258		406
259	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	407	static etp_worker wrk_first; /* NOT etp */
260		408
261	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	409	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
262	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	410	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
263		411
264	/* worker threads management */	412	/* worker threads management */
265		413
266	static void ecb_cold	414	static void
267	etp_worker_clear (etp_worker *wrk)	415	etp_worker_clear (etp_worker *wrk)
268	{	416	{
269	ETP_WORKER_CLEAR (wrk);
270	}	417	}
271		418
272	static void ecb_cold	419	static void ecb_cold
273	etp_worker_free (etp_worker *wrk)	420	etp_worker_free (etp_worker *wrk)
274	{	421	{
		422	free (wrk->tmpbuf.ptr);
		423
275	wrk->next->prev = wrk->prev;	424	wrk->next->prev = wrk->prev;
276	wrk->prev->next = wrk->next;	425	wrk->prev->next = wrk->next;
277		426
278	free (wrk);	427	free (wrk);
279	}	428	}
…		…
335	} etp_reqq;	484	} etp_reqq;
336		485
337	static etp_reqq req_queue;	486	static etp_reqq req_queue;
338	static etp_reqq res_queue;	487	static etp_reqq res_queue;
339		488
		489	static void ecb_noinline ecb_cold
		490	reqq_init (etp_reqq *q)
		491	{
		492	int pri;
		493
		494	for (pri = 0; pri < ETP_NUM_PRI; ++pri)
		495	q->qs[pri] = q->qe[pri] = 0;
		496
		497	q->size = 0;
		498	}
		499
340	static int ecb_noinline	500	static int ecb_noinline
341	reqq_push (etp_reqq *q, ETP_REQ *req)	501	reqq_push (etp_reqq *q, ETP_REQ *req)
342	{	502	{
343	int pri = req->pri;	503	int pri = req->pri;
344	req->next = 0;	504	req->next = 0;
…		…
378	}	538	}
379		539
380	abort ();	540	abort ();
381	}	541	}
382		542
383	static void ecb_cold	543	static int ecb_cold
384	etp_thread_init (void)	544	etp_init (void (*want_poll)(void), void (*done_poll)(void))
385	{	545	{
386	X_MUTEX_CREATE (wrklock);	546	X_MUTEX_CREATE (wrklock);
387	X_MUTEX_CREATE (reslock);	547	X_MUTEX_CREATE (reslock);
388	X_MUTEX_CREATE (reqlock);	548	X_MUTEX_CREATE (reqlock);
389	X_COND_CREATE (reqwait);	549	X_COND_CREATE (reqwait);
390	}
391		550
392	static void ecb_cold	551	reqq_init (&req_queue);
393	etp_atfork_prepare (void)	552	reqq_init (&res_queue);
394	{
395	X_LOCK (wrklock);
396	X_LOCK (reqlock);
397	X_LOCK (reslock);
398	#if !HAVE_PREADWRITE
399	X_LOCK (preadwritelock);
400	#endif
401	}
402		553
403	static void ecb_cold	554	wrk_first.next =
404	etp_atfork_parent (void)	555	wrk_first.prev = &wrk_first;
405	{
406	#if !HAVE_PREADWRITE
407	X_UNLOCK (preadwritelock);
408	#endif
409	X_UNLOCK (reslock);
410	X_UNLOCK (reqlock);
411	X_UNLOCK (wrklock);
412	}
413
414	static void ecb_cold
415	etp_atfork_child (void)
416	{
417	ETP_REQ *prv;
418
419	while ((prv = reqq_shift (&req_queue)))
420	ETP_DESTROY (prv);
421
422	while ((prv = reqq_shift (&res_queue)))
423	ETP_DESTROY (prv);
424
425	while (wrk_first.next != &wrk_first)
426	{
427	etp_worker *wrk = wrk_first.next;
428
429	if (wrk->req)
430	ETP_DESTROY (wrk->req);
431
432	etp_worker_clear (wrk);
433	etp_worker_free (wrk);
434	}
435		556
436	started = 0;	557	started = 0;
437	idle = 0;	558	idle = 0;
438	nreqs = 0;	559	nreqs = 0;
439	nready = 0;	560	nready = 0;
440	npending = 0;	561	npending = 0;
441
442	etp_thread_init ();
443	}
444
445	static void ecb_cold
446	etp_once_init (void)
447	{
448	etp_thread_init ();
449	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
450	}
451
452	static int ecb_cold
453	etp_init (void (*want_poll)(void), void (*done_poll)(void))
454	{
455	static pthread_once_t doinit = PTHREAD_ONCE_INIT;
456
457	pthread_once (&doinit, etp_once_init);
458		562
459	want_poll_cb = want_poll;	563	want_poll_cb = want_poll;
460	done_poll_cb = done_poll;	564	done_poll_cb = done_poll;
461		565
462	return 0;	566	return 0;
…		…
502	}	606	}
503		607
504	static void ecb_cold	608	static void ecb_cold
505	etp_end_thread (void)	609	etp_end_thread (void)
506	{	610	{
507	eio_req *req = calloc (1, sizeof (eio_req));	611	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
508		612
509	req->type = -1;	613	req->type = -1;
510	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	614	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
511		615
512	X_LOCK (reqlock);	616	X_LOCK (reqlock);
…		…
589	}	693	}
590		694
591	static void	695	static void
592	etp_cancel (ETP_REQ *req)	696	etp_cancel (ETP_REQ *req)
593	{	697	{
594	X_LOCK (wrklock);	698	req->cancelled = 1;
595	req->flags |= EIO_FLAG_CANCELLED;
596	X_UNLOCK (wrklock);
597		699
598	eio_grp_cancel (req);	700	eio_grp_cancel (req);
599	}	701	}
600		702
601	static void	703	static void
…		…
847	# undef pread	949	# undef pread
848	# undef pwrite	950	# undef pwrite
849	# define pread eio__pread	951	# define pread eio__pread
850	# define pwrite eio__pwrite	952	# define pwrite eio__pwrite
851		953
852	static ssize_t	954	static eio_ssize_t
853	eio__pread (int fd, void *buf, size_t count, off_t offset)	955	eio__pread (int fd, void *buf, size_t count, off_t offset)
854	{	956	{
855	ssize_t res;	957	eio_ssize_t res;
856	off_t ooffset;	958	off_t ooffset;
857		959
858	X_LOCK (preadwritelock);	960	X_LOCK (preadwritelock);
859	ooffset = lseek (fd, 0, SEEK_CUR);	961	ooffset = lseek (fd, 0, SEEK_CUR);
860	lseek (fd, offset, SEEK_SET);	962	lseek (fd, offset, SEEK_SET);
…		…
863	X_UNLOCK (preadwritelock);	965	X_UNLOCK (preadwritelock);
864		966
865	return res;	967	return res;
866	}	968	}
867		969
868	static ssize_t	970	static eio_ssize_t
869	eio__pwrite (int fd, void *buf, size_t count, off_t offset)	971	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
870	{	972	{
871	ssize_t res;	973	eio_ssize_t res;
872	off_t ooffset;	974	off_t ooffset;
873		975
874	X_LOCK (preadwritelock);	976	X_LOCK (preadwritelock);
875	ooffset = lseek (fd, 0, SEEK_CUR);	977	ooffset = lseek (fd, 0, SEEK_CUR);
876	lseek (fd, offset, SEEK_SET);	978	lseek (fd, offset, SEEK_SET);
…		…
921		1023
922	#if !HAVE_FDATASYNC	1024	#if !HAVE_FDATASYNC
923	# undef fdatasync	1025	# undef fdatasync
924	# define fdatasync(fd) fsync (fd)	1026	# define fdatasync(fd) fsync (fd)
925	#endif	1027	#endif
		1028
		1029	static int
		1030	eio__syncfs (int fd)
		1031	{
		1032	int res;
		1033
		1034	#if HAVE_SYS_SYNCFS
		1035	res = (int)syscall (__NR_syncfs, (int)(fd));
		1036	#else
		1037	res = -1;
		1038	errno = ENOSYS;
		1039	#endif
		1040
		1041	if (res < 0 && errno == ENOSYS && fd >= 0)
		1042	sync ();
		1043
		1044	return res;
		1045	}
926		1046
927	/* sync_file_range always needs emulation */	1047	/* sync_file_range always needs emulation */
928	static int	1048	static int
929	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1049	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
930	{	1050	{
…		…
950	/* even though we could play tricks with the flags, it's better to always	1070	/* even though we could play tricks with the flags, it's better to always
951	* call fdatasync, as that matches the expectation of its users best */	1071	* call fdatasync, as that matches the expectation of its users best */
952	return fdatasync (fd);	1072	return fdatasync (fd);
953	}	1073	}
954		1074
		1075	static int
		1076	eio__fallocate (int fd, int mode, off_t offset, size_t len)
		1077	{
		1078	#if HAVE_FALLOCATE
		1079	return fallocate (fd, mode, offset, len);
		1080	#else
		1081	errno = ENOSYS;
		1082	return -1;
		1083	#endif
		1084	}
		1085
955	#if !HAVE_READAHEAD	1086	#if !HAVE_READAHEAD
956	# undef readahead	1087	# undef readahead
957	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	1088	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
958		1089
959	static ssize_t	1090	static eio_ssize_t
960	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)	1091	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
961	{	1092	{
962	size_t todo = count;	1093	size_t todo = count;
963	dBUF;	1094	dBUF;
964		1095
…		…
969	pread (fd, eio_buf, len, offset);	1100	pread (fd, eio_buf, len, offset);
970	offset += len;	1101	offset += len;
971	todo -= len;	1102	todo -= len;
972	}	1103	}
973		1104
		1105	FUBd;
		1106
974	errno = 0;	1107	errno = 0;
975	return count;	1108	return count;
976	}	1109	}
977		1110
978	#endif	1111	#endif
979		1112
980	/* sendfile always needs emulation */	1113	/* sendfile always needs emulation */
981	static ssize_t	1114	static eio_ssize_t
982	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1115	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
983	{	1116	{
984	ssize_t written = 0;	1117	eio_ssize_t written = 0;
985	ssize_t res;	1118	eio_ssize_t res;
986		1119
987	if (!count)	1120	if (!count)
988	return 0;	1121	return 0;
989		1122
990	for (;;)	1123	for (;;)
991	{	1124	{
		1125	#ifdef __APPLE__
		1126	# undef HAVE_SENDFILE /* broken, as everything on os x */
		1127	#endif
992	#if HAVE_SENDFILE	1128	#if HAVE_SENDFILE
993	# if __linux	1129	# if __linux
994	off_t soffset = offset;	1130	off_t soffset = offset;
995	res = sendfile (ofd, ifd, &soffset, count);	1131	res = sendfile (ofd, ifd, &soffset, count);
996		1132
…		…
1012		1148
1013	/* according to source inspection, this is correct, and useful behaviour */	1149	/* according to source inspection, this is correct, and useful behaviour */
1014	if (sbytes)	1150	if (sbytes)
1015	res = sbytes;	1151	res = sbytes;
1016		1152
1017	# elif defined (__APPLE__) && 0 /* broken, as everything on os x */	1153	# elif defined (__APPLE__)
1018	off_t sbytes = count;	1154	off_t sbytes = count;
1019	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1155	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1020		1156
1021	/* according to the manpage, sbytes is always valid */	1157	/* according to the manpage, sbytes is always valid */
1022	if (sbytes)	1158	if (sbytes)
…		…
1039	if (res < 0 && sbytes)	1175	if (res < 0 && sbytes)
1040	res = sbytes;	1176	res = sbytes;
1041		1177
1042	# endif	1178	# endif
1043		1179
1044	#elif defined (_WIN32)	1180	#elif defined (_WIN32) && 0
1045	/* does not work, just for documentation of what would need to be done */	1181	/* does not work, just for documentation of what would need to be done */
1046	/* actually, cannot be done like this, as TransmitFile changes the file offset, */	1182	/* actually, cannot be done like this, as TransmitFile changes the file offset, */
1047	/* libeio guarantees that the file offset does not change, and windows */	1183	/* libeio guarantees that the file offset does not change, and windows */
1048	/* has no way to get an independent handle to the same file description */	1184	/* has no way to get an independent handle to the same file description */
1049	HANDLE h = TO_SOCKET (ifd);	1185	HANDLE h = TO_SOCKET (ifd);
…		…
1082	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK	1218	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1083	/* BSDs */	1219	/* BSDs */
1084	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */	1220	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1085	|| errno == ENOTSUP	1221	|| errno == ENOTSUP
1086	#endif	1222	#endif
		1223	#ifdef EOPNOTSUPP /* windows */
1087	|| errno == EOPNOTSUPP /* BSDs */	1224	|| errno == EOPNOTSUPP /* BSDs */
		1225	#endif
1088	#if __solaris	1226	#if __solaris
1089	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE	1227	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE
1090	#endif	1228	#endif
1091	)	1229	)
1092	)	1230	)
…		…
1096		1234
1097	res = 0;	1235	res = 0;
1098		1236
1099	while (count)	1237	while (count)
1100	{	1238	{
1101	ssize_t cnt;	1239	eio_ssize_t cnt;
1102		1240
1103	cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);	1241	cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1104		1242
1105	if (cnt <= 0)	1243	if (cnt <= 0)
1106	{	1244	{
…		…
1118		1256
1119	offset += cnt;	1257	offset += cnt;
1120	res += cnt;	1258	res += cnt;
1121	count -= cnt;	1259	count -= cnt;
1122	}	1260	}
		1261
		1262	FUBd;
1123	}	1263	}
1124		1264
1125	return res;	1265	return res;
1126	}	1266	}
1127		1267
…		…
1154	/* round up length */	1294	/* round up length */
1155	*length = (*length + mask) & ~mask;	1295	*length = (*length + mask) & ~mask;
1156	}	1296	}
1157		1297
1158	#if !_POSIX_MEMLOCK	1298	#if !_POSIX_MEMLOCK
1159	# define eio__mlockall(a) ((errno = ENOSYS), -1)	1299	# define eio__mlockall(a) EIO_ENOSYS ()
1160	#else	1300	#else
1161		1301
1162	static int	1302	static int
1163	eio__mlockall (int flags)	1303	eio__mlockall (int flags)
1164	{	1304	{
…		…
1178	return mlockall (flags);	1318	return mlockall (flags);
1179	}	1319	}
1180	#endif	1320	#endif
1181		1321
1182	#if !_POSIX_MEMLOCK_RANGE	1322	#if !_POSIX_MEMLOCK_RANGE
1183	# define eio__mlock(a,b) ((errno = ENOSYS), -1)	1323	# define eio__mlock(a,b) EIO_ENOSYS ()
1184	#else	1324	#else
1185		1325
1186	static int	1326	static int
1187	eio__mlock (void *addr, size_t length)	1327	eio__mlock (void *addr, size_t length)
1188	{	1328	{
…		…
1192	}	1332	}
1193		1333
1194	#endif	1334	#endif
1195		1335
1196	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)	1336	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1197	# define eio__msync(a,b,c) ((errno = ENOSYS), -1)	1337	# define eio__msync(a,b,c) EIO_ENOSYS ()
1198	#else	1338	#else
1199		1339
1200	static int	1340	static int
1201	eio__msync (void *mem, size_t len, int flags)	1341	eio__msync (void *mem, size_t len, int flags)
1202	{	1342	{
…		…
1242	}	1382	}
1243		1383
1244	/*****************************************************************************/	1384	/*****************************************************************************/
1245	/* requests implemented outside eio_execute, because they are so large */	1385	/* requests implemented outside eio_execute, because they are so large */
1246		1386
		1387	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1247	static void	1388	static int
1248	eio__realpath (eio_req *req, etp_worker *self)	1389	eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1249	{	1390	{
1250	char *rel = req->ptr1;	1391	const char *rel = path;
1251	char *res;	1392	char *res;
1252	char *tmp1, *tmp2;	1393	char *tmp1, *tmp2;
1253	#if SYMLOOP_MAX > 32	1394	#if SYMLOOP_MAX > 32
1254	int symlinks = SYMLOOP_MAX;	1395	int symlinks = SYMLOOP_MAX;
1255	#else	1396	#else
1256	int symlinks = 32;	1397	int symlinks = 32;
1257	#endif	1398	#endif
1258		1399
1259	req->result = -1;
1260
1261	errno = EINVAL;	1400	errno = EINVAL;
1262	if (!rel)	1401	if (!rel)
1263	return;	1402	return -1;
1264		1403
1265	errno = ENOENT;	1404	errno = ENOENT;
1266	if (!*rel)	1405	if (!*rel)
1267	return;	1406	return -1;
1268		1407
1269	if (!req->ptr2)	1408	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1270	{
1271	X_LOCK (wrklock);
1272	req->flags |= EIO_FLAG_PTR2_FREE;
1273	X_UNLOCK (wrklock);
1274	req->ptr2 = malloc (PATH_MAX * 3);
1275
1276	errno = ENOMEM;
1277	if (!req->ptr2)
1278	return;
1279	}
1280
1281	res = req->ptr2;
1282	tmp1 = res + PATH_MAX;	1409	tmp1 = res + PATH_MAX;
1283	tmp2 = tmp1 + PATH_MAX;	1410	tmp2 = tmp1 + PATH_MAX;
1284		1411
1285	#if 0 /* disabled, the musl way to do things is just too racy */	1412	#if 0 /* disabled, the musl way to do things is just too racy */
1286	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1413	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1305	#endif	1432	#endif
1306	#endif	1433	#endif
1307		1434
1308	if (*rel != '/')	1435	if (*rel != '/')
1309	{	1436	{
		1437	int len;
		1438
		1439	errno = ENOENT;
		1440	if (wd == EIO_INVALID_WD)
		1441	return -1;
		1442
		1443	if (wd == EIO_CWD)
		1444	{
1310	if (!getcwd (res, PATH_MAX))	1445	if (!getcwd (res, PATH_MAX))
1311	return;	1446	return -1;
		1447
		1448	len = strlen (res);
		1449	}
		1450	else
		1451	memcpy (res, wd->str, len = wd->len);
1312		1452
1313	if (res [1]) /* only use if not / */	1453	if (res [1]) /* only use if not / */
1314	res += strlen (res);	1454	res += len;
1315	}	1455	}
1316		1456
1317	while (*rel)	1457	while (*rel)
1318	{	1458	{
1319	ssize_t len, linklen;	1459	eio_ssize_t len, linklen;
1320	char *beg = rel;	1460	const char *beg = rel;
1321		1461
1322	while (*rel && *rel != '/')	1462	while (*rel && *rel != '/')
1323	++rel;	1463	++rel;
1324		1464
1325	len = rel - beg;	1465	len = rel - beg;
…		…
1337		1477
1338	if (beg [1] == '.' && len == 2)	1478	if (beg [1] == '.' && len == 2)
1339	{	1479	{
1340	/* .. - back up one component, if possible */	1480	/* .. - back up one component, if possible */
1341		1481
1342	while (res != req->ptr2)	1482	while (res != tmpbuf->ptr)
1343	if (*--res == '/')	1483	if (*--res == '/')
1344	break;	1484	break;
1345		1485
1346	continue;	1486	continue;
1347	}	1487	}
1348	}	1488	}
1349		1489
1350	errno = ENAMETOOLONG;	1490	errno = ENAMETOOLONG;
1351	if (res + 1 + len + 1 >= tmp1)	1491	if (res + 1 + len + 1 >= tmp1)
1352	return;	1492	return -1;
1353		1493
1354	/* copy one component */	1494	/* copy one component */
1355	*res = '/';	1495	*res = '/';
1356	memcpy (res + 1, beg, len);	1496	memcpy (res + 1, beg, len);
1357		1497
1358	/* zero-terminate, for readlink */	1498	/* zero-terminate, for readlink */
1359	res [len + 1] = 0;	1499	res [len + 1] = 0;
1360		1500
1361	/* now check if it's a symlink */	1501	/* now check if it's a symlink */
1362	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1502	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1363		1503
1364	if (linklen < 0)	1504	if (linklen < 0)
1365	{	1505	{
1366	if (errno != EINVAL)	1506	if (errno != EINVAL)
1367	return;	1507	return -1;
1368		1508
1369	/* it's a normal directory. hopefully */	1509	/* it's a normal directory. hopefully */
1370	res += len + 1;	1510	res += len + 1;
1371	}	1511	}
1372	else	1512	else
…		…
1374	/* yay, it was a symlink - build new path in tmp2 */	1514	/* yay, it was a symlink - build new path in tmp2 */
1375	int rellen = strlen (rel);	1515	int rellen = strlen (rel);
1376		1516
1377	errno = ENAMETOOLONG;	1517	errno = ENAMETOOLONG;
1378	if (linklen + 1 + rellen >= PATH_MAX)	1518	if (linklen + 1 + rellen >= PATH_MAX)
1379	return;	1519	return -1;
1380		1520
1381	errno = ELOOP;	1521	errno = ELOOP;
1382	if (!--symlinks)	1522	if (!--symlinks)
1383	return;	1523	return -1;
1384		1524
1385	if (*tmp1 == '/')	1525	if (*tmp1 == '/')
1386	res = req->ptr2; /* symlink resolves to an absolute path */	1526	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1387		1527
1388	/* we need to be careful, as rel might point into tmp2 already */	1528	/* we need to be careful, as rel might point into tmp2 already */
1389	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1529	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1390	tmp2 [linklen] = '/';	1530	tmp2 [linklen] = '/';
1391	memcpy (tmp2, tmp1, linklen);	1531	memcpy (tmp2, tmp1, linklen);
…		…
1393	rel = tmp2;	1533	rel = tmp2;
1394	}	1534	}
1395	}	1535	}
1396		1536
1397	/* special case for the lone root path */	1537	/* special case for the lone root path */
1398	if (res == req->ptr2)	1538	if (res == tmpbuf->ptr)
1399	*res++ = '/';	1539	*res++ = '/';
1400		1540
1401	req->result = res - (char *)req->ptr2;	1541	return res - (char *)tmpbuf->ptr;
1402
1403	done:
1404	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1405	}	1542	}
1406		1543
1407	static signed char	1544	static signed char
1408	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1545	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1409	{	1546	{
…		…
1417		1554
1418	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */	1555	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1419	#define EIO_SORT_FAST 60 /* when to only use insertion sort */	1556	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1420		1557
1421	static void	1558	static void
1422	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1559	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1423	{	1560	{
1424	unsigned char bits [9 + sizeof (ino_t) * 8];	1561	unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1425	unsigned char *bit = bits;	1562	unsigned char *bit = bits;
1426		1563
1427	assert (CHAR_BIT == 8);	1564	assert (CHAR_BIT == 8);
1428	assert (sizeof (eio_dirent) * 8 < 256);	1565	assert (sizeof (eio_dirent) * 8 < 256);
1429	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */	1566	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
…		…
1431		1568
1432	if (size <= EIO_SORT_FAST)	1569	if (size <= EIO_SORT_FAST)
1433	return;	1570	return;
1434		1571
1435	/* first prepare an array of bits to test in our radix sort */	1572	/* first prepare an array of bits to test in our radix sort */
1436	/* try to take endianness into account, as well as differences in ino_t sizes */	1573	/* try to take endianness into account, as well as differences in eio_ino_t sizes */
1437	/* inode_bits must contain all inodes ORed together */	1574	/* inode_bits must contain all inodes ORed together */
1438	/* which is used to skip bits that are 0 everywhere, which is very common */	1575	/* which is used to skip bits that are 0 everywhere, which is very common */
1439	{	1576	{
1440	ino_t endianness;	1577	eio_ino_t endianness;
1441	int i, j;	1578	int i, j;
1442		1579
1443	/* we store the byte offset of byte n into byte n of "endianness" */	1580	/* we store the byte offset of byte n into byte n of "endianness" */
1444	for (i = 0; i < sizeof (ino_t); ++i)	1581	for (i = 0; i < sizeof (eio_ino_t); ++i)
1445	((unsigned char *)&endianness)[i] = i;	1582	((unsigned char *)&endianness)[i] = i;
1446		1583
1447	*bit++ = 0;	1584	*bit++ = 0;
1448		1585
1449	for (i = 0; i < sizeof (ino_t); ++i)	1586	for (i = 0; i < sizeof (eio_ino_t); ++i)
1450	{	1587	{
1451	/* shifting off the byte offsets out of "endianness" */	1588	/* shifting off the byte offsets out of "endianness" */
1452	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;	1589	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1453	endianness >>= 8;	1590	endianness >>= 8;
1454		1591
1455	for (j = 0; j < 8; ++j)	1592	for (j = 0; j < 8; ++j)
1456	if (inode_bits & (((ino_t)1) << (i * 8 + j)))	1593	if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1457	*bit++ = offs + j;	1594	*bit++ = offs + j;
1458	}	1595	}
1459		1596
1460	for (j = 0; j < 8; ++j)	1597	for (j = 0; j < 8; ++j)
1461	if (score_bits & (1 << j))	1598	if (score_bits & (1 << j))
1462	*bit++ = offsetof (eio_dirent, score) * 8 + j;	1599	*bit++ = offsetof (eio_dirent, score) * 8 + j;
1463	}	1600	}
1464		1601
1465	/* now actually do the sorting (a variant of MSD radix sort) */	1602	/* now actually do the sorting (a variant of MSD radix sort) */
1466	{	1603	{
1467	eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;	1604	eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1468	eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;	1605	eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1469	unsigned char *bit_stk [9 + sizeof (ino_t) * 8];	1606	unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1470	int stk_idx = 0;	1607	int stk_idx = 0;
1471		1608
1472	base_stk [stk_idx] = dents;	1609	base_stk [stk_idx] = dents;
1473	end_stk [stk_idx] = dents + size;	1610	end_stk [stk_idx] = dents + size;
1474	bit_stk [stk_idx] = bit - 1;	1611	bit_stk [stk_idx] = bit - 1;
…		…
1553	}	1690	}
1554	}	1691	}
1555	}	1692	}
1556		1693
1557	static void	1694	static void
1558	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1695	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1559	{	1696	{
1560	if (size <= 1)	1697	if (size <= 1)
1561	return; /* our insertion sort relies on size > 0 */	1698	return; /* our insertion sort relies on size > 0 */
1562		1699
1563	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */	1700	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
…		…
1571		1708
1572	/* read a full directory */	1709	/* read a full directory */
1573	static void	1710	static void
1574	eio__scandir (eio_req *req, etp_worker *self)	1711	eio__scandir (eio_req *req, etp_worker *self)
1575	{	1712	{
1576	DIR *dirp;
1577	EIO_STRUCT_DIRENT *entp;
1578	char *name, *names;	1713	char *name, *names;
1579	int namesalloc = 4096;	1714	int namesalloc = 4096 - sizeof (void *) * 4;
1580	int namesoffs = 0;	1715	int namesoffs = 0;
1581	int flags = req->int1;	1716	int flags = req->int1;
1582	eio_dirent *dents = 0;	1717	eio_dirent *dents = 0;
1583	int dentalloc = 128;	1718	int dentalloc = 128;
1584	int dentoffs = 0;	1719	int dentoffs = 0;
1585	ino_t inode_bits = 0;	1720	eio_ino_t inode_bits = 0;
		1721	#ifdef _WIN32
		1722	HANDLE dirp;
		1723	WIN32_FIND_DATA entp;
		1724	#else
		1725	DIR *dirp;
		1726	EIO_STRUCT_DIRENT *entp;
		1727	#endif
1586		1728
1587	req->result = -1;	1729	req->result = -1;
1588		1730
1589	if (!(flags & EIO_READDIR_DENTS))	1731	if (!(flags & EIO_READDIR_DENTS))
1590	flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);	1732	flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1591		1733
1592	X_LOCK (wrklock);	1734	#ifdef _WIN32
1593	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1735	{
		1736	int len = strlen ((const char *)req->ptr1);
		1737	char *path = malloc (MAX_PATH);
		1738	const char *fmt;
		1739	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		1740
		1741	if (!len)
		1742	fmt = "./*";
		1743	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
		1744	fmt = "%s*";
		1745	else
		1746	fmt = "%s/*";
		1747
		1748	_snprintf (path, MAX_PATH, fmt, reqpath);
		1749	dirp = FindFirstFile (path, &entp);
		1750	free (path);
		1751
		1752	if (dirp == INVALID_HANDLE_VALUE)
		1753	{
		1754	/* should steal _dosmaperr */
		1755	switch (GetLastError ())
		1756	{
		1757	case ERROR_FILE_NOT_FOUND:
		1758	req->result = 0;
		1759	break;
		1760
		1761	case ERROR_INVALID_NAME:
		1762	case ERROR_PATH_NOT_FOUND:
		1763	case ERROR_NO_MORE_FILES:
		1764	errno = ENOENT;
		1765	break;
		1766
		1767	case ERROR_NOT_ENOUGH_MEMORY:
		1768	errno = ENOMEM;
		1769	break;
		1770
		1771	default:
		1772	errno = EINVAL;
		1773	break;
		1774	}
		1775
		1776	return;
		1777	}
		1778	}
		1779	#else
		1780	#if HAVE_AT
		1781	if (req->wd)
		1782	{
		1783	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		1784
		1785	if (fd < 0)
		1786	return;
		1787
		1788	dirp = fdopendir (fd);
		1789
		1790	if (!dirp)
		1791	close (fd);
		1792	}
		1793	else
1594	self->dirp = dirp = opendir (req->ptr1);	1794	dirp = opendir (req->ptr1);
		1795	#else
		1796	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1797	#endif
		1798
		1799	if (!dirp)
		1800	return;
		1801	#endif
1595		1802
1596	if (req->flags & EIO_FLAG_PTR1_FREE)	1803	if (req->flags & EIO_FLAG_PTR1_FREE)
1597	free (req->ptr1);	1804	free (req->ptr1);
1598		1805
1599	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1806	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1600	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1807	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1601	req->ptr2 = names = malloc (namesalloc);	1808	req->ptr2 = names = malloc (namesalloc);
1602	X_UNLOCK (wrklock);
1603		1809
1604	if (dirp && names && (!flags || dents))	1810	if (!names || (flags && !dents))
		1811	return;
		1812
1605	for (;;)	1813	for (;;)
1606	{	1814	{
		1815	int done;
		1816
		1817	#ifdef _WIN32
		1818	done = !dirp;
		1819	#else
1607	errno = 0;	1820	errno = 0;
1608	entp = readdir (dirp);	1821	entp = readdir (dirp);
		1822	done = !entp;
		1823	#endif
1609		1824
1610	if (!entp)	1825	if (done)
1611	{	1826	{
		1827	#ifndef _WIN32
		1828	int old_errno = errno;
		1829	closedir (dirp);
		1830	errno = old_errno;
		1831
1612	if (errno)	1832	if (errno)
1613	break;	1833	break;
		1834	#endif
1614		1835
1615	/* sort etc. */	1836	/* sort etc. */
1616	req->int1 = flags;	1837	req->int1 = flags;
1617	req->result = dentoffs;	1838	req->result = dentoffs;
1618		1839
1619	if (flags & EIO_READDIR_STAT_ORDER)	1840	if (flags & EIO_READDIR_STAT_ORDER)
1620	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1841	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1621	else if (flags & EIO_READDIR_DIRS_FIRST)	1842	else if (flags & EIO_READDIR_DIRS_FIRST)
1622	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1843	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1623	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1844	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1624	else	1845	else
		1846	{
		1847	/* in this case, all is known, and we just put dirs first and sort them */
		1848	eio_dirent *oth = dents + dentoffs;
		1849	eio_dirent *dir = dents;
		1850
		1851	/* now partition dirs to the front, and non-dirs to the back */
		1852	/* by walking from both sides and swapping if necessary */
		1853	while (oth > dir)
		1854	{
		1855	if (dir->type == EIO_DT_DIR)
		1856	++dir;
		1857	else if ((--oth)->type == EIO_DT_DIR)
		1858	{
		1859	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
		1860
		1861	++dir;
		1862	}
		1863	}
		1864
		1865	/* now sort the dirs only (dirs all have the same score) */
		1866	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1867	}
		1868
		1869	break;
		1870	}
		1871
		1872	/* now add the entry to our list(s) */
		1873	name = D_NAME (entp);
		1874
		1875	/* skip . and .. entries */
		1876	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		1877	{
		1878	int len = D_NAMLEN (entp) + 1;
		1879
		1880	while (ecb_expect_false (namesoffs + len > namesalloc))
		1881	{
		1882	namesalloc *= 2;
		1883	req->ptr2 = names = realloc (names, namesalloc);
		1884
		1885	if (!names)
		1886	break;
		1887	}
		1888
		1889	memcpy (names + namesoffs, name, len);
		1890
		1891	if (dents)
		1892	{
		1893	struct eio_dirent *ent;
		1894
		1895	if (ecb_expect_false (dentoffs == dentalloc))
1625	{	1896	{
1626	/* in this case, all is known, and we just put dirs first and sort them */	1897	dentalloc *= 2;
		1898	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1899
		1900	if (!dents)
		1901	break;
		1902	}
		1903
1627	eio_dirent *oth = dents + dentoffs;	1904	ent = dents + dentoffs;
1628	eio_dirent *dir = dents;
1629		1905
1630	/* now partition dirs to the front, and non-dirs to the back */	1906	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1631	/* by walking from both sides and swapping if necessary */	1907	ent->namelen = len - 1;
1632	while (oth > dir)	1908	ent->inode = D_INO (entp);
		1909
		1910	inode_bits |= ent->inode;
		1911
		1912	switch (D_TYPE (entp))
		1913	{
		1914	default:
		1915	ent->type = EIO_DT_UNKNOWN;
		1916	flags |= EIO_READDIR_FOUND_UNKNOWN;
		1917	break;
		1918
		1919	#ifdef DT_FIFO
		1920	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1921	#endif
		1922	#ifdef DT_CHR
		1923	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1924	#endif
		1925	#ifdef DT_MPC
		1926	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1927	#endif
		1928	#ifdef DT_DIR
		1929	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1930	#endif
		1931	#ifdef DT_NAM
		1932	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1933	#endif
		1934	#ifdef DT_BLK
		1935	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1936	#endif
		1937	#ifdef DT_MPB
		1938	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1939	#endif
		1940	#ifdef DT_REG
		1941	case DT_REG: ent->type = EIO_DT_REG; break;
		1942	#endif
		1943	#ifdef DT_NWK
		1944	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1945	#endif
		1946	#ifdef DT_CMP
		1947	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1948	#endif
		1949	#ifdef DT_LNK
		1950	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1951	#endif
		1952	#ifdef DT_SOCK
		1953	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1954	#endif
		1955	#ifdef DT_DOOR
		1956	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1957	#endif
		1958	#ifdef DT_WHT
		1959	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1960	#endif
		1961	}
		1962
		1963	ent->score = 7;
		1964
		1965	if (flags & EIO_READDIR_DIRS_FIRST)
		1966	{
		1967	if (ent->type == EIO_DT_UNKNOWN)
1633	{	1968	{
1634	if (dir->type == EIO_DT_DIR)	1969	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1635	++dir;	1970	ent->score = 1;
1636	else if ((--oth)->type == EIO_DT_DIR)	1971	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1637	{	1972	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1638	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1639
1640	++dir;
1641	}
1642	}	1973	}
1643		1974	else if (ent->type == EIO_DT_DIR)
1644	/* now sort the dirs only (dirs all have the same score) */	1975	ent->score = 0;
1645	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1646	}	1976	}
1647
1648	break;
1649	}
1650
1651	/* now add the entry to our list(s) */
1652	name = entp->d_name;
1653
1654	/* skip . and .. entries */
1655	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1656	{
1657	int len = D_NAMLEN (entp) + 1;
1658
1659	while (ecb_expect_false (namesoffs + len > namesalloc))
1660	{
1661	namesalloc *= 2;
1662	X_LOCK (wrklock);
1663	req->ptr2 = names = realloc (names, namesalloc);
1664	X_UNLOCK (wrklock);
1665
1666	if (!names)
1667	break;
1668	}	1977	}
1669		1978
1670	memcpy (names + namesoffs, name, len);
1671
1672	if (dents)
1673	{
1674	struct eio_dirent *ent;
1675
1676	if (ecb_expect_false (dentoffs == dentalloc))
1677	{
1678	dentalloc *= 2;
1679	X_LOCK (wrklock);
1680	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1681	X_UNLOCK (wrklock);
1682
1683	if (!dents)
1684	break;
1685	}
1686
1687	ent = dents + dentoffs;
1688
1689	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1690	ent->namelen = len - 1;
1691	ent->inode = D_INO (entp);
1692
1693	inode_bits |= ent->inode;
1694
1695	switch (D_TYPE (entp))
1696	{
1697	default:
1698	ent->type = EIO_DT_UNKNOWN;
1699	flags |= EIO_READDIR_FOUND_UNKNOWN;
1700	break;
1701
1702	#ifdef DT_FIFO
1703	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1704	#endif
1705	#ifdef DT_CHR
1706	case DT_CHR: ent->type = EIO_DT_CHR; break;
1707	#endif
1708	#ifdef DT_MPC
1709	case DT_MPC: ent->type = EIO_DT_MPC; break;
1710	#endif
1711	#ifdef DT_DIR
1712	case DT_DIR: ent->type = EIO_DT_DIR; break;
1713	#endif
1714	#ifdef DT_NAM
1715	case DT_NAM: ent->type = EIO_DT_NAM; break;
1716	#endif
1717	#ifdef DT_BLK
1718	case DT_BLK: ent->type = EIO_DT_BLK; break;
1719	#endif
1720	#ifdef DT_MPB
1721	case DT_MPB: ent->type = EIO_DT_MPB; break;
1722	#endif
1723	#ifdef DT_REG
1724	case DT_REG: ent->type = EIO_DT_REG; break;
1725	#endif
1726	#ifdef DT_NWK
1727	case DT_NWK: ent->type = EIO_DT_NWK; break;
1728	#endif
1729	#ifdef DT_CMP
1730	case DT_CMP: ent->type = EIO_DT_CMP; break;
1731	#endif
1732	#ifdef DT_LNK
1733	case DT_LNK: ent->type = EIO_DT_LNK; break;
1734	#endif
1735	#ifdef DT_SOCK
1736	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1737	#endif
1738	#ifdef DT_DOOR
1739	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1740	#endif
1741	#ifdef DT_WHT
1742	case DT_WHT: ent->type = EIO_DT_WHT; break;
1743	#endif
1744	}
1745
1746	ent->score = 7;
1747
1748	if (flags & EIO_READDIR_DIRS_FIRST)
1749	{
1750	if (ent->type == EIO_DT_UNKNOWN)
1751	{
1752	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1753	ent->score = 1;
1754	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1755	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1756	}
1757	else if (ent->type == EIO_DT_DIR)
1758	ent->score = 0;
1759	}
1760	}
1761
1762	namesoffs += len;	1979	namesoffs += len;
1763	++dentoffs;	1980	++dentoffs;
1764	}	1981	}
1765		1982
1766	if (EIO_CANCELLED (req))	1983	if (EIO_CANCELLED (req))
1767	{	1984	{
1768	errno = ECANCELED;	1985	errno = ECANCELED;
1769	break;	1986	break;
1770	}	1987	}
		1988
		1989	#ifdef _WIN32
		1990	if (!FindNextFile (dirp, &entp))
		1991	{
		1992	FindClose (dirp);
		1993	dirp = 0;
1771	}	1994	}
		1995	#endif
		1996	}
1772	}	1997	}
		1998
		1999	/*****************************************************************************/
		2000	/* working directory stuff */
		2001	/* various deficiencies in the posix 2008 api force us to */
		2002	/* keep the absolute path in string form at all times */
		2003	/* fuck yeah. */
		2004
		2005	#if !HAVE_AT
		2006
		2007	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2008	/* an absolute or canonical path */
		2009	static const char *
		2010	wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2011	{
		2012	if (!wd || *path == '/')
		2013	return path;
		2014
		2015	if (path [0] == '.' && !path [1])
		2016	return wd->str;
		2017
		2018	{
		2019	int l1 = wd->len;
		2020	int l2 = strlen (path);
		2021
		2022	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2023
		2024	memcpy (res, wd->str, l1);
		2025	res [l1] = '/';
		2026	memcpy (res + l1 + 1, path, l2 + 1);
		2027
		2028	return res;
		2029	}
		2030	}
		2031
		2032	#endif
		2033
		2034	static eio_wd
		2035	eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2036	{
		2037	int fd;
		2038	eio_wd res;
		2039	int len = eio__realpath (tmpbuf, wd, path);
		2040
		2041	if (len < 0)
		2042	return EIO_INVALID_WD;
		2043
		2044	#if HAVE_AT
		2045	fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		2046
		2047	if (fd < 0)
		2048	return EIO_INVALID_WD;
		2049	#endif
		2050
		2051	res = malloc (sizeof (*res) + len); /* one extra 0-byte */
		2052
		2053	#if HAVE_AT
		2054	res->fd = fd;
		2055	#endif
		2056
		2057	res->len = len;
		2058	memcpy (res->str, tmpbuf->ptr, len);
		2059	res->str [len] = 0;
		2060
		2061	return res;
		2062	}
		2063
		2064	eio_wd
		2065	eio_wd_open_sync (eio_wd wd, const char *path)
		2066	{
		2067	struct tmpbuf tmpbuf = { 0 };
		2068	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2069	free (tmpbuf.ptr);
		2070
		2071	return wd;
		2072	}
		2073
		2074	void
		2075	eio_wd_close_sync (eio_wd wd)
		2076	{
		2077	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2078	{
		2079	#if HAVE_AT
		2080	close (wd->fd);
		2081	#endif
		2082	free (wd);
		2083	}
		2084	}
		2085
		2086	#if HAVE_AT
		2087
		2088	/* they forgot these */
		2089
		2090	static int
		2091	eio__truncateat (int dirfd, const char *path, off_t length)
		2092	{
		2093	int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
		2094	int res;
		2095
		2096	if (fd < 0)
		2097	return fd;
		2098
		2099	res = ftruncate (fd, length);
		2100	close (fd);
		2101	return res;
		2102	}
		2103
		2104	static int
		2105	eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
		2106	{
		2107	int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
		2108	int res;
		2109
		2110	if (fd < 0)
		2111	return fd;
		2112
		2113	res = fstatvfs (fd, buf);
		2114	close (fd);
		2115	return res;
		2116
		2117	}
		2118
		2119	#endif
1773		2120
1774	/*****************************************************************************/	2121	/*****************************************************************************/
1775		2122
1776	#define ALLOC(len) \	2123	#define ALLOC(len) \
1777	if (!req->ptr2) \	2124	if (!req->ptr2) \
…		…
1786	req->result = -1; \	2133	req->result = -1; \
1787	break; \	2134	break; \
1788	} \	2135	} \
1789	}	2136	}
1790		2137
		2138	static void ecb_noinline ecb_cold
		2139	etp_proc_init (void)
		2140	{
		2141	#if HAVE_PRCTL_SET_NAME
		2142	/* provide a more sensible "thread name" */
		2143	char name[16 + 1];
		2144	const int namelen = sizeof (name) - 1;
		2145	int len;
		2146
		2147	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2148	name [namelen] = 0;
		2149	len = strlen (name);
		2150	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2151	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2152	#endif
		2153	}
		2154
1791	X_THREAD_PROC (etp_proc)	2155	X_THREAD_PROC (etp_proc)
1792	{	2156	{
1793	ETP_REQ *req;	2157	ETP_REQ *req;
1794	struct timespec ts;	2158	struct timespec ts;
1795	etp_worker *self = (etp_worker *)thr_arg;	2159	etp_worker *self = (etp_worker *)thr_arg;
1796		2160
		2161	etp_proc_init ();
		2162
1797	/* try to distribute timeouts somewhat randomly */	2163	/* try to distribute timeouts somewhat evenly */
1798	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2164	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1799		2165
1800	for (;;)	2166	for (;;)
1801	{	2167	{
		2168	ts.tv_sec = 0;
		2169
1802	X_LOCK (reqlock);	2170	X_LOCK (reqlock);
1803		2171
1804	for (;;)	2172	for (;;)
1805	{	2173	{
1806	self->req = req = reqq_shift (&req_queue);	2174	req = reqq_shift (&req_queue);
1807		2175
1808	if (req)	2176	if (req)
1809	break;	2177	break;
1810		2178
		2179	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
		2180	{
		2181	X_UNLOCK (reqlock);
		2182	X_LOCK (wrklock);
		2183	--started;
		2184	X_UNLOCK (wrklock);
		2185	goto quit;
		2186	}
		2187
1811	++idle;	2188	++idle;
1812		2189
1813	ts.tv_sec = time (0) + idle_timeout;	2190	if (idle <= max_idle)
1814	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)	2191	/* we are allowed to idle, so do so without any timeout */
		2192	X_COND_WAIT (reqwait, reqlock);
		2193	else
1815	{	2194	{
1816	if (idle > max_idle)	2195	/* initialise timeout once */
1817	{	2196	if (!ts.tv_sec)
1818	--idle;	2197	ts.tv_sec = time (0) + idle_timeout;
1819	X_UNLOCK (reqlock);
1820	X_LOCK (wrklock);
1821	--started;
1822	X_UNLOCK (wrklock);
1823	goto quit;
1824	}
1825		2198
1826	/* we are allowed to idle, so do so without any timeout */
1827	X_COND_WAIT (reqwait, reqlock);	2199	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
		2200	ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1828	}	2201	}
1829		2202
1830	--idle;	2203	--idle;
1831	}	2204	}
1832		2205
…		…
1844	++npending;	2217	++npending;
1845		2218
1846	if (!reqq_push (&res_queue, req) && want_poll_cb)	2219	if (!reqq_push (&res_queue, req) && want_poll_cb)
1847	want_poll_cb ();	2220	want_poll_cb ();
1848		2221
1849	self->req = 0;
1850	etp_worker_clear (self);	2222	etp_worker_clear (self);
1851		2223
1852	X_UNLOCK (reslock);	2224	X_UNLOCK (reslock);
1853	}	2225	}
1854		2226
1855	quit:	2227	quit:
		2228	free (req);
		2229
1856	X_LOCK (wrklock);	2230	X_LOCK (wrklock);
1857	etp_worker_free (self);	2231	etp_worker_free (self);
1858	X_UNLOCK (wrklock);	2232	X_UNLOCK (wrklock);
1859		2233
1860	return 0;	2234	return 0;
…		…
1863	/*****************************************************************************/	2237	/*****************************************************************************/
1864		2238
1865	int ecb_cold	2239	int ecb_cold
1866	eio_init (void (*want_poll)(void), void (*done_poll)(void))	2240	eio_init (void (*want_poll)(void), void (*done_poll)(void))
1867	{	2241	{
		2242	#if !HAVE_PREADWRITE
		2243	X_MUTEX_CREATE (preadwritelock);
		2244	#endif
		2245
1868	return etp_init (want_poll, done_poll);	2246	return etp_init (want_poll, done_poll);
1869	}	2247	}
1870		2248
1871	ecb_inline void	2249	ecb_inline void
1872	eio_api_destroy (eio_req *req)	2250	eio_api_destroy (eio_req *req)
…		…
1899	}	2277	}
1900		2278
1901	static void	2279	static void
1902	eio_execute (etp_worker *self, eio_req *req)	2280	eio_execute (etp_worker *self, eio_req *req)
1903	{	2281	{
		2282	#if HAVE_AT
		2283	int dirfd;
		2284	#else
		2285	const char *path;
		2286	#endif
		2287
1904	if (ecb_expect_false (EIO_CANCELLED (req)))	2288	if (ecb_expect_false (EIO_CANCELLED (req)))
1905	{	2289	{
1906	req->result = -1;	2290	req->result = -1;
1907	req->errorno = ECANCELED;	2291	req->errorno = ECANCELED;
1908	return;	2292	return;
1909	}	2293	}
1910		2294
		2295	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2296	{
		2297	req->result = -1;
		2298	req->errorno = ENOENT;
		2299	return;
		2300	}
		2301
		2302	if (req->type >= EIO_OPEN)
		2303	{
		2304	#if HAVE_AT
		2305	dirfd = WD2FD (req->wd);
		2306	#else
		2307	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2308	#endif
		2309	}
		2310
1911	switch (req->type)	2311	switch (req->type)
1912	{	2312	{
		2313	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2314	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2315	break;
		2316	case EIO_WD_CLOSE: req->result = 0;
		2317	eio_wd_close_sync (req->wd); break;
		2318
1913	case EIO_READ: ALLOC (req->size);	2319	case EIO_READ: ALLOC (req->size);
1914	req->result = req->offs >= 0	2320	req->result = req->offs >= 0
1915	? pread (req->int1, req->ptr2, req->size, req->offs)	2321	? pread (req->int1, req->ptr2, req->size, req->offs)
1916	: read (req->int1, req->ptr2, req->size); break;	2322	: read (req->int1, req->ptr2, req->size); break;
1917	case EIO_WRITE: req->result = req->offs >= 0	2323	case EIO_WRITE: req->result = req->offs >= 0
1918	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2324	? pwrite (req->int1, req->ptr2, req->size, req->offs)
1919	: write (req->int1, req->ptr2, req->size); break;	2325	: write (req->int1, req->ptr2, req->size); break;
1920		2326
1921	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2327	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1922	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;	2328	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
		2329
		2330	#if HAVE_AT
1923		2331
1924	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2332	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1925	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2333	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1926	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2334	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2335	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2336	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2337	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2338	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2339	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2340
		2341	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2342	case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
		2343	case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
		2344	case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2345	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2346	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2347	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2348	case EIO_READLINK: ALLOC (PATH_MAX);
		2349	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2350	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2351	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2352	case EIO_UTIME:
		2353	case EIO_FUTIME:
		2354	{
		2355	struct timespec ts[2];
		2356	struct timespec *times;
		2357
		2358	if (req->nv1 != -1. || req->nv2 != -1.)
		2359	{
		2360	ts[0].tv_sec = req->nv1;
		2361	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2362	ts[1].tv_sec = req->nv2;
		2363	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2364
		2365	times = ts;
		2366	}
		2367	else
		2368	times = 0;
		2369
		2370	req->result = req->type == EIO_FUTIME
		2371	? futimens (req->int1, times)
		2372	: utimensat (dirfd, req->ptr1, times, 0);
		2373	}
		2374	break;
		2375
		2376	#else
		2377
		2378	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2379	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2380	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1927	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2381	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2382	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2383	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2384	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2385	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2386
		2387	case EIO_UNLINK: req->result = unlink (path ); break;
		2388	case EIO_RMDIR: req->result = rmdir (path ); break;
		2389	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2390	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2391	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2392	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2393	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2394	case EIO_READLINK: ALLOC (PATH_MAX);
		2395	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2396	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2397	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2398
		2399	case EIO_UTIME:
		2400	case EIO_FUTIME:
		2401	{
		2402	struct timeval tv[2];
		2403	struct timeval *times;
		2404
		2405	if (req->nv1 != -1. || req->nv2 != -1.)
		2406	{
		2407	tv[0].tv_sec = req->nv1;
		2408	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2409	tv[1].tv_sec = req->nv2;
		2410	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2411
		2412	times = tv;
		2413	}
		2414	else
		2415	times = 0;
		2416
		2417	req->result = req->type == EIO_FUTIME
		2418	? futimes (req->int1, times)
		2419	: utimes (req->ptr1, times);
		2420	}
		2421	break;
		2422
		2423	#endif
		2424
		2425	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2426	{
		2427	ALLOC (req->result);
		2428	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2429	}
		2430	break;
		2431
1928	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2432	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1929	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2433	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1930		2434
1931	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1932	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1933	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));	2435	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1934	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2436	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1935		2437
1936	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1937	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	2438	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1938	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1939	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	2439	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1940	case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1941	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;	2440	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1942		2441
1943	case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1944	case EIO_CLOSE: req->result = close (req->int1); break;	2442	case EIO_CLOSE: req->result = close (req->int1); break;
1945	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2443	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1946	case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1947	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1948	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1949	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1950	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1951	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1952	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1953
1954	case EIO_REALPATH: eio__realpath (req, self); break;
1955
1956	case EIO_READLINK: ALLOC (PATH_MAX);
1957	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1958
1959	case EIO_SYNC: req->result = 0; sync (); break;	2444	case EIO_SYNC: req->result = 0; sync (); break;
1960	case EIO_FSYNC: req->result = fsync (req->int1); break;	2445	case EIO_FSYNC: req->result = fsync (req->int1); break;
1961	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2446	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2447	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2448	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1962	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;	2449	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1963	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2450	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1964	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2451	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1965	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2452	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1966	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;	2453	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1967		2454
1968	case EIO_READDIR: eio__scandir (req, self); break;	2455	case EIO_READDIR: eio__scandir (req, self); break;
1969		2456
1970	case EIO_BUSY:	2457	case EIO_BUSY:
1971	#ifdef _WIN32	2458	#ifdef _WIN32
…		…
1980	req->result = select (0, 0, 0, 0, &tv);	2467	req->result = select (0, 0, 0, 0, &tv);
1981	}	2468	}
1982	#endif	2469	#endif
1983	break;	2470	break;
1984		2471
1985	case EIO_UTIME:
1986	case EIO_FUTIME:
1987	{
1988	struct timeval tv[2];
1989	struct timeval *times;
1990
1991	if (req->nv1 != -1. || req->nv2 != -1.)
1992	{
1993	tv[0].tv_sec = req->nv1;
1994	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1995	tv[1].tv_sec = req->nv2;
1996	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1997
1998	times = tv;
1999	}
2000	else
2001	times = 0;
2002
2003	req->result = req->type == EIO_FUTIME
2004	? futimes (req->int1, times)
2005	: utimes (req->ptr1, times);
2006	}
2007	break;
2008
2009	case EIO_GROUP:	2472	case EIO_GROUP:
2010	abort (); /* handled in eio_request */	2473	abort (); /* handled in eio_request */
2011		2474
2012	case EIO_NOP:	2475	case EIO_NOP:
2013	req->result = 0;	2476	req->result = 0;
…		…
2026	req->errorno = errno;	2489	req->errorno = errno;
2027	}	2490	}
2028		2491
2029	#ifndef EIO_NO_WRAPPERS	2492	#ifndef EIO_NO_WRAPPERS
2030		2493
		2494	eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
		2495	{
		2496	REQ (EIO_WD_OPEN); PATH; SEND;
		2497	}
		2498
		2499	eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
		2500	{
		2501	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2502	}
		2503
2031	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2504	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2032	{	2505	{
2033	REQ (EIO_NOP); SEND;	2506	REQ (EIO_NOP); SEND;
2034	}	2507	}
2035		2508
…		…
2051	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2524	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2052	{	2525	{
2053	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2526	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2054	}	2527	}
2055		2528
		2529	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
		2530	{
		2531	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2532	}
		2533
		2534	eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
		2535	{
		2536	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2537	}
		2538
		2539	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
		2540	{
		2541	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2542	}
		2543
2056	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2544	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2057	{	2545	{
2058	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2546	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2059	}	2547	}
2060		2548
…		…
2066	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)	2554	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2067	{	2555	{
2068	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2556	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2069	}	2557	}
2070		2558
2071	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)	2559	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2072	{	2560	{
2073	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;	2561	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2074	}
2075
2076	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2077	{
2078	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2079	}	2562	}
2080		2563
2081	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)	2564	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2082	{	2565	{
2083	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2566	REQ (EIO_CLOSE); req->int1 = fd; SEND;
…		…
2121	eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)	2604	eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
2122	{	2605	{
2123	REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;	2606	REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2124	}	2607	}
2125		2608
2126	eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data)	2609	eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2127	{	2610	{
2128	REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;	2611	REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2129	}	2612	}
2130		2613
2131	eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)	2614	eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
…		…
2151	eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)	2634	eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
2152	{	2635	{
2153	REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;	2636	REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2154	}	2637	}
2155		2638
2156	eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data)	2639	eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2157	{	2640	{
2158	REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;	2641	REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2159	}	2642	}
2160		2643
2161	eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)	2644	eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
…		…
2308	}	2791	}
2309		2792
2310	/*****************************************************************************/	2793	/*****************************************************************************/
2311	/* misc garbage */	2794	/* misc garbage */
2312		2795
2313	ssize_t	2796	eio_ssize_t
2314	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2797	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2315	{	2798	{
2316	etp_worker wrk;
2317	ssize_t ret;
2318
2319	wrk.dbuf = 0;
2320
2321	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2799	return eio__sendfile (ofd, ifd, offset, count);
2322
2323	if (wrk.dbuf)
2324	free (wrk.dbuf);
2325
2326	return ret;
2327	}	2800	}
2328		2801

Diff Legend

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