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

Comparing libeio/eio.c (file contents):
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC vs.
Revision 1.122 by root, Tue Aug 14 04:15:35 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 #define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
138 #define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
139
140 #if __GNUC__
141 typedef long long eio_off_t; /* signed for compatibility to msvc */
142 #else
143 typedef __int64 eio_off_t; /* unsigned not supported by msvc */
144 #endif
145
146 static eio_ssize_t
147 eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
148 {
149 OVERLAPPED o = { 0 };
150 DWORD got;
151
152 o.Offset = offset;
153 o.OffsetHigh = offset >> 32;
154
155 return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
156 ? got : -1;
157 }
158
159 static eio_ssize_t
160 eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
161 {
162 OVERLAPPED o = { 0 };
163 DWORD got;
164
165 o.Offset = offset;
166 o.OffsetHigh = offset >> 32;
167
168 return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
169 ? got : -1;
170 }
171
172 /* rename() uses MoveFile, which fails to overwrite */
173 #define rename(old,neu) eio__rename (old, neu)
174
175 static int
176 eio__rename (const char *old, const char *neu)
177 {
178 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
179 return 0;
180
181 /* should steal _dosmaperr */
182 switch (GetLastError ())
183 {
184 case ERROR_FILE_NOT_FOUND:
185 case ERROR_PATH_NOT_FOUND:
186 case ERROR_INVALID_DRIVE:
187 case ERROR_NO_MORE_FILES:
188 case ERROR_BAD_NETPATH:
189 case ERROR_BAD_NET_NAME:
190 case ERROR_BAD_PATHNAME:
191 case ERROR_FILENAME_EXCED_RANGE:
192 errno = ENOENT;
193 break;
194
195 default:
196 errno = EACCES;
197 break;
198 }
199
200 return -1;
201 }
202
130 /* we could even stat and see if it exists */ 203 /* we could even stat and see if it exists */
131 static int 204 static int
132 symlink (const char *old, const char *neu) 205 symlink (const char *old, const char *neu)
133 { 206 {
134 #if WINVER >= 0x0600 207 #if WINVER >= 0x0600
160 233
161 #include <sys/time.h> 234 #include <sys/time.h>
162 #include <sys/select.h> 235 #include <sys/select.h>
163 #include <sys/statvfs.h> 236 #include <sys/statvfs.h>
164 #include <unistd.h> 237 #include <unistd.h>
165 #include <utime.h>
166 #include <signal.h> 238 #include <signal.h>
167 #include <dirent.h> 239 #include <dirent.h>
168 240
169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 241 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
170 #include <sys/mman.h> 242 #include <sys/mman.h>
171 #endif 243 #endif
172 244
173 #define D_NAME(entp) entp->d_name 245 #define D_NAME(entp) entp->d_name
174 246
175 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 247 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
176 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 248 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
177 #define _DIRENT_HAVE_D_TYPE /* sigh */ 249 #define _DIRENT_HAVE_D_TYPE /* sigh */
178 #define D_INO(de) (de)->d_fileno 250 #define D_INO(de) (de)->d_fileno
179 #define D_NAMLEN(de) (de)->d_namlen 251 #define D_NAMLEN(de) (de)->d_namlen
180 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 252 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
181 #define D_INO(de) (de)->d_ino 253 #define D_INO(de) (de)->d_ino
192 264
193 #ifndef EIO_STRUCT_DIRENT 265 #ifndef EIO_STRUCT_DIRENT
194 #define EIO_STRUCT_DIRENT struct dirent 266 #define EIO_STRUCT_DIRENT struct dirent
195 #endif 267 #endif
196 268
269#endif
270
271#if HAVE_UTIMES
272# include <utime.h>
273#endif
274
275#if HAVE_SYS_SYSCALL_H
276# include <sys/syscall.h>
277#endif
278
279#if HAVE_SYS_PRCTL_H
280# include <sys/prctl.h>
197#endif 281#endif
198 282
199#if HAVE_SENDFILE 283#if HAVE_SENDFILE
200# if __linux 284# if __linux
201# include <sys/sendfile.h> 285# include <sys/sendfile.h>
233 317
234/* buffer size for various temporary buffers */ 318/* buffer size for various temporary buffers */
235#define EIO_BUFSIZE 65536 319#define EIO_BUFSIZE 65536
236 320
237#define dBUF \ 321#define dBUF \
238 char *eio_buf; \
239 ETP_WORKER_LOCK (self); \
240 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 322 char *eio_buf = malloc (EIO_BUFSIZE); \
241 ETP_WORKER_UNLOCK (self); \
242 errno = ENOMEM; \ 323 errno = ENOMEM; \
243 if (!eio_buf) \ 324 if (!eio_buf) \
244 return -1; 325 return -1
326
327#define FUBd \
328 free (eio_buf)
245 329
246#define EIO_TICKS ((1000000 + 1023) >> 10) 330#define EIO_TICKS ((1000000 + 1023) >> 10)
331
332/*****************************************************************************/
333
334struct tmpbuf
335{
336 void *ptr;
337 int len;
338};
339
340static void *
341tmpbuf_get (struct tmpbuf *buf, int len)
342{
343 if (buf->len < len)
344 {
345 free (buf->ptr);
346 buf->ptr = malloc (buf->len = len);
347 }
348
349 return buf->ptr;
350}
351
352struct tmpbuf;
353
354#if _POSIX_VERSION >= 200809L
355 #define HAVE_AT 1
356 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
357 #ifndef O_SEARCH
358 #define O_SEARCH O_RDONLY
359 #endif
360#else
361 #define HAVE_AT 0
362 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path);
363#endif
364
365struct eio_pwd
366{
367#if HAVE_AT
368 int fd;
369#endif
370 int len;
371 char str[1]; /* actually, a 0-terminated canonical path */
372};
373
374/*****************************************************************************/
247 375
248#define ETP_PRI_MIN EIO_PRI_MIN 376#define ETP_PRI_MIN EIO_PRI_MIN
249#define ETP_PRI_MAX EIO_PRI_MAX 377#define ETP_PRI_MAX EIO_PRI_MAX
250 378
251struct etp_worker; 379struct etp_worker;
255static int eio_finish (eio_req *req); 383static int eio_finish (eio_req *req);
256#define ETP_FINISH(req) eio_finish (req) 384#define ETP_FINISH(req) eio_finish (req)
257static void eio_execute (struct etp_worker *self, eio_req *req); 385static void eio_execute (struct etp_worker *self, eio_req *req);
258#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 386#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
259 387
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/*****************************************************************************/ 388/*****************************************************************************/
271 389
272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 390#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
273 391
274/* calculate time difference in ~1/EIO_TICKS of a second */ 392/* calculate time difference in ~1/EIO_TICKS of a second */
285static void (*done_poll_cb) (void); 403static void (*done_poll_cb) (void);
286 404
287static unsigned int max_poll_time; /* reslock */ 405static unsigned int max_poll_time; /* reslock */
288static unsigned int max_poll_reqs; /* reslock */ 406static unsigned int max_poll_reqs; /* reslock */
289 407
290static volatile unsigned int nreqs; /* reqlock */ 408static unsigned int nreqs; /* reqlock */
291static volatile unsigned int nready; /* reqlock */ 409static unsigned int nready; /* reqlock */
292static volatile unsigned int npending; /* reqlock */ 410static unsigned int npending; /* reqlock */
293static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 411static 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 */ 412static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
295 413
296static xmutex_t wrklock; 414static xmutex_t wrklock;
297static xmutex_t reslock; 415static xmutex_t reslock;
298static xmutex_t reqlock; 416static xmutex_t reqlock;
299static xcond_t reqwait; 417static xcond_t reqwait;
300 418
301#if !HAVE_PREADWRITE
302/*
303 * make our pread/pwrite emulation safe against themselves, but not against
304 * normal read/write by using a mutex. slows down execution a lot,
305 * but that's your problem, not mine.
306 */
307static xmutex_t preadwritelock;
308#endif
309
310typedef struct etp_worker 419typedef struct etp_worker
311{ 420{
421 struct tmpbuf tmpbuf;
422
312 /* locked by wrklock */ 423 /* locked by wrklock */
313 struct etp_worker *prev, *next; 424 struct etp_worker *prev, *next;
314 425
315 xthread_t tid; 426 xthread_t tid;
316 427
317 /* locked by reslock, reqlock or wrklock */ 428#ifdef ETP_WORKER_COMMON
318 ETP_REQ *req; /* currently processed request */
319
320 ETP_WORKER_COMMON 429 ETP_WORKER_COMMON
430#endif
321} etp_worker; 431} etp_worker;
322 432
323static etp_worker wrk_first; /* NOT etp */ 433static etp_worker wrk_first; /* NOT etp */
324 434
325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 435#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
326#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 436#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
327 437
328/* worker threads management */ 438/* worker threads management */
329 439
330static void ecb_cold 440static void
331etp_worker_clear (etp_worker *wrk) 441etp_worker_clear (etp_worker *wrk)
332{ 442{
333 ETP_WORKER_CLEAR (wrk);
334} 443}
335 444
336static void ecb_cold 445static void ecb_cold
337etp_worker_free (etp_worker *wrk) 446etp_worker_free (etp_worker *wrk)
338{ 447{
448 free (wrk->tmpbuf.ptr);
449
339 wrk->next->prev = wrk->prev; 450 wrk->next->prev = wrk->prev;
340 wrk->prev->next = wrk->next; 451 wrk->prev->next = wrk->next;
341 452
342 free (wrk); 453 free (wrk);
343} 454}
521} 632}
522 633
523static void ecb_cold 634static void ecb_cold
524etp_end_thread (void) 635etp_end_thread (void)
525{ 636{
526 eio_req *req = calloc (1, sizeof (eio_req)); 637 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
527 638
528 req->type = -1; 639 req->type = -1;
529 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 640 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
530 641
531 X_LOCK (reqlock); 642 X_LOCK (reqlock);
858} 969}
859 970
860/*****************************************************************************/ 971/*****************************************************************************/
861/* work around various missing functions */ 972/* work around various missing functions */
862 973
863#if !HAVE_PREADWRITE
864# undef pread
865# undef pwrite
866# define pread eio__pread
867# define pwrite eio__pwrite
868
869static eio_ssize_t
870eio__pread (int fd, void *buf, size_t count, off_t offset)
871{
872 eio_ssize_t res;
873 off_t ooffset;
874
875 X_LOCK (preadwritelock);
876 ooffset = lseek (fd, 0, SEEK_CUR);
877 lseek (fd, offset, SEEK_SET);
878 res = read (fd, buf, count);
879 lseek (fd, ooffset, SEEK_SET);
880 X_UNLOCK (preadwritelock);
881
882 return res;
883}
884
885static eio_ssize_t
886eio__pwrite (int fd, void *buf, size_t count, off_t offset)
887{
888 eio_ssize_t res;
889 off_t ooffset;
890
891 X_LOCK (preadwritelock);
892 ooffset = lseek (fd, 0, SEEK_CUR);
893 lseek (fd, offset, SEEK_SET);
894 res = write (fd, buf, count);
895 lseek (fd, ooffset, SEEK_SET);
896 X_UNLOCK (preadwritelock);
897
898 return res;
899}
900#endif
901
902#ifndef HAVE_UTIMES 974#ifndef HAVE_UTIMES
903 975
904# undef utimes 976# undef utimes
905# define utimes(path,times) eio__utimes (path, times) 977# define utimes(path,times) eio__utimes (path, times)
906 978
938 1010
939#if !HAVE_FDATASYNC 1011#if !HAVE_FDATASYNC
940# undef fdatasync 1012# undef fdatasync
941# define fdatasync(fd) fsync (fd) 1013# define fdatasync(fd) fsync (fd)
942#endif 1014#endif
1015
1016static int
1017eio__syncfs (int fd)
1018{
1019 int res;
1020
1021#if HAVE_SYS_SYNCFS
1022 res = (int)syscall (__NR_syncfs, (int)(fd));
1023#else
1024 res = EIO_ENOSYS ();
1025#endif
1026
1027 if (res < 0 && errno == ENOSYS && fd >= 0)
1028 sync ();
1029
1030 return res;
1031}
943 1032
944/* sync_file_range always needs emulation */ 1033/* sync_file_range always needs emulation */
945static int 1034static int
946eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1035eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
947{ 1036{
970} 1059}
971 1060
972static int 1061static int
973eio__fallocate (int fd, int mode, off_t offset, size_t len) 1062eio__fallocate (int fd, int mode, off_t offset, size_t len)
974{ 1063{
975#if HAVE_FALLOCATE 1064#if HAVE_LINUX_FALLOCATE
976 return fallocate (fd, mode, offset, len); 1065 return fallocate (fd, mode, offset, len);
977#else 1066#else
978 errno = ENOSYS; 1067 return EIO_ENOSYS ();
979 return -1;
980#endif 1068#endif
981} 1069}
982 1070
983#if !HAVE_READAHEAD 1071#if !HAVE_READAHEAD
984# undef readahead 1072# undef readahead
997 pread (fd, eio_buf, len, offset); 1085 pread (fd, eio_buf, len, offset);
998 offset += len; 1086 offset += len;
999 todo -= len; 1087 todo -= len;
1000 } 1088 }
1001 1089
1002 errno = 0; 1090 FUBd;
1091
1092 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
1093 /* but not for e.g. EIO or eof, so we also never fail */
1003 return count; 1094 return 0;
1004} 1095}
1005 1096
1006#endif 1097#endif
1007 1098
1008/* sendfile always needs emulation */ 1099/* sendfile always needs emulation */
1009static eio_ssize_t 1100static eio_ssize_t
1010eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1101eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1011{ 1102{
1012 eio_ssize_t written = 0; 1103 eio_ssize_t written = 0;
1013 eio_ssize_t res; 1104 eio_ssize_t res;
1014 1105
1015 if (!count) 1106 if (!count)
1043 1134
1044 /* according to source inspection, this is correct, and useful behaviour */ 1135 /* according to source inspection, this is correct, and useful behaviour */
1045 if (sbytes) 1136 if (sbytes)
1046 res = sbytes; 1137 res = sbytes;
1047 1138
1048# elif defined (__APPLE__) 1139# elif defined __APPLE__
1049 off_t sbytes = count; 1140 off_t sbytes = count;
1050 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1141 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1051 1142
1052 /* according to the manpage, sbytes is always valid */ 1143 /* according to the manpage, sbytes is always valid */
1053 if (sbytes) 1144 if (sbytes)
1080 HANDLE h = TO_SOCKET (ifd); 1171 HANDLE h = TO_SOCKET (ifd);
1081 SetFilePointer (h, offset, 0, FILE_BEGIN); 1172 SetFilePointer (h, offset, 0, FILE_BEGIN);
1082 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1173 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1083 1174
1084#else 1175#else
1085 res = -1; 1176 res = EIO_ENOSYS ();
1086 errno = ENOSYS;
1087#endif 1177#endif
1088 1178
1089 /* we assume sendfile can copy at least 128mb in one go */ 1179 /* we assume sendfile can copy at least 128mb in one go */
1090 if (res <= 128 * 1024 * 1024) 1180 if (res <= 128 * 1024 * 1024)
1091 { 1181 {
1151 1241
1152 offset += cnt; 1242 offset += cnt;
1153 res += cnt; 1243 res += cnt;
1154 count -= cnt; 1244 count -= cnt;
1155 } 1245 }
1246
1247 FUBd;
1156 } 1248 }
1157 1249
1158 return res; 1250 return res;
1159} 1251}
1160 1252
1276 1368
1277/*****************************************************************************/ 1369/*****************************************************************************/
1278/* requests implemented outside eio_execute, because they are so large */ 1370/* requests implemented outside eio_execute, because they are so large */
1279 1371
1280static void 1372static void
1281eio__realpath (eio_req *req, etp_worker *self) 1373eio__lseek (eio_req *req)
1282{ 1374{
1283 char *rel = req->ptr1; 1375 /* this usually gets optimised away completely, or your compiler sucks, */
1376 /* or the whence constants really are not 0, 1, 2 */
1377 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
1378 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
1379 : req->int2 == EIO_SEEK_END ? SEEK_END
1380 : req->int2;
1381
1382 req->offs = lseek (req->int1, req->offs, whence);
1383 req->result = req->offs == (off_t)-1 ? -1 : 0;
1384}
1385
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387static int
1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1389{
1390 const char *rel = path;
1284 char *res; 1391 char *res;
1285 char *tmp1, *tmp2; 1392 char *tmp1, *tmp2;
1286#if SYMLOOP_MAX > 32 1393#if SYMLOOP_MAX > 32
1287 int symlinks = SYMLOOP_MAX; 1394 int symlinks = SYMLOOP_MAX;
1288#else 1395#else
1289 int symlinks = 32; 1396 int symlinks = 32;
1290#endif 1397#endif
1291 1398
1292 req->result = -1;
1293
1294 errno = EINVAL; 1399 errno = EINVAL;
1295 if (!rel) 1400 if (!rel)
1296 return; 1401 return -1;
1297 1402
1298 errno = ENOENT; 1403 errno = ENOENT;
1299 if (!*rel) 1404 if (!*rel)
1300 return; 1405 return -1;
1301 1406
1302 if (!req->ptr2) 1407 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1303 {
1304 X_LOCK (wrklock);
1305 req->flags |= EIO_FLAG_PTR2_FREE;
1306 X_UNLOCK (wrklock);
1307 req->ptr2 = malloc (PATH_MAX * 3);
1308
1309 errno = ENOMEM;
1310 if (!req->ptr2)
1311 return;
1312 }
1313
1314 res = req->ptr2;
1315 tmp1 = res + PATH_MAX; 1408 tmp1 = res + PATH_MAX;
1316 tmp2 = tmp1 + PATH_MAX; 1409 tmp2 = tmp1 + PATH_MAX;
1317 1410
1318#if 0 /* disabled, the musl way to do things is just too racy */ 1411#if 0 /* disabled, the musl way to do things is just too racy */
1319#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1412#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1338#endif 1431#endif
1339#endif 1432#endif
1340 1433
1341 if (*rel != '/') 1434 if (*rel != '/')
1342 { 1435 {
1436 int len;
1437
1438 errno = ENOENT;
1439 if (wd == EIO_INVALID_WD)
1440 return -1;
1441
1442 if (wd == EIO_CWD)
1443 {
1343 if (!getcwd (res, PATH_MAX)) 1444 if (!getcwd (res, PATH_MAX))
1344 return; 1445 return -1;
1446
1447 len = strlen (res);
1448 }
1449 else
1450 memcpy (res, wd->str, len = wd->len);
1345 1451
1346 if (res [1]) /* only use if not / */ 1452 if (res [1]) /* only use if not / */
1347 res += strlen (res); 1453 res += len;
1348 } 1454 }
1349 1455
1350 while (*rel) 1456 while (*rel)
1351 { 1457 {
1352 eio_ssize_t len, linklen; 1458 eio_ssize_t len, linklen;
1353 char *beg = rel; 1459 const char *beg = rel;
1354 1460
1355 while (*rel && *rel != '/') 1461 while (*rel && *rel != '/')
1356 ++rel; 1462 ++rel;
1357 1463
1358 len = rel - beg; 1464 len = rel - beg;
1370 1476
1371 if (beg [1] == '.' && len == 2) 1477 if (beg [1] == '.' && len == 2)
1372 { 1478 {
1373 /* .. - back up one component, if possible */ 1479 /* .. - back up one component, if possible */
1374 1480
1375 while (res != req->ptr2) 1481 while (res != tmpbuf->ptr)
1376 if (*--res == '/') 1482 if (*--res == '/')
1377 break; 1483 break;
1378 1484
1379 continue; 1485 continue;
1380 } 1486 }
1381 } 1487 }
1382 1488
1383 errno = ENAMETOOLONG; 1489 errno = ENAMETOOLONG;
1384 if (res + 1 + len + 1 >= tmp1) 1490 if (res + 1 + len + 1 >= tmp1)
1385 return; 1491 return -1;
1386 1492
1387 /* copy one component */ 1493 /* copy one component */
1388 *res = '/'; 1494 *res = '/';
1389 memcpy (res + 1, beg, len); 1495 memcpy (res + 1, beg, len);
1390 1496
1391 /* zero-terminate, for readlink */ 1497 /* zero-terminate, for readlink */
1392 res [len + 1] = 0; 1498 res [len + 1] = 0;
1393 1499
1394 /* now check if it's a symlink */ 1500 /* now check if it's a symlink */
1395 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1501 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1396 1502
1397 if (linklen < 0) 1503 if (linklen < 0)
1398 { 1504 {
1399 if (errno != EINVAL) 1505 if (errno != EINVAL)
1400 return; 1506 return -1;
1401 1507
1402 /* it's a normal directory. hopefully */ 1508 /* it's a normal directory. hopefully */
1403 res += len + 1; 1509 res += len + 1;
1404 } 1510 }
1405 else 1511 else
1407 /* yay, it was a symlink - build new path in tmp2 */ 1513 /* yay, it was a symlink - build new path in tmp2 */
1408 int rellen = strlen (rel); 1514 int rellen = strlen (rel);
1409 1515
1410 errno = ENAMETOOLONG; 1516 errno = ENAMETOOLONG;
1411 if (linklen + 1 + rellen >= PATH_MAX) 1517 if (linklen + 1 + rellen >= PATH_MAX)
1412 return; 1518 return -1;
1413 1519
1414 errno = ELOOP; 1520 errno = ELOOP;
1415 if (!--symlinks) 1521 if (!--symlinks)
1416 return; 1522 return -1;
1417 1523
1418 if (*tmp1 == '/') 1524 if (*tmp1 == '/')
1419 res = req->ptr2; /* symlink resolves to an absolute path */ 1525 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1420 1526
1421 /* we need to be careful, as rel might point into tmp2 already */ 1527 /* we need to be careful, as rel might point into tmp2 already */
1422 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1528 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1423 tmp2 [linklen] = '/'; 1529 tmp2 [linklen] = '/';
1424 memcpy (tmp2, tmp1, linklen); 1530 memcpy (tmp2, tmp1, linklen);
1426 rel = tmp2; 1532 rel = tmp2;
1427 } 1533 }
1428 } 1534 }
1429 1535
1430 /* special case for the lone root path */ 1536 /* special case for the lone root path */
1431 if (res == req->ptr2) 1537 if (res == tmpbuf->ptr)
1432 *res++ = '/'; 1538 *res++ = '/';
1433 1539
1434 req->result = res - (char *)req->ptr2; 1540 return res - (char *)tmpbuf->ptr;
1435
1436done:
1437 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1438} 1541}
1439 1542
1440static signed char 1543static signed char
1441eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1544eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1442{ 1545{
1630#ifdef _WIN32 1733#ifdef _WIN32
1631 { 1734 {
1632 int len = strlen ((const char *)req->ptr1); 1735 int len = strlen ((const char *)req->ptr1);
1633 char *path = malloc (MAX_PATH); 1736 char *path = malloc (MAX_PATH);
1634 const char *fmt; 1737 const char *fmt;
1738 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1635 1739
1636 if (!len) 1740 if (!len)
1637 fmt = "./*"; 1741 fmt = "./*";
1638 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1742 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1639 fmt = "%s*"; 1743 fmt = "%s*";
1640 else 1744 else
1641 fmt = "%s/*"; 1745 fmt = "%s/*";
1642 1746
1643 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1747 _snprintf (path, MAX_PATH, fmt, reqpath);
1644 dirp = FindFirstFile (path, &entp); 1748 dirp = FindFirstFile (path, &entp);
1645 free (path); 1749 free (path);
1646 1750
1647 if (dirp == INVALID_HANDLE_VALUE) 1751 if (dirp == INVALID_HANDLE_VALUE)
1648 { 1752 {
1649 dirp = 0; 1753 /* should steal _dosmaperr */
1650
1651 switch (GetLastError ()) 1754 switch (GetLastError ())
1652 { 1755 {
1653 case ERROR_FILE_NOT_FOUND: 1756 case ERROR_FILE_NOT_FOUND:
1654 req->result = 0; 1757 req->result = 0;
1655 break; 1758 break;
1656 1759
1657 case ERROR_INVALID_NAME: 1760 case ERROR_INVALID_NAME:
1658 case ERROR_PATH_NOT_FOUND: 1761 case ERROR_PATH_NOT_FOUND:
1659 case ERROR_NO_MORE_FILES: 1762 case ERROR_NO_MORE_FILES:
1660 errno = ENOENT; 1763 errno = ENOENT;
1661 break; 1764 break;
1662 1765
1663 case ERROR_NOT_ENOUGH_MEMORY: 1766 case ERROR_NOT_ENOUGH_MEMORY:
1664 errno = ENOMEM; 1767 errno = ENOMEM;
1665 break; 1768 break;
1666 1769
1667 default: 1770 default:
1668 errno = EINVAL; 1771 errno = EINVAL;
1669 break; 1772 break;
1670 } 1773 }
1774
1775 return;
1671 } 1776 }
1672 } 1777 }
1673#else 1778#else
1779 #if HAVE_AT
1780 if (req->wd)
1781 {
1782 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1783
1784 if (fd < 0)
1785 return;
1786
1787 dirp = fdopendir (fd);
1788
1789 if (!dirp)
1790 close (fd);
1791 }
1792 else
1674 dirp = opendir (req->ptr1); 1793 dirp = opendir (req->ptr1);
1794 #else
1795 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1796 #endif
1797
1798 if (!dirp)
1799 return;
1675#endif 1800#endif
1676 1801
1677 if (req->flags & EIO_FLAG_PTR1_FREE) 1802 if (req->flags & EIO_FLAG_PTR1_FREE)
1678 free (req->ptr1); 1803 free (req->ptr1);
1679 1804
1680 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1805 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1681 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1806 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1682 req->ptr2 = names = malloc (namesalloc); 1807 req->ptr2 = names = malloc (namesalloc);
1683 1808
1684 if (dirp && names && (!flags || dents)) 1809 if (!names || (flags && !dents))
1810 return;
1811
1685 for (;;) 1812 for (;;)
1686 { 1813 {
1687 int done; 1814 int done;
1688 1815
1689#ifdef _WIN32 1816#ifdef _WIN32
1690 done = !dirp; 1817 done = !dirp;
1691#else 1818#else
1692 errno = 0; 1819 errno = 0;
1693 entp = readdir (dirp); 1820 entp = readdir (dirp);
1694 done = !entp; 1821 done = !entp;
1695#endif 1822#endif
1696 1823
1697 if (done) 1824 if (done)
1698 { 1825 {
1699#ifndef _WIN32 1826#ifndef _WIN32
1700 int old_errno = errno; 1827 int old_errno = errno;
1701 closedir (dirp); 1828 closedir (dirp);
1702 errno = old_errno; 1829 errno = old_errno;
1703 1830
1704 if (errno) 1831 if (errno)
1705 break; 1832 break;
1706#endif 1833#endif
1707 1834
1708 /* sort etc. */ 1835 /* sort etc. */
1709 req->int1 = flags; 1836 req->int1 = flags;
1710 req->result = dentoffs; 1837 req->result = dentoffs;
1711 1838
1712 if (flags & EIO_READDIR_STAT_ORDER) 1839 if (flags & EIO_READDIR_STAT_ORDER)
1713 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1840 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1714 else if (flags & EIO_READDIR_DIRS_FIRST) 1841 else if (flags & EIO_READDIR_DIRS_FIRST)
1715 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1842 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1716 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1843 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1717 else 1844 else
1845 {
1846 /* in this case, all is known, and we just put dirs first and sort them */
1847 eio_dirent *oth = dents + dentoffs;
1848 eio_dirent *dir = dents;
1849
1850 /* now partition dirs to the front, and non-dirs to the back */
1851 /* by walking from both sides and swapping if necessary */
1852 while (oth > dir)
1853 {
1854 if (dir->type == EIO_DT_DIR)
1855 ++dir;
1856 else if ((--oth)->type == EIO_DT_DIR)
1857 {
1858 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1859
1860 ++dir;
1861 }
1862 }
1863
1864 /* now sort the dirs only (dirs all have the same score) */
1865 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1866 }
1867
1868 break;
1869 }
1870
1871 /* now add the entry to our list(s) */
1872 name = D_NAME (entp);
1873
1874 /* skip . and .. entries */
1875 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1876 {
1877 int len = D_NAMLEN (entp) + 1;
1878
1879 while (ecb_expect_false (namesoffs + len > namesalloc))
1880 {
1881 namesalloc *= 2;
1882 req->ptr2 = names = realloc (names, namesalloc);
1883
1884 if (!names)
1885 break;
1886 }
1887
1888 memcpy (names + namesoffs, name, len);
1889
1890 if (dents)
1891 {
1892 struct eio_dirent *ent;
1893
1894 if (ecb_expect_false (dentoffs == dentalloc))
1718 { 1895 {
1719 /* in this case, all is known, and we just put dirs first and sort them */ 1896 dentalloc *= 2;
1897 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1898
1899 if (!dents)
1900 break;
1901 }
1902
1720 eio_dirent *oth = dents + dentoffs; 1903 ent = dents + dentoffs;
1721 eio_dirent *dir = dents;
1722 1904
1723 /* now partition dirs to the front, and non-dirs to the back */ 1905 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1724 /* by walking from both sides and swapping if necessary */ 1906 ent->namelen = len - 1;
1725 while (oth > dir) 1907 ent->inode = D_INO (entp);
1908
1909 inode_bits |= ent->inode;
1910
1911 switch (D_TYPE (entp))
1912 {
1913 default:
1914 ent->type = EIO_DT_UNKNOWN;
1915 flags |= EIO_READDIR_FOUND_UNKNOWN;
1916 break;
1917
1918 #ifdef DT_FIFO
1919 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1920 #endif
1921 #ifdef DT_CHR
1922 case DT_CHR: ent->type = EIO_DT_CHR; break;
1923 #endif
1924 #ifdef DT_MPC
1925 case DT_MPC: ent->type = EIO_DT_MPC; break;
1926 #endif
1927 #ifdef DT_DIR
1928 case DT_DIR: ent->type = EIO_DT_DIR; break;
1929 #endif
1930 #ifdef DT_NAM
1931 case DT_NAM: ent->type = EIO_DT_NAM; break;
1932 #endif
1933 #ifdef DT_BLK
1934 case DT_BLK: ent->type = EIO_DT_BLK; break;
1935 #endif
1936 #ifdef DT_MPB
1937 case DT_MPB: ent->type = EIO_DT_MPB; break;
1938 #endif
1939 #ifdef DT_REG
1940 case DT_REG: ent->type = EIO_DT_REG; break;
1941 #endif
1942 #ifdef DT_NWK
1943 case DT_NWK: ent->type = EIO_DT_NWK; break;
1944 #endif
1945 #ifdef DT_CMP
1946 case DT_CMP: ent->type = EIO_DT_CMP; break;
1947 #endif
1948 #ifdef DT_LNK
1949 case DT_LNK: ent->type = EIO_DT_LNK; break;
1950 #endif
1951 #ifdef DT_SOCK
1952 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1953 #endif
1954 #ifdef DT_DOOR
1955 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1956 #endif
1957 #ifdef DT_WHT
1958 case DT_WHT: ent->type = EIO_DT_WHT; break;
1959 #endif
1960 }
1961
1962 ent->score = 7;
1963
1964 if (flags & EIO_READDIR_DIRS_FIRST)
1965 {
1966 if (ent->type == EIO_DT_UNKNOWN)
1726 { 1967 {
1727 if (dir->type == EIO_DT_DIR) 1968 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1728 ++dir; 1969 ent->score = 1;
1729 else if ((--oth)->type == EIO_DT_DIR) 1970 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1730 { 1971 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1731 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1732
1733 ++dir;
1734 }
1735 } 1972 }
1736 1973 else if (ent->type == EIO_DT_DIR)
1737 /* now sort the dirs only (dirs all have the same score) */ 1974 ent->score = 0;
1738 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1739 } 1975 }
1740
1741 break;
1742 }
1743
1744 /* now add the entry to our list(s) */
1745 name = D_NAME (entp);
1746
1747 /* skip . and .. entries */
1748 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1749 {
1750 int len = D_NAMLEN (entp) + 1;
1751
1752 while (ecb_expect_false (namesoffs + len > namesalloc))
1753 {
1754 namesalloc *= 2;
1755 req->ptr2 = names = realloc (names, namesalloc);
1756
1757 if (!names)
1758 break;
1759 } 1976 }
1760 1977
1761 memcpy (names + namesoffs, name, len);
1762
1763 if (dents)
1764 {
1765 struct eio_dirent *ent;
1766
1767 if (ecb_expect_false (dentoffs == dentalloc))
1768 {
1769 dentalloc *= 2;
1770 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1771
1772 if (!dents)
1773 break;
1774 }
1775
1776 ent = dents + dentoffs;
1777
1778 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1779 ent->namelen = len - 1;
1780 ent->inode = D_INO (entp);
1781
1782 inode_bits |= ent->inode;
1783
1784 switch (D_TYPE (entp))
1785 {
1786 default:
1787 ent->type = EIO_DT_UNKNOWN;
1788 flags |= EIO_READDIR_FOUND_UNKNOWN;
1789 break;
1790
1791 #ifdef DT_FIFO
1792 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1793 #endif
1794 #ifdef DT_CHR
1795 case DT_CHR: ent->type = EIO_DT_CHR; break;
1796 #endif
1797 #ifdef DT_MPC
1798 case DT_MPC: ent->type = EIO_DT_MPC; break;
1799 #endif
1800 #ifdef DT_DIR
1801 case DT_DIR: ent->type = EIO_DT_DIR; break;
1802 #endif
1803 #ifdef DT_NAM
1804 case DT_NAM: ent->type = EIO_DT_NAM; break;
1805 #endif
1806 #ifdef DT_BLK
1807 case DT_BLK: ent->type = EIO_DT_BLK; break;
1808 #endif
1809 #ifdef DT_MPB
1810 case DT_MPB: ent->type = EIO_DT_MPB; break;
1811 #endif
1812 #ifdef DT_REG
1813 case DT_REG: ent->type = EIO_DT_REG; break;
1814 #endif
1815 #ifdef DT_NWK
1816 case DT_NWK: ent->type = EIO_DT_NWK; break;
1817 #endif
1818 #ifdef DT_CMP
1819 case DT_CMP: ent->type = EIO_DT_CMP; break;
1820 #endif
1821 #ifdef DT_LNK
1822 case DT_LNK: ent->type = EIO_DT_LNK; break;
1823 #endif
1824 #ifdef DT_SOCK
1825 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1826 #endif
1827 #ifdef DT_DOOR
1828 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1829 #endif
1830 #ifdef DT_WHT
1831 case DT_WHT: ent->type = EIO_DT_WHT; break;
1832 #endif
1833 }
1834
1835 ent->score = 7;
1836
1837 if (flags & EIO_READDIR_DIRS_FIRST)
1838 {
1839 if (ent->type == EIO_DT_UNKNOWN)
1840 {
1841 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1842 ent->score = 1;
1843 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1844 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1845 }
1846 else if (ent->type == EIO_DT_DIR)
1847 ent->score = 0;
1848 }
1849 }
1850
1851 namesoffs += len; 1978 namesoffs += len;
1852 ++dentoffs; 1979 ++dentoffs;
1853 } 1980 }
1854 1981
1855 if (EIO_CANCELLED (req)) 1982 if (EIO_CANCELLED (req))
1856 { 1983 {
1857 errno = ECANCELED; 1984 errno = ECANCELED;
1858 break; 1985 break;
1859 } 1986 }
1860 1987
1861#ifdef _WIN32 1988#ifdef _WIN32
1862 if (!FindNextFile (dirp, &entp)) 1989 if (!FindNextFile (dirp, &entp))
1863 { 1990 {
1864 FindClose (dirp); 1991 FindClose (dirp);
1865 dirp = 0; 1992 dirp = 0;
1866 } 1993 }
1867#endif 1994#endif
1868 } 1995 }
1869} 1996}
1997
1998/*****************************************************************************/
1999/* working directory stuff */
2000/* various deficiencies in the posix 2008 api force us to */
2001/* keep the absolute path in string form at all times */
2002/* fuck yeah. */
2003
2004#if !HAVE_AT
2005
2006/* a bit like realpath, but usually faster because it doesn'T have to return */
2007/* an absolute or canonical path */
2008static const char *
2009wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2010{
2011 if (!wd || *path == '/')
2012 return path;
2013
2014 if (path [0] == '.' && !path [1])
2015 return wd->str;
2016
2017 {
2018 int l1 = wd->len;
2019 int l2 = strlen (path);
2020
2021 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2022
2023 memcpy (res, wd->str, l1);
2024 res [l1] = '/';
2025 memcpy (res + l1 + 1, path, l2 + 1);
2026
2027 return res;
2028 }
2029}
2030
2031#endif
2032
2033static eio_wd
2034eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2035{
2036 int fd;
2037 eio_wd res;
2038 int len = eio__realpath (tmpbuf, wd, path);
2039
2040 if (len < 0)
2041 return EIO_INVALID_WD;
2042
2043#if HAVE_AT
2044 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
2045
2046 if (fd < 0)
2047 return EIO_INVALID_WD;
2048#endif
2049
2050 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
2051
2052#if HAVE_AT
2053 res->fd = fd;
2054#endif
2055
2056 res->len = len;
2057 memcpy (res->str, tmpbuf->ptr, len);
2058 res->str [len] = 0;
2059
2060 return res;
2061}
2062
2063eio_wd
2064eio_wd_open_sync (eio_wd wd, const char *path)
2065{
2066 struct tmpbuf tmpbuf = { 0 };
2067 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2068 free (tmpbuf.ptr);
2069
2070 return wd;
2071}
2072
2073void
2074eio_wd_close_sync (eio_wd wd)
2075{
2076 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
2077 {
2078 #if HAVE_AT
2079 close (wd->fd);
2080 #endif
2081 free (wd);
2082 }
2083}
2084
2085#if HAVE_AT
2086
2087/* they forgot these */
2088
2089static int
2090eio__truncateat (int dirfd, const char *path, off_t length)
2091{
2092 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2093 int res;
2094
2095 if (fd < 0)
2096 return fd;
2097
2098 res = ftruncate (fd, length);
2099 close (fd);
2100 return res;
2101}
2102
2103static int
2104eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2105{
2106 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2107 int res;
2108
2109 if (fd < 0)
2110 return fd;
2111
2112 res = fstatvfs (fd, buf);
2113 close (fd);
2114 return res;
2115
2116}
2117
2118#endif
1870 2119
1871/*****************************************************************************/ 2120/*****************************************************************************/
1872 2121
1873#define ALLOC(len) \ 2122#define ALLOC(len) \
1874 if (!req->ptr2) \ 2123 if (!req->ptr2) \
1883 req->result = -1; \ 2132 req->result = -1; \
1884 break; \ 2133 break; \
1885 } \ 2134 } \
1886 } 2135 }
1887 2136
2137static void ecb_noinline ecb_cold
2138etp_proc_init (void)
2139{
2140#if HAVE_PRCTL_SET_NAME
2141 /* provide a more sensible "thread name" */
2142 char name[16 + 1];
2143 const int namelen = sizeof (name) - 1;
2144 int len;
2145
2146 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2147 name [namelen] = 0;
2148 len = strlen (name);
2149 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2150 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2151#endif
2152}
2153
1888X_THREAD_PROC (etp_proc) 2154X_THREAD_PROC (etp_proc)
1889{ 2155{
1890 ETP_REQ *req; 2156 ETP_REQ *req;
1891 struct timespec ts; 2157 struct timespec ts;
1892 etp_worker *self = (etp_worker *)thr_arg; 2158 etp_worker *self = (etp_worker *)thr_arg;
1893 2159
2160 etp_proc_init ();
2161
1894 /* try to distribute timeouts somewhat evenly */ 2162 /* try to distribute timeouts somewhat evenly */
1895 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2163 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1896 2164
1897 for (;;) 2165 for (;;)
1898 { 2166 {
1900 2168
1901 X_LOCK (reqlock); 2169 X_LOCK (reqlock);
1902 2170
1903 for (;;) 2171 for (;;)
1904 { 2172 {
1905 self->req = req = reqq_shift (&req_queue); 2173 req = reqq_shift (&req_queue);
1906 2174
1907 if (req) 2175 if (req)
1908 break; 2176 break;
1909 2177
1910 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */ 2178 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1948 ++npending; 2216 ++npending;
1949 2217
1950 if (!reqq_push (&res_queue, req) && want_poll_cb) 2218 if (!reqq_push (&res_queue, req) && want_poll_cb)
1951 want_poll_cb (); 2219 want_poll_cb ();
1952 2220
1953 self->req = 0;
1954 etp_worker_clear (self); 2221 etp_worker_clear (self);
1955 2222
1956 X_UNLOCK (reslock); 2223 X_UNLOCK (reslock);
1957 } 2224 }
1958 2225
1959quit: 2226quit:
2227 free (req);
2228
1960 X_LOCK (wrklock); 2229 X_LOCK (wrklock);
1961 etp_worker_free (self); 2230 etp_worker_free (self);
1962 X_UNLOCK (wrklock); 2231 X_UNLOCK (wrklock);
1963 2232
1964 return 0; 2233 return 0;
1967/*****************************************************************************/ 2236/*****************************************************************************/
1968 2237
1969int ecb_cold 2238int ecb_cold
1970eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2239eio_init (void (*want_poll)(void), void (*done_poll)(void))
1971{ 2240{
1972#if !HAVE_PREADWRITE
1973 X_MUTEX_CREATE (preadwritelock);
1974#endif
1975
1976 return etp_init (want_poll, done_poll); 2241 return etp_init (want_poll, done_poll);
1977} 2242}
1978 2243
1979ecb_inline void 2244ecb_inline void
1980eio_api_destroy (eio_req *req) 2245eio_api_destroy (eio_req *req)
1981{ 2246{
1982 free (req); 2247 free (req);
1983} 2248}
1984 2249
1985#define REQ(rtype) \ 2250#define REQ(rtype) \
1986 eio_req *req; \ 2251 eio_req *req; \
1987 \ 2252 \
1988 req = (eio_req *)calloc (1, sizeof *req); \ 2253 req = (eio_req *)calloc (1, sizeof *req); \
1989 if (!req) \ 2254 if (!req) \
1990 return 0; \ 2255 return 0; \
2007 } 2272 }
2008 2273
2009static void 2274static void
2010eio_execute (etp_worker *self, eio_req *req) 2275eio_execute (etp_worker *self, eio_req *req)
2011{ 2276{
2277#if HAVE_AT
2278 int dirfd;
2279#else
2280 const char *path;
2281#endif
2282
2012 if (ecb_expect_false (EIO_CANCELLED (req))) 2283 if (ecb_expect_false (EIO_CANCELLED (req)))
2013 { 2284 {
2014 req->result = -1; 2285 req->result = -1;
2015 req->errorno = ECANCELED; 2286 req->errorno = ECANCELED;
2016 return; 2287 return;
2017 } 2288 }
2018 2289
2290 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2291 {
2292 req->result = -1;
2293 req->errorno = ENOENT;
2294 return;
2295 }
2296
2297 if (req->type >= EIO_OPEN)
2298 {
2299 #if HAVE_AT
2300 dirfd = WD2FD (req->wd);
2301 #else
2302 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2303 #endif
2304 }
2305
2019 switch (req->type) 2306 switch (req->type)
2020 { 2307 {
2308 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2309 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2310 break;
2311 case EIO_WD_CLOSE: req->result = 0;
2312 eio_wd_close_sync (req->wd); break;
2313
2314 case EIO_SEEK: eio__lseek (req); break;
2021 case EIO_READ: ALLOC (req->size); 2315 case EIO_READ: ALLOC (req->size);
2022 req->result = req->offs >= 0 2316 req->result = req->offs >= 0
2023 ? pread (req->int1, req->ptr2, req->size, req->offs) 2317 ? pread (req->int1, req->ptr2, req->size, req->offs)
2024 : read (req->int1, req->ptr2, req->size); break; 2318 : read (req->int1, req->ptr2, req->size); break;
2025 case EIO_WRITE: req->result = req->offs >= 0 2319 case EIO_WRITE: req->result = req->offs >= 0
2026 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2320 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2027 : write (req->int1, req->ptr2, req->size); break; 2321 : write (req->int1, req->ptr2, req->size); break;
2028 2322
2029 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2323 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2030 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2324 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2325
2326#if HAVE_AT
2031 2327
2032 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2328 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2033 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2329 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2034 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2330 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2331 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2332 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2333 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2334 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2335 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2336
2337 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2338 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2339 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2340 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2341 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2342 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2343 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2344 case EIO_READLINK: ALLOC (PATH_MAX);
2345 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2346 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2347 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2348 case EIO_UTIME:
2349 case EIO_FUTIME:
2350 {
2351 struct timespec ts[2];
2352 struct timespec *times;
2353
2354 if (req->nv1 != -1. || req->nv2 != -1.)
2355 {
2356 ts[0].tv_sec = req->nv1;
2357 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2358 ts[1].tv_sec = req->nv2;
2359 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2360
2361 times = ts;
2362 }
2363 else
2364 times = 0;
2365
2366 req->result = req->type == EIO_FUTIME
2367 ? futimens (req->int1, times)
2368 : utimensat (dirfd, req->ptr1, times, 0);
2369 }
2370 break;
2371
2372#else
2373
2374 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2375 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2376 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2035 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2377 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2378 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2379 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2380 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2381 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2382
2383 case EIO_UNLINK: req->result = unlink (path ); break;
2384 case EIO_RMDIR: req->result = rmdir (path ); break;
2385 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2386 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2387 case EIO_LINK: req->result = link (path , req->ptr2); break;
2388 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2389 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2390 case EIO_READLINK: ALLOC (PATH_MAX);
2391 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2392 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2393 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2394
2395 case EIO_UTIME:
2396 case EIO_FUTIME:
2397 {
2398 struct timeval tv[2];
2399 struct timeval *times;
2400
2401 if (req->nv1 != -1. || req->nv2 != -1.)
2402 {
2403 tv[0].tv_sec = req->nv1;
2404 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2405 tv[1].tv_sec = req->nv2;
2406 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2407
2408 times = tv;
2409 }
2410 else
2411 times = 0;
2412
2413 req->result = req->type == EIO_FUTIME
2414 ? futimes (req->int1, times)
2415 : utimes (req->ptr1, times);
2416 }
2417 break;
2418
2419#endif
2420
2421 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2422 {
2423 ALLOC (req->result);
2424 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2425 }
2426 break;
2427
2036 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2428 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2037 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2429 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2038 2430
2039 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2040 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2041 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2431 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2042 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2432 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2043 2433
2044 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2045 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2434 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2046 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2047 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2435 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2048 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2049 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2436 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2050 2437
2051 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2052 case EIO_CLOSE: req->result = close (req->int1); break; 2438 case EIO_CLOSE: req->result = close (req->int1); break;
2053 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2439 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2054 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2055 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2056 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2057 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2058 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2059 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2060 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2061
2062 case EIO_REALPATH: eio__realpath (req, self); break;
2063
2064 case EIO_READLINK: ALLOC (PATH_MAX);
2065 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2066
2067 case EIO_SYNC: req->result = 0; sync (); break; 2440 case EIO_SYNC: req->result = 0; sync (); break;
2068 case EIO_FSYNC: req->result = fsync (req->int1); break; 2441 case EIO_FSYNC: req->result = fsync (req->int1); break;
2069 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2442 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2443 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2444 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2070 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2445 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2071 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2446 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2072 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2447 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2073 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2448 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2074 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2075 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2449 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2076 2450
2077 case EIO_READDIR: eio__scandir (req, self); break; 2451 case EIO_READDIR: eio__scandir (req, self); break;
2078 2452
2079 case EIO_BUSY: 2453 case EIO_BUSY:
2089 req->result = select (0, 0, 0, 0, &tv); 2463 req->result = select (0, 0, 0, 0, &tv);
2090 } 2464 }
2091#endif 2465#endif
2092 break; 2466 break;
2093 2467
2094 case EIO_UTIME:
2095 case EIO_FUTIME:
2096 {
2097 struct timeval tv[2];
2098 struct timeval *times;
2099
2100 if (req->nv1 != -1. || req->nv2 != -1.)
2101 {
2102 tv[0].tv_sec = req->nv1;
2103 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2104 tv[1].tv_sec = req->nv2;
2105 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2106
2107 times = tv;
2108 }
2109 else
2110 times = 0;
2111
2112 req->result = req->type == EIO_FUTIME
2113 ? futimes (req->int1, times)
2114 : utimes (req->ptr1, times);
2115 }
2116 break;
2117
2118 case EIO_GROUP: 2468 case EIO_GROUP:
2119 abort (); /* handled in eio_request */ 2469 abort (); /* handled in eio_request */
2120 2470
2121 case EIO_NOP: 2471 case EIO_NOP:
2122 req->result = 0; 2472 req->result = 0;
2125 case EIO_CUSTOM: 2475 case EIO_CUSTOM:
2126 req->feed (req); 2476 req->feed (req);
2127 break; 2477 break;
2128 2478
2129 default: 2479 default:
2130 errno = ENOSYS;
2131 req->result = -1; 2480 req->result = EIO_ENOSYS ();
2132 break; 2481 break;
2133 } 2482 }
2134 2483
2135 req->errorno = errno; 2484 req->errorno = errno;
2136} 2485}
2137 2486
2138#ifndef EIO_NO_WRAPPERS 2487#ifndef EIO_NO_WRAPPERS
2139 2488
2489eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2490{
2491 REQ (EIO_WD_OPEN); PATH; SEND;
2492}
2493
2494eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2495{
2496 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2497}
2498
2140eio_req *eio_nop (int pri, eio_cb cb, void *data) 2499eio_req *eio_nop (int pri, eio_cb cb, void *data)
2141{ 2500{
2142 REQ (EIO_NOP); SEND; 2501 REQ (EIO_NOP); SEND;
2143} 2502}
2144 2503
2160eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2519eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2161{ 2520{
2162 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2521 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2163} 2522}
2164 2523
2524eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2525{
2526 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2527}
2528
2529eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2530{
2531 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2532}
2533
2534eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2535{
2536 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2537}
2538
2165eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2539eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2166{ 2540{
2167 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2541 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2168} 2542}
2169 2543
2175eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2549eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2176{ 2550{
2177 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2551 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2178} 2552}
2179 2553
2180eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2181{
2182 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2183}
2184
2185eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2554eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2186{ 2555{
2187 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2556 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2188} 2557}
2189 2558
2190eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2191{
2192 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2193}
2194
2195eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2559eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2196{ 2560{
2197 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2561 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2198} 2562}
2199 2563
2200eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2564eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2201{ 2565{
2202 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2566 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2567}
2568
2569eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2570{
2571 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2203} 2572}
2204 2573
2205eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2574eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2206{ 2575{
2207 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2576 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2425/* misc garbage */ 2794/* misc garbage */
2426 2795
2427eio_ssize_t 2796eio_ssize_t
2428eio_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)
2429{ 2798{
2430 etp_worker wrk;
2431 eio_ssize_t ret;
2432
2433 wrk.dbuf = 0;
2434
2435 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2799 return eio__sendfile (ofd, ifd, offset, count);
2436
2437 if (wrk.dbuf)
2438 free (wrk.dbuf);
2439
2440 return ret;
2441} 2800}
2442 2801

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines