ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libeio/eio.c
(Generate patch)

Comparing libeio/eio.c (file contents):
Revision 1.94 by root, Mon Jul 18 02:59:58 2011 UTC vs.
Revision 1.143 by root, Sat Dec 3 16:33:46 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines