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

Comparing libeio/eio.c (file contents):
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC vs.
Revision 1.121 by root, Sat Jun 2 20:13:26 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>
67#endif 67#endif
68 68
69#ifndef ECANCELED 69#ifndef ECANCELED
70# define ECANCELED EDOM 70# define ECANCELED EDOM
71#endif 71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
72 79
73static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
74 81
75#ifndef EIO_FINISH 82#ifndef EIO_FINISH
76# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
95 102
96#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
97 104
98#ifdef _WIN32 105#ifdef _WIN32
99 106
107 #undef PAGESIZE
100 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
101 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
102 #ifdef EIO_STRUCT_STATI64 112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
103 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
104 #define fstat(fd,buf) _fstati64 (path,buf) 115 #define fstat(fd,buf) _fstati64 (fd,buf)
105 #endif 116 #endif
106 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
107 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
108 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
109 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
110 121
122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125
126 #define fchmod(fd,mode) EIO_ENOSYS ()
111 #define chown(path,uid,gid) EIO_ENOSYS () 127 #define chown(path,uid,gid) EIO_ENOSYS ()
112 #define fchown(fd,uid,gid) EIO_ENOSYS () 128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
113 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
114 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
115 #define mknod(path,mode,dev) EIO_ENOSYS () 131 #define mknod(path,mode,dev) EIO_ENOSYS ()
116 #define sync() EIO_ENOSYS () 132 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS ()
136
137 /* 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 }
117 167
118 /* we could even stat and see if it exists */ 168 /* we could even stat and see if it exists */
119 static int 169 static int
120 symlink (const char *old, const char *neu) 170 symlink (const char *old, const char *neu)
121 { 171 {
172 #if WINVER >= 0x0600
122 if (CreateSymbolicLink (neu, old, 1)) 173 if (CreateSymbolicLink (neu, old, 1))
123 return 0; 174 return 0;
124 175
125 if (CreateSymbolicLink (neu, old, 0)) 176 if (CreateSymbolicLink (neu, old, 0))
126 return 0; 177 return 0;
178 #endif
127 179
128 return EIO_ERRNO (ENOENT, -1); 180 return EIO_ERRNO (ENOENT, -1);
129 } 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)
130 196
131#else 197#else
132 198
133 #include <sys/time.h> 199 #include <sys/time.h>
134 #include <sys/select.h> 200 #include <sys/select.h>
135 #include <sys/statvfs.h> 201 #include <sys/statvfs.h>
136 #include <unistd.h> 202 #include <unistd.h>
137 #include <utime.h>
138 #include <signal.h> 203 #include <signal.h>
139 #include <dirent.h> 204 #include <dirent.h>
140 205
141 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 206 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
142 #include <sys/mman.h> 207 #include <sys/mman.h>
143 #endif 208 #endif
144 209
210 #define D_NAME(entp) entp->d_name
211
145 /* 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 */
146 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 213 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
147 #define _DIRENT_HAVE_D_TYPE /* sigh */ 214 #define _DIRENT_HAVE_D_TYPE /* sigh */
148 #define D_INO(de) (de)->d_fileno 215 #define D_INO(de) (de)->d_fileno
149 #define D_NAMLEN(de) (de)->d_namlen 216 #define D_NAMLEN(de) (de)->d_namlen
150 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 217 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
151 #define D_INO(de) (de)->d_ino 218 #define D_INO(de) (de)->d_ino
162 229
163 #ifndef EIO_STRUCT_DIRENT 230 #ifndef EIO_STRUCT_DIRENT
164 #define EIO_STRUCT_DIRENT struct dirent 231 #define EIO_STRUCT_DIRENT struct dirent
165 #endif 232 #endif
166 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>
167#endif 246#endif
168 247
169#if HAVE_SENDFILE 248#if HAVE_SENDFILE
170# if __linux 249# if __linux
171# include <sys/sendfile.h> 250# include <sys/sendfile.h>
186#endif 265#endif
187#ifndef D_INO 266#ifndef D_INO
188# define D_INO(de) 0 267# define D_INO(de) 0
189#endif 268#endif
190#ifndef D_NAMLEN 269#ifndef D_NAMLEN
191# define D_NAMLEN(de) strlen ((de)->d_name) 270# define D_NAMLEN(entp) strlen (D_NAME (entp))
192#endif 271#endif
193 272
194/* used for struct dirent, AIX doesn't provide it */ 273/* used for struct dirent, AIX doesn't provide it */
195#ifndef NAME_MAX 274#ifndef NAME_MAX
196# define NAME_MAX 4096 275# define NAME_MAX 4096
203 282
204/* buffer size for various temporary buffers */ 283/* buffer size for various temporary buffers */
205#define EIO_BUFSIZE 65536 284#define EIO_BUFSIZE 65536
206 285
207#define dBUF \ 286#define dBUF \
208 char *eio_buf; \
209 ETP_WORKER_LOCK (self); \
210 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 287 char *eio_buf = malloc (EIO_BUFSIZE); \
211 ETP_WORKER_UNLOCK (self); \
212 errno = ENOMEM; \ 288 errno = ENOMEM; \
213 if (!eio_buf) \ 289 if (!eio_buf) \
214 return -1; 290 return -1
291
292#define FUBd \
293 free (eio_buf)
215 294
216#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/*****************************************************************************/
217 340
218#define ETP_PRI_MIN EIO_PRI_MIN 341#define ETP_PRI_MIN EIO_PRI_MIN
219#define ETP_PRI_MAX EIO_PRI_MAX 342#define ETP_PRI_MAX EIO_PRI_MAX
220 343
221struct etp_worker; 344struct etp_worker;
225static int eio_finish (eio_req *req); 348static int eio_finish (eio_req *req);
226#define ETP_FINISH(req) eio_finish (req) 349#define ETP_FINISH(req) eio_finish (req)
227static void eio_execute (struct etp_worker *self, eio_req *req); 350static void eio_execute (struct etp_worker *self, eio_req *req);
228#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 351#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
229 352
230#define ETP_WORKER_CLEAR(req) \
231 if (wrk->dbuf) \
232 { \
233 free (wrk->dbuf); \
234 wrk->dbuf = 0; \
235 } \
236 \
237 if (wrk->dirp) \
238 { \
239 closedir (wrk->dirp); \
240 wrk->dirp = 0; \
241 }
242
243#define ETP_WORKER_COMMON \
244 void *dbuf; \
245 DIR *dirp;
246
247/*****************************************************************************/ 353/*****************************************************************************/
248 354
249#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 355#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250 356
251/* calculate time difference in ~1/EIO_TICKS of a second */ 357/* calculate time difference in ~1/EIO_TICKS of a second */
262static void (*done_poll_cb) (void); 368static void (*done_poll_cb) (void);
263 369
264static unsigned int max_poll_time; /* reslock */ 370static unsigned int max_poll_time; /* reslock */
265static unsigned int max_poll_reqs; /* reslock */ 371static unsigned int max_poll_reqs; /* reslock */
266 372
267static volatile unsigned int nreqs; /* reqlock */ 373static unsigned int nreqs; /* reqlock */
268static volatile unsigned int nready; /* reqlock */ 374static unsigned int nready; /* reqlock */
269static volatile unsigned int npending; /* reqlock */ 375static unsigned int npending; /* reqlock */
270static 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 */
271static 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 */
272 378
273static xmutex_t wrklock; 379static xmutex_t wrklock;
274static xmutex_t reslock; 380static xmutex_t reslock;
275static xmutex_t reqlock; 381static xmutex_t reqlock;
276static xcond_t reqwait; 382static xcond_t reqwait;
277 383
278#if !HAVE_PREADWRITE
279/*
280 * make our pread/pwrite emulation safe against themselves, but not against
281 * normal read/write by using a mutex. slows down execution a lot,
282 * but that's your problem, not mine.
283 */
284static xmutex_t preadwritelock = X_MUTEX_INIT;
285#endif
286
287typedef struct etp_worker 384typedef struct etp_worker
288{ 385{
386 struct tmpbuf tmpbuf;
387
289 /* locked by wrklock */ 388 /* locked by wrklock */
290 struct etp_worker *prev, *next; 389 struct etp_worker *prev, *next;
291 390
292 xthread_t tid; 391 xthread_t tid;
293 392
294 /* locked by reslock, reqlock or wrklock */ 393#ifdef ETP_WORKER_COMMON
295 ETP_REQ *req; /* currently processed request */
296
297 ETP_WORKER_COMMON 394 ETP_WORKER_COMMON
395#endif
298} etp_worker; 396} etp_worker;
299 397
300static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 398static etp_worker wrk_first; /* NOT etp */
301 399
302#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 400#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 401#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304 402
305/* worker threads management */ 403/* worker threads management */
306 404
307static void ecb_cold 405static void
308etp_worker_clear (etp_worker *wrk) 406etp_worker_clear (etp_worker *wrk)
309{ 407{
310 ETP_WORKER_CLEAR (wrk);
311} 408}
312 409
313static void ecb_cold 410static void ecb_cold
314etp_worker_free (etp_worker *wrk) 411etp_worker_free (etp_worker *wrk)
315{ 412{
413 free (wrk->tmpbuf.ptr);
414
316 wrk->next->prev = wrk->prev; 415 wrk->next->prev = wrk->prev;
317 wrk->prev->next = wrk->next; 416 wrk->prev->next = wrk->next;
318 417
319 free (wrk); 418 free (wrk);
320} 419}
376} etp_reqq; 475} etp_reqq;
377 476
378static etp_reqq req_queue; 477static etp_reqq req_queue;
379static etp_reqq res_queue; 478static etp_reqq res_queue;
380 479
480static void ecb_noinline ecb_cold
481reqq_init (etp_reqq *q)
482{
483 int pri;
484
485 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
486 q->qs[pri] = q->qe[pri] = 0;
487
488 q->size = 0;
489}
490
381static int ecb_noinline 491static int ecb_noinline
382reqq_push (etp_reqq *q, ETP_REQ *req) 492reqq_push (etp_reqq *q, ETP_REQ *req)
383{ 493{
384 int pri = req->pri; 494 int pri = req->pri;
385 req->next = 0; 495 req->next = 0;
419 } 529 }
420 530
421 abort (); 531 abort ();
422} 532}
423 533
424static void ecb_cold 534static int ecb_cold
425etp_thread_init (void) 535etp_init (void (*want_poll)(void), void (*done_poll)(void))
426{ 536{
427#if !HAVE_PREADWRITE
428 X_MUTEX_CREATE (preadwritelock);
429#endif
430 X_MUTEX_CREATE (wrklock); 537 X_MUTEX_CREATE (wrklock);
431 X_MUTEX_CREATE (reslock); 538 X_MUTEX_CREATE (reslock);
432 X_MUTEX_CREATE (reqlock); 539 X_MUTEX_CREATE (reqlock);
433 X_COND_CREATE (reqwait); 540 X_COND_CREATE (reqwait);
434}
435 541
436static void ecb_cold 542 reqq_init (&req_queue);
437etp_atfork_prepare (void) 543 reqq_init (&res_queue);
438{
439}
440 544
441static void ecb_cold 545 wrk_first.next =
442etp_atfork_parent (void) 546 wrk_first.prev = &wrk_first;
443{
444}
445
446static void ecb_cold
447etp_atfork_child (void)
448{
449 ETP_REQ *prv;
450
451 while ((prv = reqq_shift (&req_queue)))
452 ETP_DESTROY (prv);
453
454 while ((prv = reqq_shift (&res_queue)))
455 ETP_DESTROY (prv);
456
457 while (wrk_first.next != &wrk_first)
458 {
459 etp_worker *wrk = wrk_first.next;
460
461 if (wrk->req)
462 ETP_DESTROY (wrk->req);
463
464 etp_worker_clear (wrk);
465 etp_worker_free (wrk);
466 }
467 547
468 started = 0; 548 started = 0;
469 idle = 0; 549 idle = 0;
470 nreqs = 0; 550 nreqs = 0;
471 nready = 0; 551 nready = 0;
472 npending = 0; 552 npending = 0;
473
474 etp_thread_init ();
475}
476
477static void ecb_cold
478etp_once_init (void)
479{
480 etp_thread_init ();
481 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
482}
483
484static int ecb_cold
485etp_init (void (*want_poll)(void), void (*done_poll)(void))
486{
487 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
488
489 pthread_once (&doinit, etp_once_init);
490 553
491 want_poll_cb = want_poll; 554 want_poll_cb = want_poll;
492 done_poll_cb = done_poll; 555 done_poll_cb = done_poll;
493 556
494 return 0; 557 return 0;
534} 597}
535 598
536static void ecb_cold 599static void ecb_cold
537etp_end_thread (void) 600etp_end_thread (void)
538{ 601{
539 eio_req *req = calloc (1, sizeof (eio_req)); 602 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
540 603
541 req->type = -1; 604 req->type = -1;
542 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 605 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
543 606
544 X_LOCK (reqlock); 607 X_LOCK (reqlock);
871} 934}
872 935
873/*****************************************************************************/ 936/*****************************************************************************/
874/* work around various missing functions */ 937/* work around various missing functions */
875 938
876#if !HAVE_PREADWRITE
877# undef pread
878# undef pwrite
879# define pread eio__pread
880# define pwrite eio__pwrite
881
882static eio_ssize_t
883eio__pread (int fd, void *buf, size_t count, off_t offset)
884{
885 eio_ssize_t res;
886 off_t ooffset;
887
888 X_LOCK (preadwritelock);
889 ooffset = lseek (fd, 0, SEEK_CUR);
890 lseek (fd, offset, SEEK_SET);
891 res = read (fd, buf, count);
892 lseek (fd, ooffset, SEEK_SET);
893 X_UNLOCK (preadwritelock);
894
895 return res;
896}
897
898static eio_ssize_t
899eio__pwrite (int fd, void *buf, size_t count, off_t offset)
900{
901 eio_ssize_t res;
902 off_t ooffset;
903
904 X_LOCK (preadwritelock);
905 ooffset = lseek (fd, 0, SEEK_CUR);
906 lseek (fd, offset, SEEK_SET);
907 res = write (fd, buf, count);
908 lseek (fd, ooffset, SEEK_SET);
909 X_UNLOCK (preadwritelock);
910
911 return res;
912}
913#endif
914
915#ifndef HAVE_UTIMES 939#ifndef HAVE_UTIMES
916 940
917# undef utimes 941# undef utimes
918# define utimes(path,times) eio__utimes (path, times) 942# define utimes(path,times) eio__utimes (path, times)
919 943
951 975
952#if !HAVE_FDATASYNC 976#if !HAVE_FDATASYNC
953# undef fdatasync 977# undef fdatasync
954# define fdatasync(fd) fsync (fd) 978# define fdatasync(fd) fsync (fd)
955#endif 979#endif
980
981static int
982eio__syncfs (int fd)
983{
984 int res;
985
986#if HAVE_SYS_SYNCFS
987 res = (int)syscall (__NR_syncfs, (int)(fd));
988#else
989 res = EIO_ENOSYS ();
990#endif
991
992 if (res < 0 && errno == ENOSYS && fd >= 0)
993 sync ();
994
995 return res;
996}
956 997
957/* sync_file_range always needs emulation */ 998/* sync_file_range always needs emulation */
958static int 999static int
959eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1000eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
960{ 1001{
983} 1024}
984 1025
985static int 1026static int
986eio__fallocate (int fd, int mode, off_t offset, size_t len) 1027eio__fallocate (int fd, int mode, off_t offset, size_t len)
987{ 1028{
988#if HAVE_FALLOCATE 1029#if HAVE_LINUX_FALLOCATE
989 return fallocate (fd, mode, offset, len); 1030 return fallocate (fd, mode, offset, len);
990#else 1031#else
991 errno = ENOSYS; 1032 return EIO_ENOSYS ();
992 return -1;
993#endif 1033#endif
994} 1034}
995 1035
996#if !HAVE_READAHEAD 1036#if !HAVE_READAHEAD
997# undef readahead 1037# undef readahead
1010 pread (fd, eio_buf, len, offset); 1050 pread (fd, eio_buf, len, offset);
1011 offset += len; 1051 offset += len;
1012 todo -= len; 1052 todo -= len;
1013 } 1053 }
1014 1054
1015 errno = 0; 1055 FUBd;
1056
1057 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1058 /* but not for e.g. EIO or eof, so we also never fail */
1016 return count; 1059 return 0;
1017} 1060}
1018 1061
1019#endif 1062#endif
1020 1063
1021/* sendfile always needs emulation */ 1064/* sendfile always needs emulation */
1022static eio_ssize_t 1065static eio_ssize_t
1023eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1066eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024{ 1067{
1025 eio_ssize_t written = 0; 1068 eio_ssize_t written = 0;
1026 eio_ssize_t res; 1069 eio_ssize_t res;
1027 1070
1028 if (!count) 1071 if (!count)
1056 1099
1057 /* according to source inspection, this is correct, and useful behaviour */ 1100 /* according to source inspection, this is correct, and useful behaviour */
1058 if (sbytes) 1101 if (sbytes)
1059 res = sbytes; 1102 res = sbytes;
1060 1103
1061# elif defined (__APPLE__) 1104# elif defined __APPLE__
1062 off_t sbytes = count; 1105 off_t sbytes = count;
1063 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1106 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1064 1107
1065 /* according to the manpage, sbytes is always valid */ 1108 /* according to the manpage, sbytes is always valid */
1066 if (sbytes) 1109 if (sbytes)
1093 HANDLE h = TO_SOCKET (ifd); 1136 HANDLE h = TO_SOCKET (ifd);
1094 SetFilePointer (h, offset, 0, FILE_BEGIN); 1137 SetFilePointer (h, offset, 0, FILE_BEGIN);
1095 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1138 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1096 1139
1097#else 1140#else
1098 res = -1; 1141 res = EIO_ENOSYS ();
1099 errno = ENOSYS;
1100#endif 1142#endif
1101 1143
1102 /* we assume sendfile can copy at least 128mb in one go */ 1144 /* we assume sendfile can copy at least 128mb in one go */
1103 if (res <= 128 * 1024 * 1024) 1145 if (res <= 128 * 1024 * 1024)
1104 { 1146 {
1126 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1168 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1127 /* BSDs */ 1169 /* BSDs */
1128#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1170#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129 || errno == ENOTSUP 1171 || errno == ENOTSUP
1130#endif 1172#endif
1173#ifdef EOPNOTSUPP /* windows */
1131 || errno == EOPNOTSUPP /* BSDs */ 1174 || errno == EOPNOTSUPP /* BSDs */
1175#endif
1132#if __solaris 1176#if __solaris
1133 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1177 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1134#endif 1178#endif
1135 ) 1179 )
1136 ) 1180 )
1162 1206
1163 offset += cnt; 1207 offset += cnt;
1164 res += cnt; 1208 res += cnt;
1165 count -= cnt; 1209 count -= cnt;
1166 } 1210 }
1211
1212 FUBd;
1167 } 1213 }
1168 1214
1169 return res; 1215 return res;
1170} 1216}
1171 1217
1287 1333
1288/*****************************************************************************/ 1334/*****************************************************************************/
1289/* requests implemented outside eio_execute, because they are so large */ 1335/* requests implemented outside eio_execute, because they are so large */
1290 1336
1291static void 1337static void
1292eio__realpath (eio_req *req, etp_worker *self) 1338eio__lseek (eio_req *req)
1293{ 1339{
1294 char *rel = req->ptr1; 1340 /* this usually gets optimised away completely, or your compiler sucks, */
1341 /* or the whence constants really are not 0, 1, 2 */
1342 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
1343 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
1344 : req->int2 == EIO_SEEK_END ? SEEK_END
1345 : req->int2;
1346
1347 req->offs = lseek (req->int1, req->offs, whence);
1348 req->result = req->offs == (off_t)-1 ? -1 : 0;
1349}
1350
1351/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1352static int
1353eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1354{
1355 const char *rel = path;
1295 char *res; 1356 char *res;
1296 char *tmp1, *tmp2; 1357 char *tmp1, *tmp2;
1297#if SYMLOOP_MAX > 32 1358#if SYMLOOP_MAX > 32
1298 int symlinks = SYMLOOP_MAX; 1359 int symlinks = SYMLOOP_MAX;
1299#else 1360#else
1300 int symlinks = 32; 1361 int symlinks = 32;
1301#endif 1362#endif
1302 1363
1303 req->result = -1;
1304
1305 errno = EINVAL; 1364 errno = EINVAL;
1306 if (!rel) 1365 if (!rel)
1307 return; 1366 return -1;
1308 1367
1309 errno = ENOENT; 1368 errno = ENOENT;
1310 if (!*rel) 1369 if (!*rel)
1311 return; 1370 return -1;
1312 1371
1313 if (!req->ptr2) 1372 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1314 {
1315 X_LOCK (wrklock);
1316 req->flags |= EIO_FLAG_PTR2_FREE;
1317 X_UNLOCK (wrklock);
1318 req->ptr2 = malloc (PATH_MAX * 3);
1319
1320 errno = ENOMEM;
1321 if (!req->ptr2)
1322 return;
1323 }
1324
1325 res = req->ptr2;
1326 tmp1 = res + PATH_MAX; 1373 tmp1 = res + PATH_MAX;
1327 tmp2 = tmp1 + PATH_MAX; 1374 tmp2 = tmp1 + PATH_MAX;
1328 1375
1329#if 0 /* disabled, the musl way to do things is just too racy */ 1376#if 0 /* disabled, the musl way to do things is just too racy */
1330#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1377#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1349#endif 1396#endif
1350#endif 1397#endif
1351 1398
1352 if (*rel != '/') 1399 if (*rel != '/')
1353 { 1400 {
1401 int len;
1402
1403 errno = ENOENT;
1404 if (wd == EIO_INVALID_WD)
1405 return -1;
1406
1407 if (wd == EIO_CWD)
1408 {
1354 if (!getcwd (res, PATH_MAX)) 1409 if (!getcwd (res, PATH_MAX))
1355 return; 1410 return -1;
1411
1412 len = strlen (res);
1413 }
1414 else
1415 memcpy (res, wd->str, len = wd->len);
1356 1416
1357 if (res [1]) /* only use if not / */ 1417 if (res [1]) /* only use if not / */
1358 res += strlen (res); 1418 res += len;
1359 } 1419 }
1360 1420
1361 while (*rel) 1421 while (*rel)
1362 { 1422 {
1363 eio_ssize_t len, linklen; 1423 eio_ssize_t len, linklen;
1364 char *beg = rel; 1424 const char *beg = rel;
1365 1425
1366 while (*rel && *rel != '/') 1426 while (*rel && *rel != '/')
1367 ++rel; 1427 ++rel;
1368 1428
1369 len = rel - beg; 1429 len = rel - beg;
1381 1441
1382 if (beg [1] == '.' && len == 2) 1442 if (beg [1] == '.' && len == 2)
1383 { 1443 {
1384 /* .. - back up one component, if possible */ 1444 /* .. - back up one component, if possible */
1385 1445
1386 while (res != req->ptr2) 1446 while (res != tmpbuf->ptr)
1387 if (*--res == '/') 1447 if (*--res == '/')
1388 break; 1448 break;
1389 1449
1390 continue; 1450 continue;
1391 } 1451 }
1392 } 1452 }
1393 1453
1394 errno = ENAMETOOLONG; 1454 errno = ENAMETOOLONG;
1395 if (res + 1 + len + 1 >= tmp1) 1455 if (res + 1 + len + 1 >= tmp1)
1396 return; 1456 return -1;
1397 1457
1398 /* copy one component */ 1458 /* copy one component */
1399 *res = '/'; 1459 *res = '/';
1400 memcpy (res + 1, beg, len); 1460 memcpy (res + 1, beg, len);
1401 1461
1402 /* zero-terminate, for readlink */ 1462 /* zero-terminate, for readlink */
1403 res [len + 1] = 0; 1463 res [len + 1] = 0;
1404 1464
1405 /* now check if it's a symlink */ 1465 /* now check if it's a symlink */
1406 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1466 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1407 1467
1408 if (linklen < 0) 1468 if (linklen < 0)
1409 { 1469 {
1410 if (errno != EINVAL) 1470 if (errno != EINVAL)
1411 return; 1471 return -1;
1412 1472
1413 /* it's a normal directory. hopefully */ 1473 /* it's a normal directory. hopefully */
1414 res += len + 1; 1474 res += len + 1;
1415 } 1475 }
1416 else 1476 else
1418 /* yay, it was a symlink - build new path in tmp2 */ 1478 /* yay, it was a symlink - build new path in tmp2 */
1419 int rellen = strlen (rel); 1479 int rellen = strlen (rel);
1420 1480
1421 errno = ENAMETOOLONG; 1481 errno = ENAMETOOLONG;
1422 if (linklen + 1 + rellen >= PATH_MAX) 1482 if (linklen + 1 + rellen >= PATH_MAX)
1423 return; 1483 return -1;
1424 1484
1425 errno = ELOOP; 1485 errno = ELOOP;
1426 if (!--symlinks) 1486 if (!--symlinks)
1427 return; 1487 return -1;
1428 1488
1429 if (*tmp1 == '/') 1489 if (*tmp1 == '/')
1430 res = req->ptr2; /* symlink resolves to an absolute path */ 1490 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1431 1491
1432 /* we need to be careful, as rel might point into tmp2 already */ 1492 /* we need to be careful, as rel might point into tmp2 already */
1433 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1493 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1434 tmp2 [linklen] = '/'; 1494 tmp2 [linklen] = '/';
1435 memcpy (tmp2, tmp1, linklen); 1495 memcpy (tmp2, tmp1, linklen);
1437 rel = tmp2; 1497 rel = tmp2;
1438 } 1498 }
1439 } 1499 }
1440 1500
1441 /* special case for the lone root path */ 1501 /* special case for the lone root path */
1442 if (res == req->ptr2) 1502 if (res == tmpbuf->ptr)
1443 *res++ = '/'; 1503 *res++ = '/';
1444 1504
1445 req->result = res - (char *)req->ptr2; 1505 return res - (char *)tmpbuf->ptr;
1446
1447done:
1448 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1449} 1506}
1450 1507
1451static signed char 1508static signed char
1452eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1509eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1453{ 1510{
1461 1518
1462#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1519#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1463#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1520#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464 1521
1465static void 1522static void
1466eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1523eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467{ 1524{
1468 unsigned char bits [9 + sizeof (ino_t) * 8]; 1525 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469 unsigned char *bit = bits; 1526 unsigned char *bit = bits;
1470 1527
1471 assert (CHAR_BIT == 8); 1528 assert (CHAR_BIT == 8);
1472 assert (sizeof (eio_dirent) * 8 < 256); 1529 assert (sizeof (eio_dirent) * 8 < 256);
1473 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1530 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1475 1532
1476 if (size <= EIO_SORT_FAST) 1533 if (size <= EIO_SORT_FAST)
1477 return; 1534 return;
1478 1535
1479 /* first prepare an array of bits to test in our radix sort */ 1536 /* first prepare an array of bits to test in our radix sort */
1480 /* try to take endianness into account, as well as differences in ino_t sizes */ 1537 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481 /* inode_bits must contain all inodes ORed together */ 1538 /* inode_bits must contain all inodes ORed together */
1482 /* which is used to skip bits that are 0 everywhere, which is very common */ 1539 /* which is used to skip bits that are 0 everywhere, which is very common */
1483 { 1540 {
1484 ino_t endianness; 1541 eio_ino_t endianness;
1485 int i, j; 1542 int i, j;
1486 1543
1487 /* we store the byte offset of byte n into byte n of "endianness" */ 1544 /* we store the byte offset of byte n into byte n of "endianness" */
1488 for (i = 0; i < sizeof (ino_t); ++i) 1545 for (i = 0; i < sizeof (eio_ino_t); ++i)
1489 ((unsigned char *)&endianness)[i] = i; 1546 ((unsigned char *)&endianness)[i] = i;
1490 1547
1491 *bit++ = 0; 1548 *bit++ = 0;
1492 1549
1493 for (i = 0; i < sizeof (ino_t); ++i) 1550 for (i = 0; i < sizeof (eio_ino_t); ++i)
1494 { 1551 {
1495 /* shifting off the byte offsets out of "endianness" */ 1552 /* shifting off the byte offsets out of "endianness" */
1496 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1553 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497 endianness >>= 8; 1554 endianness >>= 8;
1498 1555
1499 for (j = 0; j < 8; ++j) 1556 for (j = 0; j < 8; ++j)
1500 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1557 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501 *bit++ = offs + j; 1558 *bit++ = offs + j;
1502 } 1559 }
1503 1560
1504 for (j = 0; j < 8; ++j) 1561 for (j = 0; j < 8; ++j)
1505 if (score_bits & (1 << j)) 1562 if (score_bits & (1 << j))
1506 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1563 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1507 } 1564 }
1508 1565
1509 /* now actually do the sorting (a variant of MSD radix sort) */ 1566 /* now actually do the sorting (a variant of MSD radix sort) */
1510 { 1567 {
1511 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1568 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1569 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1570 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514 int stk_idx = 0; 1571 int stk_idx = 0;
1515 1572
1516 base_stk [stk_idx] = dents; 1573 base_stk [stk_idx] = dents;
1517 end_stk [stk_idx] = dents + size; 1574 end_stk [stk_idx] = dents + size;
1518 bit_stk [stk_idx] = bit - 1; 1575 bit_stk [stk_idx] = bit - 1;
1597 } 1654 }
1598 } 1655 }
1599} 1656}
1600 1657
1601static void 1658static void
1602eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1659eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603{ 1660{
1604 if (size <= 1) 1661 if (size <= 1)
1605 return; /* our insertion sort relies on size > 0 */ 1662 return; /* our insertion sort relies on size > 0 */
1606 1663
1607 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1664 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1615 1672
1616/* read a full directory */ 1673/* read a full directory */
1617static void 1674static void
1618eio__scandir (eio_req *req, etp_worker *self) 1675eio__scandir (eio_req *req, etp_worker *self)
1619{ 1676{
1620 DIR *dirp;
1621 EIO_STRUCT_DIRENT *entp;
1622 char *name, *names; 1677 char *name, *names;
1623 int namesalloc = 4096; 1678 int namesalloc = 4096 - sizeof (void *) * 4;
1624 int namesoffs = 0; 1679 int namesoffs = 0;
1625 int flags = req->int1; 1680 int flags = req->int1;
1626 eio_dirent *dents = 0; 1681 eio_dirent *dents = 0;
1627 int dentalloc = 128; 1682 int dentalloc = 128;
1628 int dentoffs = 0; 1683 int dentoffs = 0;
1629 ino_t inode_bits = 0; 1684 eio_ino_t inode_bits = 0;
1685#ifdef _WIN32
1686 HANDLE dirp;
1687 WIN32_FIND_DATA entp;
1688#else
1689 DIR *dirp;
1690 EIO_STRUCT_DIRENT *entp;
1691#endif
1630 1692
1631 req->result = -1; 1693 req->result = -1;
1632 1694
1633 if (!(flags & EIO_READDIR_DENTS)) 1695 if (!(flags & EIO_READDIR_DENTS))
1634 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1696 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635 1697
1636 X_LOCK (wrklock); 1698#ifdef _WIN32
1637 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1699 {
1700 int len = strlen ((const char *)req->ptr1);
1701 char *path = malloc (MAX_PATH);
1702 const char *fmt;
1703 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1704
1705 if (!len)
1706 fmt = "./*";
1707 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1708 fmt = "%s*";
1709 else
1710 fmt = "%s/*";
1711
1712 _snprintf (path, MAX_PATH, fmt, reqpath);
1713 dirp = FindFirstFile (path, &entp);
1714 free (path);
1715
1716 if (dirp == INVALID_HANDLE_VALUE)
1717 {
1718 /* should steal _dosmaperr */
1719 switch (GetLastError ())
1720 {
1721 case ERROR_FILE_NOT_FOUND:
1722 req->result = 0;
1723 break;
1724
1725 case ERROR_INVALID_NAME:
1726 case ERROR_PATH_NOT_FOUND:
1727 case ERROR_NO_MORE_FILES:
1728 errno = ENOENT;
1729 break;
1730
1731 case ERROR_NOT_ENOUGH_MEMORY:
1732 errno = ENOMEM;
1733 break;
1734
1735 default:
1736 errno = EINVAL;
1737 break;
1738 }
1739
1740 return;
1741 }
1742 }
1743#else
1744 #if HAVE_AT
1745 if (req->wd)
1746 {
1747 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1748
1749 if (fd < 0)
1750 return;
1751
1752 dirp = fdopendir (fd);
1753
1754 if (!dirp)
1755 close (fd);
1756 }
1757 else
1638 self->dirp = dirp = opendir (req->ptr1); 1758 dirp = opendir (req->ptr1);
1759 #else
1760 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1761 #endif
1762
1763 if (!dirp)
1764 return;
1765#endif
1639 1766
1640 if (req->flags & EIO_FLAG_PTR1_FREE) 1767 if (req->flags & EIO_FLAG_PTR1_FREE)
1641 free (req->ptr1); 1768 free (req->ptr1);
1642 1769
1643 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1770 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1771 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645 req->ptr2 = names = malloc (namesalloc); 1772 req->ptr2 = names = malloc (namesalloc);
1646 X_UNLOCK (wrklock);
1647 1773
1648 if (dirp && names && (!flags || dents)) 1774 if (!names || (flags && !dents))
1775 return;
1776
1649 for (;;) 1777 for (;;)
1650 { 1778 {
1779 int done;
1780
1781#ifdef _WIN32
1782 done = !dirp;
1783#else
1651 errno = 0; 1784 errno = 0;
1652 entp = readdir (dirp); 1785 entp = readdir (dirp);
1786 done = !entp;
1787#endif
1653 1788
1654 if (!entp) 1789 if (done)
1655 { 1790 {
1791#ifndef _WIN32
1792 int old_errno = errno;
1793 closedir (dirp);
1794 errno = old_errno;
1795
1656 if (errno) 1796 if (errno)
1657 break; 1797 break;
1798#endif
1658 1799
1659 /* sort etc. */ 1800 /* sort etc. */
1660 req->int1 = flags; 1801 req->int1 = flags;
1661 req->result = dentoffs; 1802 req->result = dentoffs;
1662 1803
1663 if (flags & EIO_READDIR_STAT_ORDER) 1804 if (flags & EIO_READDIR_STAT_ORDER)
1664 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1805 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1665 else if (flags & EIO_READDIR_DIRS_FIRST) 1806 else if (flags & EIO_READDIR_DIRS_FIRST)
1666 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1807 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1667 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1808 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1668 else 1809 else
1810 {
1811 /* in this case, all is known, and we just put dirs first and sort them */
1812 eio_dirent *oth = dents + dentoffs;
1813 eio_dirent *dir = dents;
1814
1815 /* now partition dirs to the front, and non-dirs to the back */
1816 /* by walking from both sides and swapping if necessary */
1817 while (oth > dir)
1818 {
1819 if (dir->type == EIO_DT_DIR)
1820 ++dir;
1821 else if ((--oth)->type == EIO_DT_DIR)
1822 {
1823 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1824
1825 ++dir;
1826 }
1827 }
1828
1829 /* now sort the dirs only (dirs all have the same score) */
1830 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1831 }
1832
1833 break;
1834 }
1835
1836 /* now add the entry to our list(s) */
1837 name = D_NAME (entp);
1838
1839 /* skip . and .. entries */
1840 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1841 {
1842 int len = D_NAMLEN (entp) + 1;
1843
1844 while (ecb_expect_false (namesoffs + len > namesalloc))
1845 {
1846 namesalloc *= 2;
1847 req->ptr2 = names = realloc (names, namesalloc);
1848
1849 if (!names)
1850 break;
1851 }
1852
1853 memcpy (names + namesoffs, name, len);
1854
1855 if (dents)
1856 {
1857 struct eio_dirent *ent;
1858
1859 if (ecb_expect_false (dentoffs == dentalloc))
1669 { 1860 {
1670 /* in this case, all is known, and we just put dirs first and sort them */ 1861 dentalloc *= 2;
1862 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1863
1864 if (!dents)
1865 break;
1866 }
1867
1671 eio_dirent *oth = dents + dentoffs; 1868 ent = dents + dentoffs;
1672 eio_dirent *dir = dents;
1673 1869
1674 /* now partition dirs to the front, and non-dirs to the back */ 1870 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1675 /* by walking from both sides and swapping if necessary */ 1871 ent->namelen = len - 1;
1676 while (oth > dir) 1872 ent->inode = D_INO (entp);
1873
1874 inode_bits |= ent->inode;
1875
1876 switch (D_TYPE (entp))
1877 {
1878 default:
1879 ent->type = EIO_DT_UNKNOWN;
1880 flags |= EIO_READDIR_FOUND_UNKNOWN;
1881 break;
1882
1883 #ifdef DT_FIFO
1884 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1885 #endif
1886 #ifdef DT_CHR
1887 case DT_CHR: ent->type = EIO_DT_CHR; break;
1888 #endif
1889 #ifdef DT_MPC
1890 case DT_MPC: ent->type = EIO_DT_MPC; break;
1891 #endif
1892 #ifdef DT_DIR
1893 case DT_DIR: ent->type = EIO_DT_DIR; break;
1894 #endif
1895 #ifdef DT_NAM
1896 case DT_NAM: ent->type = EIO_DT_NAM; break;
1897 #endif
1898 #ifdef DT_BLK
1899 case DT_BLK: ent->type = EIO_DT_BLK; break;
1900 #endif
1901 #ifdef DT_MPB
1902 case DT_MPB: ent->type = EIO_DT_MPB; break;
1903 #endif
1904 #ifdef DT_REG
1905 case DT_REG: ent->type = EIO_DT_REG; break;
1906 #endif
1907 #ifdef DT_NWK
1908 case DT_NWK: ent->type = EIO_DT_NWK; break;
1909 #endif
1910 #ifdef DT_CMP
1911 case DT_CMP: ent->type = EIO_DT_CMP; break;
1912 #endif
1913 #ifdef DT_LNK
1914 case DT_LNK: ent->type = EIO_DT_LNK; break;
1915 #endif
1916 #ifdef DT_SOCK
1917 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1918 #endif
1919 #ifdef DT_DOOR
1920 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1921 #endif
1922 #ifdef DT_WHT
1923 case DT_WHT: ent->type = EIO_DT_WHT; break;
1924 #endif
1925 }
1926
1927 ent->score = 7;
1928
1929 if (flags & EIO_READDIR_DIRS_FIRST)
1930 {
1931 if (ent->type == EIO_DT_UNKNOWN)
1677 { 1932 {
1678 if (dir->type == EIO_DT_DIR) 1933 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1679 ++dir; 1934 ent->score = 1;
1680 else if ((--oth)->type == EIO_DT_DIR) 1935 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1681 { 1936 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1682 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1683
1684 ++dir;
1685 }
1686 } 1937 }
1687 1938 else if (ent->type == EIO_DT_DIR)
1688 /* now sort the dirs only (dirs all have the same score) */ 1939 ent->score = 0;
1689 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1690 } 1940 }
1691
1692 break;
1693 }
1694
1695 /* now add the entry to our list(s) */
1696 name = entp->d_name;
1697
1698 /* skip . and .. entries */
1699 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1700 {
1701 int len = D_NAMLEN (entp) + 1;
1702
1703 while (ecb_expect_false (namesoffs + len > namesalloc))
1704 {
1705 namesalloc *= 2;
1706 X_LOCK (wrklock);
1707 req->ptr2 = names = realloc (names, namesalloc);
1708 X_UNLOCK (wrklock);
1709
1710 if (!names)
1711 break;
1712 } 1941 }
1713 1942
1714 memcpy (names + namesoffs, name, len);
1715
1716 if (dents)
1717 {
1718 struct eio_dirent *ent;
1719
1720 if (ecb_expect_false (dentoffs == dentalloc))
1721 {
1722 dentalloc *= 2;
1723 X_LOCK (wrklock);
1724 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725 X_UNLOCK (wrklock);
1726
1727 if (!dents)
1728 break;
1729 }
1730
1731 ent = dents + dentoffs;
1732
1733 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1734 ent->namelen = len - 1;
1735 ent->inode = D_INO (entp);
1736
1737 inode_bits |= ent->inode;
1738
1739 switch (D_TYPE (entp))
1740 {
1741 default:
1742 ent->type = EIO_DT_UNKNOWN;
1743 flags |= EIO_READDIR_FOUND_UNKNOWN;
1744 break;
1745
1746 #ifdef DT_FIFO
1747 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1748 #endif
1749 #ifdef DT_CHR
1750 case DT_CHR: ent->type = EIO_DT_CHR; break;
1751 #endif
1752 #ifdef DT_MPC
1753 case DT_MPC: ent->type = EIO_DT_MPC; break;
1754 #endif
1755 #ifdef DT_DIR
1756 case DT_DIR: ent->type = EIO_DT_DIR; break;
1757 #endif
1758 #ifdef DT_NAM
1759 case DT_NAM: ent->type = EIO_DT_NAM; break;
1760 #endif
1761 #ifdef DT_BLK
1762 case DT_BLK: ent->type = EIO_DT_BLK; break;
1763 #endif
1764 #ifdef DT_MPB
1765 case DT_MPB: ent->type = EIO_DT_MPB; break;
1766 #endif
1767 #ifdef DT_REG
1768 case DT_REG: ent->type = EIO_DT_REG; break;
1769 #endif
1770 #ifdef DT_NWK
1771 case DT_NWK: ent->type = EIO_DT_NWK; break;
1772 #endif
1773 #ifdef DT_CMP
1774 case DT_CMP: ent->type = EIO_DT_CMP; break;
1775 #endif
1776 #ifdef DT_LNK
1777 case DT_LNK: ent->type = EIO_DT_LNK; break;
1778 #endif
1779 #ifdef DT_SOCK
1780 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1781 #endif
1782 #ifdef DT_DOOR
1783 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1784 #endif
1785 #ifdef DT_WHT
1786 case DT_WHT: ent->type = EIO_DT_WHT; break;
1787 #endif
1788 }
1789
1790 ent->score = 7;
1791
1792 if (flags & EIO_READDIR_DIRS_FIRST)
1793 {
1794 if (ent->type == EIO_DT_UNKNOWN)
1795 {
1796 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1797 ent->score = 1;
1798 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1799 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1800 }
1801 else if (ent->type == EIO_DT_DIR)
1802 ent->score = 0;
1803 }
1804 }
1805
1806 namesoffs += len; 1943 namesoffs += len;
1807 ++dentoffs; 1944 ++dentoffs;
1808 } 1945 }
1809 1946
1810 if (EIO_CANCELLED (req)) 1947 if (EIO_CANCELLED (req))
1811 { 1948 {
1812 errno = ECANCELED; 1949 errno = ECANCELED;
1813 break; 1950 break;
1814 } 1951 }
1952
1953#ifdef _WIN32
1954 if (!FindNextFile (dirp, &entp))
1955 {
1956 FindClose (dirp);
1957 dirp = 0;
1815 } 1958 }
1959#endif
1960 }
1816} 1961}
1962
1963/*****************************************************************************/
1964/* working directory stuff */
1965/* various deficiencies in the posix 2008 api force us to */
1966/* keep the absolute path in string form at all times */
1967/* fuck yeah. */
1968
1969#if !HAVE_AT
1970
1971/* a bit like realpath, but usually faster because it doesn'T have to return */
1972/* an absolute or canonical path */
1973static const char *
1974wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1975{
1976 if (!wd || *path == '/')
1977 return path;
1978
1979 if (path [0] == '.' && !path [1])
1980 return wd->str;
1981
1982 {
1983 int l1 = wd->len;
1984 int l2 = strlen (path);
1985
1986 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
1987
1988 memcpy (res, wd->str, l1);
1989 res [l1] = '/';
1990 memcpy (res + l1 + 1, path, l2 + 1);
1991
1992 return res;
1993 }
1994}
1995
1996#endif
1997
1998static eio_wd
1999eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2000{
2001 int fd;
2002 eio_wd res;
2003 int len = eio__realpath (tmpbuf, wd, path);
2004
2005 if (len < 0)
2006 return EIO_INVALID_WD;
2007
2008#if HAVE_AT
2009 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2010
2011 if (fd < 0)
2012 return EIO_INVALID_WD;
2013#endif
2014
2015 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2016
2017#if HAVE_AT
2018 res->fd = fd;
2019#endif
2020
2021 res->len = len;
2022 memcpy (res->str, tmpbuf->ptr, len);
2023 res->str [len] = 0;
2024
2025 return res;
2026}
2027
2028eio_wd
2029eio_wd_open_sync (eio_wd wd, const char *path)
2030{
2031 struct tmpbuf tmpbuf = { 0 };
2032 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2033 free (tmpbuf.ptr);
2034
2035 return wd;
2036}
2037
2038void
2039eio_wd_close_sync (eio_wd wd)
2040{
2041 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2042 {
2043 #if HAVE_AT
2044 close (wd->fd);
2045 #endif
2046 free (wd);
2047 }
2048}
2049
2050#if HAVE_AT
2051
2052/* they forgot these */
2053
2054static int
2055eio__truncateat (int dirfd, const char *path, off_t length)
2056{
2057 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2058 int res;
2059
2060 if (fd < 0)
2061 return fd;
2062
2063 res = ftruncate (fd, length);
2064 close (fd);
2065 return res;
2066}
2067
2068static int
2069eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2070{
2071 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2072 int res;
2073
2074 if (fd < 0)
2075 return fd;
2076
2077 res = fstatvfs (fd, buf);
2078 close (fd);
2079 return res;
2080
2081}
2082
2083#endif
1817 2084
1818/*****************************************************************************/ 2085/*****************************************************************************/
1819 2086
1820#define ALLOC(len) \ 2087#define ALLOC(len) \
1821 if (!req->ptr2) \ 2088 if (!req->ptr2) \
1830 req->result = -1; \ 2097 req->result = -1; \
1831 break; \ 2098 break; \
1832 } \ 2099 } \
1833 } 2100 }
1834 2101
2102static void ecb_noinline ecb_cold
2103etp_proc_init (void)
2104{
2105#if HAVE_PRCTL_SET_NAME
2106 /* provide a more sensible "thread name" */
2107 char name[16 + 1];
2108 const int namelen = sizeof (name) - 1;
2109 int len;
2110
2111 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2112 name [namelen] = 0;
2113 len = strlen (name);
2114 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2115 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2116#endif
2117}
2118
1835X_THREAD_PROC (etp_proc) 2119X_THREAD_PROC (etp_proc)
1836{ 2120{
1837 ETP_REQ *req; 2121 ETP_REQ *req;
1838 struct timespec ts; 2122 struct timespec ts;
1839 etp_worker *self = (etp_worker *)thr_arg; 2123 etp_worker *self = (etp_worker *)thr_arg;
1840 int timeout; 2124
2125 etp_proc_init ();
1841 2126
1842 /* try to distribute timeouts somewhat evenly */ 2127 /* try to distribute timeouts somewhat evenly */
1843 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2128 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844 2129
1845 for (;;) 2130 for (;;)
1848 2133
1849 X_LOCK (reqlock); 2134 X_LOCK (reqlock);
1850 2135
1851 for (;;) 2136 for (;;)
1852 { 2137 {
1853 self->req = req = reqq_shift (&req_queue); 2138 req = reqq_shift (&req_queue);
1854 2139
1855 if (req) 2140 if (req)
1856 break; 2141 break;
1857 2142
1858 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2143 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1896 ++npending; 2181 ++npending;
1897 2182
1898 if (!reqq_push (&res_queue, req) && want_poll_cb) 2183 if (!reqq_push (&res_queue, req) && want_poll_cb)
1899 want_poll_cb (); 2184 want_poll_cb ();
1900 2185
1901 self->req = 0;
1902 etp_worker_clear (self); 2186 etp_worker_clear (self);
1903 2187
1904 X_UNLOCK (reslock); 2188 X_UNLOCK (reslock);
1905 } 2189 }
1906 2190
1907quit: 2191quit:
2192 free (req);
2193
1908 X_LOCK (wrklock); 2194 X_LOCK (wrklock);
1909 etp_worker_free (self); 2195 etp_worker_free (self);
1910 X_UNLOCK (wrklock); 2196 X_UNLOCK (wrklock);
1911
1912 return 0;
1913} 2197}
1914 2198
1915/*****************************************************************************/ 2199/*****************************************************************************/
1916 2200
1917int ecb_cold 2201int ecb_cold
1924eio_api_destroy (eio_req *req) 2208eio_api_destroy (eio_req *req)
1925{ 2209{
1926 free (req); 2210 free (req);
1927} 2211}
1928 2212
1929#define REQ(rtype) \ 2213#define REQ(rtype) \
1930 eio_req *req; \ 2214 eio_req *req; \
1931 \ 2215 \
1932 req = (eio_req *)calloc (1, sizeof *req); \ 2216 req = (eio_req *)calloc (1, sizeof *req); \
1933 if (!req) \ 2217 if (!req) \
1934 return 0; \ 2218 return 0; \
1951 } 2235 }
1952 2236
1953static void 2237static void
1954eio_execute (etp_worker *self, eio_req *req) 2238eio_execute (etp_worker *self, eio_req *req)
1955{ 2239{
2240#if HAVE_AT
2241 int dirfd;
2242#else
2243 const char *path;
2244#endif
2245
1956 if (ecb_expect_false (EIO_CANCELLED (req))) 2246 if (ecb_expect_false (EIO_CANCELLED (req)))
1957 { 2247 {
1958 req->result = -1; 2248 req->result = -1;
1959 req->errorno = ECANCELED; 2249 req->errorno = ECANCELED;
1960 return; 2250 return;
1961 } 2251 }
1962 2252
2253 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2254 {
2255 req->result = -1;
2256 req->errorno = ENOENT;
2257 return;
2258 }
2259
2260 if (req->type >= EIO_OPEN)
2261 {
2262 #if HAVE_AT
2263 dirfd = WD2FD (req->wd);
2264 #else
2265 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2266 #endif
2267 }
2268
1963 switch (req->type) 2269 switch (req->type)
1964 { 2270 {
2271 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2272 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2273 break;
2274 case EIO_WD_CLOSE: req->result = 0;
2275 eio_wd_close_sync (req->wd); break;
2276
2277 case EIO_SEEK: eio__lseek (req); break;
1965 case EIO_READ: ALLOC (req->size); 2278 case EIO_READ: ALLOC (req->size);
1966 req->result = req->offs >= 0 2279 req->result = req->offs >= 0
1967 ? pread (req->int1, req->ptr2, req->size, req->offs) 2280 ? pread (req->int1, req->ptr2, req->size, req->offs)
1968 : read (req->int1, req->ptr2, req->size); break; 2281 : read (req->int1, req->ptr2, req->size); break;
1969 case EIO_WRITE: req->result = req->offs >= 0 2282 case EIO_WRITE: req->result = req->offs >= 0
1970 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2283 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971 : write (req->int1, req->ptr2, req->size); break; 2284 : write (req->int1, req->ptr2, req->size); break;
1972 2285
1973 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2286 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1974 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2287 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2288
2289#if HAVE_AT
1975 2290
1976 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2291 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2292 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1978 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2293 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2294 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2295 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2296 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2297 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2298 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2299
2300 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2301 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2302 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2303 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2304 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2305 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2306 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2307 case EIO_READLINK: ALLOC (PATH_MAX);
2308 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2309 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2310 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2311 case EIO_UTIME:
2312 case EIO_FUTIME:
2313 {
2314 struct timespec ts[2];
2315 struct timespec *times;
2316
2317 if (req->nv1 != -1. || req->nv2 != -1.)
2318 {
2319 ts[0].tv_sec = req->nv1;
2320 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2321 ts[1].tv_sec = req->nv2;
2322 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2323
2324 times = ts;
2325 }
2326 else
2327 times = 0;
2328
2329 req->result = req->type == EIO_FUTIME
2330 ? futimens (req->int1, times)
2331 : utimensat (dirfd, req->ptr1, times, 0);
2332 }
2333 break;
2334
2335#else
2336
2337 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2338 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2339 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2340 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2341 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2342 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2343 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2344 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2345
2346 case EIO_UNLINK: req->result = unlink (path ); break;
2347 case EIO_RMDIR: req->result = rmdir (path ); break;
2348 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2349 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2350 case EIO_LINK: req->result = link (path , req->ptr2); break;
2351 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2352 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2353 case EIO_READLINK: ALLOC (PATH_MAX);
2354 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2355 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2356 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2357
2358 case EIO_UTIME:
2359 case EIO_FUTIME:
2360 {
2361 struct timeval tv[2];
2362 struct timeval *times;
2363
2364 if (req->nv1 != -1. || req->nv2 != -1.)
2365 {
2366 tv[0].tv_sec = req->nv1;
2367 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2368 tv[1].tv_sec = req->nv2;
2369 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2370
2371 times = tv;
2372 }
2373 else
2374 times = 0;
2375
2376 req->result = req->type == EIO_FUTIME
2377 ? futimes (req->int1, times)
2378 : utimes (req->ptr1, times);
2379 }
2380 break;
2381
2382#endif
2383
2384 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2385 {
2386 ALLOC (req->result);
2387 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2388 }
2389 break;
2390
1980 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2391 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1981 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2392 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1982 2393
1983 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1984 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1985 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2394 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1986 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2395 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1987 2396
1988 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1989 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2397 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1990 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1991 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2398 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1992 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1993 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2399 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1994 2400
1995 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1996 case EIO_CLOSE: req->result = close (req->int1); break; 2401 case EIO_CLOSE: req->result = close (req->int1); break;
1997 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2402 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1998 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1999 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2000 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2001 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2002 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2003 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2004 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2005
2006 case EIO_REALPATH: eio__realpath (req, self); break;
2007
2008 case EIO_READLINK: ALLOC (PATH_MAX);
2009 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2010
2011 case EIO_SYNC: req->result = 0; sync (); break; 2403 case EIO_SYNC: req->result = 0; sync (); break;
2012 case EIO_FSYNC: req->result = fsync (req->int1); break; 2404 case EIO_FSYNC: req->result = fsync (req->int1); break;
2013 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2405 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2406 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2407 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2014 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2408 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2015 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2409 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2016 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2410 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2017 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2411 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2018 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2019 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2412 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2020 2413
2021 case EIO_READDIR: eio__scandir (req, self); break; 2414 case EIO_READDIR: eio__scandir (req, self); break;
2022 2415
2023 case EIO_BUSY: 2416 case EIO_BUSY:
2033 req->result = select (0, 0, 0, 0, &tv); 2426 req->result = select (0, 0, 0, 0, &tv);
2034 } 2427 }
2035#endif 2428#endif
2036 break; 2429 break;
2037 2430
2038 case EIO_UTIME:
2039 case EIO_FUTIME:
2040 {
2041 struct timeval tv[2];
2042 struct timeval *times;
2043
2044 if (req->nv1 != -1. || req->nv2 != -1.)
2045 {
2046 tv[0].tv_sec = req->nv1;
2047 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2048 tv[1].tv_sec = req->nv2;
2049 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2050
2051 times = tv;
2052 }
2053 else
2054 times = 0;
2055
2056 req->result = req->type == EIO_FUTIME
2057 ? futimes (req->int1, times)
2058 : utimes (req->ptr1, times);
2059 }
2060 break;
2061
2062 case EIO_GROUP: 2431 case EIO_GROUP:
2063 abort (); /* handled in eio_request */ 2432 abort (); /* handled in eio_request */
2064 2433
2065 case EIO_NOP: 2434 case EIO_NOP:
2066 req->result = 0; 2435 req->result = 0;
2069 case EIO_CUSTOM: 2438 case EIO_CUSTOM:
2070 req->feed (req); 2439 req->feed (req);
2071 break; 2440 break;
2072 2441
2073 default: 2442 default:
2074 errno = ENOSYS;
2075 req->result = -1; 2443 req->result = EIO_ENOSYS ();
2076 break; 2444 break;
2077 } 2445 }
2078 2446
2079 req->errorno = errno; 2447 req->errorno = errno;
2080} 2448}
2081 2449
2082#ifndef EIO_NO_WRAPPERS 2450#ifndef EIO_NO_WRAPPERS
2083 2451
2452eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2453{
2454 REQ (EIO_WD_OPEN); PATH; SEND;
2455}
2456
2457eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2458{
2459 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2460}
2461
2084eio_req *eio_nop (int pri, eio_cb cb, void *data) 2462eio_req *eio_nop (int pri, eio_cb cb, void *data)
2085{ 2463{
2086 REQ (EIO_NOP); SEND; 2464 REQ (EIO_NOP); SEND;
2087} 2465}
2088 2466
2104eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2482eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2105{ 2483{
2106 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2484 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2107} 2485}
2108 2486
2487eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2488{
2489 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2490}
2491
2492eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2493{
2494 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2495}
2496
2497eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2498{
2499 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2500}
2501
2109eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2502eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2110{ 2503{
2111 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2504 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2112} 2505}
2113 2506
2119eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2512eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2120{ 2513{
2121 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2514 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2122} 2515}
2123 2516
2124eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2125{
2126 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2127}
2128
2129eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2517eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2130{ 2518{
2131 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2519 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2132} 2520}
2133 2521
2134eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2135{
2136 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2137}
2138
2139eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2522eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2140{ 2523{
2141 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2524 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2142} 2525}
2143 2526
2144eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2527eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2145{ 2528{
2146 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2529 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2530}
2531
2532eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2533{
2534 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2147} 2535}
2148 2536
2149eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2537eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2150{ 2538{
2151 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2539 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2369/* misc garbage */ 2757/* misc garbage */
2370 2758
2371eio_ssize_t 2759eio_ssize_t
2372eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2760eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373{ 2761{
2374 etp_worker wrk;
2375 eio_ssize_t ret;
2376
2377 wrk.dbuf = 0;
2378
2379 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2762 return eio__sendfile (ofd, ifd, offset, count);
2380
2381 if (wrk.dbuf)
2382 free (wrk.dbuf);
2383
2384 return ret;
2385} 2763}
2386 2764

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines