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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.88 by root, Thu Jul 14 19:31:43 2011 UTC vs.
Revision 1.123 by root, Tue Oct 9 04:53:53 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines