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

Comparing libeio/eio.c (file contents):
Revision 1.86 by root, Thu Jul 14 18:30:10 2011 UTC vs.
Revision 1.107 by root, Tue Sep 27 00:41:52 2011 UTC

43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
48# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
49#endif 49#endif
50#include "xthread.h" 50#include "xthread.h"
51 51
52#include <errno.h> 52#include <errno.h>
53#include <stddef.h> 53#include <stddef.h>
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63#include <sys/statvfs.h>
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes from stdint.h, says idiot openbsd coder */ 64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H 65#if HAVE_STDINT_H
67# include <stdint.h> 66# include <stdint.h>
68#endif 67#endif
69 68
70#ifndef ECANCELED 69#ifndef ECANCELED
71# define ECANCELED EDOM 70# define ECANCELED EDOM
72#endif 71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
73 79
74static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
75 81
76#ifndef EIO_FINISH 82#ifndef EIO_FINISH
77# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
96 102
97#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
98 104
99#ifdef _WIN32 105#ifdef _WIN32
100 106
107 #undef PAGESIZE
101 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
102 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
103 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
104 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
105 #define fstat(fd,buf) _fstati64 (path,buf)
106 #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))
107 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
108 #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))
109 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 ()
110 #define chown(path,uid,gid) EIO_ENOSYS () 127 #define chown(path,uid,gid) EIO_ENOSYS ()
111 #define fchown(fd,uid,gid) EIO_ENOSYS () 128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
112 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
113 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
114 #define mknod(path,mode,dev) EIO_ENOSYS () 131 #define mknod(path,mode,dev) EIO_ENOSYS ()
115 #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 /* rename() uses MoveFile, which fails to overwrite */
138 #define rename(old,neu) eio__rename (old, neu)
139
140 static int
141 eio__rename (const char *old, const char *neu)
142 {
143 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
144 return 0;
145
146 /* should steal _dosmaperr */
147 switch (GetLastError ())
148 {
149 case ERROR_FILE_NOT_FOUND:
150 case ERROR_PATH_NOT_FOUND:
151 case ERROR_INVALID_DRIVE:
152 case ERROR_NO_MORE_FILES:
153 case ERROR_BAD_NETPATH:
154 case ERROR_BAD_NET_NAME:
155 case ERROR_BAD_PATHNAME:
156 case ERROR_FILENAME_EXCED_RANGE:
157 errno = ENOENT;
158 break;
159
160 default:
161 errno = EACCES;
162 break;
163 }
164
165 return -1;
166 }
116 167
117 /* we could even stat and see if it exists */ 168 /* we could even stat and see if it exists */
118 static int 169 static int
119 symlink (const char *old, const char *neu) 170 symlink (const char *old, const char *neu)
120 { 171 {
172 #if WINVER >= 0x0600
121 if (CreateSymbolicLink (neu, old, 1)) 173 if (CreateSymbolicLink (neu, old, 1))
122 return 0; 174 return 0;
123 175
124 if (CreateSymbolicLink (neu, old, 0)) 176 if (CreateSymbolicLink (neu, old, 0))
125 return 0; 177 return 0;
178 #endif
126 179
127 return EIO_ERRNO (ENOENT, -1); 180 return EIO_ERRNO (ENOENT, -1);
128 } 181 }
182
183 /* POSIX API only */
184 #define CreateHardLink(neu,old,flags) 0
185 #define CreateSymbolicLink(neu,old,flags) 0
186
187 struct statvfs
188 {
189 int dummy;
190 };
191
192 #define DT_DIR EIO_DT_DIR
193 #define DT_REG EIO_DT_REG
194 #define D_NAME(entp) entp.cFileName
195 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
129 196
130#else 197#else
131 198
132 #include <sys/time.h> 199 #include <sys/time.h>
133 #include <sys/select.h> 200 #include <sys/select.h>
134 #include <sys/statvfs.h> 201 #include <sys/statvfs.h>
135 #include <unistd.h> 202 #include <unistd.h>
136 #include <utime.h>
137 #include <signal.h> 203 #include <signal.h>
138 #include <dirent.h> 204 #include <dirent.h>
139 205
140 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 206 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
141 #include <sys/mman.h> 207 #include <sys/mman.h>
142 #endif 208 #endif
209
210 #define D_NAME(entp) entp->d_name
143 211
144 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 212 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
145 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 213 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
146 #define _DIRENT_HAVE_D_TYPE /* sigh */ 214 #define _DIRENT_HAVE_D_TYPE /* sigh */
147 #define D_INO(de) (de)->d_fileno 215 #define D_INO(de) (de)->d_fileno
161 229
162 #ifndef EIO_STRUCT_DIRENT 230 #ifndef EIO_STRUCT_DIRENT
163 #define EIO_STRUCT_DIRENT struct dirent 231 #define EIO_STRUCT_DIRENT struct dirent
164 #endif 232 #endif
165 233
234#endif
235
236#if HAVE_UTIMES
237# include <utime.h>
238#endif
239
240#if HAVE_SYS_SYSCALL_H
241# include <sys/syscall.h>
242#endif
243
244#if HAVE_SYS_PRCTL_H
245# include <sys/prctl.h>
166#endif 246#endif
167 247
168#if HAVE_SENDFILE 248#if HAVE_SENDFILE
169# if __linux 249# if __linux
170# include <sys/sendfile.h> 250# include <sys/sendfile.h>
185#endif 265#endif
186#ifndef D_INO 266#ifndef D_INO
187# define D_INO(de) 0 267# define D_INO(de) 0
188#endif 268#endif
189#ifndef D_NAMLEN 269#ifndef D_NAMLEN
190# define D_NAMLEN(de) strlen ((de)->d_name) 270# define D_NAMLEN(entp) strlen (D_NAME (entp))
191#endif 271#endif
192 272
193/* used for struct dirent, AIX doesn't provide it */ 273/* used for struct dirent, AIX doesn't provide it */
194#ifndef NAME_MAX 274#ifndef NAME_MAX
195# define NAME_MAX 4096 275# define NAME_MAX 4096
202 282
203/* buffer size for various temporary buffers */ 283/* buffer size for various temporary buffers */
204#define EIO_BUFSIZE 65536 284#define EIO_BUFSIZE 65536
205 285
206#define dBUF \ 286#define dBUF \
207 char *eio_buf; \
208 ETP_WORKER_LOCK (self); \
209 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 287 char *eio_buf = malloc (EIO_BUFSIZE); \
210 ETP_WORKER_UNLOCK (self); \
211 errno = ENOMEM; \ 288 errno = ENOMEM; \
212 if (!eio_buf) \ 289 if (!eio_buf) \
213 return -1; 290 return -1
291
292#define FUBd \
293 free (eio_buf)
214 294
215#define EIO_TICKS ((1000000 + 1023) >> 10) 295#define EIO_TICKS ((1000000 + 1023) >> 10)
296
297/*****************************************************************************/
298
299struct tmpbuf
300{
301 void *ptr;
302 int len;
303};
304
305static void *
306tmpbuf_get (struct tmpbuf *buf, int len)
307{
308 if (buf->len < len)
309 {
310 free (buf->ptr);
311 buf->ptr = malloc (buf->len = len);
312 }
313
314 return buf->ptr;
315}
316
317struct tmpbuf;
318
319#if _POSIX_VERSION >= 200809L
320 #define HAVE_AT 1
321 # define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
322 #ifndef O_SEARCH
323 #define O_SEARCH O_RDONLY
324 #endif
325#else
326 #define HAVE_AT 0
327 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
328#endif
329
330struct eio_pwd
331{
332#if HAVE_AT
333 int fd;
334#endif
335 int len;
336 char str[1]; /* actually, a 0-terminated canonical path */
337};
338
339/*****************************************************************************/
216 340
217#define ETP_PRI_MIN EIO_PRI_MIN 341#define ETP_PRI_MIN EIO_PRI_MIN
218#define ETP_PRI_MAX EIO_PRI_MAX 342#define ETP_PRI_MAX EIO_PRI_MAX
219 343
220struct etp_worker; 344struct etp_worker;
224static int eio_finish (eio_req *req); 348static int eio_finish (eio_req *req);
225#define ETP_FINISH(req) eio_finish (req) 349#define ETP_FINISH(req) eio_finish (req)
226static void eio_execute (struct etp_worker *self, eio_req *req); 350static void eio_execute (struct etp_worker *self, eio_req *req);
227#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 351#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
228 352
229#define ETP_WORKER_CLEAR(req) \
230 if (wrk->dbuf) \
231 { \
232 free (wrk->dbuf); \
233 wrk->dbuf = 0; \
234 } \
235 \
236 if (wrk->dirp) \
237 { \
238 closedir (wrk->dirp); \
239 wrk->dirp = 0; \
240 }
241
242#define ETP_WORKER_COMMON \
243 void *dbuf; \
244 DIR *dirp;
245
246/*****************************************************************************/ 353/*****************************************************************************/
247 354
248#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 355#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
249 356
250/* calculate time difference in ~1/EIO_TICKS of a second */ 357/* calculate time difference in ~1/EIO_TICKS of a second */
261static void (*done_poll_cb) (void); 368static void (*done_poll_cb) (void);
262 369
263static unsigned int max_poll_time; /* reslock */ 370static unsigned int max_poll_time; /* reslock */
264static unsigned int max_poll_reqs; /* reslock */ 371static unsigned int max_poll_reqs; /* reslock */
265 372
266static volatile unsigned int nreqs; /* reqlock */ 373static unsigned int nreqs; /* reqlock */
267static volatile unsigned int nready; /* reqlock */ 374static unsigned int nready; /* reqlock */
268static volatile unsigned int npending; /* reqlock */ 375static unsigned int npending; /* reqlock */
269static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 376static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
270static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */ 377static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
271 378
272static xmutex_t wrklock; 379static xmutex_t wrklock;
273static xmutex_t reslock; 380static xmutex_t reslock;
274static xmutex_t reqlock; 381static xmutex_t reqlock;
275static xcond_t reqwait; 382static xcond_t reqwait;
278/* 385/*
279 * make our pread/pwrite emulation safe against themselves, but not against 386 * make our pread/pwrite emulation safe against themselves, but not against
280 * normal read/write by using a mutex. slows down execution a lot, 387 * normal read/write by using a mutex. slows down execution a lot,
281 * but that's your problem, not mine. 388 * but that's your problem, not mine.
282 */ 389 */
283static xmutex_t preadwritelock = X_MUTEX_INIT; 390static xmutex_t preadwritelock;
284#endif 391#endif
285 392
286typedef struct etp_worker 393typedef struct etp_worker
287{ 394{
395 struct tmpbuf tmpbuf;
396
288 /* locked by wrklock */ 397 /* locked by wrklock */
289 struct etp_worker *prev, *next; 398 struct etp_worker *prev, *next;
290 399
291 xthread_t tid; 400 xthread_t tid;
292 401
293 /* locked by reslock, reqlock or wrklock */ 402#ifdef ETP_WORKER_COMMON
294 ETP_REQ *req; /* currently processed request */
295
296 ETP_WORKER_COMMON 403 ETP_WORKER_COMMON
404#endif
297} etp_worker; 405} etp_worker;
298 406
299static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 407static etp_worker wrk_first; /* NOT etp */
300 408
301#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 409#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
302#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 410#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
303 411
304/* worker threads management */ 412/* worker threads management */
305 413
306static void ecb_cold 414static void ecb_cold
307etp_worker_clear (etp_worker *wrk) 415etp_worker_clear (etp_worker *wrk)
308{ 416{
309 ETP_WORKER_CLEAR (wrk);
310} 417}
311 418
312static void ecb_cold 419static void ecb_cold
313etp_worker_free (etp_worker *wrk) 420etp_worker_free (etp_worker *wrk)
314{ 421{
422 free (wrk->tmpbuf.ptr);
423
315 wrk->next->prev = wrk->prev; 424 wrk->next->prev = wrk->prev;
316 wrk->prev->next = wrk->next; 425 wrk->prev->next = wrk->next;
317 426
318 free (wrk); 427 free (wrk);
319} 428}
375} etp_reqq; 484} etp_reqq;
376 485
377static etp_reqq req_queue; 486static etp_reqq req_queue;
378static etp_reqq res_queue; 487static etp_reqq res_queue;
379 488
489static void ecb_noinline ecb_cold
490reqq_init (etp_reqq *q)
491{
492 int pri;
493
494 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
495 q->qs[pri] = q->qe[pri] = 0;
496
497 q->size = 0;
498}
499
380static int ecb_noinline 500static int ecb_noinline
381reqq_push (etp_reqq *q, ETP_REQ *req) 501reqq_push (etp_reqq *q, ETP_REQ *req)
382{ 502{
383 int pri = req->pri; 503 int pri = req->pri;
384 req->next = 0; 504 req->next = 0;
418 } 538 }
419 539
420 abort (); 540 abort ();
421} 541}
422 542
423static void ecb_cold 543static int ecb_cold
424etp_thread_init (void) 544etp_init (void (*want_poll)(void), void (*done_poll)(void))
425{ 545{
426#if !HAVE_PREADWRITE
427 X_MUTEX_CREATE (preadwritelock);
428#endif
429 X_MUTEX_CREATE (wrklock); 546 X_MUTEX_CREATE (wrklock);
430 X_MUTEX_CREATE (reslock); 547 X_MUTEX_CREATE (reslock);
431 X_MUTEX_CREATE (reqlock); 548 X_MUTEX_CREATE (reqlock);
432 X_COND_CREATE (reqwait); 549 X_COND_CREATE (reqwait);
433}
434 550
435static void ecb_cold 551 reqq_init (&req_queue);
436etp_atfork_prepare (void) 552 reqq_init (&res_queue);
437{
438}
439 553
440static void ecb_cold 554 wrk_first.next =
441etp_atfork_parent (void) 555 wrk_first.prev = &wrk_first;
442{
443}
444
445static void ecb_cold
446etp_atfork_child (void)
447{
448 ETP_REQ *prv;
449
450 while ((prv = reqq_shift (&req_queue)))
451 ETP_DESTROY (prv);
452
453 while ((prv = reqq_shift (&res_queue)))
454 ETP_DESTROY (prv);
455
456 while (wrk_first.next != &wrk_first)
457 {
458 etp_worker *wrk = wrk_first.next;
459
460 if (wrk->req)
461 ETP_DESTROY (wrk->req);
462
463 etp_worker_clear (wrk);
464 etp_worker_free (wrk);
465 }
466 556
467 started = 0; 557 started = 0;
468 idle = 0; 558 idle = 0;
469 nreqs = 0; 559 nreqs = 0;
470 nready = 0; 560 nready = 0;
471 npending = 0; 561 npending = 0;
472
473 etp_thread_init ();
474}
475
476static void ecb_cold
477etp_once_init (void)
478{
479 etp_thread_init ();
480 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
481}
482
483static int ecb_cold
484etp_init (void (*want_poll)(void), void (*done_poll)(void))
485{
486 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
487
488 pthread_once (&doinit, etp_once_init);
489 562
490 want_poll_cb = want_poll; 563 want_poll_cb = want_poll;
491 done_poll_cb = done_poll; 564 done_poll_cb = done_poll;
492 565
493 return 0; 566 return 0;
533} 606}
534 607
535static void ecb_cold 608static void ecb_cold
536etp_end_thread (void) 609etp_end_thread (void)
537{ 610{
538 eio_req *req = calloc (1, sizeof (eio_req)); 611 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
539 612
540 req->type = -1; 613 req->type = -1;
541 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 614 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
542 615
543 X_LOCK (reqlock); 616 X_LOCK (reqlock);
876# undef pread 949# undef pread
877# undef pwrite 950# undef pwrite
878# define pread eio__pread 951# define pread eio__pread
879# define pwrite eio__pwrite 952# define pwrite eio__pwrite
880 953
881static ssize_t 954static eio_ssize_t
882eio__pread (int fd, void *buf, size_t count, off_t offset) 955eio__pread (int fd, void *buf, size_t count, off_t offset)
883{ 956{
884 ssize_t res; 957 eio_ssize_t res;
885 off_t ooffset; 958 off_t ooffset;
886 959
887 X_LOCK (preadwritelock); 960 X_LOCK (preadwritelock);
888 ooffset = lseek (fd, 0, SEEK_CUR); 961 ooffset = lseek (fd, 0, SEEK_CUR);
889 lseek (fd, offset, SEEK_SET); 962 lseek (fd, offset, SEEK_SET);
892 X_UNLOCK (preadwritelock); 965 X_UNLOCK (preadwritelock);
893 966
894 return res; 967 return res;
895} 968}
896 969
897static ssize_t 970static eio_ssize_t
898eio__pwrite (int fd, void *buf, size_t count, off_t offset) 971eio__pwrite (int fd, void *buf, size_t count, off_t offset)
899{ 972{
900 ssize_t res; 973 eio_ssize_t res;
901 off_t ooffset; 974 off_t ooffset;
902 975
903 X_LOCK (preadwritelock); 976 X_LOCK (preadwritelock);
904 ooffset = lseek (fd, 0, SEEK_CUR); 977 ooffset = lseek (fd, 0, SEEK_CUR);
905 lseek (fd, offset, SEEK_SET); 978 lseek (fd, offset, SEEK_SET);
950 1023
951#if !HAVE_FDATASYNC 1024#if !HAVE_FDATASYNC
952# undef fdatasync 1025# undef fdatasync
953# define fdatasync(fd) fsync (fd) 1026# define fdatasync(fd) fsync (fd)
954#endif 1027#endif
1028
1029static int
1030eio__syncfs (int fd)
1031{
1032 int res;
1033
1034#if HAVE_SYS_SYNCFS
1035 res = (int)syscall (__NR_syncfs, (int)(fd));
1036#else
1037 res = -1;
1038 errno = ENOSYS;
1039#endif
1040
1041 if (res < 0 && errno == ENOSYS && fd >= 0)
1042 sync ();
1043
1044 return res;
1045}
955 1046
956/* sync_file_range always needs emulation */ 1047/* sync_file_range always needs emulation */
957static int 1048static int
958eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1049eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
959{ 1050{
994 1085
995#if !HAVE_READAHEAD 1086#if !HAVE_READAHEAD
996# undef readahead 1087# undef readahead
997# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1088# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
998 1089
999static ssize_t 1090static eio_ssize_t
1000eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1091eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
1001{ 1092{
1002 size_t todo = count; 1093 size_t todo = count;
1003 dBUF; 1094 dBUF;
1004 1095
1009 pread (fd, eio_buf, len, offset); 1100 pread (fd, eio_buf, len, offset);
1010 offset += len; 1101 offset += len;
1011 todo -= len; 1102 todo -= len;
1012 } 1103 }
1013 1104
1105 FUBd;
1106
1014 errno = 0; 1107 errno = 0;
1015 return count; 1108 return count;
1016} 1109}
1017 1110
1018#endif 1111#endif
1019 1112
1020/* sendfile always needs emulation */ 1113/* sendfile always needs emulation */
1021static ssize_t 1114static eio_ssize_t
1022eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1115eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1023{ 1116{
1024 ssize_t written = 0; 1117 eio_ssize_t written = 0;
1025 ssize_t res; 1118 eio_ssize_t res;
1026 1119
1027 if (!count) 1120 if (!count)
1028 return 0; 1121 return 0;
1029 1122
1030 for (;;) 1123 for (;;)
1125 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1218 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1126 /* BSDs */ 1219 /* BSDs */
1127#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1220#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1128 || errno == ENOTSUP 1221 || errno == ENOTSUP
1129#endif 1222#endif
1223#ifdef EOPNOTSUPP /* windows */
1130 || errno == EOPNOTSUPP /* BSDs */ 1224 || errno == EOPNOTSUPP /* BSDs */
1225#endif
1131#if __solaris 1226#if __solaris
1132 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1227 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1133#endif 1228#endif
1134 ) 1229 )
1135 ) 1230 )
1139 1234
1140 res = 0; 1235 res = 0;
1141 1236
1142 while (count) 1237 while (count)
1143 { 1238 {
1144 ssize_t cnt; 1239 eio_ssize_t cnt;
1145 1240
1146 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1241 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1147 1242
1148 if (cnt <= 0) 1243 if (cnt <= 0)
1149 { 1244 {
1161 1256
1162 offset += cnt; 1257 offset += cnt;
1163 res += cnt; 1258 res += cnt;
1164 count -= cnt; 1259 count -= cnt;
1165 } 1260 }
1261
1262 FUBd;
1166 } 1263 }
1167 1264
1168 return res; 1265 return res;
1169} 1266}
1170 1267
1197 /* round up length */ 1294 /* round up length */
1198 *length = (*length + mask) & ~mask; 1295 *length = (*length + mask) & ~mask;
1199} 1296}
1200 1297
1201#if !_POSIX_MEMLOCK 1298#if !_POSIX_MEMLOCK
1202# define eio__mlockall(a) eio_nosyscall() 1299# define eio__mlockall(a) EIO_ENOSYS ()
1203#else 1300#else
1204 1301
1205static int 1302static int
1206eio__mlockall (int flags) 1303eio__mlockall (int flags)
1207{ 1304{
1285} 1382}
1286 1383
1287/*****************************************************************************/ 1384/*****************************************************************************/
1288/* requests implemented outside eio_execute, because they are so large */ 1385/* requests implemented outside eio_execute, because they are so large */
1289 1386
1387/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1290static void 1388static int
1291eio__realpath (eio_req *req, etp_worker *self) 1389eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1292{ 1390{
1293 char *rel = req->ptr1; 1391 const char *rel = path;
1294 char *res; 1392 char *res;
1295 char *tmp1, *tmp2; 1393 char *tmp1, *tmp2;
1296#if SYMLOOP_MAX > 32 1394#if SYMLOOP_MAX > 32
1297 int symlinks = SYMLOOP_MAX; 1395 int symlinks = SYMLOOP_MAX;
1298#else 1396#else
1299 int symlinks = 32; 1397 int symlinks = 32;
1300#endif 1398#endif
1301 1399
1302 req->result = -1;
1303
1304 errno = EINVAL; 1400 errno = EINVAL;
1305 if (!rel) 1401 if (!rel)
1306 return; 1402 return -1;
1307 1403
1308 errno = ENOENT; 1404 errno = ENOENT;
1309 if (!*rel) 1405 if (!*rel)
1310 return; 1406 return -1;
1311 1407
1312 if (!req->ptr2) 1408 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1313 {
1314 X_LOCK (wrklock);
1315 req->flags |= EIO_FLAG_PTR2_FREE;
1316 X_UNLOCK (wrklock);
1317 req->ptr2 = malloc (PATH_MAX * 3);
1318
1319 errno = ENOMEM;
1320 if (!req->ptr2)
1321 return;
1322 }
1323
1324 res = req->ptr2;
1325 tmp1 = res + PATH_MAX; 1409 tmp1 = res + PATH_MAX;
1326 tmp2 = tmp1 + PATH_MAX; 1410 tmp2 = tmp1 + PATH_MAX;
1327 1411
1328#if 0 /* disabled, the musl way to do things is just too racy */ 1412#if 0 /* disabled, the musl way to do things is just too racy */
1329#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1413#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1348#endif 1432#endif
1349#endif 1433#endif
1350 1434
1351 if (*rel != '/') 1435 if (*rel != '/')
1352 { 1436 {
1437 int len;
1438
1439 errno = ENOENT;
1440 if (wd == EIO_INVALID_WD)
1441 return -1;
1442
1443 if (wd == EIO_CWD)
1444 {
1353 if (!getcwd (res, PATH_MAX)) 1445 if (!getcwd (res, PATH_MAX))
1354 return; 1446 return -1;
1447
1448 len = strlen (res);
1449 }
1450 else
1451 memcpy (res, wd->str, len = wd->len);
1355 1452
1356 if (res [1]) /* only use if not / */ 1453 if (res [1]) /* only use if not / */
1357 res += strlen (res); 1454 res += len;
1358 } 1455 }
1359 1456
1360 while (*rel) 1457 while (*rel)
1361 { 1458 {
1362 ssize_t len, linklen; 1459 eio_ssize_t len, linklen;
1363 char *beg = rel; 1460 const char *beg = rel;
1364 1461
1365 while (*rel && *rel != '/') 1462 while (*rel && *rel != '/')
1366 ++rel; 1463 ++rel;
1367 1464
1368 len = rel - beg; 1465 len = rel - beg;
1380 1477
1381 if (beg [1] == '.' && len == 2) 1478 if (beg [1] == '.' && len == 2)
1382 { 1479 {
1383 /* .. - back up one component, if possible */ 1480 /* .. - back up one component, if possible */
1384 1481
1385 while (res != req->ptr2) 1482 while (res != tmpbuf->ptr)
1386 if (*--res == '/') 1483 if (*--res == '/')
1387 break; 1484 break;
1388 1485
1389 continue; 1486 continue;
1390 } 1487 }
1400 1497
1401 /* zero-terminate, for readlink */ 1498 /* zero-terminate, for readlink */
1402 res [len + 1] = 0; 1499 res [len + 1] = 0;
1403 1500
1404 /* now check if it's a symlink */ 1501 /* now check if it's a symlink */
1405 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1502 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1406 1503
1407 if (linklen < 0) 1504 if (linklen < 0)
1408 { 1505 {
1409 if (errno != EINVAL) 1506 if (errno != EINVAL)
1410 return; 1507 return -1;
1411 1508
1412 /* it's a normal directory. hopefully */ 1509 /* it's a normal directory. hopefully */
1413 res += len + 1; 1510 res += len + 1;
1414 } 1511 }
1415 else 1512 else
1417 /* yay, it was a symlink - build new path in tmp2 */ 1514 /* yay, it was a symlink - build new path in tmp2 */
1418 int rellen = strlen (rel); 1515 int rellen = strlen (rel);
1419 1516
1420 errno = ENAMETOOLONG; 1517 errno = ENAMETOOLONG;
1421 if (linklen + 1 + rellen >= PATH_MAX) 1518 if (linklen + 1 + rellen >= PATH_MAX)
1422 return; 1519 return -1;
1423 1520
1424 errno = ELOOP; 1521 errno = ELOOP;
1425 if (!--symlinks) 1522 if (!--symlinks)
1426 return; 1523 return -1;
1427 1524
1428 if (*tmp1 == '/') 1525 if (*tmp1 == '/')
1429 res = req->ptr2; /* symlink resolves to an absolute path */ 1526 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1430 1527
1431 /* we need to be careful, as rel might point into tmp2 already */ 1528 /* we need to be careful, as rel might point into tmp2 already */
1432 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1529 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1433 tmp2 [linklen] = '/'; 1530 tmp2 [linklen] = '/';
1434 memcpy (tmp2, tmp1, linklen); 1531 memcpy (tmp2, tmp1, linklen);
1436 rel = tmp2; 1533 rel = tmp2;
1437 } 1534 }
1438 } 1535 }
1439 1536
1440 /* special case for the lone root path */ 1537 /* special case for the lone root path */
1441 if (res == req->ptr2) 1538 if (res == tmpbuf->ptr)
1442 *res++ = '/'; 1539 *res++ = '/';
1443 1540
1444 req->result = res - (char *)req->ptr2; 1541 return res - (char *)tmpbuf->ptr;
1445
1446done:
1447 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1448} 1542}
1449 1543
1450static signed char 1544static signed char
1451eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1545eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1452{ 1546{
1460 1554
1461#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1555#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1462#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1556#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1463 1557
1464static void 1558static void
1465eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1559eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1466{ 1560{
1467 unsigned char bits [9 + sizeof (ino_t) * 8]; 1561 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1468 unsigned char *bit = bits; 1562 unsigned char *bit = bits;
1469 1563
1470 assert (CHAR_BIT == 8); 1564 assert (CHAR_BIT == 8);
1471 assert (sizeof (eio_dirent) * 8 < 256); 1565 assert (sizeof (eio_dirent) * 8 < 256);
1472 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1566 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1474 1568
1475 if (size <= EIO_SORT_FAST) 1569 if (size <= EIO_SORT_FAST)
1476 return; 1570 return;
1477 1571
1478 /* first prepare an array of bits to test in our radix sort */ 1572 /* first prepare an array of bits to test in our radix sort */
1479 /* try to take endianness into account, as well as differences in ino_t sizes */ 1573 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1480 /* inode_bits must contain all inodes ORed together */ 1574 /* inode_bits must contain all inodes ORed together */
1481 /* which is used to skip bits that are 0 everywhere, which is very common */ 1575 /* which is used to skip bits that are 0 everywhere, which is very common */
1482 { 1576 {
1483 ino_t endianness; 1577 eio_ino_t endianness;
1484 int i, j; 1578 int i, j;
1485 1579
1486 /* we store the byte offset of byte n into byte n of "endianness" */ 1580 /* we store the byte offset of byte n into byte n of "endianness" */
1487 for (i = 0; i < sizeof (ino_t); ++i) 1581 for (i = 0; i < sizeof (eio_ino_t); ++i)
1488 ((unsigned char *)&endianness)[i] = i; 1582 ((unsigned char *)&endianness)[i] = i;
1489 1583
1490 *bit++ = 0; 1584 *bit++ = 0;
1491 1585
1492 for (i = 0; i < sizeof (ino_t); ++i) 1586 for (i = 0; i < sizeof (eio_ino_t); ++i)
1493 { 1587 {
1494 /* shifting off the byte offsets out of "endianness" */ 1588 /* shifting off the byte offsets out of "endianness" */
1495 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1589 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1496 endianness >>= 8; 1590 endianness >>= 8;
1497 1591
1498 for (j = 0; j < 8; ++j) 1592 for (j = 0; j < 8; ++j)
1499 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1593 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1500 *bit++ = offs + j; 1594 *bit++ = offs + j;
1501 } 1595 }
1502 1596
1503 for (j = 0; j < 8; ++j) 1597 for (j = 0; j < 8; ++j)
1504 if (score_bits & (1 << j)) 1598 if (score_bits & (1 << j))
1505 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1599 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1506 } 1600 }
1507 1601
1508 /* now actually do the sorting (a variant of MSD radix sort) */ 1602 /* now actually do the sorting (a variant of MSD radix sort) */
1509 { 1603 {
1510 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1604 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1511 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1605 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1512 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1606 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1513 int stk_idx = 0; 1607 int stk_idx = 0;
1514 1608
1515 base_stk [stk_idx] = dents; 1609 base_stk [stk_idx] = dents;
1516 end_stk [stk_idx] = dents + size; 1610 end_stk [stk_idx] = dents + size;
1517 bit_stk [stk_idx] = bit - 1; 1611 bit_stk [stk_idx] = bit - 1;
1596 } 1690 }
1597 } 1691 }
1598} 1692}
1599 1693
1600static void 1694static void
1601eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1695eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1602{ 1696{
1603 if (size <= 1) 1697 if (size <= 1)
1604 return; /* our insertion sort relies on size > 0 */ 1698 return; /* our insertion sort relies on size > 0 */
1605 1699
1606 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1700 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1614 1708
1615/* read a full directory */ 1709/* read a full directory */
1616static void 1710static void
1617eio__scandir (eio_req *req, etp_worker *self) 1711eio__scandir (eio_req *req, etp_worker *self)
1618{ 1712{
1619 DIR *dirp;
1620 EIO_STRUCT_DIRENT *entp;
1621 char *name, *names; 1713 char *name, *names;
1622 int namesalloc = 4096; 1714 int namesalloc = 4096 - sizeof (void *) * 4;
1623 int namesoffs = 0; 1715 int namesoffs = 0;
1624 int flags = req->int1; 1716 int flags = req->int1;
1625 eio_dirent *dents = 0; 1717 eio_dirent *dents = 0;
1626 int dentalloc = 128; 1718 int dentalloc = 128;
1627 int dentoffs = 0; 1719 int dentoffs = 0;
1628 ino_t inode_bits = 0; 1720 eio_ino_t inode_bits = 0;
1721#ifdef _WIN32
1722 HANDLE dirp;
1723 WIN32_FIND_DATA entp;
1724#else
1725 DIR *dirp;
1726 EIO_STRUCT_DIRENT *entp;
1727#endif
1629 1728
1630 req->result = -1; 1729 req->result = -1;
1631 1730
1632 if (!(flags & EIO_READDIR_DENTS)) 1731 if (!(flags & EIO_READDIR_DENTS))
1633 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1732 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1634 1733
1635 X_LOCK (wrklock); 1734#ifdef _WIN32
1636 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1735 {
1736 int len = strlen ((const char *)req->ptr1);
1737 char *path = malloc (MAX_PATH);
1738 const char *fmt;
1739 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1740
1741 if (!len)
1742 fmt = "./*";
1743 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1744 fmt = "%s*";
1745 else
1746 fmt = "%s/*";
1747
1748 _snprintf (path, MAX_PATH, fmt, reqpath);
1749 dirp = FindFirstFile (path, &entp);
1750 free (path);
1751
1752 if (dirp == INVALID_HANDLE_VALUE)
1753 {
1754 /* should steal _dosmaperr */
1755 switch (GetLastError ())
1756 {
1757 case ERROR_FILE_NOT_FOUND:
1758 req->result = 0;
1759 break;
1760
1761 case ERROR_INVALID_NAME:
1762 case ERROR_PATH_NOT_FOUND:
1763 case ERROR_NO_MORE_FILES:
1764 errno = ENOENT;
1765 break;
1766
1767 case ERROR_NOT_ENOUGH_MEMORY:
1768 errno = ENOMEM;
1769 break;
1770
1771 default:
1772 errno = EINVAL;
1773 break;
1774 }
1775
1776 return;
1777 }
1778 }
1779#else
1780 #if HAVE_AT
1781 if (req->wd)
1782 {
1783 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1784
1785 if (fd < 0)
1786 return;
1787
1788 dirp = fdopendir (fd);
1789 }
1790 else
1637 self->dirp = dirp = opendir (req->ptr1); 1791 dirp = opendir (req->ptr1);
1792 #else
1793 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1794 #endif
1795
1796 if (!dirp)
1797 return;
1798#endif
1638 1799
1639 if (req->flags & EIO_FLAG_PTR1_FREE) 1800 if (req->flags & EIO_FLAG_PTR1_FREE)
1640 free (req->ptr1); 1801 free (req->ptr1);
1641 1802
1642 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1803 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1643 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1804 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1644 req->ptr2 = names = malloc (namesalloc); 1805 req->ptr2 = names = malloc (namesalloc);
1645 X_UNLOCK (wrklock);
1646 1806
1647 if (dirp && names && (!flags || dents)) 1807 if (!names || (flags && !dents))
1808 return;
1809
1648 for (;;) 1810 for (;;)
1649 { 1811 {
1812 int done;
1813
1814#ifdef _WIN32
1815 done = !dirp;
1816#else
1650 errno = 0; 1817 errno = 0;
1651 entp = readdir (dirp); 1818 entp = readdir (dirp);
1819 done = !entp;
1820#endif
1652 1821
1653 if (!entp) 1822 if (done)
1654 { 1823 {
1824#ifndef _WIN32
1825 int old_errno = errno;
1826 closedir (dirp);
1827 errno = old_errno;
1828
1655 if (errno) 1829 if (errno)
1656 break; 1830 break;
1831#endif
1657 1832
1658 /* sort etc. */ 1833 /* sort etc. */
1659 req->int1 = flags; 1834 req->int1 = flags;
1660 req->result = dentoffs; 1835 req->result = dentoffs;
1661 1836
1662 if (flags & EIO_READDIR_STAT_ORDER) 1837 if (flags & EIO_READDIR_STAT_ORDER)
1663 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1838 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1664 else if (flags & EIO_READDIR_DIRS_FIRST) 1839 else if (flags & EIO_READDIR_DIRS_FIRST)
1665 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1840 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1666 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1841 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1667 else 1842 else
1843 {
1844 /* in this case, all is known, and we just put dirs first and sort them */
1845 eio_dirent *oth = dents + dentoffs;
1846 eio_dirent *dir = dents;
1847
1848 /* now partition dirs to the front, and non-dirs to the back */
1849 /* by walking from both sides and swapping if necessary */
1850 while (oth > dir)
1851 {
1852 if (dir->type == EIO_DT_DIR)
1853 ++dir;
1854 else if ((--oth)->type == EIO_DT_DIR)
1855 {
1856 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1857
1858 ++dir;
1859 }
1860 }
1861
1862 /* now sort the dirs only (dirs all have the same score) */
1863 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1864 }
1865
1866 break;
1867 }
1868
1869 /* now add the entry to our list(s) */
1870 name = D_NAME (entp);
1871
1872 /* skip . and .. entries */
1873 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1874 {
1875 int len = D_NAMLEN (entp) + 1;
1876
1877 while (ecb_expect_false (namesoffs + len > namesalloc))
1878 {
1879 namesalloc *= 2;
1880 req->ptr2 = names = realloc (names, namesalloc);
1881
1882 if (!names)
1883 break;
1884 }
1885
1886 memcpy (names + namesoffs, name, len);
1887
1888 if (dents)
1889 {
1890 struct eio_dirent *ent;
1891
1892 if (ecb_expect_false (dentoffs == dentalloc))
1668 { 1893 {
1669 /* in this case, all is known, and we just put dirs first and sort them */ 1894 dentalloc *= 2;
1895 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1896
1897 if (!dents)
1898 break;
1899 }
1900
1670 eio_dirent *oth = dents + dentoffs; 1901 ent = dents + dentoffs;
1671 eio_dirent *dir = dents;
1672 1902
1673 /* now partition dirs to the front, and non-dirs to the back */ 1903 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1674 /* by walking from both sides and swapping if necessary */ 1904 ent->namelen = len - 1;
1675 while (oth > dir) 1905 ent->inode = D_INO (entp);
1906
1907 inode_bits |= ent->inode;
1908
1909 switch (D_TYPE (entp))
1910 {
1911 default:
1912 ent->type = EIO_DT_UNKNOWN;
1913 flags |= EIO_READDIR_FOUND_UNKNOWN;
1914 break;
1915
1916 #ifdef DT_FIFO
1917 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1918 #endif
1919 #ifdef DT_CHR
1920 case DT_CHR: ent->type = EIO_DT_CHR; break;
1921 #endif
1922 #ifdef DT_MPC
1923 case DT_MPC: ent->type = EIO_DT_MPC; break;
1924 #endif
1925 #ifdef DT_DIR
1926 case DT_DIR: ent->type = EIO_DT_DIR; break;
1927 #endif
1928 #ifdef DT_NAM
1929 case DT_NAM: ent->type = EIO_DT_NAM; break;
1930 #endif
1931 #ifdef DT_BLK
1932 case DT_BLK: ent->type = EIO_DT_BLK; break;
1933 #endif
1934 #ifdef DT_MPB
1935 case DT_MPB: ent->type = EIO_DT_MPB; break;
1936 #endif
1937 #ifdef DT_REG
1938 case DT_REG: ent->type = EIO_DT_REG; break;
1939 #endif
1940 #ifdef DT_NWK
1941 case DT_NWK: ent->type = EIO_DT_NWK; break;
1942 #endif
1943 #ifdef DT_CMP
1944 case DT_CMP: ent->type = EIO_DT_CMP; break;
1945 #endif
1946 #ifdef DT_LNK
1947 case DT_LNK: ent->type = EIO_DT_LNK; break;
1948 #endif
1949 #ifdef DT_SOCK
1950 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1951 #endif
1952 #ifdef DT_DOOR
1953 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1954 #endif
1955 #ifdef DT_WHT
1956 case DT_WHT: ent->type = EIO_DT_WHT; break;
1957 #endif
1958 }
1959
1960 ent->score = 7;
1961
1962 if (flags & EIO_READDIR_DIRS_FIRST)
1963 {
1964 if (ent->type == EIO_DT_UNKNOWN)
1676 { 1965 {
1677 if (dir->type == EIO_DT_DIR) 1966 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1678 ++dir; 1967 ent->score = 1;
1679 else if ((--oth)->type == EIO_DT_DIR) 1968 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1680 { 1969 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1681 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1682
1683 ++dir;
1684 }
1685 } 1970 }
1686 1971 else if (ent->type == EIO_DT_DIR)
1687 /* now sort the dirs only (dirs all have the same score) */ 1972 ent->score = 0;
1688 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1689 } 1973 }
1690
1691 break;
1692 }
1693
1694 /* now add the entry to our list(s) */
1695 name = entp->d_name;
1696
1697 /* skip . and .. entries */
1698 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1699 {
1700 int len = D_NAMLEN (entp) + 1;
1701
1702 while (ecb_expect_false (namesoffs + len > namesalloc))
1703 {
1704 namesalloc *= 2;
1705 X_LOCK (wrklock);
1706 req->ptr2 = names = realloc (names, namesalloc);
1707 X_UNLOCK (wrklock);
1708
1709 if (!names)
1710 break;
1711 } 1974 }
1712 1975
1713 memcpy (names + namesoffs, name, len);
1714
1715 if (dents)
1716 {
1717 struct eio_dirent *ent;
1718
1719 if (ecb_expect_false (dentoffs == dentalloc))
1720 {
1721 dentalloc *= 2;
1722 X_LOCK (wrklock);
1723 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1724 X_UNLOCK (wrklock);
1725
1726 if (!dents)
1727 break;
1728 }
1729
1730 ent = dents + dentoffs;
1731
1732 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1733 ent->namelen = len - 1;
1734 ent->inode = D_INO (entp);
1735
1736 inode_bits |= ent->inode;
1737
1738 switch (D_TYPE (entp))
1739 {
1740 default:
1741 ent->type = EIO_DT_UNKNOWN;
1742 flags |= EIO_READDIR_FOUND_UNKNOWN;
1743 break;
1744
1745 #ifdef DT_FIFO
1746 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1747 #endif
1748 #ifdef DT_CHR
1749 case DT_CHR: ent->type = EIO_DT_CHR; break;
1750 #endif
1751 #ifdef DT_MPC
1752 case DT_MPC: ent->type = EIO_DT_MPC; break;
1753 #endif
1754 #ifdef DT_DIR
1755 case DT_DIR: ent->type = EIO_DT_DIR; break;
1756 #endif
1757 #ifdef DT_NAM
1758 case DT_NAM: ent->type = EIO_DT_NAM; break;
1759 #endif
1760 #ifdef DT_BLK
1761 case DT_BLK: ent->type = EIO_DT_BLK; break;
1762 #endif
1763 #ifdef DT_MPB
1764 case DT_MPB: ent->type = EIO_DT_MPB; break;
1765 #endif
1766 #ifdef DT_REG
1767 case DT_REG: ent->type = EIO_DT_REG; break;
1768 #endif
1769 #ifdef DT_NWK
1770 case DT_NWK: ent->type = EIO_DT_NWK; break;
1771 #endif
1772 #ifdef DT_CMP
1773 case DT_CMP: ent->type = EIO_DT_CMP; break;
1774 #endif
1775 #ifdef DT_LNK
1776 case DT_LNK: ent->type = EIO_DT_LNK; break;
1777 #endif
1778 #ifdef DT_SOCK
1779 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1780 #endif
1781 #ifdef DT_DOOR
1782 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1783 #endif
1784 #ifdef DT_WHT
1785 case DT_WHT: ent->type = EIO_DT_WHT; break;
1786 #endif
1787 }
1788
1789 ent->score = 7;
1790
1791 if (flags & EIO_READDIR_DIRS_FIRST)
1792 {
1793 if (ent->type == EIO_DT_UNKNOWN)
1794 {
1795 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1796 ent->score = 1;
1797 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1798 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1799 }
1800 else if (ent->type == EIO_DT_DIR)
1801 ent->score = 0;
1802 }
1803 }
1804
1805 namesoffs += len; 1976 namesoffs += len;
1806 ++dentoffs; 1977 ++dentoffs;
1807 } 1978 }
1808 1979
1809 if (EIO_CANCELLED (req)) 1980 if (EIO_CANCELLED (req))
1810 { 1981 {
1811 errno = ECANCELED; 1982 errno = ECANCELED;
1812 break; 1983 break;
1813 } 1984 }
1985
1986#ifdef _WIN32
1987 if (!FindNextFile (dirp, &entp))
1988 {
1989 FindClose (dirp);
1990 dirp = 0;
1814 } 1991 }
1992#endif
1993 }
1815} 1994}
1995
1996/*****************************************************************************/
1997/* working directory stuff */
1998/* various deficiencies in the posix 2008 api force us to */
1999/* keep the absolute path in string form at all times */
2000/* fuck yeah. */
2001
2002#if !HAVE_AT
2003
2004/* a bit like realpath, but usually faster because it doesn'T have to return */
2005/* an absolute or canonical path */
2006static const char *
2007wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2008{
2009 if (!wd || *path == '/')
2010 return path;
2011
2012 if (path [0] == '.' && !path [1])
2013 return wd->str;
2014
2015 {
2016 int l1 = wd->len;
2017 int l2 = strlen (path);
2018
2019 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2020
2021 memcpy (res, wd->str, l1);
2022 res [l1] = '/';
2023 memcpy (res + l1 + 1, path, l2 + 1);
2024
2025 return res;
2026 }
2027}
2028
2029#endif
2030
2031static eio_wd
2032eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2033{
2034 int fd;
2035 eio_wd res;
2036 int len = eio__realpath (tmpbuf, wd, path);
2037
2038 if (len < 0)
2039 return EIO_INVALID_WD;
2040
2041#if HAVE_AT
2042 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2043
2044 if (fd < 0)
2045 return EIO_INVALID_WD;
2046#endif
2047
2048 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2049
2050#if HAVE_AT
2051 res->fd = fd;
2052#endif
2053
2054 res->len = len;
2055 memcpy (res->str, tmpbuf->ptr, len);
2056 res->str [len] = 0;
2057
2058 return res;
2059}
2060
2061eio_wd
2062eio_wd_open_sync (eio_wd wd, const char *path)
2063{
2064 struct tmpbuf tmpbuf = { 0 };
2065 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2066 free (tmpbuf.ptr);
2067
2068 return wd;
2069}
2070
2071void
2072eio_wd_close_sync (eio_wd wd)
2073{
2074 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2075 {
2076 #if HAVE_AT
2077 close (wd->fd);
2078 #endif
2079 free (wd);
2080 }
2081}
2082
2083#if HAVE_AT
2084
2085/* they forgot these */
2086
2087static int
2088eio__truncateat (int dirfd, const char *path, off_t length)
2089{
2090 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2091 int res;
2092
2093 if (fd < 0)
2094 return fd;
2095
2096 res = ftruncate (fd, length);
2097 close (fd);
2098 return res;
2099}
2100
2101static int
2102eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2103{
2104 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2105 int res;
2106
2107 if (fd < 0)
2108 return fd;
2109
2110 res = fstatvfs (fd, buf);
2111 close (fd);
2112 return res;
2113
2114}
2115
2116#endif
1816 2117
1817/*****************************************************************************/ 2118/*****************************************************************************/
1818 2119
1819#define ALLOC(len) \ 2120#define ALLOC(len) \
1820 if (!req->ptr2) \ 2121 if (!req->ptr2) \
1834X_THREAD_PROC (etp_proc) 2135X_THREAD_PROC (etp_proc)
1835{ 2136{
1836 ETP_REQ *req; 2137 ETP_REQ *req;
1837 struct timespec ts; 2138 struct timespec ts;
1838 etp_worker *self = (etp_worker *)thr_arg; 2139 etp_worker *self = (etp_worker *)thr_arg;
1839 int timeout; 2140
2141#if HAVE_PRCTL_SET_NAME
2142 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2143#endif
1840 2144
1841 /* try to distribute timeouts somewhat evenly */ 2145 /* try to distribute timeouts somewhat evenly */
1842 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2146 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1843 2147
1844 for (;;) 2148 for (;;)
1847 2151
1848 X_LOCK (reqlock); 2152 X_LOCK (reqlock);
1849 2153
1850 for (;;) 2154 for (;;)
1851 { 2155 {
1852 self->req = req = reqq_shift (&req_queue); 2156 req = reqq_shift (&req_queue);
1853 2157
1854 if (req) 2158 if (req)
1855 break; 2159 break;
1856 2160
1857 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2161 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1895 ++npending; 2199 ++npending;
1896 2200
1897 if (!reqq_push (&res_queue, req) && want_poll_cb) 2201 if (!reqq_push (&res_queue, req) && want_poll_cb)
1898 want_poll_cb (); 2202 want_poll_cb ();
1899 2203
1900 self->req = 0;
1901 etp_worker_clear (self); 2204 etp_worker_clear (self);
1902 2205
1903 X_UNLOCK (reslock); 2206 X_UNLOCK (reslock);
1904 } 2207 }
1905 2208
1906quit: 2209quit:
2210 free (req);
2211
1907 X_LOCK (wrklock); 2212 X_LOCK (wrklock);
1908 etp_worker_free (self); 2213 etp_worker_free (self);
1909 X_UNLOCK (wrklock); 2214 X_UNLOCK (wrklock);
1910 2215
1911 return 0; 2216 return 0;
1914/*****************************************************************************/ 2219/*****************************************************************************/
1915 2220
1916int ecb_cold 2221int ecb_cold
1917eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2222eio_init (void (*want_poll)(void), void (*done_poll)(void))
1918{ 2223{
2224#if !HAVE_PREADWRITE
2225 X_MUTEX_CREATE (preadwritelock);
2226#endif
2227
1919 return etp_init (want_poll, done_poll); 2228 return etp_init (want_poll, done_poll);
1920} 2229}
1921 2230
1922ecb_inline void 2231ecb_inline void
1923eio_api_destroy (eio_req *req) 2232eio_api_destroy (eio_req *req)
1950 } 2259 }
1951 2260
1952static void 2261static void
1953eio_execute (etp_worker *self, eio_req *req) 2262eio_execute (etp_worker *self, eio_req *req)
1954{ 2263{
2264#if HAVE_AT
2265 int dirfd;
2266#else
2267 const char *path;
2268#endif
2269
1955 if (ecb_expect_false (EIO_CANCELLED (req))) 2270 if (ecb_expect_false (EIO_CANCELLED (req)))
1956 { 2271 {
1957 req->result = -1; 2272 req->result = -1;
1958 req->errorno = ECANCELED; 2273 req->errorno = ECANCELED;
1959 return; 2274 return;
1960 } 2275 }
1961 2276
2277 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2278 {
2279 req->result = -1;
2280 req->errorno = ENOENT;
2281 return;
2282 }
2283
2284 if (req->type >= EIO_OPEN)
2285 {
2286 #if HAVE_AT
2287 dirfd = WD2FD (req->wd);
2288 #else
2289 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2290 #endif
2291 }
2292
1962 switch (req->type) 2293 switch (req->type)
1963 { 2294 {
2295 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2296 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2297 break;
2298 case EIO_WD_CLOSE: req->result = 0;
2299 eio_wd_close_sync (req->wd); break;
2300
1964 case EIO_READ: ALLOC (req->size); 2301 case EIO_READ: ALLOC (req->size);
1965 req->result = req->offs >= 0 2302 req->result = req->offs >= 0
1966 ? pread (req->int1, req->ptr2, req->size, req->offs) 2303 ? pread (req->int1, req->ptr2, req->size, req->offs)
1967 : read (req->int1, req->ptr2, req->size); break; 2304 : read (req->int1, req->ptr2, req->size); break;
1968 case EIO_WRITE: req->result = req->offs >= 0 2305 case EIO_WRITE: req->result = req->offs >= 0
1969 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2306 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1970 : write (req->int1, req->ptr2, req->size); break; 2307 : write (req->int1, req->ptr2, req->size); break;
1971 2308
1972 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2309 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1973 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2310 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2311
2312#if HAVE_AT
1974 2313
1975 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2314 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1976 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2315 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1977 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2316 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2317 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2318 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2319 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2320 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2321 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2322
2323 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2324 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2325 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2326 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2327 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2328 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2329 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2330 case EIO_READLINK: ALLOC (PATH_MAX);
2331 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2332 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2333 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2334 case EIO_UTIME:
2335 case EIO_FUTIME:
2336 {
2337 struct timespec ts[2];
2338 struct timespec *times;
2339
2340 if (req->nv1 != -1. || req->nv2 != -1.)
2341 {
2342 ts[0].tv_sec = req->nv1;
2343 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2344 ts[1].tv_sec = req->nv2;
2345 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2346
2347 times = ts;
2348 }
2349 else
2350 times = 0;
2351
2352 req->result = req->type == EIO_FUTIME
2353 ? futimens (req->int1, times)
2354 : utimensat (dirfd, req->ptr1, times, 0);
2355 }
2356 break;
2357
2358#else
2359
2360 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2361 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2362 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1978 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2363 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2364 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2365 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2366 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2367 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2368
2369 case EIO_UNLINK: req->result = unlink (path ); break;
2370 case EIO_RMDIR: req->result = rmdir (path ); break;
2371 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2372 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2373 case EIO_LINK: req->result = link (path , req->ptr2); break;
2374 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2375 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2376 case EIO_READLINK: ALLOC (PATH_MAX);
2377 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2378 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2379 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2380
2381 case EIO_UTIME:
2382 case EIO_FUTIME:
2383 {
2384 struct timeval tv[2];
2385 struct timeval *times;
2386
2387 if (req->nv1 != -1. || req->nv2 != -1.)
2388 {
2389 tv[0].tv_sec = req->nv1;
2390 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2391 tv[1].tv_sec = req->nv2;
2392 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2393
2394 times = tv;
2395 }
2396 else
2397 times = 0;
2398
2399 req->result = req->type == EIO_FUTIME
2400 ? futimes (req->int1, times)
2401 : utimes (req->ptr1, times);
2402 }
2403 break;
2404
2405#endif
2406
2407 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2408 {
2409 ALLOC (req->result);
2410 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2411 }
2412 break;
2413
1979 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2414 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1980 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2415 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1981 2416
1982 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1983 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1984 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2417 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1985 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2418 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1986 2419
1987 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1988 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2420 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1989 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1990 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2421 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1991 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1992 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2422 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1993 2423
1994 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1995 case EIO_CLOSE: req->result = close (req->int1); break; 2424 case EIO_CLOSE: req->result = close (req->int1); break;
1996 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2425 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1997 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1998 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1999 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2000 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2001 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2002 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2003 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2004
2005 case EIO_REALPATH: eio__realpath (req, self); break;
2006
2007 case EIO_READLINK: ALLOC (PATH_MAX);
2008 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2009
2010 case EIO_SYNC: req->result = 0; sync (); break; 2426 case EIO_SYNC: req->result = 0; sync (); break;
2011 case EIO_FSYNC: req->result = fsync (req->int1); break; 2427 case EIO_FSYNC: req->result = fsync (req->int1); break;
2012 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2428 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2429 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2430 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2013 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2431 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2014 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2432 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2015 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2433 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2016 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2434 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2017 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2018 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2435 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2019 2436
2020 case EIO_READDIR: eio__scandir (req, self); break; 2437 case EIO_READDIR: eio__scandir (req, self); break;
2021 2438
2022 case EIO_BUSY: 2439 case EIO_BUSY:
2032 req->result = select (0, 0, 0, 0, &tv); 2449 req->result = select (0, 0, 0, 0, &tv);
2033 } 2450 }
2034#endif 2451#endif
2035 break; 2452 break;
2036 2453
2037 case EIO_UTIME:
2038 case EIO_FUTIME:
2039 {
2040 struct timeval tv[2];
2041 struct timeval *times;
2042
2043 if (req->nv1 != -1. || req->nv2 != -1.)
2044 {
2045 tv[0].tv_sec = req->nv1;
2046 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2047 tv[1].tv_sec = req->nv2;
2048 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2049
2050 times = tv;
2051 }
2052 else
2053 times = 0;
2054
2055 req->result = req->type == EIO_FUTIME
2056 ? futimes (req->int1, times)
2057 : utimes (req->ptr1, times);
2058 }
2059 break;
2060
2061 case EIO_GROUP: 2454 case EIO_GROUP:
2062 abort (); /* handled in eio_request */ 2455 abort (); /* handled in eio_request */
2063 2456
2064 case EIO_NOP: 2457 case EIO_NOP:
2065 req->result = 0; 2458 req->result = 0;
2103eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2496eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2104{ 2497{
2105 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2498 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2106} 2499}
2107 2500
2501eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2502{
2503 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2504}
2505
2506eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2507{
2508 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2509}
2510
2511eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2512{
2513 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2514}
2515
2108eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2516eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2109{ 2517{
2110 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2518 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2111} 2519}
2112 2520
2118eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2526eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2119{ 2527{
2120 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2528 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2121} 2529}
2122 2530
2123eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2124{
2125 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2126}
2127
2128eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2531eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2129{ 2532{
2130 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2533 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2131} 2534}
2132 2535
2133eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2134{
2135 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2136}
2137
2138eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2536eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2139{ 2537{
2140 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2538 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2141} 2539}
2142 2540
2178eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2576eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
2179{ 2577{
2180 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2578 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2181} 2579}
2182 2580
2183eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2581eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2184{ 2582{
2185 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2583 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2186} 2584}
2187 2585
2188eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2586eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
2208eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2606eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
2209{ 2607{
2210 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2608 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2211} 2609}
2212 2610
2213eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2611eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2214{ 2612{
2215 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2613 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2216} 2614}
2217 2615
2218eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2616eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
2365} 2763}
2366 2764
2367/*****************************************************************************/ 2765/*****************************************************************************/
2368/* misc garbage */ 2766/* misc garbage */
2369 2767
2370ssize_t 2768eio_ssize_t
2371eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2769eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2372{ 2770{
2373 etp_worker wrk;
2374 ssize_t ret;
2375
2376 wrk.dbuf = 0;
2377
2378 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2771 return eio__sendfile (ofd, ifd, offset, count);
2379
2380 if (wrk.dbuf)
2381 free (wrk.dbuf);
2382
2383 return ret;
2384} 2772}
2385 2773

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines