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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines