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

Comparing libeio/eio.c (file contents):
Revision 1.91 by root, Sun Jul 17 04:20:04 2011 UTC vs.
Revision 1.120 by root, Tue Apr 24 18:47:50 2012 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
48# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
49#endif 49#endif
50#include "xthread.h" 50#include "xthread.h"
51 51
52#include <errno.h> 52#include <errno.h>
53#include <stddef.h> 53#include <stddef.h>
71#endif 71#endif
72#ifndef ELOOP 72#ifndef ELOOP
73# define ELOOP EDOM 73# define ELOOP EDOM
74#endif 74#endif
75 75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
76static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
77 81
78#ifndef EIO_FINISH 82#ifndef EIO_FINISH
79# 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
80#endif 84#endif
101#ifdef _WIN32 105#ifdef _WIN32
102 106
103 #undef PAGESIZE 107 #undef PAGESIZE
104 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
105 109
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
106 #ifdef EIO_STRUCT_STATI64 112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
107 #define stat(path,buf) _stati64 (path,buf) 114 #define stat(path,buf) _stati64 (path,buf)
108 #define fstat(fd,buf) _fstati64 (path,buf) 115 #define fstat(fd,buf) _fstati64 (fd,buf)
109 #endif 116 #endif
110 #define lstat(path,buf) stat (path,buf) 117 #define lstat(path,buf) stat (path,buf)
111 #define fsync(fd) (FlushFileBuffers ((HANDLE)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))
112 #define mkdir(path,mode) _mkdir (path) 119 #define mkdir(path,mode) _mkdir (path)
113 #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))
125 #define sync() EIO_ENOSYS () 132 #define sync() EIO_ENOSYS ()
126 #define readlink(path,buf,s) EIO_ENOSYS () 133 #define readlink(path,buf,s) EIO_ENOSYS ()
127 #define statvfs(path,buf) EIO_ENOSYS () 134 #define statvfs(path,buf) EIO_ENOSYS ()
128 #define fstatvfs(fd,buf) EIO_ENOSYS () 135 #define fstatvfs(fd,buf) EIO_ENOSYS ()
129 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 }
167
130 /* we could even stat and see if it exists */ 168 /* we could even stat and see if it exists */
131 static int 169 static int
132 symlink (const char *old, const char *neu) 170 symlink (const char *old, const char *neu)
133 { 171 {
134 #if WINVER >= 0x0600 172 #if WINVER >= 0x0600
160 198
161 #include <sys/time.h> 199 #include <sys/time.h>
162 #include <sys/select.h> 200 #include <sys/select.h>
163 #include <sys/statvfs.h> 201 #include <sys/statvfs.h>
164 #include <unistd.h> 202 #include <unistd.h>
165 #include <utime.h>
166 #include <signal.h> 203 #include <signal.h>
167 #include <dirent.h> 204 #include <dirent.h>
168 205
169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 206 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
170 #include <sys/mman.h> 207 #include <sys/mman.h>
171 #endif 208 #endif
172 209
173 #define D_NAME(entp) entp->d_name 210 #define D_NAME(entp) entp->d_name
174 211
175 /* 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 */
176 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 213 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
177 #define _DIRENT_HAVE_D_TYPE /* sigh */ 214 #define _DIRENT_HAVE_D_TYPE /* sigh */
178 #define D_INO(de) (de)->d_fileno 215 #define D_INO(de) (de)->d_fileno
179 #define D_NAMLEN(de) (de)->d_namlen 216 #define D_NAMLEN(de) (de)->d_namlen
180 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 217 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
181 #define D_INO(de) (de)->d_ino 218 #define D_INO(de) (de)->d_ino
192 229
193 #ifndef EIO_STRUCT_DIRENT 230 #ifndef EIO_STRUCT_DIRENT
194 #define EIO_STRUCT_DIRENT struct dirent 231 #define EIO_STRUCT_DIRENT struct dirent
195 #endif 232 #endif
196 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>
197#endif 246#endif
198 247
199#if HAVE_SENDFILE 248#if HAVE_SENDFILE
200# if __linux 249# if __linux
201# include <sys/sendfile.h> 250# include <sys/sendfile.h>
233 282
234/* buffer size for various temporary buffers */ 283/* buffer size for various temporary buffers */
235#define EIO_BUFSIZE 65536 284#define EIO_BUFSIZE 65536
236 285
237#define dBUF \ 286#define dBUF \
238 char *eio_buf; \
239 ETP_WORKER_LOCK (self); \
240 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 287 char *eio_buf = malloc (EIO_BUFSIZE); \
241 ETP_WORKER_UNLOCK (self); \
242 errno = ENOMEM; \ 288 errno = ENOMEM; \
243 if (!eio_buf) \ 289 if (!eio_buf) \
244 return -1; 290 return -1
291
292#define FUBd \
293 free (eio_buf)
245 294
246#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/*****************************************************************************/
247 340
248#define ETP_PRI_MIN EIO_PRI_MIN 341#define ETP_PRI_MIN EIO_PRI_MIN
249#define ETP_PRI_MAX EIO_PRI_MAX 342#define ETP_PRI_MAX EIO_PRI_MAX
250 343
251struct etp_worker; 344struct etp_worker;
255static int eio_finish (eio_req *req); 348static int eio_finish (eio_req *req);
256#define ETP_FINISH(req) eio_finish (req) 349#define ETP_FINISH(req) eio_finish (req)
257static void eio_execute (struct etp_worker *self, eio_req *req); 350static void eio_execute (struct etp_worker *self, eio_req *req);
258#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 351#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
259 352
260#define ETP_WORKER_CLEAR(req) \
261 if (wrk->dbuf) \
262 { \
263 free (wrk->dbuf); \
264 wrk->dbuf = 0; \
265 }
266
267#define ETP_WORKER_COMMON \
268 void *dbuf;
269
270/*****************************************************************************/ 353/*****************************************************************************/
271 354
272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 355#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273 356
274/* calculate time difference in ~1/EIO_TICKS of a second */ 357/* calculate time difference in ~1/EIO_TICKS of a second */
285static void (*done_poll_cb) (void); 368static void (*done_poll_cb) (void);
286 369
287static unsigned int max_poll_time; /* reslock */ 370static unsigned int max_poll_time; /* reslock */
288static unsigned int max_poll_reqs; /* reslock */ 371static unsigned int max_poll_reqs; /* reslock */
289 372
290static volatile unsigned int nreqs; /* reqlock */ 373static unsigned int nreqs; /* reqlock */
291static volatile unsigned int nready; /* reqlock */ 374static unsigned int nready; /* reqlock */
292static volatile unsigned int npending; /* reqlock */ 375static unsigned int npending; /* reqlock */
293static 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 */
294static 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 */
295 378
296static xmutex_t wrklock; 379static xmutex_t wrklock;
297static xmutex_t reslock; 380static xmutex_t reslock;
298static xmutex_t reqlock; 381static xmutex_t reqlock;
299static xcond_t reqwait; 382static xcond_t reqwait;
302/* 385/*
303 * make our pread/pwrite emulation safe against themselves, but not against 386 * make our pread/pwrite emulation safe against themselves, but not against
304 * 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,
305 * but that's your problem, not mine. 388 * but that's your problem, not mine.
306 */ 389 */
307static xmutex_t preadwritelock = X_MUTEX_INIT; 390static xmutex_t preadwritelock;
308#endif 391#endif
309 392
310typedef struct etp_worker 393typedef struct etp_worker
311{ 394{
395 struct tmpbuf tmpbuf;
396
312 /* locked by wrklock */ 397 /* locked by wrklock */
313 struct etp_worker *prev, *next; 398 struct etp_worker *prev, *next;
314 399
315 xthread_t tid; 400 xthread_t tid;
316 401
317 /* locked by reslock, reqlock or wrklock */ 402#ifdef ETP_WORKER_COMMON
318 ETP_REQ *req; /* currently processed request */
319
320 ETP_WORKER_COMMON 403 ETP_WORKER_COMMON
404#endif
321} etp_worker; 405} etp_worker;
322 406
323static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 407static etp_worker wrk_first; /* NOT etp */
324 408
325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 409#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
326#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 410#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
327 411
328/* worker threads management */ 412/* worker threads management */
329 413
330static void ecb_cold 414static void
331etp_worker_clear (etp_worker *wrk) 415etp_worker_clear (etp_worker *wrk)
332{ 416{
333 ETP_WORKER_CLEAR (wrk);
334} 417}
335 418
336static void ecb_cold 419static void ecb_cold
337etp_worker_free (etp_worker *wrk) 420etp_worker_free (etp_worker *wrk)
338{ 421{
422 free (wrk->tmpbuf.ptr);
423
339 wrk->next->prev = wrk->prev; 424 wrk->next->prev = wrk->prev;
340 wrk->prev->next = wrk->next; 425 wrk->prev->next = wrk->next;
341 426
342 free (wrk); 427 free (wrk);
343} 428}
453 } 538 }
454 539
455 abort (); 540 abort ();
456} 541}
457 542
458static void ecb_cold 543static int ecb_cold
459etp_thread_init (void) 544etp_init (void (*want_poll)(void), void (*done_poll)(void))
460{ 545{
461#if !HAVE_PREADWRITE
462 X_MUTEX_CREATE (preadwritelock);
463#endif
464 X_MUTEX_CREATE (wrklock); 546 X_MUTEX_CREATE (wrklock);
465 X_MUTEX_CREATE (reslock); 547 X_MUTEX_CREATE (reslock);
466 X_MUTEX_CREATE (reqlock); 548 X_MUTEX_CREATE (reqlock);
467 X_COND_CREATE (reqwait); 549 X_COND_CREATE (reqwait);
468}
469 550
470static void ecb_cold
471etp_atfork_child (void)
472{
473 reqq_init (&req_queue); 551 reqq_init (&req_queue);
474 reqq_init (&res_queue); 552 reqq_init (&res_queue);
475 553
476 wrk_first.next = 554 wrk_first.next =
477 wrk_first.prev = &wrk_first; 555 wrk_first.prev = &wrk_first;
479 started = 0; 557 started = 0;
480 idle = 0; 558 idle = 0;
481 nreqs = 0; 559 nreqs = 0;
482 nready = 0; 560 nready = 0;
483 npending = 0; 561 npending = 0;
484
485 etp_thread_init ();
486}
487
488static void ecb_cold
489etp_once_init (void)
490{
491 etp_thread_init ();
492 X_THREAD_ATFORK (0, 0, etp_atfork_child);
493}
494
495static int ecb_cold
496etp_init (void (*want_poll)(void), void (*done_poll)(void))
497{
498 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
499
500 pthread_once (&doinit, etp_once_init);
501 562
502 want_poll_cb = want_poll; 563 want_poll_cb = want_poll;
503 done_poll_cb = done_poll; 564 done_poll_cb = done_poll;
504 565
505 return 0; 566 return 0;
545} 606}
546 607
547static void ecb_cold 608static void ecb_cold
548etp_end_thread (void) 609etp_end_thread (void)
549{ 610{
550 eio_req *req = calloc (1, sizeof (eio_req)); 611 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
551 612
552 req->type = -1; 613 req->type = -1;
553 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 614 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
554 615
555 X_LOCK (reqlock); 616 X_LOCK (reqlock);
963#if !HAVE_FDATASYNC 1024#if !HAVE_FDATASYNC
964# undef fdatasync 1025# undef fdatasync
965# define fdatasync(fd) fsync (fd) 1026# define fdatasync(fd) fsync (fd)
966#endif 1027#endif
967 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 = EIO_ENOSYS ();
1038#endif
1039
1040 if (res < 0 && errno == ENOSYS && fd >= 0)
1041 sync ();
1042
1043 return res;
1044}
1045
968/* sync_file_range always needs emulation */ 1046/* sync_file_range always needs emulation */
969static int 1047static int
970eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1048eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
971{ 1049{
972#if HAVE_SYNC_FILE_RANGE 1050#if HAVE_SYNC_FILE_RANGE
994} 1072}
995 1073
996static int 1074static int
997eio__fallocate (int fd, int mode, off_t offset, size_t len) 1075eio__fallocate (int fd, int mode, off_t offset, size_t len)
998{ 1076{
999#if HAVE_FALLOCATE 1077#if HAVE_LINUX_FALLOCATE
1000 return fallocate (fd, mode, offset, len); 1078 return fallocate (fd, mode, offset, len);
1001#else 1079#else
1002 errno = ENOSYS; 1080 return EIO_ENOSYS ();
1003 return -1;
1004#endif 1081#endif
1005} 1082}
1006 1083
1007#if !HAVE_READAHEAD 1084#if !HAVE_READAHEAD
1008# undef readahead 1085# undef readahead
1021 pread (fd, eio_buf, len, offset); 1098 pread (fd, eio_buf, len, offset);
1022 offset += len; 1099 offset += len;
1023 todo -= len; 1100 todo -= len;
1024 } 1101 }
1025 1102
1026 errno = 0; 1103 FUBd;
1104
1105 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1106 /* but not for e.g. EIO or eof, so we also never fail */
1027 return count; 1107 return 0;
1028} 1108}
1029 1109
1030#endif 1110#endif
1031 1111
1032/* sendfile always needs emulation */ 1112/* sendfile always needs emulation */
1033static eio_ssize_t 1113static eio_ssize_t
1034eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1114eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1035{ 1115{
1036 eio_ssize_t written = 0; 1116 eio_ssize_t written = 0;
1037 eio_ssize_t res; 1117 eio_ssize_t res;
1038 1118
1039 if (!count) 1119 if (!count)
1067 1147
1068 /* according to source inspection, this is correct, and useful behaviour */ 1148 /* according to source inspection, this is correct, and useful behaviour */
1069 if (sbytes) 1149 if (sbytes)
1070 res = sbytes; 1150 res = sbytes;
1071 1151
1072# elif defined (__APPLE__) 1152# elif defined __APPLE__
1073 off_t sbytes = count; 1153 off_t sbytes = count;
1074 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1154 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1075 1155
1076 /* according to the manpage, sbytes is always valid */ 1156 /* according to the manpage, sbytes is always valid */
1077 if (sbytes) 1157 if (sbytes)
1104 HANDLE h = TO_SOCKET (ifd); 1184 HANDLE h = TO_SOCKET (ifd);
1105 SetFilePointer (h, offset, 0, FILE_BEGIN); 1185 SetFilePointer (h, offset, 0, FILE_BEGIN);
1106 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1186 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1107 1187
1108#else 1188#else
1109 res = -1; 1189 res = EIO_ENOSYS ();
1110 errno = ENOSYS;
1111#endif 1190#endif
1112 1191
1113 /* we assume sendfile can copy at least 128mb in one go */ 1192 /* we assume sendfile can copy at least 128mb in one go */
1114 if (res <= 128 * 1024 * 1024) 1193 if (res <= 128 * 1024 * 1024)
1115 { 1194 {
1175 1254
1176 offset += cnt; 1255 offset += cnt;
1177 res += cnt; 1256 res += cnt;
1178 count -= cnt; 1257 count -= cnt;
1179 } 1258 }
1259
1260 FUBd;
1180 } 1261 }
1181 1262
1182 return res; 1263 return res;
1183} 1264}
1184 1265
1300 1381
1301/*****************************************************************************/ 1382/*****************************************************************************/
1302/* requests implemented outside eio_execute, because they are so large */ 1383/* requests implemented outside eio_execute, because they are so large */
1303 1384
1304static void 1385static void
1305eio__realpath (eio_req *req, etp_worker *self) 1386eio__lseek (eio_req *req)
1306{ 1387{
1307 char *rel = req->ptr1; 1388 /* this usually gets optimised away completely, or your compiler sucks, */
1389 /* or the whence constants really are not 0, 1, 2 */
1390 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
1391 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
1392 : req->int2 == EIO_SEEK_END ? SEEK_END
1393 : req->int2;
1394
1395 req->offs = lseek (req->int1, req->offs, whence);
1396 req->result = req->offs == (off_t)-1 ? -1 : 0;
1397}
1398
1399/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1400static int
1401eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1402{
1403 const char *rel = path;
1308 char *res; 1404 char *res;
1309 char *tmp1, *tmp2; 1405 char *tmp1, *tmp2;
1310#if SYMLOOP_MAX > 32 1406#if SYMLOOP_MAX > 32
1311 int symlinks = SYMLOOP_MAX; 1407 int symlinks = SYMLOOP_MAX;
1312#else 1408#else
1313 int symlinks = 32; 1409 int symlinks = 32;
1314#endif 1410#endif
1315 1411
1316 req->result = -1;
1317
1318 errno = EINVAL; 1412 errno = EINVAL;
1319 if (!rel) 1413 if (!rel)
1320 return; 1414 return -1;
1321 1415
1322 errno = ENOENT; 1416 errno = ENOENT;
1323 if (!*rel) 1417 if (!*rel)
1324 return; 1418 return -1;
1325 1419
1326 if (!req->ptr2) 1420 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1327 {
1328 X_LOCK (wrklock);
1329 req->flags |= EIO_FLAG_PTR2_FREE;
1330 X_UNLOCK (wrklock);
1331 req->ptr2 = malloc (PATH_MAX * 3);
1332
1333 errno = ENOMEM;
1334 if (!req->ptr2)
1335 return;
1336 }
1337
1338 res = req->ptr2;
1339 tmp1 = res + PATH_MAX; 1421 tmp1 = res + PATH_MAX;
1340 tmp2 = tmp1 + PATH_MAX; 1422 tmp2 = tmp1 + PATH_MAX;
1341 1423
1342#if 0 /* disabled, the musl way to do things is just too racy */ 1424#if 0 /* disabled, the musl way to do things is just too racy */
1343#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1425#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1362#endif 1444#endif
1363#endif 1445#endif
1364 1446
1365 if (*rel != '/') 1447 if (*rel != '/')
1366 { 1448 {
1449 int len;
1450
1451 errno = ENOENT;
1452 if (wd == EIO_INVALID_WD)
1453 return -1;
1454
1455 if (wd == EIO_CWD)
1456 {
1367 if (!getcwd (res, PATH_MAX)) 1457 if (!getcwd (res, PATH_MAX))
1368 return; 1458 return -1;
1459
1460 len = strlen (res);
1461 }
1462 else
1463 memcpy (res, wd->str, len = wd->len);
1369 1464
1370 if (res [1]) /* only use if not / */ 1465 if (res [1]) /* only use if not / */
1371 res += strlen (res); 1466 res += len;
1372 } 1467 }
1373 1468
1374 while (*rel) 1469 while (*rel)
1375 { 1470 {
1376 eio_ssize_t len, linklen; 1471 eio_ssize_t len, linklen;
1377 char *beg = rel; 1472 const char *beg = rel;
1378 1473
1379 while (*rel && *rel != '/') 1474 while (*rel && *rel != '/')
1380 ++rel; 1475 ++rel;
1381 1476
1382 len = rel - beg; 1477 len = rel - beg;
1394 1489
1395 if (beg [1] == '.' && len == 2) 1490 if (beg [1] == '.' && len == 2)
1396 { 1491 {
1397 /* .. - back up one component, if possible */ 1492 /* .. - back up one component, if possible */
1398 1493
1399 while (res != req->ptr2) 1494 while (res != tmpbuf->ptr)
1400 if (*--res == '/') 1495 if (*--res == '/')
1401 break; 1496 break;
1402 1497
1403 continue; 1498 continue;
1404 } 1499 }
1405 } 1500 }
1406 1501
1407 errno = ENAMETOOLONG; 1502 errno = ENAMETOOLONG;
1408 if (res + 1 + len + 1 >= tmp1) 1503 if (res + 1 + len + 1 >= tmp1)
1409 return; 1504 return -1;
1410 1505
1411 /* copy one component */ 1506 /* copy one component */
1412 *res = '/'; 1507 *res = '/';
1413 memcpy (res + 1, beg, len); 1508 memcpy (res + 1, beg, len);
1414 1509
1415 /* zero-terminate, for readlink */ 1510 /* zero-terminate, for readlink */
1416 res [len + 1] = 0; 1511 res [len + 1] = 0;
1417 1512
1418 /* now check if it's a symlink */ 1513 /* now check if it's a symlink */
1419 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1514 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1420 1515
1421 if (linklen < 0) 1516 if (linklen < 0)
1422 { 1517 {
1423 if (errno != EINVAL) 1518 if (errno != EINVAL)
1424 return; 1519 return -1;
1425 1520
1426 /* it's a normal directory. hopefully */ 1521 /* it's a normal directory. hopefully */
1427 res += len + 1; 1522 res += len + 1;
1428 } 1523 }
1429 else 1524 else
1431 /* yay, it was a symlink - build new path in tmp2 */ 1526 /* yay, it was a symlink - build new path in tmp2 */
1432 int rellen = strlen (rel); 1527 int rellen = strlen (rel);
1433 1528
1434 errno = ENAMETOOLONG; 1529 errno = ENAMETOOLONG;
1435 if (linklen + 1 + rellen >= PATH_MAX) 1530 if (linklen + 1 + rellen >= PATH_MAX)
1436 return; 1531 return -1;
1437 1532
1438 errno = ELOOP; 1533 errno = ELOOP;
1439 if (!--symlinks) 1534 if (!--symlinks)
1440 return; 1535 return -1;
1441 1536
1442 if (*tmp1 == '/') 1537 if (*tmp1 == '/')
1443 res = req->ptr2; /* symlink resolves to an absolute path */ 1538 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1444 1539
1445 /* we need to be careful, as rel might point into tmp2 already */ 1540 /* we need to be careful, as rel might point into tmp2 already */
1446 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1541 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1447 tmp2 [linklen] = '/'; 1542 tmp2 [linklen] = '/';
1448 memcpy (tmp2, tmp1, linklen); 1543 memcpy (tmp2, tmp1, linklen);
1450 rel = tmp2; 1545 rel = tmp2;
1451 } 1546 }
1452 } 1547 }
1453 1548
1454 /* special case for the lone root path */ 1549 /* special case for the lone root path */
1455 if (res == req->ptr2) 1550 if (res == tmpbuf->ptr)
1456 *res++ = '/'; 1551 *res++ = '/';
1457 1552
1458 req->result = res - (char *)req->ptr2; 1553 return res - (char *)tmpbuf->ptr;
1459
1460done:
1461 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1462} 1554}
1463 1555
1464static signed char 1556static signed char
1465eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1557eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1466{ 1558{
1651 if (!(flags & EIO_READDIR_DENTS)) 1743 if (!(flags & EIO_READDIR_DENTS))
1652 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1744 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1653 1745
1654#ifdef _WIN32 1746#ifdef _WIN32
1655 { 1747 {
1748 int len = strlen ((const char *)req->ptr1);
1656 char *path = malloc (MAX_PATH); 1749 char *path = malloc (MAX_PATH);
1657 _snprintf (path, MAX_PATH, "%s/*", (const char *)req->ptr1); 1750 const char *fmt;
1751 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1752
1753 if (!len)
1754 fmt = "./*";
1755 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1756 fmt = "%s*";
1757 else
1758 fmt = "%s/*";
1759
1760 _snprintf (path, MAX_PATH, fmt, reqpath);
1658 dirp = FindFirstFile (path, &entp); 1761 dirp = FindFirstFile (path, &entp);
1659 free (path); 1762 free (path);
1660 1763
1661 if (!dirp) 1764 if (dirp == INVALID_HANDLE_VALUE)
1662 { 1765 {
1766 /* should steal _dosmaperr */
1663 switch (GetLastError ()) 1767 switch (GetLastError ())
1664 { 1768 {
1665 case ERROR_FILE_NOT_FOUND: 1769 case ERROR_FILE_NOT_FOUND:
1666 req->result = 0; 1770 req->result = 0;
1667 break; 1771 break;
1668 1772
1773 case ERROR_INVALID_NAME:
1669 case ERROR_PATH_NOT_FOUND: 1774 case ERROR_PATH_NOT_FOUND:
1670 case ERROR_NO_MORE_FILES: 1775 case ERROR_NO_MORE_FILES:
1671 errno = ENOENT; 1776 errno = ENOENT;
1672 break; 1777 break;
1673 1778
1674 case ERROR_NOT_ENOUGH_MEMORY: 1779 case ERROR_NOT_ENOUGH_MEMORY:
1675 errno = ENOMEM; 1780 errno = ENOMEM;
1676 break; 1781 break;
1677 1782
1678 default: 1783 default:
1679 errno = EINVAL; 1784 errno = EINVAL;
1680 break; 1785 break;
1681 } 1786 }
1682 1787
1788 return;
1683 } 1789 }
1684 } 1790 }
1685#else 1791#else
1792 #if HAVE_AT
1793 if (req->wd)
1794 {
1795 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1796
1797 if (fd < 0)
1798 return;
1799
1800 dirp = fdopendir (fd);
1801
1802 if (!dirp)
1803 close (fd);
1804 }
1805 else
1686 dirp = opendir (req->ptr1); 1806 dirp = opendir (req->ptr1);
1807 #else
1808 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1809 #endif
1810
1811 if (!dirp)
1812 return;
1687#endif 1813#endif
1688 1814
1689 if (req->flags & EIO_FLAG_PTR1_FREE) 1815 if (req->flags & EIO_FLAG_PTR1_FREE)
1690 free (req->ptr1); 1816 free (req->ptr1);
1691 1817
1692 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1818 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1693 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1819 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1694 req->ptr2 = names = malloc (namesalloc); 1820 req->ptr2 = names = malloc (namesalloc);
1695 1821
1696 if (dirp && names && (!flags || dents)) 1822 if (!names || (flags && !dents))
1823 return;
1824
1697 for (;;) 1825 for (;;)
1698 { 1826 {
1699 int more; 1827 int done;
1700 1828
1701#ifdef _WIN32 1829#ifdef _WIN32
1702 more = dirp; 1830 done = !dirp;
1703#else 1831#else
1704 errno = 0; 1832 errno = 0;
1705 entp = readdir (dirp); 1833 entp = readdir (dirp);
1706 more = entp; 1834 done = !entp;
1707#endif 1835#endif
1708 1836
1709 if (!more) 1837 if (done)
1710 { 1838 {
1711#ifndef _WIN32 1839#ifndef _WIN32
1712 int old_errno = errno; 1840 int old_errno = errno;
1713 closedir (dirp); 1841 closedir (dirp);
1714 errno = old_errno; 1842 errno = old_errno;
1715 1843
1716 if (errno) 1844 if (errno)
1717 break; 1845 break;
1718#endif 1846#endif
1719 1847
1720 /* sort etc. */ 1848 /* sort etc. */
1721 req->int1 = flags; 1849 req->int1 = flags;
1722 req->result = dentoffs; 1850 req->result = dentoffs;
1723 1851
1724 if (flags & EIO_READDIR_STAT_ORDER) 1852 if (flags & EIO_READDIR_STAT_ORDER)
1725 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1853 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1726 else if (flags & EIO_READDIR_DIRS_FIRST) 1854 else if (flags & EIO_READDIR_DIRS_FIRST)
1727 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1855 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1728 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1856 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1729 else 1857 else
1858 {
1859 /* in this case, all is known, and we just put dirs first and sort them */
1860 eio_dirent *oth = dents + dentoffs;
1861 eio_dirent *dir = dents;
1862
1863 /* now partition dirs to the front, and non-dirs to the back */
1864 /* by walking from both sides and swapping if necessary */
1865 while (oth > dir)
1866 {
1867 if (dir->type == EIO_DT_DIR)
1868 ++dir;
1869 else if ((--oth)->type == EIO_DT_DIR)
1870 {
1871 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1872
1873 ++dir;
1874 }
1875 }
1876
1877 /* now sort the dirs only (dirs all have the same score) */
1878 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1879 }
1880
1881 break;
1882 }
1883
1884 /* now add the entry to our list(s) */
1885 name = D_NAME (entp);
1886
1887 /* skip . and .. entries */
1888 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1889 {
1890 int len = D_NAMLEN (entp) + 1;
1891
1892 while (ecb_expect_false (namesoffs + len > namesalloc))
1893 {
1894 namesalloc *= 2;
1895 req->ptr2 = names = realloc (names, namesalloc);
1896
1897 if (!names)
1898 break;
1899 }
1900
1901 memcpy (names + namesoffs, name, len);
1902
1903 if (dents)
1904 {
1905 struct eio_dirent *ent;
1906
1907 if (ecb_expect_false (dentoffs == dentalloc))
1730 { 1908 {
1731 /* in this case, all is known, and we just put dirs first and sort them */ 1909 dentalloc *= 2;
1910 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1911
1912 if (!dents)
1913 break;
1914 }
1915
1732 eio_dirent *oth = dents + dentoffs; 1916 ent = dents + dentoffs;
1733 eio_dirent *dir = dents;
1734 1917
1735 /* now partition dirs to the front, and non-dirs to the back */ 1918 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1736 /* by walking from both sides and swapping if necessary */ 1919 ent->namelen = len - 1;
1737 while (oth > dir) 1920 ent->inode = D_INO (entp);
1921
1922 inode_bits |= ent->inode;
1923
1924 switch (D_TYPE (entp))
1925 {
1926 default:
1927 ent->type = EIO_DT_UNKNOWN;
1928 flags |= EIO_READDIR_FOUND_UNKNOWN;
1929 break;
1930
1931 #ifdef DT_FIFO
1932 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1933 #endif
1934 #ifdef DT_CHR
1935 case DT_CHR: ent->type = EIO_DT_CHR; break;
1936 #endif
1937 #ifdef DT_MPC
1938 case DT_MPC: ent->type = EIO_DT_MPC; break;
1939 #endif
1940 #ifdef DT_DIR
1941 case DT_DIR: ent->type = EIO_DT_DIR; break;
1942 #endif
1943 #ifdef DT_NAM
1944 case DT_NAM: ent->type = EIO_DT_NAM; break;
1945 #endif
1946 #ifdef DT_BLK
1947 case DT_BLK: ent->type = EIO_DT_BLK; break;
1948 #endif
1949 #ifdef DT_MPB
1950 case DT_MPB: ent->type = EIO_DT_MPB; break;
1951 #endif
1952 #ifdef DT_REG
1953 case DT_REG: ent->type = EIO_DT_REG; break;
1954 #endif
1955 #ifdef DT_NWK
1956 case DT_NWK: ent->type = EIO_DT_NWK; break;
1957 #endif
1958 #ifdef DT_CMP
1959 case DT_CMP: ent->type = EIO_DT_CMP; break;
1960 #endif
1961 #ifdef DT_LNK
1962 case DT_LNK: ent->type = EIO_DT_LNK; break;
1963 #endif
1964 #ifdef DT_SOCK
1965 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1966 #endif
1967 #ifdef DT_DOOR
1968 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1969 #endif
1970 #ifdef DT_WHT
1971 case DT_WHT: ent->type = EIO_DT_WHT; break;
1972 #endif
1973 }
1974
1975 ent->score = 7;
1976
1977 if (flags & EIO_READDIR_DIRS_FIRST)
1978 {
1979 if (ent->type == EIO_DT_UNKNOWN)
1738 { 1980 {
1739 if (dir->type == EIO_DT_DIR) 1981 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1740 ++dir; 1982 ent->score = 1;
1741 else if ((--oth)->type == EIO_DT_DIR) 1983 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1742 { 1984 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1743 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1744
1745 ++dir;
1746 }
1747 } 1985 }
1748 1986 else if (ent->type == EIO_DT_DIR)
1749 /* now sort the dirs only (dirs all have the same score) */ 1987 ent->score = 0;
1750 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1751 } 1988 }
1752
1753 break;
1754 }
1755
1756 /* now add the entry to our list(s) */
1757 name = D_NAME (entp);
1758
1759 /* skip . and .. entries */
1760 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1761 {
1762 int len = D_NAMLEN (entp) + 1;
1763
1764 while (ecb_expect_false (namesoffs + len > namesalloc))
1765 {
1766 namesalloc *= 2;
1767 req->ptr2 = names = realloc (names, namesalloc);
1768
1769 if (!names)
1770 break;
1771 } 1989 }
1772 1990
1773 memcpy (names + namesoffs, name, len);
1774
1775 if (dents)
1776 {
1777 struct eio_dirent *ent;
1778
1779 if (ecb_expect_false (dentoffs == dentalloc))
1780 {
1781 dentalloc *= 2;
1782 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1783
1784 if (!dents)
1785 break;
1786 }
1787
1788 ent = dents + dentoffs;
1789
1790 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1791 ent->namelen = len - 1;
1792 ent->inode = D_INO (entp);
1793
1794 inode_bits |= ent->inode;
1795
1796 switch (D_TYPE (entp))
1797 {
1798 default:
1799 ent->type = EIO_DT_UNKNOWN;
1800 flags |= EIO_READDIR_FOUND_UNKNOWN;
1801 break;
1802
1803 #ifdef DT_FIFO
1804 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1805 #endif
1806 #ifdef DT_CHR
1807 case DT_CHR: ent->type = EIO_DT_CHR; break;
1808 #endif
1809 #ifdef DT_MPC
1810 case DT_MPC: ent->type = EIO_DT_MPC; break;
1811 #endif
1812 #ifdef DT_DIR
1813 case DT_DIR: ent->type = EIO_DT_DIR; break;
1814 #endif
1815 #ifdef DT_NAM
1816 case DT_NAM: ent->type = EIO_DT_NAM; break;
1817 #endif
1818 #ifdef DT_BLK
1819 case DT_BLK: ent->type = EIO_DT_BLK; break;
1820 #endif
1821 #ifdef DT_MPB
1822 case DT_MPB: ent->type = EIO_DT_MPB; break;
1823 #endif
1824 #ifdef DT_REG
1825 case DT_REG: ent->type = EIO_DT_REG; break;
1826 #endif
1827 #ifdef DT_NWK
1828 case DT_NWK: ent->type = EIO_DT_NWK; break;
1829 #endif
1830 #ifdef DT_CMP
1831 case DT_CMP: ent->type = EIO_DT_CMP; break;
1832 #endif
1833 #ifdef DT_LNK
1834 case DT_LNK: ent->type = EIO_DT_LNK; break;
1835 #endif
1836 #ifdef DT_SOCK
1837 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1838 #endif
1839 #ifdef DT_DOOR
1840 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1841 #endif
1842 #ifdef DT_WHT
1843 case DT_WHT: ent->type = EIO_DT_WHT; break;
1844 #endif
1845 }
1846
1847 ent->score = 7;
1848
1849 if (flags & EIO_READDIR_DIRS_FIRST)
1850 {
1851 if (ent->type == EIO_DT_UNKNOWN)
1852 {
1853 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1854 ent->score = 1;
1855 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1856 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1857 }
1858 else if (ent->type == EIO_DT_DIR)
1859 ent->score = 0;
1860 }
1861 }
1862
1863 namesoffs += len; 1991 namesoffs += len;
1864 ++dentoffs; 1992 ++dentoffs;
1865 } 1993 }
1866 1994
1867 if (EIO_CANCELLED (req)) 1995 if (EIO_CANCELLED (req))
1868 { 1996 {
1869 errno = ECANCELED; 1997 errno = ECANCELED;
1870 break; 1998 break;
1871 } 1999 }
1872 2000
1873#ifdef _WIN32 2001#ifdef _WIN32
1874 if (!FindNextFile (dirp, &entp)) 2002 if (!FindNextFile (dirp, &entp))
1875 { 2003 {
1876 FindClose (dirp); 2004 FindClose (dirp);
1877 dirp = 0; 2005 dirp = 0;
1878 } 2006 }
1879#endif 2007#endif
1880 } 2008 }
1881} 2009}
2010
2011/*****************************************************************************/
2012/* working directory stuff */
2013/* various deficiencies in the posix 2008 api force us to */
2014/* keep the absolute path in string form at all times */
2015/* fuck yeah. */
2016
2017#if !HAVE_AT
2018
2019/* a bit like realpath, but usually faster because it doesn'T have to return */
2020/* an absolute or canonical path */
2021static const char *
2022wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2023{
2024 if (!wd || *path == '/')
2025 return path;
2026
2027 if (path [0] == '.' && !path [1])
2028 return wd->str;
2029
2030 {
2031 int l1 = wd->len;
2032 int l2 = strlen (path);
2033
2034 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2035
2036 memcpy (res, wd->str, l1);
2037 res [l1] = '/';
2038 memcpy (res + l1 + 1, path, l2 + 1);
2039
2040 return res;
2041 }
2042}
2043
2044#endif
2045
2046static eio_wd
2047eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2048{
2049 int fd;
2050 eio_wd res;
2051 int len = eio__realpath (tmpbuf, wd, path);
2052
2053 if (len < 0)
2054 return EIO_INVALID_WD;
2055
2056#if HAVE_AT
2057 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2058
2059 if (fd < 0)
2060 return EIO_INVALID_WD;
2061#endif
2062
2063 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2064
2065#if HAVE_AT
2066 res->fd = fd;
2067#endif
2068
2069 res->len = len;
2070 memcpy (res->str, tmpbuf->ptr, len);
2071 res->str [len] = 0;
2072
2073 return res;
2074}
2075
2076eio_wd
2077eio_wd_open_sync (eio_wd wd, const char *path)
2078{
2079 struct tmpbuf tmpbuf = { 0 };
2080 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2081 free (tmpbuf.ptr);
2082
2083 return wd;
2084}
2085
2086void
2087eio_wd_close_sync (eio_wd wd)
2088{
2089 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2090 {
2091 #if HAVE_AT
2092 close (wd->fd);
2093 #endif
2094 free (wd);
2095 }
2096}
2097
2098#if HAVE_AT
2099
2100/* they forgot these */
2101
2102static int
2103eio__truncateat (int dirfd, const char *path, off_t length)
2104{
2105 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2106 int res;
2107
2108 if (fd < 0)
2109 return fd;
2110
2111 res = ftruncate (fd, length);
2112 close (fd);
2113 return res;
2114}
2115
2116static int
2117eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2118{
2119 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2120 int res;
2121
2122 if (fd < 0)
2123 return fd;
2124
2125 res = fstatvfs (fd, buf);
2126 close (fd);
2127 return res;
2128
2129}
2130
2131#endif
1882 2132
1883/*****************************************************************************/ 2133/*****************************************************************************/
1884 2134
1885#define ALLOC(len) \ 2135#define ALLOC(len) \
1886 if (!req->ptr2) \ 2136 if (!req->ptr2) \
1895 req->result = -1; \ 2145 req->result = -1; \
1896 break; \ 2146 break; \
1897 } \ 2147 } \
1898 } 2148 }
1899 2149
2150static void ecb_noinline ecb_cold
2151etp_proc_init (void)
2152{
2153#if HAVE_PRCTL_SET_NAME
2154 /* provide a more sensible "thread name" */
2155 char name[16 + 1];
2156 const int namelen = sizeof (name) - 1;
2157 int len;
2158
2159 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2160 name [namelen] = 0;
2161 len = strlen (name);
2162 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2163 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2164#endif
2165}
2166
1900X_THREAD_PROC (etp_proc) 2167X_THREAD_PROC (etp_proc)
1901{ 2168{
1902 ETP_REQ *req; 2169 ETP_REQ *req;
1903 struct timespec ts; 2170 struct timespec ts;
1904 etp_worker *self = (etp_worker *)thr_arg; 2171 etp_worker *self = (etp_worker *)thr_arg;
1905 2172
2173 etp_proc_init ();
2174
1906 /* try to distribute timeouts somewhat evenly */ 2175 /* try to distribute timeouts somewhat evenly */
1907 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2176 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1908 2177
1909 for (;;) 2178 for (;;)
1910 { 2179 {
1912 2181
1913 X_LOCK (reqlock); 2182 X_LOCK (reqlock);
1914 2183
1915 for (;;) 2184 for (;;)
1916 { 2185 {
1917 self->req = req = reqq_shift (&req_queue); 2186 req = reqq_shift (&req_queue);
1918 2187
1919 if (req) 2188 if (req)
1920 break; 2189 break;
1921 2190
1922 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2191 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1960 ++npending; 2229 ++npending;
1961 2230
1962 if (!reqq_push (&res_queue, req) && want_poll_cb) 2231 if (!reqq_push (&res_queue, req) && want_poll_cb)
1963 want_poll_cb (); 2232 want_poll_cb ();
1964 2233
1965 self->req = 0;
1966 etp_worker_clear (self); 2234 etp_worker_clear (self);
1967 2235
1968 X_UNLOCK (reslock); 2236 X_UNLOCK (reslock);
1969 } 2237 }
1970 2238
1971quit: 2239quit:
2240 free (req);
2241
1972 X_LOCK (wrklock); 2242 X_LOCK (wrklock);
1973 etp_worker_free (self); 2243 etp_worker_free (self);
1974 X_UNLOCK (wrklock); 2244 X_UNLOCK (wrklock);
1975
1976 return 0;
1977} 2245}
1978 2246
1979/*****************************************************************************/ 2247/*****************************************************************************/
1980 2248
1981int ecb_cold 2249int ecb_cold
1982eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2250eio_init (void (*want_poll)(void), void (*done_poll)(void))
1983{ 2251{
2252#if !HAVE_PREADWRITE
2253 X_MUTEX_CREATE (preadwritelock);
2254#endif
2255
1984 return etp_init (want_poll, done_poll); 2256 return etp_init (want_poll, done_poll);
1985} 2257}
1986 2258
1987ecb_inline void 2259ecb_inline void
1988eio_api_destroy (eio_req *req) 2260eio_api_destroy (eio_req *req)
2015 } 2287 }
2016 2288
2017static void 2289static void
2018eio_execute (etp_worker *self, eio_req *req) 2290eio_execute (etp_worker *self, eio_req *req)
2019{ 2291{
2292#if HAVE_AT
2293 int dirfd;
2294#else
2295 const char *path;
2296#endif
2297
2020 if (ecb_expect_false (EIO_CANCELLED (req))) 2298 if (ecb_expect_false (EIO_CANCELLED (req)))
2021 { 2299 {
2022 req->result = -1; 2300 req->result = -1;
2023 req->errorno = ECANCELED; 2301 req->errorno = ECANCELED;
2024 return; 2302 return;
2025 } 2303 }
2026 2304
2305 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2306 {
2307 req->result = -1;
2308 req->errorno = ENOENT;
2309 return;
2310 }
2311
2312 if (req->type >= EIO_OPEN)
2313 {
2314 #if HAVE_AT
2315 dirfd = WD2FD (req->wd);
2316 #else
2317 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2318 #endif
2319 }
2320
2027 switch (req->type) 2321 switch (req->type)
2028 { 2322 {
2323 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2324 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2325 break;
2326 case EIO_WD_CLOSE: req->result = 0;
2327 eio_wd_close_sync (req->wd); break;
2328
2329 case EIO_SEEK: eio__lseek (req); break;
2029 case EIO_READ: ALLOC (req->size); 2330 case EIO_READ: ALLOC (req->size);
2030 req->result = req->offs >= 0 2331 req->result = req->offs >= 0
2031 ? pread (req->int1, req->ptr2, req->size, req->offs) 2332 ? pread (req->int1, req->ptr2, req->size, req->offs)
2032 : read (req->int1, req->ptr2, req->size); break; 2333 : read (req->int1, req->ptr2, req->size); break;
2033 case EIO_WRITE: req->result = req->offs >= 0 2334 case EIO_WRITE: req->result = req->offs >= 0
2034 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2335 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2035 : write (req->int1, req->ptr2, req->size); break; 2336 : write (req->int1, req->ptr2, req->size); break;
2036 2337
2037 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2338 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2038 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2339 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2340
2341#if HAVE_AT
2039 2342
2040 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2343 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2041 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2344 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2042 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2345 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2346 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2347 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2348 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2349 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2350 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2351
2352 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2353 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2354 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2355 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2356 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2357 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2358 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2359 case EIO_READLINK: ALLOC (PATH_MAX);
2360 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2361 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2362 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2363 case EIO_UTIME:
2364 case EIO_FUTIME:
2365 {
2366 struct timespec ts[2];
2367 struct timespec *times;
2368
2369 if (req->nv1 != -1. || req->nv2 != -1.)
2370 {
2371 ts[0].tv_sec = req->nv1;
2372 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2373 ts[1].tv_sec = req->nv2;
2374 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2375
2376 times = ts;
2377 }
2378 else
2379 times = 0;
2380
2381 req->result = req->type == EIO_FUTIME
2382 ? futimens (req->int1, times)
2383 : utimensat (dirfd, req->ptr1, times, 0);
2384 }
2385 break;
2386
2387#else
2388
2389 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2390 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2391 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2043 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2392 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2393 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2394 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2395 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2396 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2397
2398 case EIO_UNLINK: req->result = unlink (path ); break;
2399 case EIO_RMDIR: req->result = rmdir (path ); break;
2400 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2401 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2402 case EIO_LINK: req->result = link (path , req->ptr2); break;
2403 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2404 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2405 case EIO_READLINK: ALLOC (PATH_MAX);
2406 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2407 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2408 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2409
2410 case EIO_UTIME:
2411 case EIO_FUTIME:
2412 {
2413 struct timeval tv[2];
2414 struct timeval *times;
2415
2416 if (req->nv1 != -1. || req->nv2 != -1.)
2417 {
2418 tv[0].tv_sec = req->nv1;
2419 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2420 tv[1].tv_sec = req->nv2;
2421 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2422
2423 times = tv;
2424 }
2425 else
2426 times = 0;
2427
2428 req->result = req->type == EIO_FUTIME
2429 ? futimes (req->int1, times)
2430 : utimes (req->ptr1, times);
2431 }
2432 break;
2433
2434#endif
2435
2436 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2437 {
2438 ALLOC (req->result);
2439 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2440 }
2441 break;
2442
2044 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2443 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2045 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2444 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2046 2445
2047 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2048 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2049 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2446 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2050 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2447 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2051 2448
2052 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2053 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2449 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2054 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2055 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2450 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2056 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2057 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2451 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2058 2452
2059 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2060 case EIO_CLOSE: req->result = close (req->int1); break; 2453 case EIO_CLOSE: req->result = close (req->int1); break;
2061 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2454 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2062 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2063 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2064 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2065 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2066 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2067 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2068 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2069
2070 case EIO_REALPATH: eio__realpath (req, self); break;
2071
2072 case EIO_READLINK: ALLOC (PATH_MAX);
2073 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2074
2075 case EIO_SYNC: req->result = 0; sync (); break; 2455 case EIO_SYNC: req->result = 0; sync (); break;
2076 case EIO_FSYNC: req->result = fsync (req->int1); break; 2456 case EIO_FSYNC: req->result = fsync (req->int1); break;
2077 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2457 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2458 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2459 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2078 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2460 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2079 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2461 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2080 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2462 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2081 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2463 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2082 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2083 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2464 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2084 2465
2085 case EIO_READDIR: eio__scandir (req, self); break; 2466 case EIO_READDIR: eio__scandir (req, self); break;
2086 2467
2087 case EIO_BUSY: 2468 case EIO_BUSY:
2097 req->result = select (0, 0, 0, 0, &tv); 2478 req->result = select (0, 0, 0, 0, &tv);
2098 } 2479 }
2099#endif 2480#endif
2100 break; 2481 break;
2101 2482
2102 case EIO_UTIME:
2103 case EIO_FUTIME:
2104 {
2105 struct timeval tv[2];
2106 struct timeval *times;
2107
2108 if (req->nv1 != -1. || req->nv2 != -1.)
2109 {
2110 tv[0].tv_sec = req->nv1;
2111 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2112 tv[1].tv_sec = req->nv2;
2113 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2114
2115 times = tv;
2116 }
2117 else
2118 times = 0;
2119
2120 req->result = req->type == EIO_FUTIME
2121 ? futimes (req->int1, times)
2122 : utimes (req->ptr1, times);
2123 }
2124 break;
2125
2126 case EIO_GROUP: 2483 case EIO_GROUP:
2127 abort (); /* handled in eio_request */ 2484 abort (); /* handled in eio_request */
2128 2485
2129 case EIO_NOP: 2486 case EIO_NOP:
2130 req->result = 0; 2487 req->result = 0;
2133 case EIO_CUSTOM: 2490 case EIO_CUSTOM:
2134 req->feed (req); 2491 req->feed (req);
2135 break; 2492 break;
2136 2493
2137 default: 2494 default:
2138 errno = ENOSYS;
2139 req->result = -1; 2495 req->result = EIO_ENOSYS ();
2140 break; 2496 break;
2141 } 2497 }
2142 2498
2143 req->errorno = errno; 2499 req->errorno = errno;
2144} 2500}
2145 2501
2146#ifndef EIO_NO_WRAPPERS 2502#ifndef EIO_NO_WRAPPERS
2147 2503
2504eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2505{
2506 REQ (EIO_WD_OPEN); PATH; SEND;
2507}
2508
2509eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2510{
2511 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2512}
2513
2148eio_req *eio_nop (int pri, eio_cb cb, void *data) 2514eio_req *eio_nop (int pri, eio_cb cb, void *data)
2149{ 2515{
2150 REQ (EIO_NOP); SEND; 2516 REQ (EIO_NOP); SEND;
2151} 2517}
2152 2518
2168eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2534eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2169{ 2535{
2170 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2536 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2171} 2537}
2172 2538
2539eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2540{
2541 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2542}
2543
2544eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2545{
2546 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2547}
2548
2549eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2550{
2551 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2552}
2553
2173eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2554eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2174{ 2555{
2175 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2556 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2176} 2557}
2177 2558
2183eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2564eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2184{ 2565{
2185 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2566 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2186} 2567}
2187 2568
2188eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2189{
2190 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2191}
2192
2193eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2569eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2194{ 2570{
2195 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2571 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2196} 2572}
2197 2573
2198eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2199{
2200 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2201}
2202
2203eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2574eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2204{ 2575{
2205 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2576 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2206} 2577}
2207 2578
2208eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2579eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2209{ 2580{
2210 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2581 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2582}
2583
2584eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2585{
2586 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2211} 2587}
2212 2588
2213eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2589eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2214{ 2590{
2215 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2591 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2433/* misc garbage */ 2809/* misc garbage */
2434 2810
2435eio_ssize_t 2811eio_ssize_t
2436eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2812eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2437{ 2813{
2438 etp_worker wrk;
2439 eio_ssize_t ret;
2440
2441 wrk.dbuf = 0;
2442
2443 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2814 return eio__sendfile (ofd, ifd, offset, count);
2444
2445 if (wrk.dbuf)
2446 free (wrk.dbuf);
2447
2448 return ret;
2449} 2815}
2450 2816

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines