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

Comparing libeio/eio.c (file contents):
Revision 1.82 by root, Thu Jul 7 15:44:44 2011 UTC vs.
Revision 1.99 by root, Tue Jul 26 11:07:08 2011 UTC

… …
54#include <stdlib.h> 54#include <stdlib.h>
55#include <string.h> 55#include <string.h>
56#include <errno.h> 56#include <errno.h>
57#include <sys/types.h> 57#include <sys/types.h>
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <sys/statvfs.h>
60#include <limits.h> 59#include <limits.h>
61#include <fcntl.h> 60#include <fcntl.h>
62#include <assert.h> 61#include <assert.h>
63 62
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
… …
68#endif 67#endif
69 68
70#ifndef ECANCELED 69#ifndef ECANCELED
71# define ECANCELED EDOM 70# define ECANCELED EDOM
72#endif 71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
73 79
74static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
75 81
76#ifndef EIO_FINISH 82#ifndef EIO_FINISH
77# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 83# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
… …
83 89
84#ifndef EIO_FEED 90#ifndef EIO_FEED
85# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 91# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
86#endif 92#endif
87 93
94#ifndef EIO_FD_TO_WIN32_HANDLE
95# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
96#endif
97#ifndef EIO_WIN32_HANDLE_TO_FD
98# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
99#endif
100
101#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
102
103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
104
88#ifdef _WIN32 105#ifdef _WIN32
89 106
90 /*doh*/ 107 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */
109
110 #ifdef EIO_STRUCT_STATI64
111 #define stat(path,buf) _stati64 (path,buf)
112 #define fstat(fd,buf) _fstati64 (fd,buf)
113 #endif
114 #define lstat(path,buf) stat (path,buf)
115 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
116 #define mkdir(path,mode) _mkdir (path)
117 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
118
119 #define chmod(path,mode) _chmod (path, mode)
120 #define dup(fd) _dup (fd)
121 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
122
123 #define fchmod(fd,mode) EIO_ENOSYS ()
124 #define chown(path,uid,gid) EIO_ENOSYS ()
125 #define fchown(fd,uid,gid) EIO_ENOSYS ()
126 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
127 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
128 #define mknod(path,mode,dev) EIO_ENOSYS ()
129 #define sync() EIO_ENOSYS ()
130 #define readlink(path,buf,s) EIO_ENOSYS ()
131 #define statvfs(path,buf) EIO_ENOSYS ()
132 #define fstatvfs(fd,buf) EIO_ENOSYS ()
133
134 /* rename() uses MoveFile, which fails to overwrite */
135 #define rename(old,neu) eio__rename (old, neu)
136
137 static int
138 eio__rename (const char *old, const char *neu)
139 {
140 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
141 return 0;
142
143 /* should steal _dosmaperr */
144 switch (GetLastError ())
145 {
146 case ERROR_FILE_NOT_FOUND:
147 case ERROR_PATH_NOT_FOUND:
148 case ERROR_INVALID_DRIVE:
149 case ERROR_NO_MORE_FILES:
150 case ERROR_BAD_NETPATH:
151 case ERROR_BAD_NET_NAME:
152 case ERROR_BAD_PATHNAME:
153 case ERROR_FILENAME_EXCED_RANGE:
154 errno = ENOENT;
155 break;
156
157 default:
158 errno = EACCES;
159 break;
160 }
161
162 return -1;
163 }
164
165 /* we could even stat and see if it exists */
166 static int
167 symlink (const char *old, const char *neu)
168 {
169 #if WINVER >= 0x0600
170 if (CreateSymbolicLink (neu, old, 1))
171 return 0;
172
173 if (CreateSymbolicLink (neu, old, 0))
174 return 0;
175 #endif
176
177 return EIO_ERRNO (ENOENT, -1);
178 }
179
180 /* POSIX API only */
181 #define CreateHardLink(neu,old,flags) 0
182 #define CreateSymbolicLink(neu,old,flags) 0
183
184 struct statvfs
185 {
186 int dummy;
187 };
188
189 #define DT_DIR EIO_DT_DIR
190 #define DT_REG EIO_DT_REG
191 #define D_NAME(entp) entp.cFileName
192 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
193
91#else 194#else
92 195
93# include <sys/time.h> 196 #include <sys/time.h>
94# include <sys/select.h> 197 #include <sys/select.h>
198 #include <sys/statvfs.h>
95# include <unistd.h> 199 #include <unistd.h>
200 #include <signal.h>
201 #include <dirent.h>
202
203 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
204 #include <sys/mman.h>
205 #endif
206
207 #define D_NAME(entp) entp->d_name
208
209 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
210 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
211 #define _DIRENT_HAVE_D_TYPE /* sigh */
212 #define D_INO(de) (de)->d_fileno
213 #define D_NAMLEN(de) (de)->d_namlen
214 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
215 #define D_INO(de) (de)->d_ino
216 #endif
217
218 #ifdef _D_EXACT_NAMLEN
219 #undef D_NAMLEN
220 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
221 #endif
222
223 #ifdef _DIRENT_HAVE_D_TYPE
224 #define D_TYPE(de) (de)->d_type
225 #endif
226
227 #ifndef EIO_STRUCT_DIRENT
228 #define EIO_STRUCT_DIRENT struct dirent
229 #endif
230
231#endif
232
233#if HAVE_UTIMES
96# include <utime.h> 234# include <utime.h>
97# include <signal.h>
98# include <dirent.h>
99
100#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
101# include <sys/mman.h>
102#endif
103
104/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
105# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
106# define _DIRENT_HAVE_D_TYPE /* sigh */
107# define D_INO(de) (de)->d_fileno
108# define D_NAMLEN(de) (de)->d_namlen
109# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
110# define D_INO(de) (de)->d_ino
111# endif 235#endif
112 236
113#ifdef _D_EXACT_NAMLEN 237#if HAVE_SYS_SYSCALL_H
114# undef D_NAMLEN 238# include <sys/syscall.h>
115# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
116#endif
117
118# ifdef _DIRENT_HAVE_D_TYPE
119# define D_TYPE(de) (de)->d_type
120# endif 239#endif
121 240
122# ifndef EIO_STRUCT_DIRENT 241#if HAVE_SYS_PRCTL_H
123# define EIO_STRUCT_DIRENT struct dirent 242# include <sys/prctl.h>
124# endif
125
126#endif 243#endif
127 244
128#if HAVE_SENDFILE 245#if HAVE_SENDFILE
129# if __linux 246# if __linux
130# include <sys/sendfile.h> 247# include <sys/sendfile.h>
… …
145#endif 262#endif
146#ifndef D_INO 263#ifndef D_INO
147# define D_INO(de) 0 264# define D_INO(de) 0
148#endif 265#endif
149#ifndef D_NAMLEN 266#ifndef D_NAMLEN
150# define D_NAMLEN(de) strlen ((de)->d_name) 267# define D_NAMLEN(entp) strlen (D_NAME (entp))
151#endif 268#endif
152 269
153/* used for struct dirent, AIX doesn't provide it */ 270/* used for struct dirent, AIX doesn't provide it */
154#ifndef NAME_MAX 271#ifndef NAME_MAX
155# define NAME_MAX 4096 272# define NAME_MAX 4096
… …
162 279
163/* buffer size for various temporary buffers */ 280/* buffer size for various temporary buffers */
164#define EIO_BUFSIZE 65536 281#define EIO_BUFSIZE 65536
165 282
166#define dBUF \ 283#define dBUF \
167 char *eio_buf; \
168 ETP_WORKER_LOCK (self); \
169 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 284 char *eio_buf = malloc (EIO_BUFSIZE); \
170 ETP_WORKER_UNLOCK (self); \
171 errno = ENOMEM; \ 285 errno = ENOMEM; \
172 if (!eio_buf) \ 286 if (!eio_buf) \
173 return -1; 287 return -1
288
289#define FUBd \
290 free (eio_buf)
174 291
175#define EIO_TICKS ((1000000 + 1023) >> 10) 292#define EIO_TICKS ((1000000 + 1023) >> 10)
176 293
177#define ETP_PRI_MIN EIO_PRI_MIN 294#define ETP_PRI_MIN EIO_PRI_MIN
178#define ETP_PRI_MAX EIO_PRI_MAX 295#define ETP_PRI_MAX EIO_PRI_MAX
… …
184static int eio_finish (eio_req *req); 301static int eio_finish (eio_req *req);
185#define ETP_FINISH(req) eio_finish (req) 302#define ETP_FINISH(req) eio_finish (req)
186static void eio_execute (struct etp_worker *self, eio_req *req); 303static void eio_execute (struct etp_worker *self, eio_req *req);
187#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 304#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
188 305
189#define ETP_WORKER_CLEAR(req) \
190 if (wrk->dbuf) \
191 { \
192 free (wrk->dbuf); \
193 wrk->dbuf = 0; \
194 } \
195 \
196 if (wrk->dirp) \
197 { \
198 closedir (wrk->dirp); \
199 wrk->dirp = 0; \
200 }
201
202#define ETP_WORKER_COMMON \
203 void *dbuf; \
204 DIR *dirp;
205
206/*****************************************************************************/ 306/*****************************************************************************/
207 307
208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 308#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
209 309
210/* calculate time difference in ~1/EIO_TICKS of a second */ 310/* calculate time difference in ~1/EIO_TICKS of a second */
… …
238/* 338/*
239 * make our pread/pwrite emulation safe against themselves, but not against 339 * make our pread/pwrite emulation safe against themselves, but not against
240 * normal read/write by using a mutex. slows down execution a lot, 340 * normal read/write by using a mutex. slows down execution a lot,
241 * but that's your problem, not mine. 341 * but that's your problem, not mine.
242 */ 342 */
243static xmutex_t preadwritelock = X_MUTEX_INIT; 343static xmutex_t preadwritelock;
244#endif 344#endif
245 345
246typedef struct etp_worker 346typedef struct etp_worker
247{ 347{
248 /* locked by wrklock */ 348 /* locked by wrklock */
… …
251 xthread_t tid; 351 xthread_t tid;
252 352
253 /* locked by reslock, reqlock or wrklock */ 353 /* locked by reslock, reqlock or wrklock */
254 ETP_REQ *req; /* currently processed request */ 354 ETP_REQ *req; /* currently processed request */
255 355
356#ifdef ETP_WORKER_COMMON
256 ETP_WORKER_COMMON 357 ETP_WORKER_COMMON
358#endif
257} etp_worker; 359} etp_worker;
258 360
259static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 361static etp_worker wrk_first; /* NOT etp */
260 362
261#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 363#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
262#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 364#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
263 365
264/* worker threads management */ 366/* worker threads management */
265 367
266static void ecb_cold 368static void ecb_cold
267etp_worker_clear (etp_worker *wrk) 369etp_worker_clear (etp_worker *wrk)
268{ 370{
269 ETP_WORKER_CLEAR (wrk);
270} 371}
271 372
272static void ecb_cold 373static void ecb_cold
273etp_worker_free (etp_worker *wrk) 374etp_worker_free (etp_worker *wrk)
274{ 375{
… …
335} etp_reqq; 436} etp_reqq;
336 437
337static etp_reqq req_queue; 438static etp_reqq req_queue;
338static etp_reqq res_queue; 439static etp_reqq res_queue;
339 440
441static void ecb_noinline ecb_cold
442reqq_init (etp_reqq *q)
443{
444 int pri;
445
446 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
447 q->qs[pri] = q->qe[pri] = 0;
448
449 q->size = 0;
450}
451
340static int ecb_noinline 452static int ecb_noinline
341reqq_push (etp_reqq *q, ETP_REQ *req) 453reqq_push (etp_reqq *q, ETP_REQ *req)
342{ 454{
343 int pri = req->pri; 455 int pri = req->pri;
344 req->next = 0; 456 req->next = 0;
… …
378 } 490 }
379 491
380 abort (); 492 abort ();
381} 493}
382 494
383static void ecb_cold 495static int ecb_cold
384etp_thread_init (void) 496etp_init (void (*want_poll)(void), void (*done_poll)(void))
385{ 497{
386 X_MUTEX_CREATE (wrklock); 498 X_MUTEX_CREATE (wrklock);
387 X_MUTEX_CREATE (reslock); 499 X_MUTEX_CREATE (reslock);
388 X_MUTEX_CREATE (reqlock); 500 X_MUTEX_CREATE (reqlock);
389 X_COND_CREATE (reqwait); 501 X_COND_CREATE (reqwait);
390}
391 502
392static void ecb_cold 503 reqq_init (&req_queue);
393etp_atfork_prepare (void) 504 reqq_init (&res_queue);
394{
395 X_LOCK (wrklock);
396 X_LOCK (reqlock);
397 X_LOCK (reslock);
398#if !HAVE_PREADWRITE
399 X_LOCK (preadwritelock);
400#endif
401}
402 505
403static void ecb_cold 506 wrk_first.next =
404etp_atfork_parent (void) 507 wrk_first.prev = &wrk_first;
405{
406#if !HAVE_PREADWRITE
407 X_UNLOCK (preadwritelock);
408#endif
409 X_UNLOCK (reslock);
410 X_UNLOCK (reqlock);
411 X_UNLOCK (wrklock);
412}
413
414static void ecb_cold
415etp_atfork_child (void)
416{
417 ETP_REQ *prv;
418
419 while ((prv = reqq_shift (&req_queue)))
420 ETP_DESTROY (prv);
421
422 while ((prv = reqq_shift (&res_queue)))
423 ETP_DESTROY (prv);
424
425 while (wrk_first.next != &wrk_first)
426 {
427 etp_worker *wrk = wrk_first.next;
428
429 if (wrk->req)
430 ETP_DESTROY (wrk->req);
431
432 etp_worker_clear (wrk);
433 etp_worker_free (wrk);
434 }
435 508
436 started = 0; 509 started = 0;
437 idle = 0; 510 idle = 0;
438 nreqs = 0; 511 nreqs = 0;
439 nready = 0; 512 nready = 0;
440 npending = 0; 513 npending = 0;
441
442 etp_thread_init ();
443}
444
445static void ecb_cold
446etp_once_init (void)
447{
448 etp_thread_init ();
449 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
450}
451
452static int ecb_cold
453etp_init (void (*want_poll)(void), void (*done_poll)(void))
454{
455 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
456
457 pthread_once (&doinit, etp_once_init);
458 514
459 want_poll_cb = want_poll; 515 want_poll_cb = want_poll;
460 done_poll_cb = done_poll; 516 done_poll_cb = done_poll;
461 517
462 return 0; 518 return 0;
… …
845# undef pread 901# undef pread
846# undef pwrite 902# undef pwrite
847# define pread eio__pread 903# define pread eio__pread
848# define pwrite eio__pwrite 904# define pwrite eio__pwrite
849 905
850static ssize_t 906static eio_ssize_t
851eio__pread (int fd, void *buf, size_t count, off_t offset) 907eio__pread (int fd, void *buf, size_t count, off_t offset)
852{ 908{
853 ssize_t res; 909 eio_ssize_t res;
854 off_t ooffset; 910 off_t ooffset;
855 911
856 X_LOCK (preadwritelock); 912 X_LOCK (preadwritelock);
857 ooffset = lseek (fd, 0, SEEK_CUR); 913 ooffset = lseek (fd, 0, SEEK_CUR);
858 lseek (fd, offset, SEEK_SET); 914 lseek (fd, offset, SEEK_SET);
… …
861 X_UNLOCK (preadwritelock); 917 X_UNLOCK (preadwritelock);
862 918
863 return res; 919 return res;
864} 920}
865 921
866static ssize_t 922static eio_ssize_t
867eio__pwrite (int fd, void *buf, size_t count, off_t offset) 923eio__pwrite (int fd, void *buf, size_t count, off_t offset)
868{ 924{
869 ssize_t res; 925 eio_ssize_t res;
870 off_t ooffset; 926 off_t ooffset;
871 927
872 X_LOCK (preadwritelock); 928 X_LOCK (preadwritelock);
873 ooffset = lseek (fd, 0, SEEK_CUR); 929 ooffset = lseek (fd, 0, SEEK_CUR);
874 lseek (fd, offset, SEEK_SET); 930 lseek (fd, offset, SEEK_SET);
… …
919 975
920#if !HAVE_FDATASYNC 976#if !HAVE_FDATASYNC
921# undef fdatasync 977# undef fdatasync
922# define fdatasync(fd) fsync (fd) 978# define fdatasync(fd) fsync (fd)
923#endif 979#endif
980
981static int
982eio__syncfs (int fd)
983{
984 int res;
985
986#if HAVE_SYS_SYNCFS
987 res = (int)syscall (__NR_syncfs, (int)(fd));
988#else
989 res = -1;
990 errno = ENOSYS;
991#endif
992
993 if (res < 0 && errno == ENOSYS && fd >= 0)
994 sync ();
995
996 return res;
997}
924 998
925/* sync_file_range always needs emulation */ 999/* sync_file_range always needs emulation */
926static int 1000static int
927eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1001eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
928{ 1002{
… …
948 /* even though we could play tricks with the flags, it's better to always 1022 /* even though we could play tricks with the flags, it's better to always
949 * call fdatasync, as that matches the expectation of its users best */ 1023 * call fdatasync, as that matches the expectation of its users best */
950 return fdatasync (fd); 1024 return fdatasync (fd);
951} 1025}
952 1026
1027static int
1028eio__fallocate (int fd, int mode, off_t offset, size_t len)
1029{
1030#if HAVE_FALLOCATE
1031 return fallocate (fd, mode, offset, len);
1032#else
1033 errno = ENOSYS;
1034 return -1;
1035#endif
1036}
1037
953#if !HAVE_READAHEAD 1038#if !HAVE_READAHEAD
954# undef readahead 1039# undef readahead
955# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1040# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
956 1041
957static ssize_t 1042static eio_ssize_t
958eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1043eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
959{ 1044{
960 size_t todo = count; 1045 size_t todo = count;
961 dBUF; 1046 dBUF;
962 1047
… …
967 pread (fd, eio_buf, len, offset); 1052 pread (fd, eio_buf, len, offset);
968 offset += len; 1053 offset += len;
969 todo -= len; 1054 todo -= len;
970 } 1055 }
971 1056
1057 FUBd;
1058
972 errno = 0; 1059 errno = 0;
973 return count; 1060 return count;
974} 1061}
975 1062
976#endif 1063#endif
977 1064
978/* sendfile always needs emulation */ 1065/* sendfile always needs emulation */
979static ssize_t 1066static eio_ssize_t
980eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1067eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
981{ 1068{
982 ssize_t written = 0; 1069 eio_ssize_t written = 0;
983 ssize_t res; 1070 eio_ssize_t res;
984 1071
985 if (!count) 1072 if (!count)
986 return 0; 1073 return 0;
987 1074
988 for (;;) 1075 for (;;)
… …
1040 if (res < 0 && sbytes) 1127 if (res < 0 && sbytes)
1041 res = sbytes; 1128 res = sbytes;
1042 1129
1043# endif 1130# endif
1044 1131
1045#elif defined (_WIN32) 1132#elif defined (_WIN32) && 0
1046 /* does not work, just for documentation of what would need to be done */ 1133 /* does not work, just for documentation of what would need to be done */
1047 /* actually, cannot be done like this, as TransmitFile changes the file offset, */ 1134 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1048 /* libeio guarantees that the file offset does not change, and windows */ 1135 /* libeio guarantees that the file offset does not change, and windows */
1049 /* has no way to get an independent handle to the same file description */ 1136 /* has no way to get an independent handle to the same file description */
1050 HANDLE h = TO_SOCKET (ifd); 1137 HANDLE h = TO_SOCKET (ifd);
… …
1083 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1170 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1084 /* BSDs */ 1171 /* BSDs */
1085#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1172#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1086 || errno == ENOTSUP 1173 || errno == ENOTSUP
1087#endif 1174#endif
1175#ifdef EOPNOTSUPP /* windows */
1088 || errno == EOPNOTSUPP /* BSDs */ 1176 || errno == EOPNOTSUPP /* BSDs */
1177#endif
1089#if __solaris 1178#if __solaris
1090 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1179 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1091#endif 1180#endif
1092 ) 1181 )
1093 ) 1182 )
… …
1097 1186
1098 res = 0; 1187 res = 0;
1099 1188
1100 while (count) 1189 while (count)
1101 { 1190 {
1102 ssize_t cnt; 1191 eio_ssize_t cnt;
1103 1192
1104 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1193 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1105 1194
1106 if (cnt <= 0) 1195 if (cnt <= 0)
1107 { 1196 {
… …
1119 1208
1120 offset += cnt; 1209 offset += cnt;
1121 res += cnt; 1210 res += cnt;
1122 count -= cnt; 1211 count -= cnt;
1123 } 1212 }
1213
1214 FUBd;
1124 } 1215 }
1125 1216
1126 return res; 1217 return res;
1127} 1218}
1128 1219
… …
1155 /* round up length */ 1246 /* round up length */
1156 *length = (*length + mask) & ~mask; 1247 *length = (*length + mask) & ~mask;
1157} 1248}
1158 1249
1159#if !_POSIX_MEMLOCK 1250#if !_POSIX_MEMLOCK
1160# define eio__mlockall(a) ((errno = ENOSYS), -1) 1251# define eio__mlockall(a) EIO_ENOSYS ()
1161#else 1252#else
1162 1253
1163static int 1254static int
1164eio__mlockall (int flags) 1255eio__mlockall (int flags)
1165{ 1256{
… …
1179 return mlockall (flags); 1270 return mlockall (flags);
1180} 1271}
1181#endif 1272#endif
1182 1273
1183#if !_POSIX_MEMLOCK_RANGE 1274#if !_POSIX_MEMLOCK_RANGE
1184# define eio__mlock(a,b) ((errno = ENOSYS), -1) 1275# define eio__mlock(a,b) EIO_ENOSYS ()
1185#else 1276#else
1186 1277
1187static int 1278static int
1188eio__mlock (void *addr, size_t length) 1279eio__mlock (void *addr, size_t length)
1189{ 1280{
… …
1193} 1284}
1194 1285
1195#endif 1286#endif
1196 1287
1197#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1288#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1198# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1289# define eio__msync(a,b,c) EIO_ENOSYS ()
1199#else 1290#else
1200 1291
1201static int 1292static int
1202eio__msync (void *mem, size_t len, int flags) 1293eio__msync (void *mem, size_t len, int flags)
1203{ 1294{
… …
1315 res += strlen (res); 1406 res += strlen (res);
1316 } 1407 }
1317 1408
1318 while (*rel) 1409 while (*rel)
1319 { 1410 {
1320 ssize_t len, linklen; 1411 eio_ssize_t len, linklen;
1321 char *beg = rel; 1412 char *beg = rel;
1322 1413
1323 while (*rel && *rel != '/') 1414 while (*rel && *rel != '/')
1324 ++rel; 1415 ++rel;
1325 1416
… …
1418 1509
1419#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1510#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1420#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1511#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1421 1512
1422static void 1513static void
1423eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1514eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1424{ 1515{
1425 unsigned char bits [9 + sizeof (ino_t) * 8]; 1516 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1426 unsigned char *bit = bits; 1517 unsigned char *bit = bits;
1427 1518
1428 assert (CHAR_BIT == 8); 1519 assert (CHAR_BIT == 8);
1429 assert (sizeof (eio_dirent) * 8 < 256); 1520 assert (sizeof (eio_dirent) * 8 < 256);
1430 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1521 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1432 1523
1433 if (size <= EIO_SORT_FAST) 1524 if (size <= EIO_SORT_FAST)
1434 return; 1525 return;
1435 1526
1436 /* first prepare an array of bits to test in our radix sort */ 1527 /* first prepare an array of bits to test in our radix sort */
1437 /* try to take endianness into account, as well as differences in ino_t sizes */ 1528 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1438 /* inode_bits must contain all inodes ORed together */ 1529 /* inode_bits must contain all inodes ORed together */
1439 /* which is used to skip bits that are 0 everywhere, which is very common */ 1530 /* which is used to skip bits that are 0 everywhere, which is very common */
1440 { 1531 {
1441 ino_t endianness; 1532 eio_ino_t endianness;
1442 int i, j; 1533 int i, j;
1443 1534
1444 /* we store the byte offset of byte n into byte n of "endianness" */ 1535 /* we store the byte offset of byte n into byte n of "endianness" */
1445 for (i = 0; i < sizeof (ino_t); ++i) 1536 for (i = 0; i < sizeof (eio_ino_t); ++i)
1446 ((unsigned char *)&endianness)[i] = i; 1537 ((unsigned char *)&endianness)[i] = i;
1447 1538
1448 *bit++ = 0; 1539 *bit++ = 0;
1449 1540
1450 for (i = 0; i < sizeof (ino_t); ++i) 1541 for (i = 0; i < sizeof (eio_ino_t); ++i)
1451 { 1542 {
1452 /* shifting off the byte offsets out of "endianness" */ 1543 /* shifting off the byte offsets out of "endianness" */
1453 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1544 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1454 endianness >>= 8; 1545 endianness >>= 8;
1455 1546
1456 for (j = 0; j < 8; ++j) 1547 for (j = 0; j < 8; ++j)
1457 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1548 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1458 *bit++ = offs + j; 1549 *bit++ = offs + j;
1459 } 1550 }
1460 1551
1461 for (j = 0; j < 8; ++j) 1552 for (j = 0; j < 8; ++j)
1462 if (score_bits & (1 << j)) 1553 if (score_bits & (1 << j))
1463 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1554 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1464 } 1555 }
1465 1556
1466 /* now actually do the sorting (a variant of MSD radix sort) */ 1557 /* now actually do the sorting (a variant of MSD radix sort) */
1467 { 1558 {
1468 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1559 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1469 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1560 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1470 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1561 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1471 int stk_idx = 0; 1562 int stk_idx = 0;
1472 1563
1473 base_stk [stk_idx] = dents; 1564 base_stk [stk_idx] = dents;
1474 end_stk [stk_idx] = dents + size; 1565 end_stk [stk_idx] = dents + size;
1475 bit_stk [stk_idx] = bit - 1; 1566 bit_stk [stk_idx] = bit - 1;
… …
1554 } 1645 }
1555 } 1646 }
1556} 1647}
1557 1648
1558static void 1649static void
1559eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1650eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1560{ 1651{
1561 if (size <= 1) 1652 if (size <= 1)
1562 return; /* our insertion sort relies on size > 0 */ 1653 return; /* our insertion sort relies on size > 0 */
1563 1654
1564 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1655 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1572 1663
1573/* read a full directory */ 1664/* read a full directory */
1574static void 1665static void
1575eio__scandir (eio_req *req, etp_worker *self) 1666eio__scandir (eio_req *req, etp_worker *self)
1576{ 1667{
1577 DIR *dirp;
1578 EIO_STRUCT_DIRENT *entp;
1579 char *name, *names; 1668 char *name, *names;
1580 int namesalloc = 4096; 1669 int namesalloc = 4096 - sizeof (void *) * 4;
1581 int namesoffs = 0; 1670 int namesoffs = 0;
1582 int flags = req->int1; 1671 int flags = req->int1;
1583 eio_dirent *dents = 0; 1672 eio_dirent *dents = 0;
1584 int dentalloc = 128; 1673 int dentalloc = 128;
1585 int dentoffs = 0; 1674 int dentoffs = 0;
1586 ino_t inode_bits = 0; 1675 eio_ino_t inode_bits = 0;
1676#ifdef _WIN32
1677 HANDLE dirp;
1678 WIN32_FIND_DATA entp;
1679#else
1680 DIR *dirp;
1681 EIO_STRUCT_DIRENT *entp;
1682#endif
1587 1683
1588 req->result = -1; 1684 req->result = -1;
1589 1685
1590 if (!(flags & EIO_READDIR_DENTS)) 1686 if (!(flags & EIO_READDIR_DENTS))
1591 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1687 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1592 1688
1593 X_LOCK (wrklock); 1689#ifdef _WIN32
1594 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1690 {
1691 int len = strlen ((const char *)req->ptr1);
1692 char *path = malloc (MAX_PATH);
1693 const char *fmt;
1694
1695 if (!len)
1696 fmt = "./*";
1697 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1698 fmt = "%s*";
1699 else
1700 fmt = "%s/*";
1701
1702 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1703 dirp = FindFirstFile (path, &entp);
1704 free (path);
1705
1706 if (dirp == INVALID_HANDLE_VALUE)
1707 {
1708 dirp = 0;
1709
1710 /* should steal _dosmaperr */
1711 switch (GetLastError ())
1712 {
1713 case ERROR_FILE_NOT_FOUND:
1714 req->result = 0;
1715 break;
1716
1717 case ERROR_INVALID_NAME:
1718 case ERROR_PATH_NOT_FOUND:
1719 case ERROR_NO_MORE_FILES:
1720 errno = ENOENT;
1721 break;
1722
1723 case ERROR_NOT_ENOUGH_MEMORY:
1724 errno = ENOMEM;
1725 break;
1726
1727 default:
1728 errno = EINVAL;
1729 break;
1730 }
1731 }
1732 }
1733#else
1595 self->dirp = dirp = opendir (req->ptr1); 1734 dirp = opendir (req->ptr1);
1735#endif
1596 1736
1597 if (req->flags & EIO_FLAG_PTR1_FREE) 1737 if (req->flags & EIO_FLAG_PTR1_FREE)
1598 free (req->ptr1); 1738 free (req->ptr1);
1599 1739
1600 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1740 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1601 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1741 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1602 req->ptr2 = names = malloc (namesalloc); 1742 req->ptr2 = names = malloc (namesalloc);
1603 X_UNLOCK (wrklock);
1604 1743
1605 if (dirp && names && (!flags || dents)) 1744 if (dirp && names && (!flags || dents))
1606 for (;;) 1745 for (;;)
1607 { 1746 {
1747 int done;
1748
1749#ifdef _WIN32
1750 done = !dirp;
1751#else
1608 errno = 0; 1752 errno = 0;
1609 entp = readdir (dirp); 1753 entp = readdir (dirp);
1754 done = !entp;
1755#endif
1610 1756
1611 if (!entp) 1757 if (done)
1612 { 1758 {
1759#ifndef _WIN32
1760 int old_errno = errno;
1761 closedir (dirp);
1762 errno = old_errno;
1763
1613 if (errno) 1764 if (errno)
1614 break; 1765 break;
1766#endif
1615 1767
1616 /* sort etc. */ 1768 /* sort etc. */
1617 req->int1 = flags; 1769 req->int1 = flags;
1618 req->result = dentoffs; 1770 req->result = dentoffs;
1619 1771
… …
1648 1800
1649 break; 1801 break;
1650 } 1802 }
1651 1803
1652 /* now add the entry to our list(s) */ 1804 /* now add the entry to our list(s) */
1653 name = entp->d_name; 1805 name = D_NAME (entp);
1654 1806
1655 /* skip . and .. entries */ 1807 /* skip . and .. entries */
1656 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1808 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1657 { 1809 {
1658 int len = D_NAMLEN (entp) + 1; 1810 int len = D_NAMLEN (entp) + 1;
1659 1811
1660 while (ecb_expect_false (namesoffs + len > namesalloc)) 1812 while (ecb_expect_false (namesoffs + len > namesalloc))
1661 { 1813 {
1662 namesalloc *= 2; 1814 namesalloc *= 2;
1663 X_LOCK (wrklock);
1664 req->ptr2 = names = realloc (names, namesalloc); 1815 req->ptr2 = names = realloc (names, namesalloc);
1665 X_UNLOCK (wrklock);
1666 1816
1667 if (!names) 1817 if (!names)
1668 break; 1818 break;
1669 } 1819 }
1670 1820
… …
1675 struct eio_dirent *ent; 1825 struct eio_dirent *ent;
1676 1826
1677 if (ecb_expect_false (dentoffs == dentalloc)) 1827 if (ecb_expect_false (dentoffs == dentalloc))
1678 { 1828 {
1679 dentalloc *= 2; 1829 dentalloc *= 2;
1680 X_LOCK (wrklock);
1681 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1830 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1682 X_UNLOCK (wrklock);
1683 1831
1684 if (!dents) 1832 if (!dents)
1685 break; 1833 break;
1686 } 1834 }
1687 1835
… …
1767 if (EIO_CANCELLED (req)) 1915 if (EIO_CANCELLED (req))
1768 { 1916 {
1769 errno = ECANCELED; 1917 errno = ECANCELED;
1770 break; 1918 break;
1771 } 1919 }
1920
1921#ifdef _WIN32
1922 if (!FindNextFile (dirp, &entp))
1923 {
1924 FindClose (dirp);
1925 dirp = 0;
1926 }
1927#endif
1772 } 1928 }
1773} 1929}
1774 1930
1775/*****************************************************************************/ 1931/*****************************************************************************/
1776 1932
… …
1793{ 1949{
1794 ETP_REQ *req; 1950 ETP_REQ *req;
1795 struct timespec ts; 1951 struct timespec ts;
1796 etp_worker *self = (etp_worker *)thr_arg; 1952 etp_worker *self = (etp_worker *)thr_arg;
1797 1953
1954#if HAVE_PRCTL_SET_NAME
1955 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1956#endif
1957
1798 /* try to distribute timeouts somewhat randomly */ 1958 /* try to distribute timeouts somewhat evenly */
1799 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1959 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1800 1960
1801 for (;;) 1961 for (;;)
1802 { 1962 {
1963 ts.tv_sec = 0;
1964
1803 X_LOCK (reqlock); 1965 X_LOCK (reqlock);
1804 1966
1805 for (;;) 1967 for (;;)
1806 { 1968 {
1807 self->req = req = reqq_shift (&req_queue); 1969 self->req = req = reqq_shift (&req_queue);
1808 1970
1809 if (req) 1971 if (req)
1810 break; 1972 break;
1811 1973
1974 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1975 {
1976 X_UNLOCK (reqlock);
1977 X_LOCK (wrklock);
1978 --started;
1979 X_UNLOCK (wrklock);
1980 goto quit;
1981 }
1982
1812 ++idle; 1983 ++idle;
1813 1984
1814 ts.tv_sec = time (0) + idle_timeout; 1985 if (idle <= max_idle)
1815 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1986 /* we are allowed to idle, so do so without any timeout */
1987 X_COND_WAIT (reqwait, reqlock);
1988 else
1816 { 1989 {
1817 if (idle > max_idle) 1990 /* initialise timeout once */
1818 { 1991 if (!ts.tv_sec)
1819 --idle; 1992 ts.tv_sec = time (0) + idle_timeout;
1820 X_UNLOCK (reqlock);
1821 X_LOCK (wrklock);
1822 --started;
1823 X_UNLOCK (wrklock);
1824 goto quit;
1825 }
1826 1993
1827 /* we are allowed to idle, so do so without any timeout */
1828 X_COND_WAIT (reqwait, reqlock); 1994 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1995 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1829 } 1996 }
1830 1997
1831 --idle; 1998 --idle;
1832 } 1999 }
1833 2000
… …
1864/*****************************************************************************/ 2031/*****************************************************************************/
1865 2032
1866int ecb_cold 2033int ecb_cold
1867eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2034eio_init (void (*want_poll)(void), void (*done_poll)(void))
1868{ 2035{
2036#if !HAVE_PREADWRITE
2037 X_MUTEX_CREATE (preadwritelock);
2038#endif
2039
1869 return etp_init (want_poll, done_poll); 2040 return etp_init (want_poll, done_poll);
1870} 2041}
1871 2042
1872ecb_inline void 2043ecb_inline void
1873eio_api_destroy (eio_req *req) 2044eio_api_destroy (eio_req *req)
… …
1918 case EIO_WRITE: req->result = req->offs >= 0 2089 case EIO_WRITE: req->result = req->offs >= 0
1919 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2090 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1920 : write (req->int1, req->ptr2, req->size); break; 2091 : write (req->int1, req->ptr2, req->size); break;
1921 2092
1922 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2093 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1923 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2094 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1924 2095
1925 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2096 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1926 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2097 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1927 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2098 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1928 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2099 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
… …
1958 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2129 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1959 2130
1960 case EIO_SYNC: req->result = 0; sync (); break; 2131 case EIO_SYNC: req->result = 0; sync (); break;
1961 case EIO_FSYNC: req->result = fsync (req->int1); break; 2132 case EIO_FSYNC: req->result = fsync (req->int1); break;
1962 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2133 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2134 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2135 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1963 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2136 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1964 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2137 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1965 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2138 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1966 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2139 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1967 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2140 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1968 2141
1969 case EIO_READDIR: eio__scandir (req, self); break; 2142 case EIO_READDIR: eio__scandir (req, self); break;
1970 2143
1971 case EIO_BUSY: 2144 case EIO_BUSY:
1972#ifdef _WIN32 2145#ifdef _WIN32
… …
2052eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2225eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2053{ 2226{
2054 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2227 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2055} 2228}
2056 2229
2230eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2231{
2232 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2233}
2234
2235eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2236{
2237 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2238}
2239
2240eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2241{
2242 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2243}
2244
2057eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2245eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2058{ 2246{
2059 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2247 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2060} 2248}
2061 2249
… …
2067eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2255eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2068{ 2256{
2069 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2257 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2070} 2258}
2071 2259
2072eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2260eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2073{ 2261{
2074 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2262 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2075}
2076
2077eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2078{
2079 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2080} 2263}
2081 2264
2082eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2265eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2083{ 2266{
2084 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2267 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
2122eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2305eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
2123{ 2306{
2124 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2307 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2125} 2308}
2126 2309
2127eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2310eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2128{ 2311{
2129 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2312 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2130} 2313}
2131 2314
2132eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2315eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
2152eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2335eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
2153{ 2336{
2154 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2337 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2155} 2338}
2156 2339
2157eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2340eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2158{ 2341{
2159 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2342 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2160} 2343}
2161 2344
2162eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2345eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
2309} 2492}
2310 2493
2311/*****************************************************************************/ 2494/*****************************************************************************/
2312/* misc garbage */ 2495/* misc garbage */
2313 2496
2314ssize_t 2497eio_ssize_t
2315eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2498eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2316{ 2499{
2317 etp_worker wrk;
2318 ssize_t ret;
2319
2320 wrk.dbuf = 0;
2321
2322 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2500 return eio__sendfile (ofd, ifd, offset, count);
2323
2324 if (wrk.dbuf)
2325 free (wrk.dbuf);
2326
2327 return ret;
2328} 2501}
2329 2502

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines