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.116 by root, Tue Mar 27 19:27:35 2012 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>
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
209
210 #define D_NAME(entp) entp->d_name
144 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__ || defined __NetBSD__ || defined __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
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;
279/* 385/*
280 * make our pread/pwrite emulation safe against themselves, but not against 386 * make our pread/pwrite emulation safe against themselves, but not against
281 * normal read/write by using a mutex. slows down execution a lot, 387 * normal read/write by using a mutex. slows down execution a lot,
282 * but that's your problem, not mine. 388 * but that's your problem, not mine.
283 */ 389 */
284static xmutex_t preadwritelock = X_MUTEX_INIT; 390static xmutex_t preadwritelock;
285#endif 391#endif
286 392
287typedef struct etp_worker 393typedef struct etp_worker
288{ 394{
395 struct tmpbuf tmpbuf;
396
289 /* locked by wrklock */ 397 /* locked by wrklock */
290 struct etp_worker *prev, *next; 398 struct etp_worker *prev, *next;
291 399
292 xthread_t tid; 400 xthread_t tid;
293 401
294 /* locked by reslock, reqlock or wrklock */ 402#ifdef ETP_WORKER_COMMON
295 ETP_REQ *req; /* currently processed request */
296
297 ETP_WORKER_COMMON 403 ETP_WORKER_COMMON
404#endif
298} etp_worker; 405} etp_worker;
299 406
300static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 407static etp_worker wrk_first; /* NOT etp */
301 408
302#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 409#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 410#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304 411
305/* worker threads management */ 412/* worker threads management */
306 413
307static void ecb_cold 414static void
308etp_worker_clear (etp_worker *wrk) 415etp_worker_clear (etp_worker *wrk)
309{ 416{
310 ETP_WORKER_CLEAR (wrk);
311} 417}
312 418
313static void ecb_cold 419static void ecb_cold
314etp_worker_free (etp_worker *wrk) 420etp_worker_free (etp_worker *wrk)
315{ 421{
422 free (wrk->tmpbuf.ptr);
423
316 wrk->next->prev = wrk->prev; 424 wrk->next->prev = wrk->prev;
317 wrk->prev->next = wrk->next; 425 wrk->prev->next = wrk->next;
318 426
319 free (wrk); 427 free (wrk);
320} 428}
376} etp_reqq; 484} etp_reqq;
377 485
378static etp_reqq req_queue; 486static etp_reqq req_queue;
379static etp_reqq res_queue; 487static etp_reqq res_queue;
380 488
489static void ecb_noinline ecb_cold
490reqq_init (etp_reqq *q)
491{
492 int pri;
493
494 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
495 q->qs[pri] = q->qe[pri] = 0;
496
497 q->size = 0;
498}
499
381static int ecb_noinline 500static int ecb_noinline
382reqq_push (etp_reqq *q, ETP_REQ *req) 501reqq_push (etp_reqq *q, ETP_REQ *req)
383{ 502{
384 int pri = req->pri; 503 int pri = req->pri;
385 req->next = 0; 504 req->next = 0;
419 } 538 }
420 539
421 abort (); 540 abort ();
422} 541}
423 542
424static void ecb_cold 543static int ecb_cold
425etp_thread_init (void) 544etp_init (void (*want_poll)(void), void (*done_poll)(void))
426{ 545{
427#if !HAVE_PREADWRITE
428 X_MUTEX_CREATE (preadwritelock);
429#endif
430 X_MUTEX_CREATE (wrklock); 546 X_MUTEX_CREATE (wrklock);
431 X_MUTEX_CREATE (reslock); 547 X_MUTEX_CREATE (reslock);
432 X_MUTEX_CREATE (reqlock); 548 X_MUTEX_CREATE (reqlock);
433 X_COND_CREATE (reqwait); 549 X_COND_CREATE (reqwait);
434}
435 550
436static void ecb_cold 551 reqq_init (&req_queue);
437etp_atfork_prepare (void) 552 reqq_init (&res_queue);
438{
439}
440 553
441static void ecb_cold 554 wrk_first.next =
442etp_atfork_parent (void) 555 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 556
468 started = 0; 557 started = 0;
469 idle = 0; 558 idle = 0;
470 nreqs = 0; 559 nreqs = 0;
471 nready = 0; 560 nready = 0;
472 npending = 0; 561 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 562
491 want_poll_cb = want_poll; 563 want_poll_cb = want_poll;
492 done_poll_cb = done_poll; 564 done_poll_cb = done_poll;
493 565
494 return 0; 566 return 0;
534} 606}
535 607
536static void ecb_cold 608static void ecb_cold
537etp_end_thread (void) 609etp_end_thread (void)
538{ 610{
539 eio_req *req = calloc (1, sizeof (eio_req)); 611 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
540 612
541 req->type = -1; 613 req->type = -1;
542 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 614 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
543 615
544 X_LOCK (reqlock); 616 X_LOCK (reqlock);
952#if !HAVE_FDATASYNC 1024#if !HAVE_FDATASYNC
953# undef fdatasync 1025# undef fdatasync
954# define fdatasync(fd) fsync (fd) 1026# define fdatasync(fd) fsync (fd)
955#endif 1027#endif
956 1028
1029static int
1030eio__syncfs (int fd)
1031{
1032 int res;
1033
1034#if HAVE_SYS_SYNCFS
1035 res = (int)syscall (__NR_syncfs, (int)(fd));
1036#else
1037 res = -1;
1038 errno = ENOSYS;
1039#endif
1040
1041 if (res < 0 && errno == ENOSYS && fd >= 0)
1042 sync ();
1043
1044 return res;
1045}
1046
957/* sync_file_range always needs emulation */ 1047/* sync_file_range always needs emulation */
958static int 1048static int
959eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1049eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
960{ 1050{
961#if HAVE_SYNC_FILE_RANGE 1051#if HAVE_SYNC_FILE_RANGE
1010 pread (fd, eio_buf, len, offset); 1100 pread (fd, eio_buf, len, offset);
1011 offset += len; 1101 offset += len;
1012 todo -= len; 1102 todo -= len;
1013 } 1103 }
1014 1104
1015 errno = 0; 1105 FUBd;
1106
1107 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1108 /* but not for e.g. EIO or eof, so we also never fail */
1016 return count; 1109 return 0;
1017} 1110}
1018 1111
1019#endif 1112#endif
1020 1113
1021/* sendfile always needs emulation */ 1114/* sendfile always needs emulation */
1022static eio_ssize_t 1115static eio_ssize_t
1023eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1116eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024{ 1117{
1025 eio_ssize_t written = 0; 1118 eio_ssize_t written = 0;
1026 eio_ssize_t res; 1119 eio_ssize_t res;
1027 1120
1028 if (!count) 1121 if (!count)
1126 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1219 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1127 /* BSDs */ 1220 /* BSDs */
1128#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1221#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129 || errno == ENOTSUP 1222 || errno == ENOTSUP
1130#endif 1223#endif
1224#ifdef EOPNOTSUPP /* windows */
1131 || errno == EOPNOTSUPP /* BSDs */ 1225 || errno == EOPNOTSUPP /* BSDs */
1226#endif
1132#if __solaris 1227#if __solaris
1133 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1228 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1134#endif 1229#endif
1135 ) 1230 )
1136 ) 1231 )
1162 1257
1163 offset += cnt; 1258 offset += cnt;
1164 res += cnt; 1259 res += cnt;
1165 count -= cnt; 1260 count -= cnt;
1166 } 1261 }
1262
1263 FUBd;
1167 } 1264 }
1168 1265
1169 return res; 1266 return res;
1170} 1267}
1171 1268
1286} 1383}
1287 1384
1288/*****************************************************************************/ 1385/*****************************************************************************/
1289/* requests implemented outside eio_execute, because they are so large */ 1386/* requests implemented outside eio_execute, because they are so large */
1290 1387
1388/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1291static void 1389static int
1292eio__realpath (eio_req *req, etp_worker *self) 1390eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1293{ 1391{
1294 char *rel = req->ptr1; 1392 const char *rel = path;
1295 char *res; 1393 char *res;
1296 char *tmp1, *tmp2; 1394 char *tmp1, *tmp2;
1297#if SYMLOOP_MAX > 32 1395#if SYMLOOP_MAX > 32
1298 int symlinks = SYMLOOP_MAX; 1396 int symlinks = SYMLOOP_MAX;
1299#else 1397#else
1300 int symlinks = 32; 1398 int symlinks = 32;
1301#endif 1399#endif
1302 1400
1303 req->result = -1;
1304
1305 errno = EINVAL; 1401 errno = EINVAL;
1306 if (!rel) 1402 if (!rel)
1307 return; 1403 return -1;
1308 1404
1309 errno = ENOENT; 1405 errno = ENOENT;
1310 if (!*rel) 1406 if (!*rel)
1311 return; 1407 return -1;
1312 1408
1313 if (!req->ptr2) 1409 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; 1410 tmp1 = res + PATH_MAX;
1327 tmp2 = tmp1 + PATH_MAX; 1411 tmp2 = tmp1 + PATH_MAX;
1328 1412
1329#if 0 /* disabled, the musl way to do things is just too racy */ 1413#if 0 /* disabled, the musl way to do things is just too racy */
1330#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1414#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1349#endif 1433#endif
1350#endif 1434#endif
1351 1435
1352 if (*rel != '/') 1436 if (*rel != '/')
1353 { 1437 {
1438 int len;
1439
1440 errno = ENOENT;
1441 if (wd == EIO_INVALID_WD)
1442 return -1;
1443
1444 if (wd == EIO_CWD)
1445 {
1354 if (!getcwd (res, PATH_MAX)) 1446 if (!getcwd (res, PATH_MAX))
1355 return; 1447 return -1;
1448
1449 len = strlen (res);
1450 }
1451 else
1452 memcpy (res, wd->str, len = wd->len);
1356 1453
1357 if (res [1]) /* only use if not / */ 1454 if (res [1]) /* only use if not / */
1358 res += strlen (res); 1455 res += len;
1359 } 1456 }
1360 1457
1361 while (*rel) 1458 while (*rel)
1362 { 1459 {
1363 eio_ssize_t len, linklen; 1460 eio_ssize_t len, linklen;
1364 char *beg = rel; 1461 const char *beg = rel;
1365 1462
1366 while (*rel && *rel != '/') 1463 while (*rel && *rel != '/')
1367 ++rel; 1464 ++rel;
1368 1465
1369 len = rel - beg; 1466 len = rel - beg;
1381 1478
1382 if (beg [1] == '.' && len == 2) 1479 if (beg [1] == '.' && len == 2)
1383 { 1480 {
1384 /* .. - back up one component, if possible */ 1481 /* .. - back up one component, if possible */
1385 1482
1386 while (res != req->ptr2) 1483 while (res != tmpbuf->ptr)
1387 if (*--res == '/') 1484 if (*--res == '/')
1388 break; 1485 break;
1389 1486
1390 continue; 1487 continue;
1391 } 1488 }
1392 } 1489 }
1393 1490
1394 errno = ENAMETOOLONG; 1491 errno = ENAMETOOLONG;
1395 if (res + 1 + len + 1 >= tmp1) 1492 if (res + 1 + len + 1 >= tmp1)
1396 return; 1493 return -1;
1397 1494
1398 /* copy one component */ 1495 /* copy one component */
1399 *res = '/'; 1496 *res = '/';
1400 memcpy (res + 1, beg, len); 1497 memcpy (res + 1, beg, len);
1401 1498
1402 /* zero-terminate, for readlink */ 1499 /* zero-terminate, for readlink */
1403 res [len + 1] = 0; 1500 res [len + 1] = 0;
1404 1501
1405 /* now check if it's a symlink */ 1502 /* now check if it's a symlink */
1406 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1503 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1407 1504
1408 if (linklen < 0) 1505 if (linklen < 0)
1409 { 1506 {
1410 if (errno != EINVAL) 1507 if (errno != EINVAL)
1411 return; 1508 return -1;
1412 1509
1413 /* it's a normal directory. hopefully */ 1510 /* it's a normal directory. hopefully */
1414 res += len + 1; 1511 res += len + 1;
1415 } 1512 }
1416 else 1513 else
1418 /* yay, it was a symlink - build new path in tmp2 */ 1515 /* yay, it was a symlink - build new path in tmp2 */
1419 int rellen = strlen (rel); 1516 int rellen = strlen (rel);
1420 1517
1421 errno = ENAMETOOLONG; 1518 errno = ENAMETOOLONG;
1422 if (linklen + 1 + rellen >= PATH_MAX) 1519 if (linklen + 1 + rellen >= PATH_MAX)
1423 return; 1520 return -1;
1424 1521
1425 errno = ELOOP; 1522 errno = ELOOP;
1426 if (!--symlinks) 1523 if (!--symlinks)
1427 return; 1524 return -1;
1428 1525
1429 if (*tmp1 == '/') 1526 if (*tmp1 == '/')
1430 res = req->ptr2; /* symlink resolves to an absolute path */ 1527 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1431 1528
1432 /* we need to be careful, as rel might point into tmp2 already */ 1529 /* we need to be careful, as rel might point into tmp2 already */
1433 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1530 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1434 tmp2 [linklen] = '/'; 1531 tmp2 [linklen] = '/';
1435 memcpy (tmp2, tmp1, linklen); 1532 memcpy (tmp2, tmp1, linklen);
1437 rel = tmp2; 1534 rel = tmp2;
1438 } 1535 }
1439 } 1536 }
1440 1537
1441 /* special case for the lone root path */ 1538 /* special case for the lone root path */
1442 if (res == req->ptr2) 1539 if (res == tmpbuf->ptr)
1443 *res++ = '/'; 1540 *res++ = '/';
1444 1541
1445 req->result = res - (char *)req->ptr2; 1542 return res - (char *)tmpbuf->ptr;
1446
1447done:
1448 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1449} 1543}
1450 1544
1451static signed char 1545static signed char
1452eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1546eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1453{ 1547{
1461 1555
1462#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1556#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 */ 1557#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464 1558
1465static void 1559static void
1466eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1560eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467{ 1561{
1468 unsigned char bits [9 + sizeof (ino_t) * 8]; 1562 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469 unsigned char *bit = bits; 1563 unsigned char *bit = bits;
1470 1564
1471 assert (CHAR_BIT == 8); 1565 assert (CHAR_BIT == 8);
1472 assert (sizeof (eio_dirent) * 8 < 256); 1566 assert (sizeof (eio_dirent) * 8 < 256);
1473 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1567 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1475 1569
1476 if (size <= EIO_SORT_FAST) 1570 if (size <= EIO_SORT_FAST)
1477 return; 1571 return;
1478 1572
1479 /* first prepare an array of bits to test in our radix sort */ 1573 /* 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 */ 1574 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481 /* inode_bits must contain all inodes ORed together */ 1575 /* inode_bits must contain all inodes ORed together */
1482 /* which is used to skip bits that are 0 everywhere, which is very common */ 1576 /* which is used to skip bits that are 0 everywhere, which is very common */
1483 { 1577 {
1484 ino_t endianness; 1578 eio_ino_t endianness;
1485 int i, j; 1579 int i, j;
1486 1580
1487 /* we store the byte offset of byte n into byte n of "endianness" */ 1581 /* we store the byte offset of byte n into byte n of "endianness" */
1488 for (i = 0; i < sizeof (ino_t); ++i) 1582 for (i = 0; i < sizeof (eio_ino_t); ++i)
1489 ((unsigned char *)&endianness)[i] = i; 1583 ((unsigned char *)&endianness)[i] = i;
1490 1584
1491 *bit++ = 0; 1585 *bit++ = 0;
1492 1586
1493 for (i = 0; i < sizeof (ino_t); ++i) 1587 for (i = 0; i < sizeof (eio_ino_t); ++i)
1494 { 1588 {
1495 /* shifting off the byte offsets out of "endianness" */ 1589 /* shifting off the byte offsets out of "endianness" */
1496 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1590 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497 endianness >>= 8; 1591 endianness >>= 8;
1498 1592
1499 for (j = 0; j < 8; ++j) 1593 for (j = 0; j < 8; ++j)
1500 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1594 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501 *bit++ = offs + j; 1595 *bit++ = offs + j;
1502 } 1596 }
1503 1597
1504 for (j = 0; j < 8; ++j) 1598 for (j = 0; j < 8; ++j)
1505 if (score_bits & (1 << j)) 1599 if (score_bits & (1 << j))
1506 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1600 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1507 } 1601 }
1508 1602
1509 /* now actually do the sorting (a variant of MSD radix sort) */ 1603 /* now actually do the sorting (a variant of MSD radix sort) */
1510 { 1604 {
1511 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1605 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1606 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1607 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514 int stk_idx = 0; 1608 int stk_idx = 0;
1515 1609
1516 base_stk [stk_idx] = dents; 1610 base_stk [stk_idx] = dents;
1517 end_stk [stk_idx] = dents + size; 1611 end_stk [stk_idx] = dents + size;
1518 bit_stk [stk_idx] = bit - 1; 1612 bit_stk [stk_idx] = bit - 1;
1597 } 1691 }
1598 } 1692 }
1599} 1693}
1600 1694
1601static void 1695static void
1602eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1696eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603{ 1697{
1604 if (size <= 1) 1698 if (size <= 1)
1605 return; /* our insertion sort relies on size > 0 */ 1699 return; /* our insertion sort relies on size > 0 */
1606 1700
1607 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1701 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1615 1709
1616/* read a full directory */ 1710/* read a full directory */
1617static void 1711static void
1618eio__scandir (eio_req *req, etp_worker *self) 1712eio__scandir (eio_req *req, etp_worker *self)
1619{ 1713{
1620 DIR *dirp;
1621 EIO_STRUCT_DIRENT *entp;
1622 char *name, *names; 1714 char *name, *names;
1623 int namesalloc = 4096; 1715 int namesalloc = 4096 - sizeof (void *) * 4;
1624 int namesoffs = 0; 1716 int namesoffs = 0;
1625 int flags = req->int1; 1717 int flags = req->int1;
1626 eio_dirent *dents = 0; 1718 eio_dirent *dents = 0;
1627 int dentalloc = 128; 1719 int dentalloc = 128;
1628 int dentoffs = 0; 1720 int dentoffs = 0;
1629 ino_t inode_bits = 0; 1721 eio_ino_t inode_bits = 0;
1722#ifdef _WIN32
1723 HANDLE dirp;
1724 WIN32_FIND_DATA entp;
1725#else
1726 DIR *dirp;
1727 EIO_STRUCT_DIRENT *entp;
1728#endif
1630 1729
1631 req->result = -1; 1730 req->result = -1;
1632 1731
1633 if (!(flags & EIO_READDIR_DENTS)) 1732 if (!(flags & EIO_READDIR_DENTS))
1634 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1733 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635 1734
1636 X_LOCK (wrklock); 1735#ifdef _WIN32
1637 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1736 {
1737 int len = strlen ((const char *)req->ptr1);
1738 char *path = malloc (MAX_PATH);
1739 const char *fmt;
1740 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1741
1742 if (!len)
1743 fmt = "./*";
1744 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1745 fmt = "%s*";
1746 else
1747 fmt = "%s/*";
1748
1749 _snprintf (path, MAX_PATH, fmt, reqpath);
1750 dirp = FindFirstFile (path, &entp);
1751 free (path);
1752
1753 if (dirp == INVALID_HANDLE_VALUE)
1754 {
1755 /* should steal _dosmaperr */
1756 switch (GetLastError ())
1757 {
1758 case ERROR_FILE_NOT_FOUND:
1759 req->result = 0;
1760 break;
1761
1762 case ERROR_INVALID_NAME:
1763 case ERROR_PATH_NOT_FOUND:
1764 case ERROR_NO_MORE_FILES:
1765 errno = ENOENT;
1766 break;
1767
1768 case ERROR_NOT_ENOUGH_MEMORY:
1769 errno = ENOMEM;
1770 break;
1771
1772 default:
1773 errno = EINVAL;
1774 break;
1775 }
1776
1777 return;
1778 }
1779 }
1780#else
1781 #if HAVE_AT
1782 if (req->wd)
1783 {
1784 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1785
1786 if (fd < 0)
1787 return;
1788
1789 dirp = fdopendir (fd);
1790
1791 if (!dirp)
1792 close (fd);
1793 }
1794 else
1638 self->dirp = dirp = opendir (req->ptr1); 1795 dirp = opendir (req->ptr1);
1796 #else
1797 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1798 #endif
1799
1800 if (!dirp)
1801 return;
1802#endif
1639 1803
1640 if (req->flags & EIO_FLAG_PTR1_FREE) 1804 if (req->flags & EIO_FLAG_PTR1_FREE)
1641 free (req->ptr1); 1805 free (req->ptr1);
1642 1806
1643 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1807 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1808 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645 req->ptr2 = names = malloc (namesalloc); 1809 req->ptr2 = names = malloc (namesalloc);
1646 X_UNLOCK (wrklock);
1647 1810
1648 if (dirp && names && (!flags || dents)) 1811 if (!names || (flags && !dents))
1812 return;
1813
1649 for (;;) 1814 for (;;)
1650 { 1815 {
1816 int done;
1817
1818#ifdef _WIN32
1819 done = !dirp;
1820#else
1651 errno = 0; 1821 errno = 0;
1652 entp = readdir (dirp); 1822 entp = readdir (dirp);
1823 done = !entp;
1824#endif
1653 1825
1654 if (!entp) 1826 if (done)
1655 { 1827 {
1828#ifndef _WIN32
1829 int old_errno = errno;
1830 closedir (dirp);
1831 errno = old_errno;
1832
1656 if (errno) 1833 if (errno)
1657 break; 1834 break;
1835#endif
1658 1836
1659 /* sort etc. */ 1837 /* sort etc. */
1660 req->int1 = flags; 1838 req->int1 = flags;
1661 req->result = dentoffs; 1839 req->result = dentoffs;
1662 1840
1663 if (flags & EIO_READDIR_STAT_ORDER) 1841 if (flags & EIO_READDIR_STAT_ORDER)
1664 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1842 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1665 else if (flags & EIO_READDIR_DIRS_FIRST) 1843 else if (flags & EIO_READDIR_DIRS_FIRST)
1666 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1844 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1667 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1845 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1668 else 1846 else
1847 {
1848 /* in this case, all is known, and we just put dirs first and sort them */
1849 eio_dirent *oth = dents + dentoffs;
1850 eio_dirent *dir = dents;
1851
1852 /* now partition dirs to the front, and non-dirs to the back */
1853 /* by walking from both sides and swapping if necessary */
1854 while (oth > dir)
1855 {
1856 if (dir->type == EIO_DT_DIR)
1857 ++dir;
1858 else if ((--oth)->type == EIO_DT_DIR)
1859 {
1860 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1861
1862 ++dir;
1863 }
1864 }
1865
1866 /* now sort the dirs only (dirs all have the same score) */
1867 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1868 }
1869
1870 break;
1871 }
1872
1873 /* now add the entry to our list(s) */
1874 name = D_NAME (entp);
1875
1876 /* skip . and .. entries */
1877 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1878 {
1879 int len = D_NAMLEN (entp) + 1;
1880
1881 while (ecb_expect_false (namesoffs + len > namesalloc))
1882 {
1883 namesalloc *= 2;
1884 req->ptr2 = names = realloc (names, namesalloc);
1885
1886 if (!names)
1887 break;
1888 }
1889
1890 memcpy (names + namesoffs, name, len);
1891
1892 if (dents)
1893 {
1894 struct eio_dirent *ent;
1895
1896 if (ecb_expect_false (dentoffs == dentalloc))
1669 { 1897 {
1670 /* in this case, all is known, and we just put dirs first and sort them */ 1898 dentalloc *= 2;
1899 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1900
1901 if (!dents)
1902 break;
1903 }
1904
1671 eio_dirent *oth = dents + dentoffs; 1905 ent = dents + dentoffs;
1672 eio_dirent *dir = dents;
1673 1906
1674 /* now partition dirs to the front, and non-dirs to the back */ 1907 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1675 /* by walking from both sides and swapping if necessary */ 1908 ent->namelen = len - 1;
1676 while (oth > dir) 1909 ent->inode = D_INO (entp);
1910
1911 inode_bits |= ent->inode;
1912
1913 switch (D_TYPE (entp))
1914 {
1915 default:
1916 ent->type = EIO_DT_UNKNOWN;
1917 flags |= EIO_READDIR_FOUND_UNKNOWN;
1918 break;
1919
1920 #ifdef DT_FIFO
1921 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1922 #endif
1923 #ifdef DT_CHR
1924 case DT_CHR: ent->type = EIO_DT_CHR; break;
1925 #endif
1926 #ifdef DT_MPC
1927 case DT_MPC: ent->type = EIO_DT_MPC; break;
1928 #endif
1929 #ifdef DT_DIR
1930 case DT_DIR: ent->type = EIO_DT_DIR; break;
1931 #endif
1932 #ifdef DT_NAM
1933 case DT_NAM: ent->type = EIO_DT_NAM; break;
1934 #endif
1935 #ifdef DT_BLK
1936 case DT_BLK: ent->type = EIO_DT_BLK; break;
1937 #endif
1938 #ifdef DT_MPB
1939 case DT_MPB: ent->type = EIO_DT_MPB; break;
1940 #endif
1941 #ifdef DT_REG
1942 case DT_REG: ent->type = EIO_DT_REG; break;
1943 #endif
1944 #ifdef DT_NWK
1945 case DT_NWK: ent->type = EIO_DT_NWK; break;
1946 #endif
1947 #ifdef DT_CMP
1948 case DT_CMP: ent->type = EIO_DT_CMP; break;
1949 #endif
1950 #ifdef DT_LNK
1951 case DT_LNK: ent->type = EIO_DT_LNK; break;
1952 #endif
1953 #ifdef DT_SOCK
1954 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1955 #endif
1956 #ifdef DT_DOOR
1957 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1958 #endif
1959 #ifdef DT_WHT
1960 case DT_WHT: ent->type = EIO_DT_WHT; break;
1961 #endif
1962 }
1963
1964 ent->score = 7;
1965
1966 if (flags & EIO_READDIR_DIRS_FIRST)
1967 {
1968 if (ent->type == EIO_DT_UNKNOWN)
1677 { 1969 {
1678 if (dir->type == EIO_DT_DIR) 1970 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1679 ++dir; 1971 ent->score = 1;
1680 else if ((--oth)->type == EIO_DT_DIR) 1972 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1681 { 1973 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 } 1974 }
1687 1975 else if (ent->type == EIO_DT_DIR)
1688 /* now sort the dirs only (dirs all have the same score) */ 1976 ent->score = 0;
1689 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1690 } 1977 }
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 } 1978 }
1713 1979
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; 1980 namesoffs += len;
1807 ++dentoffs; 1981 ++dentoffs;
1808 } 1982 }
1809 1983
1810 if (EIO_CANCELLED (req)) 1984 if (EIO_CANCELLED (req))
1811 { 1985 {
1812 errno = ECANCELED; 1986 errno = ECANCELED;
1813 break; 1987 break;
1814 } 1988 }
1989
1990#ifdef _WIN32
1991 if (!FindNextFile (dirp, &entp))
1992 {
1993 FindClose (dirp);
1994 dirp = 0;
1815 } 1995 }
1996#endif
1997 }
1816} 1998}
1999
2000/*****************************************************************************/
2001/* working directory stuff */
2002/* various deficiencies in the posix 2008 api force us to */
2003/* keep the absolute path in string form at all times */
2004/* fuck yeah. */
2005
2006#if !HAVE_AT
2007
2008/* a bit like realpath, but usually faster because it doesn'T have to return */
2009/* an absolute or canonical path */
2010static const char *
2011wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2012{
2013 if (!wd || *path == '/')
2014 return path;
2015
2016 if (path [0] == '.' && !path [1])
2017 return wd->str;
2018
2019 {
2020 int l1 = wd->len;
2021 int l2 = strlen (path);
2022
2023 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2024
2025 memcpy (res, wd->str, l1);
2026 res [l1] = '/';
2027 memcpy (res + l1 + 1, path, l2 + 1);
2028
2029 return res;
2030 }
2031}
2032
2033#endif
2034
2035static eio_wd
2036eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2037{
2038 int fd;
2039 eio_wd res;
2040 int len = eio__realpath (tmpbuf, wd, path);
2041
2042 if (len < 0)
2043 return EIO_INVALID_WD;
2044
2045#if HAVE_AT
2046 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2047
2048 if (fd < 0)
2049 return EIO_INVALID_WD;
2050#endif
2051
2052 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2053
2054#if HAVE_AT
2055 res->fd = fd;
2056#endif
2057
2058 res->len = len;
2059 memcpy (res->str, tmpbuf->ptr, len);
2060 res->str [len] = 0;
2061
2062 return res;
2063}
2064
2065eio_wd
2066eio_wd_open_sync (eio_wd wd, const char *path)
2067{
2068 struct tmpbuf tmpbuf = { 0 };
2069 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2070 free (tmpbuf.ptr);
2071
2072 return wd;
2073}
2074
2075void
2076eio_wd_close_sync (eio_wd wd)
2077{
2078 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2079 {
2080 #if HAVE_AT
2081 close (wd->fd);
2082 #endif
2083 free (wd);
2084 }
2085}
2086
2087#if HAVE_AT
2088
2089/* they forgot these */
2090
2091static int
2092eio__truncateat (int dirfd, const char *path, off_t length)
2093{
2094 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2095 int res;
2096
2097 if (fd < 0)
2098 return fd;
2099
2100 res = ftruncate (fd, length);
2101 close (fd);
2102 return res;
2103}
2104
2105static int
2106eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2107{
2108 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2109 int res;
2110
2111 if (fd < 0)
2112 return fd;
2113
2114 res = fstatvfs (fd, buf);
2115 close (fd);
2116 return res;
2117
2118}
2119
2120#endif
1817 2121
1818/*****************************************************************************/ 2122/*****************************************************************************/
1819 2123
1820#define ALLOC(len) \ 2124#define ALLOC(len) \
1821 if (!req->ptr2) \ 2125 if (!req->ptr2) \
1830 req->result = -1; \ 2134 req->result = -1; \
1831 break; \ 2135 break; \
1832 } \ 2136 } \
1833 } 2137 }
1834 2138
2139static void ecb_noinline ecb_cold
2140etp_proc_init (void)
2141{
2142#if HAVE_PRCTL_SET_NAME
2143 /* provide a more sensible "thread name" */
2144 char name[16 + 1];
2145 const int namelen = sizeof (name) - 1;
2146 int len;
2147
2148 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2149 name [namelen] = 0;
2150 len = strlen (name);
2151 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2152 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2153#endif
2154}
2155
1835X_THREAD_PROC (etp_proc) 2156X_THREAD_PROC (etp_proc)
1836{ 2157{
1837 ETP_REQ *req; 2158 ETP_REQ *req;
1838 struct timespec ts; 2159 struct timespec ts;
1839 etp_worker *self = (etp_worker *)thr_arg; 2160 etp_worker *self = (etp_worker *)thr_arg;
1840 int timeout; 2161
2162 etp_proc_init ();
1841 2163
1842 /* try to distribute timeouts somewhat evenly */ 2164 /* try to distribute timeouts somewhat evenly */
1843 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2165 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844 2166
1845 for (;;) 2167 for (;;)
1848 2170
1849 X_LOCK (reqlock); 2171 X_LOCK (reqlock);
1850 2172
1851 for (;;) 2173 for (;;)
1852 { 2174 {
1853 self->req = req = reqq_shift (&req_queue); 2175 req = reqq_shift (&req_queue);
1854 2176
1855 if (req) 2177 if (req)
1856 break; 2178 break;
1857 2179
1858 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2180 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1896 ++npending; 2218 ++npending;
1897 2219
1898 if (!reqq_push (&res_queue, req) && want_poll_cb) 2220 if (!reqq_push (&res_queue, req) && want_poll_cb)
1899 want_poll_cb (); 2221 want_poll_cb ();
1900 2222
1901 self->req = 0;
1902 etp_worker_clear (self); 2223 etp_worker_clear (self);
1903 2224
1904 X_UNLOCK (reslock); 2225 X_UNLOCK (reslock);
1905 } 2226 }
1906 2227
1907quit: 2228quit:
2229 free (req);
2230
1908 X_LOCK (wrklock); 2231 X_LOCK (wrklock);
1909 etp_worker_free (self); 2232 etp_worker_free (self);
1910 X_UNLOCK (wrklock); 2233 X_UNLOCK (wrklock);
1911 2234
1912 return 0; 2235 return 0;
1915/*****************************************************************************/ 2238/*****************************************************************************/
1916 2239
1917int ecb_cold 2240int ecb_cold
1918eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2241eio_init (void (*want_poll)(void), void (*done_poll)(void))
1919{ 2242{
2243#if !HAVE_PREADWRITE
2244 X_MUTEX_CREATE (preadwritelock);
2245#endif
2246
1920 return etp_init (want_poll, done_poll); 2247 return etp_init (want_poll, done_poll);
1921} 2248}
1922 2249
1923ecb_inline void 2250ecb_inline void
1924eio_api_destroy (eio_req *req) 2251eio_api_destroy (eio_req *req)
1951 } 2278 }
1952 2279
1953static void 2280static void
1954eio_execute (etp_worker *self, eio_req *req) 2281eio_execute (etp_worker *self, eio_req *req)
1955{ 2282{
2283#if HAVE_AT
2284 int dirfd;
2285#else
2286 const char *path;
2287#endif
2288
1956 if (ecb_expect_false (EIO_CANCELLED (req))) 2289 if (ecb_expect_false (EIO_CANCELLED (req)))
1957 { 2290 {
1958 req->result = -1; 2291 req->result = -1;
1959 req->errorno = ECANCELED; 2292 req->errorno = ECANCELED;
1960 return; 2293 return;
1961 } 2294 }
1962 2295
2296 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2297 {
2298 req->result = -1;
2299 req->errorno = ENOENT;
2300 return;
2301 }
2302
2303 if (req->type >= EIO_OPEN)
2304 {
2305 #if HAVE_AT
2306 dirfd = WD2FD (req->wd);
2307 #else
2308 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2309 #endif
2310 }
2311
1963 switch (req->type) 2312 switch (req->type)
1964 { 2313 {
2314 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2315 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2316 break;
2317 case EIO_WD_CLOSE: req->result = 0;
2318 eio_wd_close_sync (req->wd); break;
2319
1965 case EIO_READ: ALLOC (req->size); 2320 case EIO_READ: ALLOC (req->size);
1966 req->result = req->offs >= 0 2321 req->result = req->offs >= 0
1967 ? pread (req->int1, req->ptr2, req->size, req->offs) 2322 ? pread (req->int1, req->ptr2, req->size, req->offs)
1968 : read (req->int1, req->ptr2, req->size); break; 2323 : read (req->int1, req->ptr2, req->size); break;
1969 case EIO_WRITE: req->result = req->offs >= 0 2324 case EIO_WRITE: req->result = req->offs >= 0
1970 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2325 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971 : write (req->int1, req->ptr2, req->size); break; 2326 : write (req->int1, req->ptr2, req->size); break;
1972 2327
1973 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2328 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; 2329 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2330
2331#if HAVE_AT
1975 2332
1976 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2333 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2334 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1978 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2335 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2336 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2337 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2338 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2339 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2340 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2341
2342 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2343 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2344 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2345 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2346 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2347 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2348 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2349 case EIO_READLINK: ALLOC (PATH_MAX);
2350 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2351 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2352 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2353 case EIO_UTIME:
2354 case EIO_FUTIME:
2355 {
2356 struct timespec ts[2];
2357 struct timespec *times;
2358
2359 if (req->nv1 != -1. || req->nv2 != -1.)
2360 {
2361 ts[0].tv_sec = req->nv1;
2362 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2363 ts[1].tv_sec = req->nv2;
2364 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2365
2366 times = ts;
2367 }
2368 else
2369 times = 0;
2370
2371 req->result = req->type == EIO_FUTIME
2372 ? futimens (req->int1, times)
2373 : utimensat (dirfd, req->ptr1, times, 0);
2374 }
2375 break;
2376
2377#else
2378
2379 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2380 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2381 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2382 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2383 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2384 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2385 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2386 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2387
2388 case EIO_UNLINK: req->result = unlink (path ); break;
2389 case EIO_RMDIR: req->result = rmdir (path ); break;
2390 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2391 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2392 case EIO_LINK: req->result = link (path , req->ptr2); break;
2393 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2394 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2395 case EIO_READLINK: ALLOC (PATH_MAX);
2396 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2397 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2398 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2399
2400 case EIO_UTIME:
2401 case EIO_FUTIME:
2402 {
2403 struct timeval tv[2];
2404 struct timeval *times;
2405
2406 if (req->nv1 != -1. || req->nv2 != -1.)
2407 {
2408 tv[0].tv_sec = req->nv1;
2409 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2410 tv[1].tv_sec = req->nv2;
2411 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2412
2413 times = tv;
2414 }
2415 else
2416 times = 0;
2417
2418 req->result = req->type == EIO_FUTIME
2419 ? futimes (req->int1, times)
2420 : utimes (req->ptr1, times);
2421 }
2422 break;
2423
2424#endif
2425
2426 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2427 {
2428 ALLOC (req->result);
2429 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2430 }
2431 break;
2432
1980 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2433 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1981 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2434 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1982 2435
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)); 2436 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1986 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2437 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1987 2438
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; 2439 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; 2440 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; 2441 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1994 2442
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; 2443 case EIO_CLOSE: req->result = close (req->int1); break;
1997 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2444 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; 2445 case EIO_SYNC: req->result = 0; sync (); break;
2012 case EIO_FSYNC: req->result = fsync (req->int1); break; 2446 case EIO_FSYNC: req->result = fsync (req->int1); break;
2013 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2447 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2448 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2449 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; 2450 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2015 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2451 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2016 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2452 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2017 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2453 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; 2454 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2020 2455
2021 case EIO_READDIR: eio__scandir (req, self); break; 2456 case EIO_READDIR: eio__scandir (req, self); break;
2022 2457
2023 case EIO_BUSY: 2458 case EIO_BUSY:
2033 req->result = select (0, 0, 0, 0, &tv); 2468 req->result = select (0, 0, 0, 0, &tv);
2034 } 2469 }
2035#endif 2470#endif
2036 break; 2471 break;
2037 2472
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: 2473 case EIO_GROUP:
2063 abort (); /* handled in eio_request */ 2474 abort (); /* handled in eio_request */
2064 2475
2065 case EIO_NOP: 2476 case EIO_NOP:
2066 req->result = 0; 2477 req->result = 0;
2079 req->errorno = errno; 2490 req->errorno = errno;
2080} 2491}
2081 2492
2082#ifndef EIO_NO_WRAPPERS 2493#ifndef EIO_NO_WRAPPERS
2083 2494
2495eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2496{
2497 REQ (EIO_WD_OPEN); PATH; SEND;
2498}
2499
2500eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2501{
2502 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2503}
2504
2084eio_req *eio_nop (int pri, eio_cb cb, void *data) 2505eio_req *eio_nop (int pri, eio_cb cb, void *data)
2085{ 2506{
2086 REQ (EIO_NOP); SEND; 2507 REQ (EIO_NOP); SEND;
2087} 2508}
2088 2509
2104eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2525eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2105{ 2526{
2106 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2527 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2107} 2528}
2108 2529
2530eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2531{
2532 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2533}
2534
2535eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2536{
2537 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2538}
2539
2540eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2541{
2542 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2543}
2544
2109eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2545eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2110{ 2546{
2111 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2547 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2112} 2548}
2113 2549
2119eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2555eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2120{ 2556{
2121 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2557 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2122} 2558}
2123 2559
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) 2560eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2130{ 2561{
2131 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2562 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2132}
2133
2134eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2135{
2136 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2137} 2563}
2138 2564
2139eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2565eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2140{ 2566{
2141 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2567 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2369/* misc garbage */ 2795/* misc garbage */
2370 2796
2371eio_ssize_t 2797eio_ssize_t
2372eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2798eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373{ 2799{
2374 etp_worker wrk;
2375 eio_ssize_t ret;
2376
2377 wrk.dbuf = 0;
2378
2379 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2800 return eio__sendfile (ofd, ifd, offset, count);
2380
2381 if (wrk.dbuf)
2382 free (wrk.dbuf);
2383
2384 return ret;
2385} 2801}
2386 2802

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines