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

Comparing libeio/eio.c (file contents):
Revision 1.86 by root, Thu Jul 14 18:30:10 2011 UTC vs.
Revision 1.105 by root, Mon Sep 26 18:23:18 2011 UTC

43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
48# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
49#endif 49#endif
50#include "xthread.h" 50#include "xthread.h"
51 51
52#include <errno.h> 52#include <errno.h>
53#include <stddef.h> 53#include <stddef.h>
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63#include <sys/statvfs.h>
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes from stdint.h, says idiot openbsd coder */ 64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H 65#if HAVE_STDINT_H
67# include <stdint.h> 66# include <stdint.h>
68#endif 67#endif
69 68
70#ifndef ECANCELED 69#ifndef ECANCELED
71# define ECANCELED EDOM 70# define ECANCELED EDOM
72#endif 71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
73 79
74static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
75 81
76#ifndef EIO_FINISH 82#ifndef EIO_FINISH
77# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
96 102
97#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
98 104
99#ifdef _WIN32 105#ifdef _WIN32
100 106
107 #undef PAGESIZE
101 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
102 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
103 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
104 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
105 #define fstat(fd,buf) _fstati64 (path,buf)
106 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
107 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
108 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
109 121
122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125
126 #define fchmod(fd,mode) EIO_ENOSYS ()
110 #define chown(path,uid,gid) EIO_ENOSYS () 127 #define chown(path,uid,gid) EIO_ENOSYS ()
111 #define fchown(fd,uid,gid) EIO_ENOSYS () 128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
112 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
113 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
114 #define mknod(path,mode,dev) EIO_ENOSYS () 131 #define mknod(path,mode,dev) EIO_ENOSYS ()
115 #define sync() EIO_ENOSYS () 132 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS ()
136
137 /* rename() uses MoveFile, which fails to overwrite */
138 #define rename(old,neu) eio__rename (old, neu)
139
140 static int
141 eio__rename (const char *old, const char *neu)
142 {
143 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
144 return 0;
145
146 /* should steal _dosmaperr */
147 switch (GetLastError ())
148 {
149 case ERROR_FILE_NOT_FOUND:
150 case ERROR_PATH_NOT_FOUND:
151 case ERROR_INVALID_DRIVE:
152 case ERROR_NO_MORE_FILES:
153 case ERROR_BAD_NETPATH:
154 case ERROR_BAD_NET_NAME:
155 case ERROR_BAD_PATHNAME:
156 case ERROR_FILENAME_EXCED_RANGE:
157 errno = ENOENT;
158 break;
159
160 default:
161 errno = EACCES;
162 break;
163 }
164
165 return -1;
166 }
116 167
117 /* we could even stat and see if it exists */ 168 /* we could even stat and see if it exists */
118 static int 169 static int
119 symlink (const char *old, const char *neu) 170 symlink (const char *old, const char *neu)
120 { 171 {
172 #if WINVER >= 0x0600
121 if (CreateSymbolicLink (neu, old, 1)) 173 if (CreateSymbolicLink (neu, old, 1))
122 return 0; 174 return 0;
123 175
124 if (CreateSymbolicLink (neu, old, 0)) 176 if (CreateSymbolicLink (neu, old, 0))
125 return 0; 177 return 0;
178 #endif
126 179
127 return EIO_ERRNO (ENOENT, -1); 180 return EIO_ERRNO (ENOENT, -1);
128 } 181 }
182
183 /* POSIX API only */
184 #define CreateHardLink(neu,old,flags) 0
185 #define CreateSymbolicLink(neu,old,flags) 0
186
187 struct statvfs
188 {
189 int dummy;
190 };
191
192 #define DT_DIR EIO_DT_DIR
193 #define DT_REG EIO_DT_REG
194 #define D_NAME(entp) entp.cFileName
195 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
129 196
130#else 197#else
131 198
132 #include <sys/time.h> 199 #include <sys/time.h>
133 #include <sys/select.h> 200 #include <sys/select.h>
134 #include <sys/statvfs.h> 201 #include <sys/statvfs.h>
135 #include <unistd.h> 202 #include <unistd.h>
136 #include <utime.h>
137 #include <signal.h> 203 #include <signal.h>
138 #include <dirent.h> 204 #include <dirent.h>
139 205
140 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 206 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
141 #include <sys/mman.h> 207 #include <sys/mman.h>
142 #endif 208 #endif
209
210 #define D_NAME(entp) entp->d_name
143 211
144 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 212 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
145 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 213 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
146 #define _DIRENT_HAVE_D_TYPE /* sigh */ 214 #define _DIRENT_HAVE_D_TYPE /* sigh */
147 #define D_INO(de) (de)->d_fileno 215 #define D_INO(de) (de)->d_fileno
161 229
162 #ifndef EIO_STRUCT_DIRENT 230 #ifndef EIO_STRUCT_DIRENT
163 #define EIO_STRUCT_DIRENT struct dirent 231 #define EIO_STRUCT_DIRENT struct dirent
164 #endif 232 #endif
165 233
234#endif
235
236#if HAVE_UTIMES
237# include <utime.h>
238#endif
239
240#if HAVE_SYS_SYSCALL_H
241# include <sys/syscall.h>
242#endif
243
244#if HAVE_SYS_PRCTL_H
245# include <sys/prctl.h>
166#endif 246#endif
167 247
168#if HAVE_SENDFILE 248#if HAVE_SENDFILE
169# if __linux 249# if __linux
170# include <sys/sendfile.h> 250# include <sys/sendfile.h>
185#endif 265#endif
186#ifndef D_INO 266#ifndef D_INO
187# define D_INO(de) 0 267# define D_INO(de) 0
188#endif 268#endif
189#ifndef D_NAMLEN 269#ifndef D_NAMLEN
190# define D_NAMLEN(de) strlen ((de)->d_name) 270# define D_NAMLEN(entp) strlen (D_NAME (entp))
191#endif 271#endif
192 272
193/* used for struct dirent, AIX doesn't provide it */ 273/* used for struct dirent, AIX doesn't provide it */
194#ifndef NAME_MAX 274#ifndef NAME_MAX
195# define NAME_MAX 4096 275# define NAME_MAX 4096
202 282
203/* buffer size for various temporary buffers */ 283/* buffer size for various temporary buffers */
204#define EIO_BUFSIZE 65536 284#define EIO_BUFSIZE 65536
205 285
206#define dBUF \ 286#define dBUF \
207 char *eio_buf; \
208 ETP_WORKER_LOCK (self); \
209 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 287 char *eio_buf = malloc (EIO_BUFSIZE); \
210 ETP_WORKER_UNLOCK (self); \
211 errno = ENOMEM; \ 288 errno = ENOMEM; \
212 if (!eio_buf) \ 289 if (!eio_buf) \
213 return -1; 290 return -1
291
292#define FUBd \
293 free (eio_buf)
214 294
215#define EIO_TICKS ((1000000 + 1023) >> 10) 295#define EIO_TICKS ((1000000 + 1023) >> 10)
296
297/*****************************************************************************/
298
299struct tmpbuf
300{
301 void *ptr;
302 int len;
303};
304
305static void *
306tmpbuf_get (struct tmpbuf *buf, int len)
307{
308 if (buf->len < len)
309 {
310 free (buf->ptr);
311 buf->ptr = malloc (buf->len = len);
312 }
313
314 return buf->ptr;
315}
316
317/*****************************************************************************/
216 318
217#define ETP_PRI_MIN EIO_PRI_MIN 319#define ETP_PRI_MIN EIO_PRI_MIN
218#define ETP_PRI_MAX EIO_PRI_MAX 320#define ETP_PRI_MAX EIO_PRI_MAX
219 321
220struct etp_worker; 322struct etp_worker;
224static int eio_finish (eio_req *req); 326static int eio_finish (eio_req *req);
225#define ETP_FINISH(req) eio_finish (req) 327#define ETP_FINISH(req) eio_finish (req)
226static void eio_execute (struct etp_worker *self, eio_req *req); 328static void eio_execute (struct etp_worker *self, eio_req *req);
227#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 329#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
228 330
229#define ETP_WORKER_CLEAR(req) \
230 if (wrk->dbuf) \
231 { \
232 free (wrk->dbuf); \
233 wrk->dbuf = 0; \
234 } \
235 \
236 if (wrk->dirp) \
237 { \
238 closedir (wrk->dirp); \
239 wrk->dirp = 0; \
240 }
241
242#define ETP_WORKER_COMMON \
243 void *dbuf; \
244 DIR *dirp;
245
246/*****************************************************************************/ 331/*****************************************************************************/
247 332
248#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 333#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
249 334
250/* calculate time difference in ~1/EIO_TICKS of a second */ 335/* calculate time difference in ~1/EIO_TICKS of a second */
261static void (*done_poll_cb) (void); 346static void (*done_poll_cb) (void);
262 347
263static unsigned int max_poll_time; /* reslock */ 348static unsigned int max_poll_time; /* reslock */
264static unsigned int max_poll_reqs; /* reslock */ 349static unsigned int max_poll_reqs; /* reslock */
265 350
266static volatile unsigned int nreqs; /* reqlock */ 351static unsigned int nreqs; /* reqlock */
267static volatile unsigned int nready; /* reqlock */ 352static unsigned int nready; /* reqlock */
268static volatile unsigned int npending; /* reqlock */ 353static unsigned int npending; /* reqlock */
269static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 354static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
270static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */ 355static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
271 356
272static xmutex_t wrklock; 357static xmutex_t wrklock;
273static xmutex_t reslock; 358static xmutex_t reslock;
274static xmutex_t reqlock; 359static xmutex_t reqlock;
275static xcond_t reqwait; 360static xcond_t reqwait;
278/* 363/*
279 * make our pread/pwrite emulation safe against themselves, but not against 364 * make our pread/pwrite emulation safe against themselves, but not against
280 * normal read/write by using a mutex. slows down execution a lot, 365 * normal read/write by using a mutex. slows down execution a lot,
281 * but that's your problem, not mine. 366 * but that's your problem, not mine.
282 */ 367 */
283static xmutex_t preadwritelock = X_MUTEX_INIT; 368static xmutex_t preadwritelock;
284#endif 369#endif
285 370
286typedef struct etp_worker 371typedef struct etp_worker
287{ 372{
373 struct tmpbuf tmpbuf;
374
288 /* locked by wrklock */ 375 /* locked by wrklock */
289 struct etp_worker *prev, *next; 376 struct etp_worker *prev, *next;
290 377
291 xthread_t tid; 378 xthread_t tid;
292 379
293 /* locked by reslock, reqlock or wrklock */ 380#ifdef ETP_WORKER_COMMON
294 ETP_REQ *req; /* currently processed request */
295
296 ETP_WORKER_COMMON 381 ETP_WORKER_COMMON
382#endif
297} etp_worker; 383} etp_worker;
298 384
299static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 385static etp_worker wrk_first; /* NOT etp */
300 386
301#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 387#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
302#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 388#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
303 389
304/* worker threads management */ 390/* worker threads management */
305 391
306static void ecb_cold 392static void ecb_cold
307etp_worker_clear (etp_worker *wrk) 393etp_worker_clear (etp_worker *wrk)
308{ 394{
309 ETP_WORKER_CLEAR (wrk);
310} 395}
311 396
312static void ecb_cold 397static void ecb_cold
313etp_worker_free (etp_worker *wrk) 398etp_worker_free (etp_worker *wrk)
314{ 399{
400 free (wrk->tmpbuf.ptr);
401
315 wrk->next->prev = wrk->prev; 402 wrk->next->prev = wrk->prev;
316 wrk->prev->next = wrk->next; 403 wrk->prev->next = wrk->next;
317 404
318 free (wrk); 405 free (wrk);
319} 406}
375} etp_reqq; 462} etp_reqq;
376 463
377static etp_reqq req_queue; 464static etp_reqq req_queue;
378static etp_reqq res_queue; 465static etp_reqq res_queue;
379 466
467static void ecb_noinline ecb_cold
468reqq_init (etp_reqq *q)
469{
470 int pri;
471
472 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
473 q->qs[pri] = q->qe[pri] = 0;
474
475 q->size = 0;
476}
477
380static int ecb_noinline 478static int ecb_noinline
381reqq_push (etp_reqq *q, ETP_REQ *req) 479reqq_push (etp_reqq *q, ETP_REQ *req)
382{ 480{
383 int pri = req->pri; 481 int pri = req->pri;
384 req->next = 0; 482 req->next = 0;
418 } 516 }
419 517
420 abort (); 518 abort ();
421} 519}
422 520
423static void ecb_cold 521static int ecb_cold
424etp_thread_init (void) 522etp_init (void (*want_poll)(void), void (*done_poll)(void))
425{ 523{
426#if !HAVE_PREADWRITE
427 X_MUTEX_CREATE (preadwritelock);
428#endif
429 X_MUTEX_CREATE (wrklock); 524 X_MUTEX_CREATE (wrklock);
430 X_MUTEX_CREATE (reslock); 525 X_MUTEX_CREATE (reslock);
431 X_MUTEX_CREATE (reqlock); 526 X_MUTEX_CREATE (reqlock);
432 X_COND_CREATE (reqwait); 527 X_COND_CREATE (reqwait);
433}
434 528
435static void ecb_cold 529 reqq_init (&req_queue);
436etp_atfork_prepare (void) 530 reqq_init (&res_queue);
437{
438}
439 531
440static void ecb_cold 532 wrk_first.next =
441etp_atfork_parent (void) 533 wrk_first.prev = &wrk_first;
442{
443}
444
445static void ecb_cold
446etp_atfork_child (void)
447{
448 ETP_REQ *prv;
449
450 while ((prv = reqq_shift (&req_queue)))
451 ETP_DESTROY (prv);
452
453 while ((prv = reqq_shift (&res_queue)))
454 ETP_DESTROY (prv);
455
456 while (wrk_first.next != &wrk_first)
457 {
458 etp_worker *wrk = wrk_first.next;
459
460 if (wrk->req)
461 ETP_DESTROY (wrk->req);
462
463 etp_worker_clear (wrk);
464 etp_worker_free (wrk);
465 }
466 534
467 started = 0; 535 started = 0;
468 idle = 0; 536 idle = 0;
469 nreqs = 0; 537 nreqs = 0;
470 nready = 0; 538 nready = 0;
471 npending = 0; 539 npending = 0;
472
473 etp_thread_init ();
474}
475
476static void ecb_cold
477etp_once_init (void)
478{
479 etp_thread_init ();
480 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
481}
482
483static int ecb_cold
484etp_init (void (*want_poll)(void), void (*done_poll)(void))
485{
486 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
487
488 pthread_once (&doinit, etp_once_init);
489 540
490 want_poll_cb = want_poll; 541 want_poll_cb = want_poll;
491 done_poll_cb = done_poll; 542 done_poll_cb = done_poll;
492 543
493 return 0; 544 return 0;
533} 584}
534 585
535static void ecb_cold 586static void ecb_cold
536etp_end_thread (void) 587etp_end_thread (void)
537{ 588{
538 eio_req *req = calloc (1, sizeof (eio_req)); 589 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
539 590
540 req->type = -1; 591 req->type = -1;
541 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 592 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
542 593
543 X_LOCK (reqlock); 594 X_LOCK (reqlock);
876# undef pread 927# undef pread
877# undef pwrite 928# undef pwrite
878# define pread eio__pread 929# define pread eio__pread
879# define pwrite eio__pwrite 930# define pwrite eio__pwrite
880 931
881static ssize_t 932static eio_ssize_t
882eio__pread (int fd, void *buf, size_t count, off_t offset) 933eio__pread (int fd, void *buf, size_t count, off_t offset)
883{ 934{
884 ssize_t res; 935 eio_ssize_t res;
885 off_t ooffset; 936 off_t ooffset;
886 937
887 X_LOCK (preadwritelock); 938 X_LOCK (preadwritelock);
888 ooffset = lseek (fd, 0, SEEK_CUR); 939 ooffset = lseek (fd, 0, SEEK_CUR);
889 lseek (fd, offset, SEEK_SET); 940 lseek (fd, offset, SEEK_SET);
892 X_UNLOCK (preadwritelock); 943 X_UNLOCK (preadwritelock);
893 944
894 return res; 945 return res;
895} 946}
896 947
897static ssize_t 948static eio_ssize_t
898eio__pwrite (int fd, void *buf, size_t count, off_t offset) 949eio__pwrite (int fd, void *buf, size_t count, off_t offset)
899{ 950{
900 ssize_t res; 951 eio_ssize_t res;
901 off_t ooffset; 952 off_t ooffset;
902 953
903 X_LOCK (preadwritelock); 954 X_LOCK (preadwritelock);
904 ooffset = lseek (fd, 0, SEEK_CUR); 955 ooffset = lseek (fd, 0, SEEK_CUR);
905 lseek (fd, offset, SEEK_SET); 956 lseek (fd, offset, SEEK_SET);
950 1001
951#if !HAVE_FDATASYNC 1002#if !HAVE_FDATASYNC
952# undef fdatasync 1003# undef fdatasync
953# define fdatasync(fd) fsync (fd) 1004# define fdatasync(fd) fsync (fd)
954#endif 1005#endif
1006
1007static int
1008eio__syncfs (int fd)
1009{
1010 int res;
1011
1012#if HAVE_SYS_SYNCFS
1013 res = (int)syscall (__NR_syncfs, (int)(fd));
1014#else
1015 res = -1;
1016 errno = ENOSYS;
1017#endif
1018
1019 if (res < 0 && errno == ENOSYS && fd >= 0)
1020 sync ();
1021
1022 return res;
1023}
955 1024
956/* sync_file_range always needs emulation */ 1025/* sync_file_range always needs emulation */
957static int 1026static int
958eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1027eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
959{ 1028{
994 1063
995#if !HAVE_READAHEAD 1064#if !HAVE_READAHEAD
996# undef readahead 1065# undef readahead
997# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1066# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
998 1067
999static ssize_t 1068static eio_ssize_t
1000eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1069eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
1001{ 1070{
1002 size_t todo = count; 1071 size_t todo = count;
1003 dBUF; 1072 dBUF;
1004 1073
1009 pread (fd, eio_buf, len, offset); 1078 pread (fd, eio_buf, len, offset);
1010 offset += len; 1079 offset += len;
1011 todo -= len; 1080 todo -= len;
1012 } 1081 }
1013 1082
1083 FUBd;
1084
1014 errno = 0; 1085 errno = 0;
1015 return count; 1086 return count;
1016} 1087}
1017 1088
1018#endif 1089#endif
1019 1090
1020/* sendfile always needs emulation */ 1091/* sendfile always needs emulation */
1021static ssize_t 1092static eio_ssize_t
1022eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1093eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1023{ 1094{
1024 ssize_t written = 0; 1095 eio_ssize_t written = 0;
1025 ssize_t res; 1096 eio_ssize_t res;
1026 1097
1027 if (!count) 1098 if (!count)
1028 return 0; 1099 return 0;
1029 1100
1030 for (;;) 1101 for (;;)
1125 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1196 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1126 /* BSDs */ 1197 /* BSDs */
1127#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1198#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1128 || errno == ENOTSUP 1199 || errno == ENOTSUP
1129#endif 1200#endif
1201#ifdef EOPNOTSUPP /* windows */
1130 || errno == EOPNOTSUPP /* BSDs */ 1202 || errno == EOPNOTSUPP /* BSDs */
1203#endif
1131#if __solaris 1204#if __solaris
1132 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1205 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1133#endif 1206#endif
1134 ) 1207 )
1135 ) 1208 )
1139 1212
1140 res = 0; 1213 res = 0;
1141 1214
1142 while (count) 1215 while (count)
1143 { 1216 {
1144 ssize_t cnt; 1217 eio_ssize_t cnt;
1145 1218
1146 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1219 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1147 1220
1148 if (cnt <= 0) 1221 if (cnt <= 0)
1149 { 1222 {
1161 1234
1162 offset += cnt; 1235 offset += cnt;
1163 res += cnt; 1236 res += cnt;
1164 count -= cnt; 1237 count -= cnt;
1165 } 1238 }
1239
1240 FUBd;
1166 } 1241 }
1167 1242
1168 return res; 1243 return res;
1169} 1244}
1170 1245
1197 /* round up length */ 1272 /* round up length */
1198 *length = (*length + mask) & ~mask; 1273 *length = (*length + mask) & ~mask;
1199} 1274}
1200 1275
1201#if !_POSIX_MEMLOCK 1276#if !_POSIX_MEMLOCK
1202# define eio__mlockall(a) eio_nosyscall() 1277# define eio__mlockall(a) EIO_ENOSYS ()
1203#else 1278#else
1204 1279
1205static int 1280static int
1206eio__mlockall (int flags) 1281eio__mlockall (int flags)
1207{ 1282{
1285} 1360}
1286 1361
1287/*****************************************************************************/ 1362/*****************************************************************************/
1288/* requests implemented outside eio_execute, because they are so large */ 1363/* requests implemented outside eio_execute, because they are so large */
1289 1364
1365/* copies some absolute path to tmpbuf */
1366static char *
1367eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1368{
1369 if (wd == EIO_CWD)
1370 return getcwd (tmpbuf->ptr, PATH_MAX);
1371
1372#if HAVE_AT
1373 abort (); /*TODO*/
1374#else
1375 strcpy (tmpbuf->ptr, wd);
1376#endif
1377 return tmpbuf->ptr;
1378}
1379
1380/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1290static void 1381static int
1291eio__realpath (eio_req *req, etp_worker *self) 1382eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1292{ 1383{
1293 char *rel = req->ptr1; 1384 const char *rel = path;
1294 char *res; 1385 char *res;
1295 char *tmp1, *tmp2; 1386 char *tmp1, *tmp2;
1296#if SYMLOOP_MAX > 32 1387#if SYMLOOP_MAX > 32
1297 int symlinks = SYMLOOP_MAX; 1388 int symlinks = SYMLOOP_MAX;
1298#else 1389#else
1299 int symlinks = 32; 1390 int symlinks = 32;
1300#endif 1391#endif
1301 1392
1302 req->result = -1; 1393 /*D*/ /*TODO: wd ignored */
1303 1394
1304 errno = EINVAL; 1395 errno = EINVAL;
1305 if (!rel) 1396 if (!rel)
1306 return; 1397 return -1;
1307 1398
1308 errno = ENOENT; 1399 errno = ENOENT;
1309 if (!*rel) 1400 if (!*rel)
1310 return; 1401 return -1;
1311 1402
1312 if (!req->ptr2) 1403 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1313 {
1314 X_LOCK (wrklock);
1315 req->flags |= EIO_FLAG_PTR2_FREE;
1316 X_UNLOCK (wrklock);
1317 req->ptr2 = malloc (PATH_MAX * 3);
1318
1319 errno = ENOMEM;
1320 if (!req->ptr2)
1321 return;
1322 }
1323
1324 res = req->ptr2;
1325 tmp1 = res + PATH_MAX; 1404 tmp1 = res + PATH_MAX;
1326 tmp2 = tmp1 + PATH_MAX; 1405 tmp2 = tmp1 + PATH_MAX;
1327 1406
1328#if 0 /* disabled, the musl way to do things is just too racy */ 1407#if 0 /* disabled, the musl way to do things is just too racy */
1329#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1408#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1348#endif 1427#endif
1349#endif 1428#endif
1350 1429
1351 if (*rel != '/') 1430 if (*rel != '/')
1352 { 1431 {
1353 if (!getcwd (res, PATH_MAX)) 1432 if (!eio__getwd (tmpbuf, wd))
1354 return; 1433 return -1;
1355 1434
1356 if (res [1]) /* only use if not / */ 1435 if (res [1]) /* only use if not / */
1357 res += strlen (res); 1436 res += strlen (res);
1358 } 1437 }
1359 1438
1360 while (*rel) 1439 while (*rel)
1361 { 1440 {
1362 ssize_t len, linklen; 1441 eio_ssize_t len, linklen;
1363 char *beg = rel; 1442 const char *beg = rel;
1364 1443
1365 while (*rel && *rel != '/') 1444 while (*rel && *rel != '/')
1366 ++rel; 1445 ++rel;
1367 1446
1368 len = rel - beg; 1447 len = rel - beg;
1380 1459
1381 if (beg [1] == '.' && len == 2) 1460 if (beg [1] == '.' && len == 2)
1382 { 1461 {
1383 /* .. - back up one component, if possible */ 1462 /* .. - back up one component, if possible */
1384 1463
1385 while (res != req->ptr2) 1464 while (res != tmpbuf->ptr)
1386 if (*--res == '/') 1465 if (*--res == '/')
1387 break; 1466 break;
1388 1467
1389 continue; 1468 continue;
1390 } 1469 }
1400 1479
1401 /* zero-terminate, for readlink */ 1480 /* zero-terminate, for readlink */
1402 res [len + 1] = 0; 1481 res [len + 1] = 0;
1403 1482
1404 /* now check if it's a symlink */ 1483 /* now check if it's a symlink */
1405 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1484 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1406 1485
1407 if (linklen < 0) 1486 if (linklen < 0)
1408 { 1487 {
1409 if (errno != EINVAL) 1488 if (errno != EINVAL)
1410 return; 1489 return -1;
1411 1490
1412 /* it's a normal directory. hopefully */ 1491 /* it's a normal directory. hopefully */
1413 res += len + 1; 1492 res += len + 1;
1414 } 1493 }
1415 else 1494 else
1417 /* yay, it was a symlink - build new path in tmp2 */ 1496 /* yay, it was a symlink - build new path in tmp2 */
1418 int rellen = strlen (rel); 1497 int rellen = strlen (rel);
1419 1498
1420 errno = ENAMETOOLONG; 1499 errno = ENAMETOOLONG;
1421 if (linklen + 1 + rellen >= PATH_MAX) 1500 if (linklen + 1 + rellen >= PATH_MAX)
1422 return; 1501 return -1;
1423 1502
1424 errno = ELOOP; 1503 errno = ELOOP;
1425 if (!--symlinks) 1504 if (!--symlinks)
1426 return; 1505 return -1;
1427 1506
1428 if (*tmp1 == '/') 1507 if (*tmp1 == '/')
1429 res = req->ptr2; /* symlink resolves to an absolute path */ 1508 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1430 1509
1431 /* we need to be careful, as rel might point into tmp2 already */ 1510 /* we need to be careful, as rel might point into tmp2 already */
1432 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1511 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1433 tmp2 [linklen] = '/'; 1512 tmp2 [linklen] = '/';
1434 memcpy (tmp2, tmp1, linklen); 1513 memcpy (tmp2, tmp1, linklen);
1436 rel = tmp2; 1515 rel = tmp2;
1437 } 1516 }
1438 } 1517 }
1439 1518
1440 /* special case for the lone root path */ 1519 /* special case for the lone root path */
1441 if (res == req->ptr2) 1520 if (res == tmpbuf->ptr)
1442 *res++ = '/'; 1521 *res++ = '/';
1443 1522
1444 req->result = res - (char *)req->ptr2; 1523 return res - (char *)tmpbuf->ptr;
1445
1446done:
1447 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1448} 1524}
1449 1525
1450static signed char 1526static signed char
1451eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1527eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1452{ 1528{
1460 1536
1461#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1537#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1462#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1538#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1463 1539
1464static void 1540static void
1465eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1541eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1466{ 1542{
1467 unsigned char bits [9 + sizeof (ino_t) * 8]; 1543 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1468 unsigned char *bit = bits; 1544 unsigned char *bit = bits;
1469 1545
1470 assert (CHAR_BIT == 8); 1546 assert (CHAR_BIT == 8);
1471 assert (sizeof (eio_dirent) * 8 < 256); 1547 assert (sizeof (eio_dirent) * 8 < 256);
1472 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1548 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1474 1550
1475 if (size <= EIO_SORT_FAST) 1551 if (size <= EIO_SORT_FAST)
1476 return; 1552 return;
1477 1553
1478 /* first prepare an array of bits to test in our radix sort */ 1554 /* first prepare an array of bits to test in our radix sort */
1479 /* try to take endianness into account, as well as differences in ino_t sizes */ 1555 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1480 /* inode_bits must contain all inodes ORed together */ 1556 /* inode_bits must contain all inodes ORed together */
1481 /* which is used to skip bits that are 0 everywhere, which is very common */ 1557 /* which is used to skip bits that are 0 everywhere, which is very common */
1482 { 1558 {
1483 ino_t endianness; 1559 eio_ino_t endianness;
1484 int i, j; 1560 int i, j;
1485 1561
1486 /* we store the byte offset of byte n into byte n of "endianness" */ 1562 /* we store the byte offset of byte n into byte n of "endianness" */
1487 for (i = 0; i < sizeof (ino_t); ++i) 1563 for (i = 0; i < sizeof (eio_ino_t); ++i)
1488 ((unsigned char *)&endianness)[i] = i; 1564 ((unsigned char *)&endianness)[i] = i;
1489 1565
1490 *bit++ = 0; 1566 *bit++ = 0;
1491 1567
1492 for (i = 0; i < sizeof (ino_t); ++i) 1568 for (i = 0; i < sizeof (eio_ino_t); ++i)
1493 { 1569 {
1494 /* shifting off the byte offsets out of "endianness" */ 1570 /* shifting off the byte offsets out of "endianness" */
1495 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1571 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1496 endianness >>= 8; 1572 endianness >>= 8;
1497 1573
1498 for (j = 0; j < 8; ++j) 1574 for (j = 0; j < 8; ++j)
1499 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1575 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1500 *bit++ = offs + j; 1576 *bit++ = offs + j;
1501 } 1577 }
1502 1578
1503 for (j = 0; j < 8; ++j) 1579 for (j = 0; j < 8; ++j)
1504 if (score_bits & (1 << j)) 1580 if (score_bits & (1 << j))
1505 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1581 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1506 } 1582 }
1507 1583
1508 /* now actually do the sorting (a variant of MSD radix sort) */ 1584 /* now actually do the sorting (a variant of MSD radix sort) */
1509 { 1585 {
1510 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1586 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1511 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1587 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1512 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1588 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1513 int stk_idx = 0; 1589 int stk_idx = 0;
1514 1590
1515 base_stk [stk_idx] = dents; 1591 base_stk [stk_idx] = dents;
1516 end_stk [stk_idx] = dents + size; 1592 end_stk [stk_idx] = dents + size;
1517 bit_stk [stk_idx] = bit - 1; 1593 bit_stk [stk_idx] = bit - 1;
1596 } 1672 }
1597 } 1673 }
1598} 1674}
1599 1675
1600static void 1676static void
1601eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1677eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1602{ 1678{
1603 if (size <= 1) 1679 if (size <= 1)
1604 return; /* our insertion sort relies on size > 0 */ 1680 return; /* our insertion sort relies on size > 0 */
1605 1681
1606 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1682 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1612 eio_dent_insertion_sort (dents, size); 1688 eio_dent_insertion_sort (dents, size);
1613} 1689}
1614 1690
1615/* read a full directory */ 1691/* read a full directory */
1616static void 1692static void
1617eio__scandir (eio_req *req, etp_worker *self) 1693eio__scandir (eio_req *req)
1618{ 1694{
1619 DIR *dirp;
1620 EIO_STRUCT_DIRENT *entp;
1621 char *name, *names; 1695 char *name, *names;
1622 int namesalloc = 4096; 1696 int namesalloc = 4096 - sizeof (void *) * 4;
1623 int namesoffs = 0; 1697 int namesoffs = 0;
1624 int flags = req->int1; 1698 int flags = req->int1;
1625 eio_dirent *dents = 0; 1699 eio_dirent *dents = 0;
1626 int dentalloc = 128; 1700 int dentalloc = 128;
1627 int dentoffs = 0; 1701 int dentoffs = 0;
1628 ino_t inode_bits = 0; 1702 eio_ino_t inode_bits = 0;
1703#ifdef _WIN32
1704 HANDLE dirp;
1705 WIN32_FIND_DATA entp;
1706#else
1707 DIR *dirp;
1708 EIO_STRUCT_DIRENT *entp;
1709#endif
1629 1710
1630 req->result = -1; 1711 req->result = -1;
1631 1712
1632 if (!(flags & EIO_READDIR_DENTS)) 1713 if (!(flags & EIO_READDIR_DENTS))
1633 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1714 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1634 1715
1635 X_LOCK (wrklock); 1716#ifdef _WIN32
1636 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1717 {
1718 int len = strlen ((const char *)req->ptr1);
1719 char *path = malloc (MAX_PATH);
1720 const char *fmt;
1721
1722 if (!len)
1723 fmt = "./*";
1724 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1725 fmt = "%s*";
1726 else
1727 fmt = "%s/*";
1728
1729 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1730 dirp = FindFirstFile (path, &entp);
1731 free (path);
1732
1733 if (dirp == INVALID_HANDLE_VALUE)
1734 {
1735 /* should steal _dosmaperr */
1736 switch (GetLastError ())
1737 {
1738 case ERROR_FILE_NOT_FOUND:
1739 req->result = 0;
1740 break;
1741
1742 case ERROR_INVALID_NAME:
1743 case ERROR_PATH_NOT_FOUND:
1744 case ERROR_NO_MORE_FILES:
1745 errno = ENOENT;
1746 break;
1747
1748 case ERROR_NOT_ENOUGH_MEMORY:
1749 errno = ENOMEM;
1750 break;
1751
1752 default:
1753 errno = EINVAL;
1754 break;
1755 }
1756
1757 return;
1758 }
1759 }
1760#else
1637 self->dirp = dirp = opendir (req->ptr1); 1761 dirp = opendir (req->ptr1);
1762
1763 if (!dirp)
1764 return;
1765#endif
1638 1766
1639 if (req->flags & EIO_FLAG_PTR1_FREE) 1767 if (req->flags & EIO_FLAG_PTR1_FREE)
1640 free (req->ptr1); 1768 free (req->ptr1);
1641 1769
1642 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1770 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1643 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1771 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1644 req->ptr2 = names = malloc (namesalloc); 1772 req->ptr2 = names = malloc (namesalloc);
1645 X_UNLOCK (wrklock);
1646 1773
1647 if (dirp && names && (!flags || dents)) 1774 if (!names || (flags && !dents))
1775 return;
1776
1648 for (;;) 1777 for (;;)
1649 { 1778 {
1779 int done;
1780
1781#ifdef _WIN32
1782 done = !dirp;
1783#else
1650 errno = 0; 1784 errno = 0;
1651 entp = readdir (dirp); 1785 entp = readdir (dirp);
1786 done = !entp;
1787#endif
1652 1788
1653 if (!entp) 1789 if (done)
1654 { 1790 {
1791#ifndef _WIN32
1792 int old_errno = errno;
1793 closedir (dirp);
1794 errno = old_errno;
1795
1655 if (errno) 1796 if (errno)
1656 break; 1797 break;
1798#endif
1657 1799
1658 /* sort etc. */ 1800 /* sort etc. */
1659 req->int1 = flags; 1801 req->int1 = flags;
1660 req->result = dentoffs; 1802 req->result = dentoffs;
1661 1803
1662 if (flags & EIO_READDIR_STAT_ORDER) 1804 if (flags & EIO_READDIR_STAT_ORDER)
1663 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);
1664 else if (flags & EIO_READDIR_DIRS_FIRST) 1806 else if (flags & EIO_READDIR_DIRS_FIRST)
1665 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1807 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1666 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 */
1667 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))
1668 { 1860 {
1669 /* 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
1670 eio_dirent *oth = dents + dentoffs; 1868 ent = dents + dentoffs;
1671 eio_dirent *dir = dents;
1672 1869
1673 /* 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 */
1674 /* by walking from both sides and swapping if necessary */ 1871 ent->namelen = len - 1;
1675 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)
1676 { 1932 {
1677 if (dir->type == EIO_DT_DIR) 1933 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1678 ++dir; 1934 ent->score = 1;
1679 else if ((--oth)->type == EIO_DT_DIR) 1935 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1680 { 1936 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1681 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1682
1683 ++dir;
1684 }
1685 } 1937 }
1686 1938 else if (ent->type == EIO_DT_DIR)
1687 /* now sort the dirs only (dirs all have the same score) */ 1939 ent->score = 0;
1688 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1689 } 1940 }
1690
1691 break;
1692 }
1693
1694 /* now add the entry to our list(s) */
1695 name = entp->d_name;
1696
1697 /* skip . and .. entries */
1698 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1699 {
1700 int len = D_NAMLEN (entp) + 1;
1701
1702 while (ecb_expect_false (namesoffs + len > namesalloc))
1703 {
1704 namesalloc *= 2;
1705 X_LOCK (wrklock);
1706 req->ptr2 = names = realloc (names, namesalloc);
1707 X_UNLOCK (wrklock);
1708
1709 if (!names)
1710 break;
1711 } 1941 }
1712 1942
1713 memcpy (names + namesoffs, name, len);
1714
1715 if (dents)
1716 {
1717 struct eio_dirent *ent;
1718
1719 if (ecb_expect_false (dentoffs == dentalloc))
1720 {
1721 dentalloc *= 2;
1722 X_LOCK (wrklock);
1723 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1724 X_UNLOCK (wrklock);
1725
1726 if (!dents)
1727 break;
1728 }
1729
1730 ent = dents + dentoffs;
1731
1732 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1733 ent->namelen = len - 1;
1734 ent->inode = D_INO (entp);
1735
1736 inode_bits |= ent->inode;
1737
1738 switch (D_TYPE (entp))
1739 {
1740 default:
1741 ent->type = EIO_DT_UNKNOWN;
1742 flags |= EIO_READDIR_FOUND_UNKNOWN;
1743 break;
1744
1745 #ifdef DT_FIFO
1746 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1747 #endif
1748 #ifdef DT_CHR
1749 case DT_CHR: ent->type = EIO_DT_CHR; break;
1750 #endif
1751 #ifdef DT_MPC
1752 case DT_MPC: ent->type = EIO_DT_MPC; break;
1753 #endif
1754 #ifdef DT_DIR
1755 case DT_DIR: ent->type = EIO_DT_DIR; break;
1756 #endif
1757 #ifdef DT_NAM
1758 case DT_NAM: ent->type = EIO_DT_NAM; break;
1759 #endif
1760 #ifdef DT_BLK
1761 case DT_BLK: ent->type = EIO_DT_BLK; break;
1762 #endif
1763 #ifdef DT_MPB
1764 case DT_MPB: ent->type = EIO_DT_MPB; break;
1765 #endif
1766 #ifdef DT_REG
1767 case DT_REG: ent->type = EIO_DT_REG; break;
1768 #endif
1769 #ifdef DT_NWK
1770 case DT_NWK: ent->type = EIO_DT_NWK; break;
1771 #endif
1772 #ifdef DT_CMP
1773 case DT_CMP: ent->type = EIO_DT_CMP; break;
1774 #endif
1775 #ifdef DT_LNK
1776 case DT_LNK: ent->type = EIO_DT_LNK; break;
1777 #endif
1778 #ifdef DT_SOCK
1779 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1780 #endif
1781 #ifdef DT_DOOR
1782 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1783 #endif
1784 #ifdef DT_WHT
1785 case DT_WHT: ent->type = EIO_DT_WHT; break;
1786 #endif
1787 }
1788
1789 ent->score = 7;
1790
1791 if (flags & EIO_READDIR_DIRS_FIRST)
1792 {
1793 if (ent->type == EIO_DT_UNKNOWN)
1794 {
1795 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1796 ent->score = 1;
1797 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1798 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1799 }
1800 else if (ent->type == EIO_DT_DIR)
1801 ent->score = 0;
1802 }
1803 }
1804
1805 namesoffs += len; 1943 namesoffs += len;
1806 ++dentoffs; 1944 ++dentoffs;
1807 } 1945 }
1808 1946
1809 if (EIO_CANCELLED (req)) 1947 if (EIO_CANCELLED (req))
1810 { 1948 {
1811 errno = ECANCELED; 1949 errno = ECANCELED;
1812 break; 1950 break;
1813 } 1951 }
1952
1953#ifdef _WIN32
1954 if (!FindNextFile (dirp, &entp))
1955 {
1956 FindClose (dirp);
1957 dirp = 0;
1814 } 1958 }
1959#endif
1960 }
1815} 1961}
1962
1963/*****************************************************************************/
1964/* working directory stuff */
1965
1966#if HAVE_AT
1967
1968#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD)
1969
1970#ifndef O_SEARCH
1971# define O_SEARCH O_RDONLY
1972#endif
1973
1974eio_wd
1975eio_wd_open_sync (eio_wd wd, const char *path)
1976{
1977 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1978
1979 return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1980}
1981
1982static eio_wd
1983eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1984{
1985 return eio_wd_open_sync (wd, path);
1986}
1987
1988void
1989eio_wd_close_sync (eio_wd wd)
1990{
1991 int fd = WD2FD (wd);
1992
1993 if (fd >= 0)
1994 close (fd);
1995}
1996
1997static int
1998eio__truncateat (int dirfd, const char *path, off_t length)
1999{
2000 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2001 int res;
2002
2003 if (fd < 0)
2004 return fd;
2005
2006 res = ftruncate (fd, length);
2007 close (fd);
2008 return res;
2009}
2010
2011static int
2012eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2013{
2014 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2015 int res;
2016
2017 if (fd < 0)
2018 return fd;
2019
2020 res = fstatvfs (fd, buf);
2021 close (fd);
2022 return res;
2023
2024}
2025
2026#else
2027
2028/* on legacy systems, we represent the working directories simply by their path strings */
2029
2030static const char *
2031wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2032{
2033 if (!wd || *path == '/')
2034 return path;
2035
2036 {
2037 int l1 = strlen ((const char *)wd);
2038 int l2 = strlen (path);
2039
2040 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2041
2042 memcpy (res, wd, l1);
2043 res [l1] = '/';
2044 memcpy (res + l1 + 1, path, l2 + 1);
2045
2046 return res;
2047 }
2048}
2049
2050static eio_wd
2051eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2052{
2053 if (*path == '/') /* absolute paths ignore wd */
2054 path = strdup (path);
2055 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2056 return wd;
2057 else
2058 {
2059 int len = eio__realpath (tmpbuf, wd, path);
2060
2061 path = EIO_INVALID_WD;
2062
2063 if (len >= 0)
2064 {
2065 ((char *)tmpbuf->ptr)[len] = 0;
2066 path = strdup (tmpbuf->ptr);
2067 }
2068 }
2069
2070 if (!path)
2071 path = EIO_INVALID_WD;
2072
2073 return (eio_wd)path;
2074}
2075
2076eio_wd
2077eio_wd_open_sync (eio_wd wd, const char *path)
2078{
2079 struct tmpbuf tmpbuf = { 0 };
2080 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2081 free (tmpbuf.ptr);
2082
2083 return wd;
2084}
2085
2086void
2087eio_wd_close_sync (eio_wd wd)
2088{
2089 if (wd != EIO_INVALID_WD)
2090 free (wd);
2091}
2092
2093#endif
1816 2094
1817/*****************************************************************************/ 2095/*****************************************************************************/
1818 2096
1819#define ALLOC(len) \ 2097#define ALLOC(len) \
1820 if (!req->ptr2) \ 2098 if (!req->ptr2) \
1834X_THREAD_PROC (etp_proc) 2112X_THREAD_PROC (etp_proc)
1835{ 2113{
1836 ETP_REQ *req; 2114 ETP_REQ *req;
1837 struct timespec ts; 2115 struct timespec ts;
1838 etp_worker *self = (etp_worker *)thr_arg; 2116 etp_worker *self = (etp_worker *)thr_arg;
1839 int timeout; 2117
2118#if HAVE_PRCTL_SET_NAME
2119 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2120#endif
1840 2121
1841 /* try to distribute timeouts somewhat evenly */ 2122 /* try to distribute timeouts somewhat evenly */
1842 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2123 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1843 2124
1844 for (;;) 2125 for (;;)
1847 2128
1848 X_LOCK (reqlock); 2129 X_LOCK (reqlock);
1849 2130
1850 for (;;) 2131 for (;;)
1851 { 2132 {
1852 self->req = req = reqq_shift (&req_queue); 2133 req = reqq_shift (&req_queue);
1853 2134
1854 if (req) 2135 if (req)
1855 break; 2136 break;
1856 2137
1857 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2138 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1895 ++npending; 2176 ++npending;
1896 2177
1897 if (!reqq_push (&res_queue, req) && want_poll_cb) 2178 if (!reqq_push (&res_queue, req) && want_poll_cb)
1898 want_poll_cb (); 2179 want_poll_cb ();
1899 2180
1900 self->req = 0;
1901 etp_worker_clear (self); 2181 etp_worker_clear (self);
1902 2182
1903 X_UNLOCK (reslock); 2183 X_UNLOCK (reslock);
1904 } 2184 }
1905 2185
1906quit: 2186quit:
2187 free (req);
2188
1907 X_LOCK (wrklock); 2189 X_LOCK (wrklock);
1908 etp_worker_free (self); 2190 etp_worker_free (self);
1909 X_UNLOCK (wrklock); 2191 X_UNLOCK (wrklock);
1910 2192
1911 return 0; 2193 return 0;
1914/*****************************************************************************/ 2196/*****************************************************************************/
1915 2197
1916int ecb_cold 2198int ecb_cold
1917eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2199eio_init (void (*want_poll)(void), void (*done_poll)(void))
1918{ 2200{
2201#if !HAVE_PREADWRITE
2202 X_MUTEX_CREATE (preadwritelock);
2203#endif
2204
1919 return etp_init (want_poll, done_poll); 2205 return etp_init (want_poll, done_poll);
1920} 2206}
1921 2207
1922ecb_inline void 2208ecb_inline void
1923eio_api_destroy (eio_req *req) 2209eio_api_destroy (eio_req *req)
1950 } 2236 }
1951 2237
1952static void 2238static void
1953eio_execute (etp_worker *self, eio_req *req) 2239eio_execute (etp_worker *self, eio_req *req)
1954{ 2240{
2241#if HAVE_AT
2242 int dirfd;
2243#else
2244 const char *path;
2245#endif
2246
1955 if (ecb_expect_false (EIO_CANCELLED (req))) 2247 if (ecb_expect_false (EIO_CANCELLED (req)))
1956 { 2248 {
1957 req->result = -1; 2249 req->result = -1;
1958 req->errorno = ECANCELED; 2250 req->errorno = ECANCELED;
1959 return; 2251 return;
1960 } 2252 }
1961 2253
2254 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2255 {
2256 req->result = -1;
2257 req->errorno = ENOENT;
2258 return;
2259 }
2260
2261 if (req->type >= EIO_OPEN)
2262 {
2263 #if HAVE_AT
2264 dirfd = WD2FD (req->wd);
2265 #else
2266 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2267 #endif
2268 }
2269
1962 switch (req->type) 2270 switch (req->type)
1963 { 2271 {
2272 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2273 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2274 break;
2275 case EIO_WD_CLOSE: eio_wd_close_sync (req->wd); break;
2276
1964 case EIO_READ: ALLOC (req->size); 2277 case EIO_READ: ALLOC (req->size);
1965 req->result = req->offs >= 0 2278 req->result = req->offs >= 0
1966 ? pread (req->int1, req->ptr2, req->size, req->offs) 2279 ? pread (req->int1, req->ptr2, req->size, req->offs)
1967 : read (req->int1, req->ptr2, req->size); break; 2280 : read (req->int1, req->ptr2, req->size); break;
1968 case EIO_WRITE: req->result = req->offs >= 0 2281 case EIO_WRITE: req->result = req->offs >= 0
1969 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2282 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1970 : write (req->int1, req->ptr2, req->size); break; 2283 : write (req->int1, req->ptr2, req->size); break;
1971 2284
1972 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2285 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1973 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2286 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1974 2287
2288#if HAVE_AT
1975 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2289 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1976 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2290 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1977 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2291 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2292 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2293 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2294 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2295 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2296 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2297
2298 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2299 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2300 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2301 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break;
2302 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break;
2303 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2304 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2305 case EIO_READLINK: ALLOC (PATH_MAX);
2306 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2307 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2308 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2309#else
2310 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2311 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2312 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1978 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2313 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2314 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2315 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2316 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2317 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2318
2319 case EIO_UNLINK: req->result = unlink (path ); break;
2320 case EIO_RMDIR: req->result = rmdir (path ); break;
2321 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2322 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2323 case EIO_LINK: req->result = link (path , req->ptr2); break;
2324 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2325 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2326 case EIO_READLINK: ALLOC (PATH_MAX);
2327 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2328 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2329 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2330#endif
2331
2332 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2333 {
2334 ALLOC (req->result);
2335 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2336 }
2337 break;
2338
1979 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2339 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1980 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2340 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1981 2341
1982 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1983 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1984 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2342 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1985 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2343 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1986 2344
1987 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1988 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2345 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1989 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1990 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2346 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1991 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1992 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2347 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1993 2348
1994 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1995 case EIO_CLOSE: req->result = close (req->int1); break; 2349 case EIO_CLOSE: req->result = close (req->int1); break;
1996 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2350 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1997 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1998 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1999 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2000 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2001 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2002 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2003 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2004
2005 case EIO_REALPATH: eio__realpath (req, self); break;
2006
2007 case EIO_READLINK: ALLOC (PATH_MAX);
2008 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2009
2010 case EIO_SYNC: req->result = 0; sync (); break; 2351 case EIO_SYNC: req->result = 0; sync (); break;
2011 case EIO_FSYNC: req->result = fsync (req->int1); break; 2352 case EIO_FSYNC: req->result = fsync (req->int1); break;
2012 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2353 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2354 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2355 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2013 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2356 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2014 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2357 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2015 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2358 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2016 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2359 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2017 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2018 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2360 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2019 2361
2020 case EIO_READDIR: eio__scandir (req, self); break; 2362 case EIO_READDIR: eio__scandir (req); break;
2021 2363
2022 case EIO_BUSY: 2364 case EIO_BUSY:
2023#ifdef _WIN32 2365#ifdef _WIN32
2024 Sleep (req->nv1 * 1e3); 2366 Sleep (req->nv1 * 1e3);
2025#else 2367#else
2103eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2445eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2104{ 2446{
2105 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2447 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2106} 2448}
2107 2449
2450eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2451{
2452 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2453}
2454
2455eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2456{
2457 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2458}
2459
2460eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2461{
2462 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2463}
2464
2108eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2465eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2109{ 2466{
2110 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2467 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2111} 2468}
2112 2469
2118eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2475eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2119{ 2476{
2120 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2477 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2121} 2478}
2122 2479
2123eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2124{
2125 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2126}
2127
2128eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2480eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2129{ 2481{
2130 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2482 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2131} 2483}
2132 2484
2133eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2134{
2135 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2136}
2137
2138eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2485eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2139{ 2486{
2140 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2487 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2141} 2488}
2142 2489
2178eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2525eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
2179{ 2526{
2180 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2527 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2181} 2528}
2182 2529
2183eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2530eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2184{ 2531{
2185 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2532 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2186} 2533}
2187 2534
2188eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2535eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
2208eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2555eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
2209{ 2556{
2210 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2557 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2211} 2558}
2212 2559
2213eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2560eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2214{ 2561{
2215 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2562 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2216} 2563}
2217 2564
2218eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2565eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
2365} 2712}
2366 2713
2367/*****************************************************************************/ 2714/*****************************************************************************/
2368/* misc garbage */ 2715/* misc garbage */
2369 2716
2370ssize_t 2717eio_ssize_t
2371eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2718eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2372{ 2719{
2373 etp_worker wrk;
2374 ssize_t ret;
2375
2376 wrk.dbuf = 0;
2377
2378 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2720 return eio__sendfile (ofd, ifd, offset, count);
2379
2380 if (wrk.dbuf)
2381 free (wrk.dbuf);
2382
2383 return ret;
2384} 2721}
2385 2722

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines