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.126 by root, Fri Dec 28 07:33:41 2012 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 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
		126	#define fchmod(fd,mode) EIO_ENOSYS ()
111	#define chown(path,uid,gid) EIO_ENOSYS ()	127	#define chown(path,uid,gid) EIO_ENOSYS ()
112	#define fchown(fd,uid,gid) EIO_ENOSYS ()	128	#define fchown(fd,uid,gid) EIO_ENOSYS ()
113	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */	129	#define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
114	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */	130	#define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
115	#define mknod(path,mode,dev) EIO_ENOSYS ()	131	#define mknod(path,mode,dev) EIO_ENOSYS ()
116	#define sync() 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	#define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
		138	#define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
		139
		140	#if __GNUC__
		141	typedef long long eio_off_t; /* signed for compatibility to msvc */
		142	#else
		143	typedef __int64 eio_off_t; /* unsigned not supported by msvc */
		144	#endif
		145
		146	static eio_ssize_t
		147	eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
		148	{
		149	OVERLAPPED o = { 0 };
		150	DWORD got;
		151
		152	o.Offset = offset;
		153	o.OffsetHigh = offset >> 32;
		154
		155	return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
		156	? got : -1;
		157	}
		158
		159	static eio_ssize_t
		160	eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
		161	{
		162	OVERLAPPED o = { 0 };
		163	DWORD got;
		164
		165	o.Offset = offset;
		166	o.OffsetHigh = offset >> 32;
		167
		168	return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
		169	? got : -1;
		170	}
		171
		172	/* rename() uses MoveFile, which fails to overwrite */
		173	#define rename(old,neu) eio__rename (old, neu)
		174
		175	static int
		176	eio__rename (const char *old, const char *neu)
		177	{
		178	if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
		179	return 0;
		180
		181	/* should steal _dosmaperr */
		182	switch (GetLastError ())
		183	{
		184	case ERROR_FILE_NOT_FOUND:
		185	case ERROR_PATH_NOT_FOUND:
		186	case ERROR_INVALID_DRIVE:
		187	case ERROR_NO_MORE_FILES:
		188	case ERROR_BAD_NETPATH:
		189	case ERROR_BAD_NET_NAME:
		190	case ERROR_BAD_PATHNAME:
		191	case ERROR_FILENAME_EXCED_RANGE:
		192	errno = ENOENT;
		193	break;
		194
		195	default:
		196	errno = EACCES;
		197	break;
		198	}
		199
		200	return -1;
		201	}
117		202
118	/* we could even stat and see if it exists */	203	/* we could even stat and see if it exists */
119	static int	204	static int
120	symlink (const char *old, const char *neu)	205	symlink (const char *old, const char *neu)
121	{	206	{
		207	#if WINVER >= 0x0600
122	if (CreateSymbolicLink (neu, old, 1))	208	if (CreateSymbolicLink (neu, old, 1))
123	return 0;	209	return 0;
124		210
125	if (CreateSymbolicLink (neu, old, 0))	211	if (CreateSymbolicLink (neu, old, 0))
126	return 0;	212	return 0;
		213	#endif
127		214
128	return EIO_ERRNO (ENOENT, -1);	215	return EIO_ERRNO (ENOENT, -1);
129	}	216	}
		217
		218	/* POSIX API only */
		219	#define CreateHardLink(neu,old,flags) 0
		220	#define CreateSymbolicLink(neu,old,flags) 0
		221
		222	struct statvfs
		223	{
		224	int dummy;
		225	};
		226
		227	#define DT_DIR EIO_DT_DIR
		228	#define DT_REG EIO_DT_REG
		229	#define D_NAME(entp) entp.cFileName
		230	#define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
130		231
131	#else	232	#else
132		233
133	#include <sys/time.h>	234	#include <sys/time.h>
134	#include <sys/select.h>	235	#include <sys/select.h>
135	#include <sys/statvfs.h>	236	#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>
140		240
141	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES	241	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
142	#include <sys/mman.h>	242	#include <sys/mman.h>
143	#endif	243	#endif
144		244
		245	#define D_NAME(entp) entp->d_name
		246
145	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */	247	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
146	#if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__	248	#if __FreeBSD__ || __NetBSD__ || __OpenBSD__
147	#define _DIRENT_HAVE_D_TYPE /* sigh */	249	#define _DIRENT_HAVE_D_TYPE /* sigh */
148	#define D_INO(de) (de)->d_fileno	250	#define D_INO(de) (de)->d_fileno
149	#define D_NAMLEN(de) (de)->d_namlen	251	#define D_NAMLEN(de) (de)->d_namlen
150	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600	252	#elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
151	#define D_INO(de) (de)->d_ino	253	#define D_INO(de) (de)->d_ino
…		…
162		264
163	#ifndef EIO_STRUCT_DIRENT	265	#ifndef EIO_STRUCT_DIRENT
164	#define EIO_STRUCT_DIRENT struct dirent	266	#define EIO_STRUCT_DIRENT struct dirent
165	#endif	267	#endif
166		268
		269	#endif
		270
		271	#if HAVE_UTIMES
		272	# include <utime.h>
		273	#endif
		274
		275	#if HAVE_SYS_SYSCALL_H
		276	# include <sys/syscall.h>
		277	#endif
		278
		279	#if HAVE_SYS_PRCTL_H
		280	# include <sys/prctl.h>
167	#endif	281	#endif
168		282
169	#if HAVE_SENDFILE	283	#if HAVE_SENDFILE
170	# if __linux	284	# if __linux
171	# include <sys/sendfile.h>	285	# include <sys/sendfile.h>
…		…
186	#endif	300	#endif
187	#ifndef D_INO	301	#ifndef D_INO
188	# define D_INO(de) 0	302	# define D_INO(de) 0
189	#endif	303	#endif
190	#ifndef D_NAMLEN	304	#ifndef D_NAMLEN
191	# define D_NAMLEN(de) strlen ((de)->d_name)	305	# define D_NAMLEN(entp) strlen (D_NAME (entp))
192	#endif	306	#endif
193		307
194	/* used for struct dirent, AIX doesn't provide it */	308	/* used for struct dirent, AIX doesn't provide it */
195	#ifndef NAME_MAX	309	#ifndef NAME_MAX
196	# define NAME_MAX 4096	310	# define NAME_MAX 4096
…		…
202	#endif	316	#endif
203		317
204	/* buffer size for various temporary buffers */	318	/* buffer size for various temporary buffers */
205	#define EIO_BUFSIZE 65536	319	#define EIO_BUFSIZE 65536
206		320
207	#define dBUF \	321	#define dBUF \
208	char *eio_buf; \
209	ETP_WORKER_LOCK (self); \
210	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	322	char *eio_buf = malloc (EIO_BUFSIZE); \
211	ETP_WORKER_UNLOCK (self); \
212	errno = ENOMEM; \	323	errno = ENOMEM; \
213	if (!eio_buf) \	324	if (!eio_buf) \
214	return -1;	325	return -1
		326
		327	#define FUBd \
		328	free (eio_buf)
215		329
216	#define EIO_TICKS ((1000000 + 1023) >> 10)	330	#define EIO_TICKS ((1000000 + 1023) >> 10)
		331
		332	/*****************************************************************************/
		333
		334	struct tmpbuf
		335	{
		336	void *ptr;
		337	int len;
		338	};
		339
		340	static void *
		341	tmpbuf_get (struct tmpbuf *buf, int len)
		342	{
		343	if (buf->len < len)
		344	{
		345	free (buf->ptr);
		346	buf->ptr = malloc (buf->len = len);
		347	}
		348
		349	return buf->ptr;
		350	}
		351
		352	struct tmpbuf;
		353
		354	#if _POSIX_VERSION >= 200809L
		355	#define HAVE_AT 1
		356	#define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
		357	#ifndef O_SEARCH
		358	#define O_SEARCH O_RDONLY
		359	#endif
		360	#else
		361	#define HAVE_AT 0
		362	static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
		363	#endif
		364
		365	struct eio_pwd
		366	{
		367	#if HAVE_AT
		368	int fd;
		369	#endif
		370	int len;
		371	char str[1]; /* actually, a 0-terminated canonical path */
		372	};
		373
		374	/*****************************************************************************/
217		375
218	#define ETP_PRI_MIN EIO_PRI_MIN	376	#define ETP_PRI_MIN EIO_PRI_MIN
219	#define ETP_PRI_MAX EIO_PRI_MAX	377	#define ETP_PRI_MAX EIO_PRI_MAX
220		378
221	struct etp_worker;	379	struct etp_worker;
…		…
225	static int eio_finish (eio_req *req);	383	static int eio_finish (eio_req *req);
226	#define ETP_FINISH(req) eio_finish (req)	384	#define ETP_FINISH(req) eio_finish (req)
227	static void eio_execute (struct etp_worker *self, eio_req *req);	385	static void eio_execute (struct etp_worker *self, eio_req *req);
228	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)	386	#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
229		387
230	#define ETP_WORKER_CLEAR(req) \
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	/*****************************************************************************/	388	/*****************************************************************************/
248		389
249	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	390	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250		391
251	/* calculate time difference in ~1/EIO_TICKS of a second */	392	/* calculate time difference in ~1/EIO_TICKS of a second */
…		…
262	static void (*done_poll_cb) (void);	403	static void (*done_poll_cb) (void);
263		404
264	static unsigned int max_poll_time; /* reslock */	405	static unsigned int max_poll_time; /* reslock */
265	static unsigned int max_poll_reqs; /* reslock */	406	static unsigned int max_poll_reqs; /* reslock */
266		407
267	static volatile unsigned int nreqs; /* reqlock */	408	static unsigned int nreqs; /* reqlock */
268	static volatile unsigned int nready; /* reqlock */	409	static unsigned int nready; /* reqlock */
269	static volatile unsigned int npending; /* reqlock */	410	static unsigned int npending; /* reqlock */
270	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */	411	static 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 */	412	static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
272		413
273	static xmutex_t wrklock;	414	static xmutex_t wrklock;
274	static xmutex_t reslock;	415	static xmutex_t reslock;
275	static xmutex_t reqlock;	416	static xmutex_t reqlock;
276	static xcond_t reqwait;	417	static xcond_t reqwait;
277		418
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	419	typedef struct etp_worker
288	{	420	{
		421	struct tmpbuf tmpbuf;
		422
289	/* locked by wrklock */	423	/* locked by wrklock */
290	struct etp_worker *prev, *next;	424	struct etp_worker *prev, *next;
291		425
292	xthread_t tid;	426	xthread_t tid;
293		427
294	/* locked by reslock, reqlock or wrklock */	428	#ifdef ETP_WORKER_COMMON
295	ETP_REQ *req; /* currently processed request */
296
297	ETP_WORKER_COMMON	429	ETP_WORKER_COMMON
		430	#endif
298	} etp_worker;	431	} etp_worker;
299		432
300	static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */	433	static etp_worker wrk_first; /* NOT etp */
301		434
302	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)	435	#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)	436	#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304		437
305	/* worker threads management */	438	/* worker threads management */
306		439
307	static void ecb_cold	440	static void
308	etp_worker_clear (etp_worker *wrk)	441	etp_worker_clear (etp_worker *wrk)
309	{	442	{
310	ETP_WORKER_CLEAR (wrk);
311	}	443	}
312		444
313	static void ecb_cold	445	static void ecb_cold
314	etp_worker_free (etp_worker *wrk)	446	etp_worker_free (etp_worker *wrk)
315	{	447	{
		448	free (wrk->tmpbuf.ptr);
		449
316	wrk->next->prev = wrk->prev;	450	wrk->next->prev = wrk->prev;
317	wrk->prev->next = wrk->next;	451	wrk->prev->next = wrk->next;
318		452
319	free (wrk);	453	free (wrk);
320	}	454	}
…		…
376	} etp_reqq;	510	} etp_reqq;
377		511
378	static etp_reqq req_queue;	512	static etp_reqq req_queue;
379	static etp_reqq res_queue;	513	static etp_reqq res_queue;
380		514
		515	static void ecb_noinline ecb_cold
		516	reqq_init (etp_reqq *q)
		517	{
		518	int pri;
		519
		520	for (pri = 0; pri < ETP_NUM_PRI; ++pri)
		521	q->qs[pri] = q->qe[pri] = 0;
		522
		523	q->size = 0;
		524	}
		525
381	static int ecb_noinline	526	static int ecb_noinline
382	reqq_push (etp_reqq *q, ETP_REQ *req)	527	reqq_push (etp_reqq *q, ETP_REQ *req)
383	{	528	{
384	int pri = req->pri;	529	int pri = req->pri;
385	req->next = 0;	530	req->next = 0;
…		…
419	}	564	}
420		565
421	abort ();	566	abort ();
422	}	567	}
423		568
424	static void ecb_cold	569	static int ecb_cold
425	etp_thread_init (void)	570	etp_init (void (*want_poll)(void), void (*done_poll)(void))
426	{	571	{
427	#if !HAVE_PREADWRITE
428	X_MUTEX_CREATE (preadwritelock);
429	#endif
430	X_MUTEX_CREATE (wrklock);	572	X_MUTEX_CREATE (wrklock);
431	X_MUTEX_CREATE (reslock);	573	X_MUTEX_CREATE (reslock);
432	X_MUTEX_CREATE (reqlock);	574	X_MUTEX_CREATE (reqlock);
433	X_COND_CREATE (reqwait);	575	X_COND_CREATE (reqwait);
434	}
435		576
436	static void ecb_cold	577	reqq_init (&req_queue);
437	etp_atfork_prepare (void)	578	reqq_init (&res_queue);
438	{
439	}
440		579
441	static void ecb_cold	580	wrk_first.next =
442	etp_atfork_parent (void)	581	wrk_first.prev = &wrk_first;
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		582
468	started = 0;	583	started = 0;
469	idle = 0;	584	idle = 0;
470	nreqs = 0;	585	nreqs = 0;
471	nready = 0;	586	nready = 0;
472	npending = 0;	587	npending = 0;
473		588
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;	589	want_poll_cb = want_poll;
492	done_poll_cb = done_poll;	590	done_poll_cb = done_poll;
493		591
494	return 0;	592	return 0;
495	}	593	}
…		…
504	/*TODO*/	602	/*TODO*/
505	assert (("unable to allocate worker thread data", wrk));	603	assert (("unable to allocate worker thread data", wrk));
506		604
507	X_LOCK (wrklock);	605	X_LOCK (wrklock);
508		606
509	if (thread_create (&wrk->tid, etp_proc, (void *)wrk))	607	if (xthread_create (&wrk->tid, etp_proc, (void *)wrk))
510	{	608	{
511	wrk->prev = &wrk_first;	609	wrk->prev = &wrk_first;
512	wrk->next = wrk_first.next;	610	wrk->next = wrk_first.next;
513	wrk_first.next->prev = wrk;	611	wrk_first.next->prev = wrk;
514	wrk_first.next = wrk;	612	wrk_first.next = wrk;
…		…
534	}	632	}
535		633
536	static void ecb_cold	634	static void ecb_cold
537	etp_end_thread (void)	635	etp_end_thread (void)
538	{	636	{
539	eio_req *req = calloc (1, sizeof (eio_req));	637	eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
540		638
541	req->type = -1;	639	req->type = -1;
542	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	640	req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
543		641
544	X_LOCK (reqlock);	642	X_LOCK (reqlock);
…		…
871	}	969	}
872		970
873	/*****************************************************************************/	971	/*****************************************************************************/
874	/* work around various missing functions */	972	/* work around various missing functions */
875		973
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
915	#ifndef HAVE_UTIMES	974	#ifndef HAVE_UTIMES
916		975
917	# undef utimes	976	# undef utimes
918	# define utimes(path,times) eio__utimes (path, times)	977	# define utimes(path,times) eio__utimes (path, times)
919		978
…		…
951		1010
952	#if !HAVE_FDATASYNC	1011	#if !HAVE_FDATASYNC
953	# undef fdatasync	1012	# undef fdatasync
954	# define fdatasync(fd) fsync (fd)	1013	# define fdatasync(fd) fsync (fd)
955	#endif	1014	#endif
		1015
		1016	static int
		1017	eio__syncfs (int fd)
		1018	{
		1019	int res;
		1020
		1021	#if HAVE_SYS_SYNCFS
		1022	res = (int)syscall (__NR_syncfs, (int)(fd));
		1023	#else
		1024	res = EIO_ENOSYS ();
		1025	#endif
		1026
		1027	if (res < 0 && errno == ENOSYS && fd >= 0)
		1028	sync ();
		1029
		1030	return res;
		1031	}
956		1032
957	/* sync_file_range always needs emulation */	1033	/* sync_file_range always needs emulation */
958	static int	1034	static int
959	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)	1035	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
960	{	1036	{
…		…
983	}	1059	}
984		1060
985	static int	1061	static int
986	eio__fallocate (int fd, int mode, off_t offset, size_t len)	1062	eio__fallocate (int fd, int mode, off_t offset, size_t len)
987	{	1063	{
988	#if HAVE_FALLOCATE	1064	#if HAVE_LINUX_FALLOCATE
989	return fallocate (fd, mode, offset, len);	1065	return fallocate (fd, mode, offset, len);
990	#else	1066	#else
991	errno = ENOSYS;	1067	return EIO_ENOSYS ();
992	return -1;
993	#endif	1068	#endif
994	}	1069	}
995		1070
996	#if !HAVE_READAHEAD	1071	#if !HAVE_READAHEAD
997	# undef readahead	1072	# undef readahead
…		…
1010	pread (fd, eio_buf, len, offset);	1085	pread (fd, eio_buf, len, offset);
1011	offset += len;	1086	offset += len;
1012	todo -= len;	1087	todo -= len;
1013	}	1088	}
1014		1089
1015	errno = 0;	1090	FUBd;
		1091
		1092	/* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
		1093	/* but not for e.g. EIO or eof, so we also never fail */
1016	return count;	1094	return 0;
1017	}	1095	}
1018		1096
1019	#endif	1097	#endif
1020		1098
1021	/* sendfile always needs emulation */	1099	/* sendfile always needs emulation */
1022	static eio_ssize_t	1100	static eio_ssize_t
1023	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	1101	eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024	{	1102	{
1025	eio_ssize_t written = 0;	1103	eio_ssize_t written = 0;
1026	eio_ssize_t res;	1104	eio_ssize_t res;
1027		1105
1028	if (!count)	1106	if (!count)
…		…
1056		1134
1057	/* according to source inspection, this is correct, and useful behaviour */	1135	/* according to source inspection, this is correct, and useful behaviour */
1058	if (sbytes)	1136	if (sbytes)
1059	res = sbytes;	1137	res = sbytes;
1060		1138
1061	# elif defined (__APPLE__)	1139	# elif defined __APPLE__
1062	off_t sbytes = count;	1140	off_t sbytes = count;
1063	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);	1141	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1064		1142
1065	/* according to the manpage, sbytes is always valid */	1143	/* according to the manpage, sbytes is always valid */
1066	if (sbytes)	1144	if (sbytes)
…		…
1093	HANDLE h = TO_SOCKET (ifd);	1171	HANDLE h = TO_SOCKET (ifd);
1094	SetFilePointer (h, offset, 0, FILE_BEGIN);	1172	SetFilePointer (h, offset, 0, FILE_BEGIN);
1095	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);	1173	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1096		1174
1097	#else	1175	#else
1098	res = -1;	1176	res = EIO_ENOSYS ();
1099	errno = ENOSYS;
1100	#endif	1177	#endif
1101		1178
1102	/* we assume sendfile can copy at least 128mb in one go */	1179	/* we assume sendfile can copy at least 128mb in one go */
1103	if (res <= 128 * 1024 * 1024)	1180	if (res <= 128 * 1024 * 1024)
1104	{	1181	{
…		…
1126	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK	1203	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1127	/* BSDs */	1204	/* BSDs */
1128	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */	1205	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129	|| errno == ENOTSUP	1206	|| errno == ENOTSUP
1130	#endif	1207	#endif
		1208	#ifdef EOPNOTSUPP /* windows */
1131	|| errno == EOPNOTSUPP /* BSDs */	1209	|| errno == EOPNOTSUPP /* BSDs */
		1210	#endif
1132	#if __solaris	1211	#if __solaris
1133	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE	1212	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE
1134	#endif	1213	#endif
1135	)	1214	)
1136	)	1215	)
…		…
1162		1241
1163	offset += cnt;	1242	offset += cnt;
1164	res += cnt;	1243	res += cnt;
1165	count -= cnt;	1244	count -= cnt;
1166	}	1245	}
		1246
		1247	FUBd;
1167	}	1248	}
1168		1249
1169	return res;	1250	return res;
1170	}	1251	}
1171		1252
…		…
1287		1368
1288	/*****************************************************************************/	1369	/*****************************************************************************/
1289	/* requests implemented outside eio_execute, because they are so large */	1370	/* requests implemented outside eio_execute, because they are so large */
1290		1371
1291	static void	1372	static void
1292	eio__realpath (eio_req *req, etp_worker *self)	1373	eio__lseek (eio_req *req)
1293	{	1374	{
1294	char *rel = req->ptr1;	1375	/* this usually gets optimised away completely, or your compiler sucks, */
		1376	/* or the whence constants really are not 0, 1, 2 */
		1377	int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
		1378	: req->int2 == EIO_SEEK_CUR ? SEEK_CUR
		1379	: req->int2 == EIO_SEEK_END ? SEEK_END
		1380	: req->int2;
		1381
		1382	req->offs = lseek (req->int1, req->offs, whence);
		1383	req->result = req->offs == (off_t)-1 ? -1 : 0;
		1384	}
		1385
		1386	/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
		1387	static int
		1388	eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		1389	{
		1390	const char *rel = path;
1295	char *res;	1391	char *res;
1296	char *tmp1, *tmp2;	1392	char *tmp1, *tmp2;
1297	#if SYMLOOP_MAX > 32	1393	#if SYMLOOP_MAX > 32
1298	int symlinks = SYMLOOP_MAX;	1394	int symlinks = SYMLOOP_MAX;
1299	#else	1395	#else
1300	int symlinks = 32;	1396	int symlinks = 32;
1301	#endif	1397	#endif
1302		1398
1303	req->result = -1;
1304
1305	errno = EINVAL;	1399	errno = EINVAL;
1306	if (!rel)	1400	if (!rel)
1307	return;	1401	return -1;
1308		1402
1309	errno = ENOENT;	1403	errno = ENOENT;
1310	if (!*rel)	1404	if (!*rel)
1311	return;	1405	return -1;
1312		1406
1313	if (!req->ptr2)	1407	res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1314	{
1315	X_LOCK (wrklock);
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;
1323	}
1324
1325	res = req->ptr2;
1326	tmp1 = res + PATH_MAX;	1408	tmp1 = res + PATH_MAX;
1327	tmp2 = tmp1 + PATH_MAX;	1409	tmp2 = tmp1 + PATH_MAX;
1328		1410
1329	#if 0 /* disabled, the musl way to do things is just too racy */	1411	#if 0 /* disabled, the musl way to do things is just too racy */
1330	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)	1412	#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
…		…
1334		1416
1335	if (fd >= 0)	1417	if (fd >= 0)
1336	{	1418	{
1337	sprintf (tmp1, "/proc/self/fd/%d", fd);	1419	sprintf (tmp1, "/proc/self/fd/%d", fd);
1338	req->result = readlink (tmp1, res, PATH_MAX);	1420	req->result = readlink (tmp1, res, PATH_MAX);
		1421	/* here we should probably stat the open file and the disk file, to make sure they still match */
1339	close (fd);	1422	close (fd);
1340
1341	/* here we should probably stat the open file and the disk file, to make sure they still match */
1342		1423
1343	if (req->result > 0)	1424	if (req->result > 0)
1344	goto done;	1425	goto done;
1345	}	1426	}
1346	else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)	1427	else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1347	return;	1428	return -1;
1348	}	1429	}
1349	#endif	1430	#endif
1350	#endif	1431	#endif
1351		1432
1352	if (*rel != '/')	1433	if (*rel != '/')
1353	{	1434	{
		1435	int len;
		1436
		1437	errno = ENOENT;
		1438	if (wd == EIO_INVALID_WD)
		1439	return -1;
		1440
		1441	if (wd == EIO_CWD)
		1442	{
1354	if (!getcwd (res, PATH_MAX))	1443	if (!getcwd (res, PATH_MAX))
1355	return;	1444	return -1;
		1445
		1446	len = strlen (res);
		1447	}
		1448	else
		1449	memcpy (res, wd->str, len = wd->len);
1356		1450
1357	if (res [1]) /* only use if not / */	1451	if (res [1]) /* only use if not / */
1358	res += strlen (res);	1452	res += len;
1359	}	1453	}
1360		1454
1361	while (*rel)	1455	while (*rel)
1362	{	1456	{
1363	eio_ssize_t len, linklen;	1457	eio_ssize_t len, linklen;
1364	char *beg = rel;	1458	const char *beg = rel;
1365		1459
1366	while (*rel && *rel != '/')	1460	while (*rel && *rel != '/')
1367	++rel;	1461	++rel;
1368		1462
1369	len = rel - beg;	1463	len = rel - beg;
…		…
1381		1475
1382	if (beg [1] == '.' && len == 2)	1476	if (beg [1] == '.' && len == 2)
1383	{	1477	{
1384	/* .. - back up one component, if possible */	1478	/* .. - back up one component, if possible */
1385		1479
1386	while (res != req->ptr2)	1480	while (res != tmpbuf->ptr)
1387	if (*--res == '/')	1481	if (*--res == '/')
1388	break;	1482	break;
1389		1483
1390	continue;	1484	continue;
1391	}	1485	}
1392	}	1486	}
1393		1487
1394	errno = ENAMETOOLONG;	1488	errno = ENAMETOOLONG;
1395	if (res + 1 + len + 1 >= tmp1)	1489	if (res + 1 + len + 1 >= tmp1)
1396	return;	1490	return -1;
1397		1491
1398	/* copy one component */	1492	/* copy one component */
1399	*res = '/';	1493	*res = '/';
1400	memcpy (res + 1, beg, len);	1494	memcpy (res + 1, beg, len);
1401		1495
1402	/* zero-terminate, for readlink */	1496	/* zero-terminate, for readlink */
1403	res [len + 1] = 0;	1497	res [len + 1] = 0;
1404		1498
1405	/* now check if it's a symlink */	1499	/* now check if it's a symlink */
1406	linklen = readlink (req->ptr2, tmp1, PATH_MAX);	1500	linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1407		1501
1408	if (linklen < 0)	1502	if (linklen < 0)
1409	{	1503	{
1410	if (errno != EINVAL)	1504	if (errno != EINVAL)
1411	return;	1505	return -1;
1412		1506
1413	/* it's a normal directory. hopefully */	1507	/* it's a normal directory. hopefully */
1414	res += len + 1;	1508	res += len + 1;
1415	}	1509	}
1416	else	1510	else
…		…
1418	/* yay, it was a symlink - build new path in tmp2 */	1512	/* yay, it was a symlink - build new path in tmp2 */
1419	int rellen = strlen (rel);	1513	int rellen = strlen (rel);
1420		1514
1421	errno = ENAMETOOLONG;	1515	errno = ENAMETOOLONG;
1422	if (linklen + 1 + rellen >= PATH_MAX)	1516	if (linklen + 1 + rellen >= PATH_MAX)
1423	return;	1517	return -1;
1424		1518
1425	errno = ELOOP;	1519	errno = ELOOP;
1426	if (!--symlinks)	1520	if (!--symlinks)
1427	return;	1521	return -1;
1428		1522
1429	if (*tmp1 == '/')	1523	if (*tmp1 == '/')
1430	res = req->ptr2; /* symlink resolves to an absolute path */	1524	res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1431		1525
1432	/* we need to be careful, as rel might point into tmp2 already */	1526	/* we need to be careful, as rel might point into tmp2 already */
1433	memmove (tmp2 + linklen + 1, rel, rellen + 1);	1527	memmove (tmp2 + linklen + 1, rel, rellen + 1);
1434	tmp2 [linklen] = '/';	1528	tmp2 [linklen] = '/';
1435	memcpy (tmp2, tmp1, linklen);	1529	memcpy (tmp2, tmp1, linklen);
…		…
1437	rel = tmp2;	1531	rel = tmp2;
1438	}	1532	}
1439	}	1533	}
1440		1534
1441	/* special case for the lone root path */	1535	/* special case for the lone root path */
1442	if (res == req->ptr2)	1536	if (res == tmpbuf->ptr)
1443	*res++ = '/';	1537	*res++ = '/';
1444		1538
1445	req->result = res - (char *)req->ptr2;	1539	return res - (char *)tmpbuf->ptr;
1446
1447	done:
1448	req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1449	}	1540	}
1450		1541
1451	static signed char	1542	static signed char
1452	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)	1543	eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1453	{	1544	{
…		…
1461		1552
1462	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */	1553	#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 */	1554	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464		1555
1465	static void	1556	static void
1466	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1557	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467	{	1558	{
1468	unsigned char bits [9 + sizeof (ino_t) * 8];	1559	unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469	unsigned char *bit = bits;	1560	unsigned char *bit = bits;
1470		1561
1471	assert (CHAR_BIT == 8);	1562	assert (CHAR_BIT == 8);
1472	assert (sizeof (eio_dirent) * 8 < 256);	1563	assert (sizeof (eio_dirent) * 8 < 256);
1473	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */	1564	assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
…		…
1475		1566
1476	if (size <= EIO_SORT_FAST)	1567	if (size <= EIO_SORT_FAST)
1477	return;	1568	return;
1478		1569
1479	/* first prepare an array of bits to test in our radix sort */	1570	/* 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 */	1571	/* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481	/* inode_bits must contain all inodes ORed together */	1572	/* inode_bits must contain all inodes ORed together */
1482	/* which is used to skip bits that are 0 everywhere, which is very common */	1573	/* which is used to skip bits that are 0 everywhere, which is very common */
1483	{	1574	{
1484	ino_t endianness;	1575	eio_ino_t endianness;
1485	int i, j;	1576	int i, j;
1486		1577
1487	/* we store the byte offset of byte n into byte n of "endianness" */	1578	/* we store the byte offset of byte n into byte n of "endianness" */
1488	for (i = 0; i < sizeof (ino_t); ++i)	1579	for (i = 0; i < sizeof (eio_ino_t); ++i)
1489	((unsigned char *)&endianness)[i] = i;	1580	((unsigned char *)&endianness)[i] = i;
1490		1581
1491	*bit++ = 0;	1582	*bit++ = 0;
1492		1583
1493	for (i = 0; i < sizeof (ino_t); ++i)	1584	for (i = 0; i < sizeof (eio_ino_t); ++i)
1494	{	1585	{
1495	/* shifting off the byte offsets out of "endianness" */	1586	/* shifting off the byte offsets out of "endianness" */
1496	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;	1587	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497	endianness >>= 8;	1588	endianness >>= 8;
1498		1589
1499	for (j = 0; j < 8; ++j)	1590	for (j = 0; j < 8; ++j)
1500	if (inode_bits & (((ino_t)1) << (i * 8 + j)))	1591	if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501	*bit++ = offs + j;	1592	*bit++ = offs + j;
1502	}	1593	}
1503		1594
1504	for (j = 0; j < 8; ++j)	1595	for (j = 0; j < 8; ++j)
1505	if (score_bits & (1 << j))	1596	if (score_bits & (1 << j))
1506	*bit++ = offsetof (eio_dirent, score) * 8 + j;	1597	*bit++ = offsetof (eio_dirent, score) * 8 + j;
1507	}	1598	}
1508		1599
1509	/* now actually do the sorting (a variant of MSD radix sort) */	1600	/* now actually do the sorting (a variant of MSD radix sort) */
1510	{	1601	{
1511	eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;	1602	eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512	eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;	1603	eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513	unsigned char *bit_stk [9 + sizeof (ino_t) * 8];	1604	unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514	int stk_idx = 0;	1605	int stk_idx = 0;
1515		1606
1516	base_stk [stk_idx] = dents;	1607	base_stk [stk_idx] = dents;
1517	end_stk [stk_idx] = dents + size;	1608	end_stk [stk_idx] = dents + size;
1518	bit_stk [stk_idx] = bit - 1;	1609	bit_stk [stk_idx] = bit - 1;
…		…
1597	}	1688	}
1598	}	1689	}
1599	}	1690	}
1600		1691
1601	static void	1692	static void
1602	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)	1693	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603	{	1694	{
1604	if (size <= 1)	1695	if (size <= 1)
1605	return; /* our insertion sort relies on size > 0 */	1696	return; /* our insertion sort relies on size > 0 */
1606		1697
1607	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */	1698	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
…		…
1615		1706
1616	/* read a full directory */	1707	/* read a full directory */
1617	static void	1708	static void
1618	eio__scandir (eio_req *req, etp_worker *self)	1709	eio__scandir (eio_req *req, etp_worker *self)
1619	{	1710	{
1620	DIR *dirp;
1621	EIO_STRUCT_DIRENT *entp;
1622	char *name, *names;	1711	char *name, *names;
1623	int namesalloc = 4096;	1712	int namesalloc = 4096 - sizeof (void *) * 4;
1624	int namesoffs = 0;	1713	int namesoffs = 0;
1625	int flags = req->int1;	1714	int flags = req->int1;
1626	eio_dirent *dents = 0;	1715	eio_dirent *dents = 0;
1627	int dentalloc = 128;	1716	int dentalloc = 128;
1628	int dentoffs = 0;	1717	int dentoffs = 0;
1629	ino_t inode_bits = 0;	1718	eio_ino_t inode_bits = 0;
		1719	#ifdef _WIN32
		1720	HANDLE dirp;
		1721	WIN32_FIND_DATA entp;
		1722	#else
		1723	DIR *dirp;
		1724	EIO_STRUCT_DIRENT *entp;
		1725	#endif
1630		1726
1631	req->result = -1;	1727	req->result = -1;
1632		1728
1633	if (!(flags & EIO_READDIR_DENTS))	1729	if (!(flags & EIO_READDIR_DENTS))
1634	flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);	1730	flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635		1731
1636	X_LOCK (wrklock);	1732	#ifdef _WIN32
1637	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1733	{
		1734	int len = strlen ((const char *)req->ptr1);
		1735	char *path = malloc (MAX_PATH);
		1736	const char *fmt;
		1737	const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		1738
		1739	if (!len)
		1740	fmt = "./*";
		1741	else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
		1742	fmt = "%s*";
		1743	else
		1744	fmt = "%s/*";
		1745
		1746	_snprintf (path, MAX_PATH, fmt, reqpath);
		1747	dirp = FindFirstFile (path, &entp);
		1748	free (path);
		1749
		1750	if (dirp == INVALID_HANDLE_VALUE)
		1751	{
		1752	/* should steal _dosmaperr */
		1753	switch (GetLastError ())
		1754	{
		1755	case ERROR_FILE_NOT_FOUND:
		1756	req->result = 0;
		1757	break;
		1758
		1759	case ERROR_INVALID_NAME:
		1760	case ERROR_PATH_NOT_FOUND:
		1761	case ERROR_NO_MORE_FILES:
		1762	errno = ENOENT;
		1763	break;
		1764
		1765	case ERROR_NOT_ENOUGH_MEMORY:
		1766	errno = ENOMEM;
		1767	break;
		1768
		1769	default:
		1770	errno = EINVAL;
		1771	break;
		1772	}
		1773
		1774	return;
		1775	}
		1776	}
		1777	#else
		1778	#if HAVE_AT
		1779	if (req->wd)
		1780	{
		1781	int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		1782
		1783	if (fd < 0)
		1784	return;
		1785
		1786	dirp = fdopendir (fd);
		1787
		1788	if (!dirp)
		1789	close (fd);
		1790	}
		1791	else
1638	self->dirp = dirp = opendir (req->ptr1);	1792	dirp = opendir (req->ptr1);
		1793	#else
		1794	dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
		1795	#endif
		1796
		1797	if (!dirp)
		1798	return;
		1799	#endif
1639		1800
1640	if (req->flags & EIO_FLAG_PTR1_FREE)	1801	if (req->flags & EIO_FLAG_PTR1_FREE)
1641	free (req->ptr1);	1802	free (req->ptr1);
1642		1803
1643	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;	1804	req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;	1805	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645	req->ptr2 = names = malloc (namesalloc);	1806	req->ptr2 = names = malloc (namesalloc);
1646	X_UNLOCK (wrklock);
1647		1807
1648	if (dirp && names && (!flags || dents))	1808	if (!names || (flags && !dents))
		1809	return;
		1810
1649	for (;;)	1811	for (;;)
1650	{	1812	{
		1813	int done;
		1814
		1815	#ifdef _WIN32
		1816	done = !dirp;
		1817	#else
1651	errno = 0;	1818	errno = 0;
1652	entp = readdir (dirp);	1819	entp = readdir (dirp);
		1820	done = !entp;
		1821	#endif
1653		1822
1654	if (!entp)	1823	if (done)
1655	{	1824	{
		1825	#ifndef _WIN32
		1826	int old_errno = errno;
		1827	closedir (dirp);
		1828	errno = old_errno;
		1829
1656	if (errno)	1830	if (errno)
1657	break;	1831	break;
		1832	#endif
1658		1833
1659	/* sort etc. */	1834	/* sort etc. */
1660	req->int1 = flags;	1835	req->int1 = flags;
1661	req->result = dentoffs;	1836	req->result = dentoffs;
1662		1837
1663	if (flags & EIO_READDIR_STAT_ORDER)	1838	if (flags & EIO_READDIR_STAT_ORDER)
1664	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);	1839	eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1665	else if (flags & EIO_READDIR_DIRS_FIRST)	1840	else if (flags & EIO_READDIR_DIRS_FIRST)
1666	if (flags & EIO_READDIR_FOUND_UNKNOWN)	1841	if (flags & EIO_READDIR_FOUND_UNKNOWN)
1667	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */	1842	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1668	else	1843	else
		1844	{
		1845	/* in this case, all is known, and we just put dirs first and sort them */
		1846	eio_dirent *oth = dents + dentoffs;
		1847	eio_dirent *dir = dents;
		1848
		1849	/* now partition dirs to the front, and non-dirs to the back */
		1850	/* by walking from both sides and swapping if necessary */
		1851	while (oth > dir)
		1852	{
		1853	if (dir->type == EIO_DT_DIR)
		1854	++dir;
		1855	else if ((--oth)->type == EIO_DT_DIR)
		1856	{
		1857	eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
		1858
		1859	++dir;
		1860	}
		1861	}
		1862
		1863	/* now sort the dirs only (dirs all have the same score) */
		1864	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1865	}
		1866
		1867	break;
		1868	}
		1869
		1870	/* now add the entry to our list(s) */
		1871	name = D_NAME (entp);
		1872
		1873	/* skip . and .. entries */
		1874	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		1875	{
		1876	int len = D_NAMLEN (entp) + 1;
		1877
		1878	while (ecb_expect_false (namesoffs + len > namesalloc))
		1879	{
		1880	namesalloc *= 2;
		1881	req->ptr2 = names = realloc (names, namesalloc);
		1882
		1883	if (!names)
		1884	break;
		1885	}
		1886
		1887	memcpy (names + namesoffs, name, len);
		1888
		1889	if (dents)
		1890	{
		1891	struct eio_dirent *ent;
		1892
		1893	if (ecb_expect_false (dentoffs == dentalloc))
1669	{	1894	{
1670	/* in this case, all is known, and we just put dirs first and sort them */	1895	dentalloc *= 2;
		1896	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1897
		1898	if (!dents)
		1899	break;
		1900	}
		1901
1671	eio_dirent *oth = dents + dentoffs;	1902	ent = dents + dentoffs;
1672	eio_dirent *dir = dents;
1673		1903
1674	/* now partition dirs to the front, and non-dirs to the back */	1904	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1675	/* by walking from both sides and swapping if necessary */	1905	ent->namelen = len - 1;
1676	while (oth > dir)	1906	ent->inode = D_INO (entp);
		1907
		1908	inode_bits |= ent->inode;
		1909
		1910	switch (D_TYPE (entp))
		1911	{
		1912	default:
		1913	ent->type = EIO_DT_UNKNOWN;
		1914	flags |= EIO_READDIR_FOUND_UNKNOWN;
		1915	break;
		1916
		1917	#ifdef DT_FIFO
		1918	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1919	#endif
		1920	#ifdef DT_CHR
		1921	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1922	#endif
		1923	#ifdef DT_MPC
		1924	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1925	#endif
		1926	#ifdef DT_DIR
		1927	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1928	#endif
		1929	#ifdef DT_NAM
		1930	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1931	#endif
		1932	#ifdef DT_BLK
		1933	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1934	#endif
		1935	#ifdef DT_MPB
		1936	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1937	#endif
		1938	#ifdef DT_REG
		1939	case DT_REG: ent->type = EIO_DT_REG; break;
		1940	#endif
		1941	#ifdef DT_NWK
		1942	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1943	#endif
		1944	#ifdef DT_CMP
		1945	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1946	#endif
		1947	#ifdef DT_LNK
		1948	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1949	#endif
		1950	#ifdef DT_SOCK
		1951	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1952	#endif
		1953	#ifdef DT_DOOR
		1954	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1955	#endif
		1956	#ifdef DT_WHT
		1957	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1958	#endif
		1959	}
		1960
		1961	ent->score = 7;
		1962
		1963	if (flags & EIO_READDIR_DIRS_FIRST)
		1964	{
		1965	if (ent->type == EIO_DT_UNKNOWN)
1677	{	1966	{
1678	if (dir->type == EIO_DT_DIR)	1967	if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1679	++dir;	1968	ent->score = 1;
1680	else if ((--oth)->type == EIO_DT_DIR)	1969	else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1681	{	1970	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	}	1971	}
1687		1972	else if (ent->type == EIO_DT_DIR)
1688	/* now sort the dirs only (dirs all have the same score) */	1973	ent->score = 0;
1689	eio_dent_sort (dents, dir - dents, 0, inode_bits);
1690	}	1974	}
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	}	1975	}
1713		1976
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;	1977	namesoffs += len;
1807	++dentoffs;	1978	++dentoffs;
1808	}	1979	}
1809		1980
1810	if (EIO_CANCELLED (req))	1981	if (EIO_CANCELLED (req))
1811	{	1982	{
1812	errno = ECANCELED;	1983	errno = ECANCELED;
1813	break;	1984	break;
1814	}	1985	}
		1986
		1987	#ifdef _WIN32
		1988	if (!FindNextFile (dirp, &entp))
		1989	{
		1990	FindClose (dirp);
		1991	dirp = 0;
1815	}	1992	}
		1993	#endif
		1994	}
1816	}	1995	}
		1996
		1997	/*****************************************************************************/
		1998	/* working directory stuff */
		1999	/* various deficiencies in the posix 2008 api force us to */
		2000	/* keep the absolute path in string form at all times */
		2001	/* fuck yeah. */
		2002
		2003	#if !HAVE_AT
		2004
		2005	/* a bit like realpath, but usually faster because it doesn'T have to return */
		2006	/* an absolute or canonical path */
		2007	static const char *
		2008	wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2009	{
		2010	if (!wd || *path == '/')
		2011	return path;
		2012
		2013	if (path [0] == '.' && !path [1])
		2014	return wd->str;
		2015
		2016	{
		2017	int l1 = wd->len;
		2018	int l2 = strlen (path);
		2019
		2020	char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
		2021
		2022	memcpy (res, wd->str, l1);
		2023	res [l1] = '/';
		2024	memcpy (res + l1 + 1, path, l2 + 1);
		2025
		2026	return res;
		2027	}
		2028	}
		2029
		2030	#endif
		2031
		2032	static eio_wd
		2033	eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
		2034	{
		2035	int fd;
		2036	eio_wd res;
		2037	int len = eio__realpath (tmpbuf, wd, path);
		2038
		2039	if (len < 0)
		2040	return EIO_INVALID_WD;
		2041
		2042	#if HAVE_AT
		2043	fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
		2044
		2045	if (fd < 0)
		2046	return EIO_INVALID_WD;
		2047	#endif
		2048
		2049	res = malloc (sizeof (*res) + len); /* one extra 0-byte */
		2050
		2051	#if HAVE_AT
		2052	res->fd = fd;
		2053	#endif
		2054
		2055	res->len = len;
		2056	memcpy (res->str, tmpbuf->ptr, len);
		2057	res->str [len] = 0;
		2058
		2059	return res;
		2060	}
		2061
		2062	eio_wd
		2063	eio_wd_open_sync (eio_wd wd, const char *path)
		2064	{
		2065	struct tmpbuf tmpbuf = { 0 };
		2066	wd = eio__wd_open_sync (&tmpbuf, wd, path);
		2067	free (tmpbuf.ptr);
		2068
		2069	return wd;
		2070	}
		2071
		2072	void
		2073	eio_wd_close_sync (eio_wd wd)
		2074	{
		2075	if (wd != EIO_INVALID_WD && wd != EIO_CWD)
		2076	{
		2077	#if HAVE_AT
		2078	close (wd->fd);
		2079	#endif
		2080	free (wd);
		2081	}
		2082	}
		2083
		2084	#if HAVE_AT
		2085
		2086	/* they forgot these */
		2087
		2088	static int
		2089	eio__truncateat (int dirfd, const char *path, off_t length)
		2090	{
		2091	int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
		2092	int res;
		2093
		2094	if (fd < 0)
		2095	return fd;
		2096
		2097	res = ftruncate (fd, length);
		2098	close (fd);
		2099	return res;
		2100	}
		2101
		2102	static int
		2103	eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
		2104	{
		2105	int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
		2106	int res;
		2107
		2108	if (fd < 0)
		2109	return fd;
		2110
		2111	res = fstatvfs (fd, buf);
		2112	close (fd);
		2113	return res;
		2114
		2115	}
		2116
		2117	#endif
1817		2118
1818	/*****************************************************************************/	2119	/*****************************************************************************/
1819		2120
1820	#define ALLOC(len) \	2121	#define ALLOC(len) \
1821	if (!req->ptr2) \	2122	if (!req->ptr2) \
…		…
1830	req->result = -1; \	2131	req->result = -1; \
1831	break; \	2132	break; \
1832	} \	2133	} \
1833	}	2134	}
1834		2135
		2136	static void ecb_noinline ecb_cold
		2137	etp_proc_init (void)
		2138	{
		2139	#if HAVE_PRCTL_SET_NAME
		2140	/* provide a more sensible "thread name" */
		2141	char name[16 + 1];
		2142	const int namelen = sizeof (name) - 1;
		2143	int len;
		2144
		2145	prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
		2146	name [namelen] = 0;
		2147	len = strlen (name);
		2148	strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
		2149	prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
		2150	#endif
		2151	}
		2152
1835	X_THREAD_PROC (etp_proc)	2153	X_THREAD_PROC (etp_proc)
1836	{	2154	{
1837	ETP_REQ *req;	2155	ETP_REQ *req;
1838	struct timespec ts;	2156	struct timespec ts;
1839	etp_worker *self = (etp_worker *)thr_arg;	2157	etp_worker *self = (etp_worker *)thr_arg;
1840	int timeout;	2158
		2159	etp_proc_init ();
1841		2160
1842	/* try to distribute timeouts somewhat evenly */	2161	/* try to distribute timeouts somewhat evenly */
1843	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);	2162	ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844		2163
1845	for (;;)	2164	for (;;)
…		…
1848		2167
1849	X_LOCK (reqlock);	2168	X_LOCK (reqlock);
1850		2169
1851	for (;;)	2170	for (;;)
1852	{	2171	{
1853	self->req = req = reqq_shift (&req_queue);	2172	req = reqq_shift (&req_queue);
1854		2173
1855	if (req)	2174	if (req)
1856	break;	2175	break;
1857		2176
1858	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */	2177	if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
…		…
1896	++npending;	2215	++npending;
1897		2216
1898	if (!reqq_push (&res_queue, req) && want_poll_cb)	2217	if (!reqq_push (&res_queue, req) && want_poll_cb)
1899	want_poll_cb ();	2218	want_poll_cb ();
1900		2219
1901	self->req = 0;
1902	etp_worker_clear (self);	2220	etp_worker_clear (self);
1903		2221
1904	X_UNLOCK (reslock);	2222	X_UNLOCK (reslock);
1905	}	2223	}
1906		2224
1907	quit:	2225	quit:
		2226	free (req);
		2227
1908	X_LOCK (wrklock);	2228	X_LOCK (wrklock);
1909	etp_worker_free (self);	2229	etp_worker_free (self);
1910	X_UNLOCK (wrklock);	2230	X_UNLOCK (wrklock);
1911		2231
1912	return 0;	2232	return 0;
…		…
1924	eio_api_destroy (eio_req *req)	2244	eio_api_destroy (eio_req *req)
1925	{	2245	{
1926	free (req);	2246	free (req);
1927	}	2247	}
1928		2248
1929	#define REQ(rtype) \	2249	#define REQ(rtype) \
1930	eio_req *req; \	2250	eio_req *req; \
1931	\	2251	\
1932	req = (eio_req *)calloc (1, sizeof *req); \	2252	req = (eio_req *)calloc (1, sizeof *req); \
1933	if (!req) \	2253	if (!req) \
1934	return 0; \	2254	return 0; \
…		…
1948	{ \	2268	{ \
1949	eio_api_destroy (req); \	2269	eio_api_destroy (req); \
1950	return 0; \	2270	return 0; \
1951	}	2271	}
1952		2272
		2273	#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
		2274
1953	static void	2275	static void
1954	eio_execute (etp_worker *self, eio_req *req)	2276	eio_execute (etp_worker *self, eio_req *req)
1955	{	2277	{
		2278	#if HAVE_AT
		2279	int dirfd;
		2280	#else
		2281	const char *path;
		2282	#endif
		2283
1956	if (ecb_expect_false (EIO_CANCELLED (req)))	2284	if (ecb_expect_false (EIO_CANCELLED (req)))
1957	{	2285	{
1958	req->result = -1;	2286	req->result = -1;
1959	req->errorno = ECANCELED;	2287	req->errorno = ECANCELED;
1960	return;	2288	return;
1961	}	2289	}
1962		2290
		2291	if (ecb_expect_false (req->wd == EIO_INVALID_WD))
		2292	{
		2293	req->result = -1;
		2294	req->errorno = ENOENT;
		2295	return;
		2296	}
		2297
		2298	if (req->type >= EIO_OPEN)
		2299	{
		2300	#if HAVE_AT
		2301	dirfd = WD2FD (req->wd);
		2302	#else
		2303	path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
		2304	#endif
		2305	}
		2306
1963	switch (req->type)	2307	switch (req->type)
1964	{	2308	{
		2309	case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
		2310	req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
		2311	break;
		2312	case EIO_WD_CLOSE: req->result = 0;
		2313	eio_wd_close_sync (req->wd); break;
		2314
		2315	case EIO_SEEK: eio__lseek (req); break;
1965	case EIO_READ: ALLOC (req->size);	2316	case EIO_READ: ALLOC (req->size);
1966	req->result = req->offs >= 0	2317	req->result = req->offs >= 0
1967	? pread (req->int1, req->ptr2, req->size, req->offs)	2318	? pread (req->int1, req->ptr2, req->size, req->offs)
1968	: read (req->int1, req->ptr2, req->size); break;	2319	: read (req->int1, req->ptr2, req->size); break;
1969	case EIO_WRITE: req->result = req->offs >= 0	2320	case EIO_WRITE: req->result = req->offs >= 0
1970	? pwrite (req->int1, req->ptr2, req->size, req->offs)	2321	? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971	: write (req->int1, req->ptr2, req->size); break;	2322	: write (req->int1, req->ptr2, req->size); break;
1972		2323
1973	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	2324	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;	2325	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
		2326
		2327	#if HAVE_AT
1975		2328
1976	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2329	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2330	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1978	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2331	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2332	req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
		2333	case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
		2334	case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
		2335	case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
		2336	case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
		2337
		2338	case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
		2339	case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
		2340	req->result = req->wd && SINGLEDOT (req->ptr1)
		2341	? rmdir (req->wd->str)
		2342	: 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: /* complications arise because "." cannot be renamed, so we might have to expand */
		2345	req->result = req->wd && SINGLEDOT (req->ptr1)
		2346	? rename (req->wd->str, req->ptr2)
		2347	: renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
		2348	case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
		2349	case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
		2350	case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
		2351	case EIO_READLINK: ALLOC (PATH_MAX);
		2352	req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
		2353	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2354	req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2355	case EIO_UTIME:
		2356	case EIO_FUTIME:
		2357	{
		2358	struct timespec ts[2];
		2359	struct timespec *times;
		2360
		2361	if (req->nv1 != -1. || req->nv2 != -1.)
		2362	{
		2363	ts[0].tv_sec = req->nv1;
		2364	ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
		2365	ts[1].tv_sec = req->nv2;
		2366	ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
		2367
		2368	times = ts;
		2369	}
		2370	else
		2371	times = 0;
		2372
		2373	req->result = req->type == EIO_FUTIME
		2374	? futimens (req->int1, times)
		2375	: utimensat (dirfd, req->ptr1, times, 0);
		2376	}
		2377	break;
		2378
		2379	#else
		2380
		2381	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
		2382	req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2383	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	2384	req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
		2385	case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
		2386	case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
		2387	case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
		2388	case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
		2389
		2390	case EIO_UNLINK: req->result = unlink (path ); break;
		2391	case EIO_RMDIR: req->result = rmdir (path ); break;
		2392	case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
		2393	case EIO_RENAME: req->result = rename (path , req->ptr2); break;
		2394	case EIO_LINK: req->result = link (path , req->ptr2); break;
		2395	case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
		2396	case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
		2397	case EIO_READLINK: ALLOC (PATH_MAX);
		2398	req->result = readlink (path, req->ptr2, PATH_MAX); break;
		2399	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		2400	req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
		2401
		2402	case EIO_UTIME:
		2403	case EIO_FUTIME:
		2404	{
		2405	struct timeval tv[2];
		2406	struct timeval *times;
		2407
		2408	if (req->nv1 != -1. || req->nv2 != -1.)
		2409	{
		2410	tv[0].tv_sec = req->nv1;
		2411	tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
		2412	tv[1].tv_sec = req->nv2;
		2413	tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
		2414
		2415	times = tv;
		2416	}
		2417	else
		2418	times = 0;
		2419
		2420	req->result = req->type == EIO_FUTIME
		2421	? futimes (req->int1, times)
		2422	: utimes (req->ptr1, times);
		2423	}
		2424	break;
		2425
		2426	#endif
		2427
		2428	case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
		2429	{
		2430	ALLOC (req->result);
		2431	memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
		2432	}
		2433	break;
		2434
1980	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	2435	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1981	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	2436	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1982		2437
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));	2438	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1986	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;	2439	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1987		2440
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;	2441	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;	2442	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;	2443	case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1994		2444
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;	2445	case EIO_CLOSE: req->result = close (req->int1); break;
1997	case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;	2446	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;	2447	case EIO_SYNC: req->result = 0; sync (); break;
2012	case EIO_FSYNC: req->result = fsync (req->int1); break;	2448	case EIO_FSYNC: req->result = fsync (req->int1); break;
2013	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	2449	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		2450	case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
		2451	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;	2452	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2015	case EIO_MTOUCH: req->result = eio__mtouch (req); break;	2453	case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2016	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;	2454	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2017	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;	2455	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;	2456	case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2020		2457
2021	case EIO_READDIR: eio__scandir (req, self); break;	2458	case EIO_READDIR: eio__scandir (req, self); break;
2022		2459
2023	case EIO_BUSY:	2460	case EIO_BUSY:
…		…
2033	req->result = select (0, 0, 0, 0, &tv);	2470	req->result = select (0, 0, 0, 0, &tv);
2034	}	2471	}
2035	#endif	2472	#endif
2036	break;	2473	break;
2037		2474
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:	2475	case EIO_GROUP:
2063	abort (); /* handled in eio_request */	2476	abort (); /* handled in eio_request */
2064		2477
2065	case EIO_NOP:	2478	case EIO_NOP:
2066	req->result = 0;	2479	req->result = 0;
…		…
2069	case EIO_CUSTOM:	2482	case EIO_CUSTOM:
2070	req->feed (req);	2483	req->feed (req);
2071	break;	2484	break;
2072		2485
2073	default:	2486	default:
2074	errno = ENOSYS;
2075	req->result = -1;	2487	req->result = EIO_ENOSYS ();
2076	break;	2488	break;
2077	}	2489	}
2078		2490
2079	req->errorno = errno;	2491	req->errorno = errno;
2080	}	2492	}
2081		2493
2082	#ifndef EIO_NO_WRAPPERS	2494	#ifndef EIO_NO_WRAPPERS
2083		2495
		2496	eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
		2497	{
		2498	REQ (EIO_WD_OPEN); PATH; SEND;
		2499	}
		2500
		2501	eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
		2502	{
		2503	REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
		2504	}
		2505
2084	eio_req *eio_nop (int pri, eio_cb cb, void *data)	2506	eio_req *eio_nop (int pri, eio_cb cb, void *data)
2085	{	2507	{
2086	REQ (EIO_NOP); SEND;	2508	REQ (EIO_NOP); SEND;
2087	}	2509	}
2088		2510
…		…
2104	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2526	eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2105	{	2527	{
2106	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2528	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2107	}	2529	}
2108		2530
		2531	eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
		2532	{
		2533	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
		2534	}
		2535
		2536	eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
		2537	{
		2538	REQ (EIO_SYNCFS); req->int1 = fd; SEND;
		2539	}
		2540
		2541	eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
		2542	{
		2543	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		2544	}
		2545
2109	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)	2546	eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2110	{	2547	{
2111	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	2548	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2112	}	2549	}
2113		2550
…		…
2119	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)	2556	eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2120	{	2557	{
2121	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;	2558	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2122	}	2559	}
2123		2560
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)	2561	eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2130	{	2562	{
2131	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;	2563	REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2132	}	2564	}
2133		2565
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)	2566	eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2140	{	2567	{
2141	REQ (EIO_CLOSE); req->int1 = fd; SEND;	2568	REQ (EIO_CLOSE); req->int1 = fd; SEND;
2142	}	2569	}
2143		2570
2144	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)	2571	eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2145	{	2572	{
2146	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;	2573	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
		2574	}
		2575
		2576	eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
		2577	{
		2578	REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2147	}	2579	}
2148		2580
2149	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)	2581	eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2150	{	2582	{
2151	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;	2583	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
…		…
2369	/* misc garbage */	2801	/* misc garbage */
2370		2802
2371	eio_ssize_t	2803	eio_ssize_t
2372	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2804	eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373	{	2805	{
2374	etp_worker wrk;
2375	eio_ssize_t ret;
2376
2377	wrk.dbuf = 0;
2378
2379	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);	2806	return eio__sendfile (ofd, ifd, offset, count);
2380
2381	if (wrk.dbuf)
2382	free (wrk.dbuf);
2383
2384	return ret;
2385	}	2807	}
2386		2808

Diff Legend

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