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

Comparing libeio/eio.c (file contents):
Revision 1.83 by root, Thu Jul 7 22:36:18 2011 UTC vs.
Revision 1.101 by root, Wed Aug 3 15:25:38 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 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111
112 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */
114 #define stat(path,buf) _stati64 (path,buf)
115 #define fstat(fd,buf) _fstati64 (fd,buf)
116 #endif
117 #define lstat(path,buf) stat (path,buf)
118 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
119 #define mkdir(path,mode) _mkdir (path)
120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
121
122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125
126 #define fchmod(fd,mode) EIO_ENOSYS ()
127 #define chown(path,uid,gid) EIO_ENOSYS ()
128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
131 #define mknod(path,mode,dev) EIO_ENOSYS ()
132 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS ()
136
137 /* rename() uses MoveFile, which fails to overwrite */
138 #define rename(old,neu) eio__rename (old, neu)
139
140 static int
141 eio__rename (const char *old, const char *neu)
142 {
143 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
144 return 0;
145
146 /* should steal _dosmaperr */
147 switch (GetLastError ())
148 {
149 case ERROR_FILE_NOT_FOUND:
150 case ERROR_PATH_NOT_FOUND:
151 case ERROR_INVALID_DRIVE:
152 case ERROR_NO_MORE_FILES:
153 case ERROR_BAD_NETPATH:
154 case ERROR_BAD_NET_NAME:
155 case ERROR_BAD_PATHNAME:
156 case ERROR_FILENAME_EXCED_RANGE:
157 errno = ENOENT;
158 break;
159
160 default:
161 errno = EACCES;
162 break;
163 }
164
165 return -1;
166 }
167
168 /* we could even stat and see if it exists */
169 static int
170 symlink (const char *old, const char *neu)
171 {
172 #if WINVER >= 0x0600
173 if (CreateSymbolicLink (neu, old, 1))
174 return 0;
175
176 if (CreateSymbolicLink (neu, old, 0))
177 return 0;
178 #endif
179
180 return EIO_ERRNO (ENOENT, -1);
181 }
182
183 /* POSIX API only */
184 #define CreateHardLink(neu,old,flags) 0
185 #define CreateSymbolicLink(neu,old,flags) 0
186
187 struct statvfs
188 {
189 int dummy;
190 };
191
192 #define DT_DIR EIO_DT_DIR
193 #define DT_REG EIO_DT_REG
194 #define D_NAME(entp) entp.cFileName
195 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
196
91#else 197#else
92 198
93# include <sys/time.h> 199 #include <sys/time.h>
94# include <sys/select.h> 200 #include <sys/select.h>
201 #include <sys/statvfs.h>
95# include <unistd.h> 202 #include <unistd.h>
203 #include <signal.h>
204 #include <dirent.h>
205
206 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
207 #include <sys/mman.h>
208 #endif
209
210 #define D_NAME(entp) entp->d_name
211
212 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
213 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
214 #define _DIRENT_HAVE_D_TYPE /* sigh */
215 #define D_INO(de) (de)->d_fileno
216 #define D_NAMLEN(de) (de)->d_namlen
217 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
218 #define D_INO(de) (de)->d_ino
219 #endif
220
221 #ifdef _D_EXACT_NAMLEN
222 #undef D_NAMLEN
223 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
224 #endif
225
226 #ifdef _DIRENT_HAVE_D_TYPE
227 #define D_TYPE(de) (de)->d_type
228 #endif
229
230 #ifndef EIO_STRUCT_DIRENT
231 #define EIO_STRUCT_DIRENT struct dirent
232 #endif
233
234#endif
235
236#if HAVE_UTIMES
96# include <utime.h> 237# 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 238#endif
112 239
113#ifdef _D_EXACT_NAMLEN 240#if HAVE_SYS_SYSCALL_H
114# undef D_NAMLEN 241# 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 242#endif
121 243
122# ifndef EIO_STRUCT_DIRENT 244#if HAVE_SYS_PRCTL_H
123# define EIO_STRUCT_DIRENT struct dirent 245# include <sys/prctl.h>
124# endif
125
126#endif 246#endif
127 247
128#if HAVE_SENDFILE 248#if HAVE_SENDFILE
129# if __linux 249# if __linux
130# include <sys/sendfile.h> 250# include <sys/sendfile.h>
… …
145#endif 265#endif
146#ifndef D_INO 266#ifndef D_INO
147# define D_INO(de) 0 267# define D_INO(de) 0
148#endif 268#endif
149#ifndef D_NAMLEN 269#ifndef D_NAMLEN
150# define D_NAMLEN(de) strlen ((de)->d_name) 270# define D_NAMLEN(entp) strlen (D_NAME (entp))
151#endif 271#endif
152 272
153/* used for struct dirent, AIX doesn't provide it */ 273/* used for struct dirent, AIX doesn't provide it */
154#ifndef NAME_MAX 274#ifndef NAME_MAX
155# define NAME_MAX 4096 275# define NAME_MAX 4096
… …
162 282
163/* buffer size for various temporary buffers */ 283/* buffer size for various temporary buffers */
164#define EIO_BUFSIZE 65536 284#define EIO_BUFSIZE 65536
165 285
166#define dBUF \ 286#define dBUF \
167 char *eio_buf; \
168 ETP_WORKER_LOCK (self); \
169 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 287 char *eio_buf = malloc (EIO_BUFSIZE); \
170 ETP_WORKER_UNLOCK (self); \
171 errno = ENOMEM; \ 288 errno = ENOMEM; \
172 if (!eio_buf) \ 289 if (!eio_buf) \
173 return -1; 290 return -1
291
292#define FUBd \
293 free (eio_buf)
174 294
175#define EIO_TICKS ((1000000 + 1023) >> 10) 295#define EIO_TICKS ((1000000 + 1023) >> 10)
176 296
177#define ETP_PRI_MIN EIO_PRI_MIN 297#define ETP_PRI_MIN EIO_PRI_MIN
178#define ETP_PRI_MAX EIO_PRI_MAX 298#define ETP_PRI_MAX EIO_PRI_MAX
… …
184static int eio_finish (eio_req *req); 304static int eio_finish (eio_req *req);
185#define ETP_FINISH(req) eio_finish (req) 305#define ETP_FINISH(req) eio_finish (req)
186static void eio_execute (struct etp_worker *self, eio_req *req); 306static void eio_execute (struct etp_worker *self, eio_req *req);
187#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 307#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
188 308
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/*****************************************************************************/ 309/*****************************************************************************/
207 310
208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 311#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
209 312
210/* calculate time difference in ~1/EIO_TICKS of a second */ 313/* calculate time difference in ~1/EIO_TICKS of a second */
… …
221static void (*done_poll_cb) (void); 324static void (*done_poll_cb) (void);
222 325
223static unsigned int max_poll_time; /* reslock */ 326static unsigned int max_poll_time; /* reslock */
224static unsigned int max_poll_reqs; /* reslock */ 327static unsigned int max_poll_reqs; /* reslock */
225 328
226static volatile unsigned int nreqs; /* reqlock */ 329static unsigned int nreqs; /* reqlock */
227static volatile unsigned int nready; /* reqlock */ 330static unsigned int nready; /* reqlock */
228static volatile unsigned int npending; /* reqlock */ 331static unsigned int npending; /* reqlock */
229static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 332static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
230static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */ 333static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
231 334
232static xmutex_t wrklock; 335static xmutex_t wrklock;
233static xmutex_t reslock; 336static xmutex_t reslock;
234static xmutex_t reqlock; 337static xmutex_t reqlock;
235static xcond_t reqwait; 338static xcond_t reqwait;
… …
238/* 341/*
239 * make our pread/pwrite emulation safe against themselves, but not against 342 * make our pread/pwrite emulation safe against themselves, but not against
240 * normal read/write by using a mutex. slows down execution a lot, 343 * normal read/write by using a mutex. slows down execution a lot,
241 * but that's your problem, not mine. 344 * but that's your problem, not mine.
242 */ 345 */
243static xmutex_t preadwritelock = X_MUTEX_INIT; 346static xmutex_t preadwritelock;
244#endif 347#endif
245 348
246typedef struct etp_worker 349typedef struct etp_worker
247{ 350{
248 /* locked by wrklock */ 351 /* locked by wrklock */
… …
251 xthread_t tid; 354 xthread_t tid;
252 355
253 /* locked by reslock, reqlock or wrklock */ 356 /* locked by reslock, reqlock or wrklock */
254 ETP_REQ *req; /* currently processed request */ 357 ETP_REQ *req; /* currently processed request */
255 358
359#ifdef ETP_WORKER_COMMON
256 ETP_WORKER_COMMON 360 ETP_WORKER_COMMON
361#endif
257} etp_worker; 362} etp_worker;
258 363
259static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 364static etp_worker wrk_first; /* NOT etp */
260 365
261#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 366#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
262#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 367#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
263 368
264/* worker threads management */ 369/* worker threads management */
265 370
266static void ecb_cold 371static void ecb_cold
267etp_worker_clear (etp_worker *wrk) 372etp_worker_clear (etp_worker *wrk)
268{ 373{
269 ETP_WORKER_CLEAR (wrk);
270} 374}
271 375
272static void ecb_cold 376static void ecb_cold
273etp_worker_free (etp_worker *wrk) 377etp_worker_free (etp_worker *wrk)
274{ 378{
… …
335} etp_reqq; 439} etp_reqq;
336 440
337static etp_reqq req_queue; 441static etp_reqq req_queue;
338static etp_reqq res_queue; 442static etp_reqq res_queue;
339 443
444static void ecb_noinline ecb_cold
445reqq_init (etp_reqq *q)
446{
447 int pri;
448
449 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
450 q->qs[pri] = q->qe[pri] = 0;
451
452 q->size = 0;
453}
454
340static int ecb_noinline 455static int ecb_noinline
341reqq_push (etp_reqq *q, ETP_REQ *req) 456reqq_push (etp_reqq *q, ETP_REQ *req)
342{ 457{
343 int pri = req->pri; 458 int pri = req->pri;
344 req->next = 0; 459 req->next = 0;
… …
378 } 493 }
379 494
380 abort (); 495 abort ();
381} 496}
382 497
383static void ecb_cold 498static int ecb_cold
384etp_thread_init (void) 499etp_init (void (*want_poll)(void), void (*done_poll)(void))
385{ 500{
386 X_MUTEX_CREATE (wrklock); 501 X_MUTEX_CREATE (wrklock);
387 X_MUTEX_CREATE (reslock); 502 X_MUTEX_CREATE (reslock);
388 X_MUTEX_CREATE (reqlock); 503 X_MUTEX_CREATE (reqlock);
389 X_COND_CREATE (reqwait); 504 X_COND_CREATE (reqwait);
390}
391 505
392static void ecb_cold 506 reqq_init (&req_queue);
393etp_atfork_prepare (void) 507 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 508
403static void ecb_cold 509 wrk_first.next =
404etp_atfork_parent (void) 510 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 511
436 started = 0; 512 started = 0;
437 idle = 0; 513 idle = 0;
438 nreqs = 0; 514 nreqs = 0;
439 nready = 0; 515 nready = 0;
440 npending = 0; 516 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 517
459 want_poll_cb = want_poll; 518 want_poll_cb = want_poll;
460 done_poll_cb = done_poll; 519 done_poll_cb = done_poll;
461 520
462 return 0; 521 return 0;
… …
845# undef pread 904# undef pread
846# undef pwrite 905# undef pwrite
847# define pread eio__pread 906# define pread eio__pread
848# define pwrite eio__pwrite 907# define pwrite eio__pwrite
849 908
850static ssize_t 909static eio_ssize_t
851eio__pread (int fd, void *buf, size_t count, off_t offset) 910eio__pread (int fd, void *buf, size_t count, off_t offset)
852{ 911{
853 ssize_t res; 912 eio_ssize_t res;
854 off_t ooffset; 913 off_t ooffset;
855 914
856 X_LOCK (preadwritelock); 915 X_LOCK (preadwritelock);
857 ooffset = lseek (fd, 0, SEEK_CUR); 916 ooffset = lseek (fd, 0, SEEK_CUR);
858 lseek (fd, offset, SEEK_SET); 917 lseek (fd, offset, SEEK_SET);
… …
861 X_UNLOCK (preadwritelock); 920 X_UNLOCK (preadwritelock);
862 921
863 return res; 922 return res;
864} 923}
865 924
866static ssize_t 925static eio_ssize_t
867eio__pwrite (int fd, void *buf, size_t count, off_t offset) 926eio__pwrite (int fd, void *buf, size_t count, off_t offset)
868{ 927{
869 ssize_t res; 928 eio_ssize_t res;
870 off_t ooffset; 929 off_t ooffset;
871 930
872 X_LOCK (preadwritelock); 931 X_LOCK (preadwritelock);
873 ooffset = lseek (fd, 0, SEEK_CUR); 932 ooffset = lseek (fd, 0, SEEK_CUR);
874 lseek (fd, offset, SEEK_SET); 933 lseek (fd, offset, SEEK_SET);
… …
919 978
920#if !HAVE_FDATASYNC 979#if !HAVE_FDATASYNC
921# undef fdatasync 980# undef fdatasync
922# define fdatasync(fd) fsync (fd) 981# define fdatasync(fd) fsync (fd)
923#endif 982#endif
983
984static int
985eio__syncfs (int fd)
986{
987 int res;
988
989#if HAVE_SYS_SYNCFS
990 res = (int)syscall (__NR_syncfs, (int)(fd));
991#else
992 res = -1;
993 errno = ENOSYS;
994#endif
995
996 if (res < 0 && errno == ENOSYS && fd >= 0)
997 sync ();
998
999 return res;
1000}
924 1001
925/* sync_file_range always needs emulation */ 1002/* sync_file_range always needs emulation */
926static int 1003static int
927eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1004eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
928{ 1005{
… …
949 * call fdatasync, as that matches the expectation of its users best */ 1026 * call fdatasync, as that matches the expectation of its users best */
950 return fdatasync (fd); 1027 return fdatasync (fd);
951} 1028}
952 1029
953static int 1030static int
954eio__fallocate (int fd, int mode, off_t offset, size_t nbytes) 1031eio__fallocate (int fd, int mode, off_t offset, size_t len)
955{ 1032{
956#if HAVE_FALLOCATE 1033#if HAVE_FALLOCATE
957 return fallocate (fd, offset, nbytes, flags); 1034 return fallocate (fd, mode, offset, len);
958#else 1035#else
959 errno = ENOSYS; 1036 errno = ENOSYS;
960 return -1; 1037 return -1;
961#endif 1038#endif
962} 1039}
963 1040
964#if !HAVE_READAHEAD 1041#if !HAVE_READAHEAD
965# undef readahead 1042# undef readahead
966# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1043# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
967 1044
968static ssize_t 1045static eio_ssize_t
969eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1046eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
970{ 1047{
971 size_t todo = count; 1048 size_t todo = count;
972 dBUF; 1049 dBUF;
973 1050
… …
978 pread (fd, eio_buf, len, offset); 1055 pread (fd, eio_buf, len, offset);
979 offset += len; 1056 offset += len;
980 todo -= len; 1057 todo -= len;
981 } 1058 }
982 1059
1060 FUBd;
1061
983 errno = 0; 1062 errno = 0;
984 return count; 1063 return count;
985} 1064}
986 1065
987#endif 1066#endif
988 1067
989/* sendfile always needs emulation */ 1068/* sendfile always needs emulation */
990static ssize_t 1069static eio_ssize_t
991eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1070eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
992{ 1071{
993 ssize_t written = 0; 1072 eio_ssize_t written = 0;
994 ssize_t res; 1073 eio_ssize_t res;
995 1074
996 if (!count) 1075 if (!count)
997 return 0; 1076 return 0;
998 1077
999 for (;;) 1078 for (;;)
… …
1051 if (res < 0 && sbytes) 1130 if (res < 0 && sbytes)
1052 res = sbytes; 1131 res = sbytes;
1053 1132
1054# endif 1133# endif
1055 1134
1056#elif defined (_WIN32) 1135#elif defined (_WIN32) && 0
1057 /* does not work, just for documentation of what would need to be done */ 1136 /* does not work, just for documentation of what would need to be done */
1058 /* actually, cannot be done like this, as TransmitFile changes the file offset, */ 1137 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1059 /* libeio guarantees that the file offset does not change, and windows */ 1138 /* libeio guarantees that the file offset does not change, and windows */
1060 /* has no way to get an independent handle to the same file description */ 1139 /* has no way to get an independent handle to the same file description */
1061 HANDLE h = TO_SOCKET (ifd); 1140 HANDLE h = TO_SOCKET (ifd);
… …
1094 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1173 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1095 /* BSDs */ 1174 /* BSDs */
1096#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1175#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1097 || errno == ENOTSUP 1176 || errno == ENOTSUP
1098#endif 1177#endif
1178#ifdef EOPNOTSUPP /* windows */
1099 || errno == EOPNOTSUPP /* BSDs */ 1179 || errno == EOPNOTSUPP /* BSDs */
1180#endif
1100#if __solaris 1181#if __solaris
1101 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1182 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1102#endif 1183#endif
1103 ) 1184 )
1104 ) 1185 )
… …
1108 1189
1109 res = 0; 1190 res = 0;
1110 1191
1111 while (count) 1192 while (count)
1112 { 1193 {
1113 ssize_t cnt; 1194 eio_ssize_t cnt;
1114 1195
1115 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1196 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1116 1197
1117 if (cnt <= 0) 1198 if (cnt <= 0)
1118 { 1199 {
… …
1130 1211
1131 offset += cnt; 1212 offset += cnt;
1132 res += cnt; 1213 res += cnt;
1133 count -= cnt; 1214 count -= cnt;
1134 } 1215 }
1216
1217 FUBd;
1135 } 1218 }
1136 1219
1137 return res; 1220 return res;
1138} 1221}
1139 1222
… …
1166 /* round up length */ 1249 /* round up length */
1167 *length = (*length + mask) & ~mask; 1250 *length = (*length + mask) & ~mask;
1168} 1251}
1169 1252
1170#if !_POSIX_MEMLOCK 1253#if !_POSIX_MEMLOCK
1171# define eio__mlockall(a) ((errno = ENOSYS), -1) 1254# define eio__mlockall(a) EIO_ENOSYS ()
1172#else 1255#else
1173 1256
1174static int 1257static int
1175eio__mlockall (int flags) 1258eio__mlockall (int flags)
1176{ 1259{
… …
1190 return mlockall (flags); 1273 return mlockall (flags);
1191} 1274}
1192#endif 1275#endif
1193 1276
1194#if !_POSIX_MEMLOCK_RANGE 1277#if !_POSIX_MEMLOCK_RANGE
1195# define eio__mlock(a,b) ((errno = ENOSYS), -1) 1278# define eio__mlock(a,b) EIO_ENOSYS ()
1196#else 1279#else
1197 1280
1198static int 1281static int
1199eio__mlock (void *addr, size_t length) 1282eio__mlock (void *addr, size_t length)
1200{ 1283{
… …
1204} 1287}
1205 1288
1206#endif 1289#endif
1207 1290
1208#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1291#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1209# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1292# define eio__msync(a,b,c) EIO_ENOSYS ()
1210#else 1293#else
1211 1294
1212static int 1295static int
1213eio__msync (void *mem, size_t len, int flags) 1296eio__msync (void *mem, size_t len, int flags)
1214{ 1297{
… …
1326 res += strlen (res); 1409 res += strlen (res);
1327 } 1410 }
1328 1411
1329 while (*rel) 1412 while (*rel)
1330 { 1413 {
1331 ssize_t len, linklen; 1414 eio_ssize_t len, linklen;
1332 char *beg = rel; 1415 char *beg = rel;
1333 1416
1334 while (*rel && *rel != '/') 1417 while (*rel && *rel != '/')
1335 ++rel; 1418 ++rel;
1336 1419
… …
1429 1512
1430#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1513#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1431#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1514#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1432 1515
1433static void 1516static void
1434eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1517eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1435{ 1518{
1436 unsigned char bits [9 + sizeof (ino_t) * 8]; 1519 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1437 unsigned char *bit = bits; 1520 unsigned char *bit = bits;
1438 1521
1439 assert (CHAR_BIT == 8); 1522 assert (CHAR_BIT == 8);
1440 assert (sizeof (eio_dirent) * 8 < 256); 1523 assert (sizeof (eio_dirent) * 8 < 256);
1441 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1524 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1443 1526
1444 if (size <= EIO_SORT_FAST) 1527 if (size <= EIO_SORT_FAST)
1445 return; 1528 return;
1446 1529
1447 /* first prepare an array of bits to test in our radix sort */ 1530 /* first prepare an array of bits to test in our radix sort */
1448 /* try to take endianness into account, as well as differences in ino_t sizes */ 1531 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1449 /* inode_bits must contain all inodes ORed together */ 1532 /* inode_bits must contain all inodes ORed together */
1450 /* which is used to skip bits that are 0 everywhere, which is very common */ 1533 /* which is used to skip bits that are 0 everywhere, which is very common */
1451 { 1534 {
1452 ino_t endianness; 1535 eio_ino_t endianness;
1453 int i, j; 1536 int i, j;
1454 1537
1455 /* we store the byte offset of byte n into byte n of "endianness" */ 1538 /* we store the byte offset of byte n into byte n of "endianness" */
1456 for (i = 0; i < sizeof (ino_t); ++i) 1539 for (i = 0; i < sizeof (eio_ino_t); ++i)
1457 ((unsigned char *)&endianness)[i] = i; 1540 ((unsigned char *)&endianness)[i] = i;
1458 1541
1459 *bit++ = 0; 1542 *bit++ = 0;
1460 1543
1461 for (i = 0; i < sizeof (ino_t); ++i) 1544 for (i = 0; i < sizeof (eio_ino_t); ++i)
1462 { 1545 {
1463 /* shifting off the byte offsets out of "endianness" */ 1546 /* shifting off the byte offsets out of "endianness" */
1464 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1547 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1465 endianness >>= 8; 1548 endianness >>= 8;
1466 1549
1467 for (j = 0; j < 8; ++j) 1550 for (j = 0; j < 8; ++j)
1468 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1551 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1469 *bit++ = offs + j; 1552 *bit++ = offs + j;
1470 } 1553 }
1471 1554
1472 for (j = 0; j < 8; ++j) 1555 for (j = 0; j < 8; ++j)
1473 if (score_bits & (1 << j)) 1556 if (score_bits & (1 << j))
1474 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1557 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1475 } 1558 }
1476 1559
1477 /* now actually do the sorting (a variant of MSD radix sort) */ 1560 /* now actually do the sorting (a variant of MSD radix sort) */
1478 { 1561 {
1479 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1562 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1480 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1563 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1481 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1564 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1482 int stk_idx = 0; 1565 int stk_idx = 0;
1483 1566
1484 base_stk [stk_idx] = dents; 1567 base_stk [stk_idx] = dents;
1485 end_stk [stk_idx] = dents + size; 1568 end_stk [stk_idx] = dents + size;
1486 bit_stk [stk_idx] = bit - 1; 1569 bit_stk [stk_idx] = bit - 1;
… …
1565 } 1648 }
1566 } 1649 }
1567} 1650}
1568 1651
1569static void 1652static void
1570eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1653eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1571{ 1654{
1572 if (size <= 1) 1655 if (size <= 1)
1573 return; /* our insertion sort relies on size > 0 */ 1656 return; /* our insertion sort relies on size > 0 */
1574 1657
1575 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1658 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1583 1666
1584/* read a full directory */ 1667/* read a full directory */
1585static void 1668static void
1586eio__scandir (eio_req *req, etp_worker *self) 1669eio__scandir (eio_req *req, etp_worker *self)
1587{ 1670{
1588 DIR *dirp;
1589 EIO_STRUCT_DIRENT *entp;
1590 char *name, *names; 1671 char *name, *names;
1591 int namesalloc = 4096; 1672 int namesalloc = 4096 - sizeof (void *) * 4;
1592 int namesoffs = 0; 1673 int namesoffs = 0;
1593 int flags = req->int1; 1674 int flags = req->int1;
1594 eio_dirent *dents = 0; 1675 eio_dirent *dents = 0;
1595 int dentalloc = 128; 1676 int dentalloc = 128;
1596 int dentoffs = 0; 1677 int dentoffs = 0;
1597 ino_t inode_bits = 0; 1678 eio_ino_t inode_bits = 0;
1679#ifdef _WIN32
1680 HANDLE dirp;
1681 WIN32_FIND_DATA entp;
1682#else
1683 DIR *dirp;
1684 EIO_STRUCT_DIRENT *entp;
1685#endif
1598 1686
1599 req->result = -1; 1687 req->result = -1;
1600 1688
1601 if (!(flags & EIO_READDIR_DENTS)) 1689 if (!(flags & EIO_READDIR_DENTS))
1602 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1690 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1603 1691
1604 X_LOCK (wrklock); 1692#ifdef _WIN32
1605 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1693 {
1694 int len = strlen ((const char *)req->ptr1);
1695 char *path = malloc (MAX_PATH);
1696 const char *fmt;
1697
1698 if (!len)
1699 fmt = "./*";
1700 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1701 fmt = "%s*";
1702 else
1703 fmt = "%s/*";
1704
1705 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1706 dirp = FindFirstFile (path, &entp);
1707 free (path);
1708
1709 if (dirp == INVALID_HANDLE_VALUE)
1710 {
1711 dirp = 0;
1712
1713 /* should steal _dosmaperr */
1714 switch (GetLastError ())
1715 {
1716 case ERROR_FILE_NOT_FOUND:
1717 req->result = 0;
1718 break;
1719
1720 case ERROR_INVALID_NAME:
1721 case ERROR_PATH_NOT_FOUND:
1722 case ERROR_NO_MORE_FILES:
1723 errno = ENOENT;
1724 break;
1725
1726 case ERROR_NOT_ENOUGH_MEMORY:
1727 errno = ENOMEM;
1728 break;
1729
1730 default:
1731 errno = EINVAL;
1732 break;
1733 }
1734 }
1735 }
1736#else
1606 self->dirp = dirp = opendir (req->ptr1); 1737 dirp = opendir (req->ptr1);
1738#endif
1607 1739
1608 if (req->flags & EIO_FLAG_PTR1_FREE) 1740 if (req->flags & EIO_FLAG_PTR1_FREE)
1609 free (req->ptr1); 1741 free (req->ptr1);
1610 1742
1611 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1743 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1612 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1744 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1613 req->ptr2 = names = malloc (namesalloc); 1745 req->ptr2 = names = malloc (namesalloc);
1614 X_UNLOCK (wrklock);
1615 1746
1616 if (dirp && names && (!flags || dents)) 1747 if (dirp && names && (!flags || dents))
1617 for (;;) 1748 for (;;)
1618 { 1749 {
1750 int done;
1751
1752#ifdef _WIN32
1753 done = !dirp;
1754#else
1619 errno = 0; 1755 errno = 0;
1620 entp = readdir (dirp); 1756 entp = readdir (dirp);
1757 done = !entp;
1758#endif
1621 1759
1622 if (!entp) 1760 if (done)
1623 { 1761 {
1762#ifndef _WIN32
1763 int old_errno = errno;
1764 closedir (dirp);
1765 errno = old_errno;
1766
1624 if (errno) 1767 if (errno)
1625 break; 1768 break;
1769#endif
1626 1770
1627 /* sort etc. */ 1771 /* sort etc. */
1628 req->int1 = flags; 1772 req->int1 = flags;
1629 req->result = dentoffs; 1773 req->result = dentoffs;
1630 1774
… …
1659 1803
1660 break; 1804 break;
1661 } 1805 }
1662 1806
1663 /* now add the entry to our list(s) */ 1807 /* now add the entry to our list(s) */
1664 name = entp->d_name; 1808 name = D_NAME (entp);
1665 1809
1666 /* skip . and .. entries */ 1810 /* skip . and .. entries */
1667 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1811 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1668 { 1812 {
1669 int len = D_NAMLEN (entp) + 1; 1813 int len = D_NAMLEN (entp) + 1;
1670 1814
1671 while (ecb_expect_false (namesoffs + len > namesalloc)) 1815 while (ecb_expect_false (namesoffs + len > namesalloc))
1672 { 1816 {
1673 namesalloc *= 2; 1817 namesalloc *= 2;
1674 X_LOCK (wrklock);
1675 req->ptr2 = names = realloc (names, namesalloc); 1818 req->ptr2 = names = realloc (names, namesalloc);
1676 X_UNLOCK (wrklock);
1677 1819
1678 if (!names) 1820 if (!names)
1679 break; 1821 break;
1680 } 1822 }
1681 1823
… …
1686 struct eio_dirent *ent; 1828 struct eio_dirent *ent;
1687 1829
1688 if (ecb_expect_false (dentoffs == dentalloc)) 1830 if (ecb_expect_false (dentoffs == dentalloc))
1689 { 1831 {
1690 dentalloc *= 2; 1832 dentalloc *= 2;
1691 X_LOCK (wrklock);
1692 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1833 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1693 X_UNLOCK (wrklock);
1694 1834
1695 if (!dents) 1835 if (!dents)
1696 break; 1836 break;
1697 } 1837 }
1698 1838
… …
1778 if (EIO_CANCELLED (req)) 1918 if (EIO_CANCELLED (req))
1779 { 1919 {
1780 errno = ECANCELED; 1920 errno = ECANCELED;
1781 break; 1921 break;
1782 } 1922 }
1923
1924#ifdef _WIN32
1925 if (!FindNextFile (dirp, &entp))
1926 {
1927 FindClose (dirp);
1928 dirp = 0;
1929 }
1930#endif
1783 } 1931 }
1784} 1932}
1785 1933
1786/*****************************************************************************/ 1934/*****************************************************************************/
1787 1935
… …
1804{ 1952{
1805 ETP_REQ *req; 1953 ETP_REQ *req;
1806 struct timespec ts; 1954 struct timespec ts;
1807 etp_worker *self = (etp_worker *)thr_arg; 1955 etp_worker *self = (etp_worker *)thr_arg;
1808 1956
1957#if HAVE_PRCTL_SET_NAME
1958 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1959#endif
1960
1809 /* try to distribute timeouts somewhat randomly */ 1961 /* try to distribute timeouts somewhat evenly */
1810 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1962 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1811 1963
1812 for (;;) 1964 for (;;)
1813 { 1965 {
1966 ts.tv_sec = 0;
1967
1814 X_LOCK (reqlock); 1968 X_LOCK (reqlock);
1815 1969
1816 for (;;) 1970 for (;;)
1817 { 1971 {
1818 self->req = req = reqq_shift (&req_queue); 1972 self->req = req = reqq_shift (&req_queue);
1819 1973
1820 if (req) 1974 if (req)
1821 break; 1975 break;
1822 1976
1977 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1978 {
1979 X_UNLOCK (reqlock);
1980 X_LOCK (wrklock);
1981 --started;
1982 X_UNLOCK (wrklock);
1983 goto quit;
1984 }
1985
1823 ++idle; 1986 ++idle;
1824 1987
1825 ts.tv_sec = time (0) + idle_timeout; 1988 if (idle <= max_idle)
1826 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1989 /* we are allowed to idle, so do so without any timeout */
1990 X_COND_WAIT (reqwait, reqlock);
1991 else
1827 { 1992 {
1828 if (idle > max_idle) 1993 /* initialise timeout once */
1829 { 1994 if (!ts.tv_sec)
1830 --idle; 1995 ts.tv_sec = time (0) + idle_timeout;
1831 X_UNLOCK (reqlock);
1832 X_LOCK (wrklock);
1833 --started;
1834 X_UNLOCK (wrklock);
1835 goto quit;
1836 }
1837 1996
1838 /* we are allowed to idle, so do so without any timeout */
1839 X_COND_WAIT (reqwait, reqlock); 1997 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1998 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1840 } 1999 }
1841 2000
1842 --idle; 2001 --idle;
1843 } 2002 }
1844 2003
… …
1875/*****************************************************************************/ 2034/*****************************************************************************/
1876 2035
1877int ecb_cold 2036int ecb_cold
1878eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2037eio_init (void (*want_poll)(void), void (*done_poll)(void))
1879{ 2038{
2039#if !HAVE_PREADWRITE
2040 X_MUTEX_CREATE (preadwritelock);
2041#endif
2042
1880 return etp_init (want_poll, done_poll); 2043 return etp_init (want_poll, done_poll);
1881} 2044}
1882 2045
1883ecb_inline void 2046ecb_inline void
1884eio_api_destroy (eio_req *req) 2047eio_api_destroy (eio_req *req)
… …
1929 case EIO_WRITE: req->result = req->offs >= 0 2092 case EIO_WRITE: req->result = req->offs >= 0
1930 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2093 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1931 : write (req->int1, req->ptr2, req->size); break; 2094 : write (req->int1, req->ptr2, req->size); break;
1932 2095
1933 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2096 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1934 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2097 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1935 2098
1936 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2099 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1937 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2100 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1938 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2101 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1939 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2102 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
… …
1969 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2132 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1970 2133
1971 case EIO_SYNC: req->result = 0; sync (); break; 2134 case EIO_SYNC: req->result = 0; sync (); break;
1972 case EIO_FSYNC: req->result = fsync (req->int1); break; 2135 case EIO_FSYNC: req->result = fsync (req->int1); break;
1973 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2136 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2137 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2138 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1974 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2139 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1975 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2140 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1976 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2141 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1977 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2142 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1978 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1979 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2143 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1980 2144
1981 case EIO_READDIR: eio__scandir (req, self); break; 2145 case EIO_READDIR: eio__scandir (req, self); break;
1982 2146
1983 case EIO_BUSY: 2147 case EIO_BUSY:
… …
2064eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2228eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2065{ 2229{
2066 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2230 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2067} 2231}
2068 2232
2233eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2234{
2235 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2236}
2237
2238eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2239{
2240 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2241}
2242
2243eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2244{
2245 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2246}
2247
2069eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2248eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2070{ 2249{
2071 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2250 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2072} 2251}
2073 2252
… …
2079eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2258eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2080{ 2259{
2081 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2260 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2082} 2261}
2083 2262
2084eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2085{
2086 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2087}
2088
2089eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2263eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2090{ 2264{
2091 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2265 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2092} 2266}
2093 2267
2094eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2095{
2096 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2097}
2098
2099eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2268eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2100{ 2269{
2101 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2270 REQ (EIO_CLOSE); req->int1 = fd; SEND;
2102} 2271}
2103 2272
… …
2139eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2308eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
2140{ 2309{
2141 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2310 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2142} 2311}
2143 2312
2144eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2313eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2145{ 2314{
2146 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2315 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2147} 2316}
2148 2317
2149eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2318eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
2169eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2338eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
2170{ 2339{
2171 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2340 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2172} 2341}
2173 2342
2174eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2343eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
2175{ 2344{
2176 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2345 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
2177} 2346}
2178 2347
2179eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2348eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
2326} 2495}
2327 2496
2328/*****************************************************************************/ 2497/*****************************************************************************/
2329/* misc garbage */ 2498/* misc garbage */
2330 2499
2331ssize_t 2500eio_ssize_t
2332eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2501eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2333{ 2502{
2334 etp_worker wrk;
2335 ssize_t ret;
2336
2337 wrk.dbuf = 0;
2338
2339 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2503 return eio__sendfile (ofd, ifd, offset, count);
2340
2341 if (wrk.dbuf)
2342 free (wrk.dbuf);
2343
2344 return ret;
2345} 2504}
2346 2505

Diff Legend

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