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

Comparing libeio/eio.c (file contents):
Revision 1.79 by root, Tue Jul 5 16:57:41 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 */
65/* intptr_t only comes form stdint.h, says idiot openbsd coder */ 64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H 65#if HAVE_STDINT_H
67# include <stdint.h> 66# include <stdint.h>
68#endif 67#endif
69 68
69#ifndef ECANCELED
70# define ECANCELED EDOM
71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
79
80static void eio_destroy (eio_req *req);
81
70#ifndef EIO_FINISH 82#ifndef EIO_FINISH
71# 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
72#endif 84#endif
73 85
74#ifndef EIO_DESTROY 86#ifndef EIO_DESTROY
… …
77 89
78#ifndef EIO_FEED 90#ifndef EIO_FEED
79# 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)
80#endif 92#endif
81 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
82#ifdef _WIN32 105#ifdef _WIN32
83 106
84 /*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
85#else 194#else
86 195
87# include <sys/time.h> 196 #include <sys/time.h>
88# include <sys/select.h> 197 #include <sys/select.h>
198 #include <sys/statvfs.h>
89# 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
90# include <utime.h> 234# include <utime.h>
91# include <signal.h>
92# include <dirent.h>
93
94#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
95# include <sys/mman.h>
96#endif
97
98/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
99# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
100# define _DIRENT_HAVE_D_TYPE /* sigh */
101# define D_INO(de) (de)->d_fileno
102# define D_NAMLEN(de) (de)->d_namlen
103# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
104# define D_INO(de) (de)->d_ino
105# endif 235#endif
106 236
107#ifdef _D_EXACT_NAMLEN 237#if HAVE_SYS_SYSCALL_H
108# undef D_NAMLEN 238# include <sys/syscall.h>
109# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
110#endif
111
112# ifdef _DIRENT_HAVE_D_TYPE
113# define D_TYPE(de) (de)->d_type
114# endif 239#endif
115 240
116# ifndef EIO_STRUCT_DIRENT 241#if HAVE_SYS_PRCTL_H
117# define EIO_STRUCT_DIRENT struct dirent 242# include <sys/prctl.h>
118# endif
119
120#endif 243#endif
121 244
122#if HAVE_SENDFILE 245#if HAVE_SENDFILE
123# if __linux 246# if __linux
124# include <sys/sendfile.h> 247# include <sys/sendfile.h>
… …
139#endif 262#endif
140#ifndef D_INO 263#ifndef D_INO
141# define D_INO(de) 0 264# define D_INO(de) 0
142#endif 265#endif
143#ifndef D_NAMLEN 266#ifndef D_NAMLEN
144# define D_NAMLEN(de) strlen ((de)->d_name) 267# define D_NAMLEN(entp) strlen (D_NAME (entp))
145#endif 268#endif
146 269
147/* used for struct dirent, AIX doesn't provide it */ 270/* used for struct dirent, AIX doesn't provide it */
148#ifndef NAME_MAX 271#ifndef NAME_MAX
149# define NAME_MAX 4096 272# define NAME_MAX 4096
… …
156 279
157/* buffer size for various temporary buffers */ 280/* buffer size for various temporary buffers */
158#define EIO_BUFSIZE 65536 281#define EIO_BUFSIZE 65536
159 282
160#define dBUF \ 283#define dBUF \
161 char *eio_buf; \
162 ETP_WORKER_LOCK (self); \
163 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 284 char *eio_buf = malloc (EIO_BUFSIZE); \
164 ETP_WORKER_UNLOCK (self); \
165 errno = ENOMEM; \ 285 errno = ENOMEM; \
166 if (!eio_buf) \ 286 if (!eio_buf) \
167 return -1; 287 return -1
288
289#define FUBd \
290 free (eio_buf)
168 291
169#define EIO_TICKS ((1000000 + 1023) >> 10) 292#define EIO_TICKS ((1000000 + 1023) >> 10)
170 293
171#define ETP_PRI_MIN EIO_PRI_MIN 294#define ETP_PRI_MIN EIO_PRI_MIN
172#define ETP_PRI_MAX EIO_PRI_MAX 295#define ETP_PRI_MAX EIO_PRI_MAX
… …
178static int eio_finish (eio_req *req); 301static int eio_finish (eio_req *req);
179#define ETP_FINISH(req) eio_finish (req) 302#define ETP_FINISH(req) eio_finish (req)
180static void eio_execute (struct etp_worker *self, eio_req *req); 303static void eio_execute (struct etp_worker *self, eio_req *req);
181#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 304#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
182 305
183#define ETP_WORKER_CLEAR(req) \
184 if (wrk->dbuf) \
185 { \
186 free (wrk->dbuf); \
187 wrk->dbuf = 0; \
188 } \
189 \
190 if (wrk->dirp) \
191 { \
192 closedir (wrk->dirp); \
193 wrk->dirp = 0; \
194 }
195
196#define ETP_WORKER_COMMON \
197 void *dbuf; \
198 DIR *dirp;
199
200/*****************************************************************************/ 306/*****************************************************************************/
201 307
202#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 308#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
203 309
204/* calculate time difference in ~1/EIO_TICKS of a second */ 310/* calculate time difference in ~1/EIO_TICKS of a second */
… …
232/* 338/*
233 * make our pread/pwrite emulation safe against themselves, but not against 339 * make our pread/pwrite emulation safe against themselves, but not against
234 * 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,
235 * but that's your problem, not mine. 341 * but that's your problem, not mine.
236 */ 342 */
237static xmutex_t preadwritelock = X_MUTEX_INIT; 343static xmutex_t preadwritelock;
238#endif 344#endif
239 345
240typedef struct etp_worker 346typedef struct etp_worker
241{ 347{
242 /* locked by wrklock */ 348 /* locked by wrklock */
… …
245 xthread_t tid; 351 xthread_t tid;
246 352
247 /* locked by reslock, reqlock or wrklock */ 353 /* locked by reslock, reqlock or wrklock */
248 ETP_REQ *req; /* currently processed request */ 354 ETP_REQ *req; /* currently processed request */
249 355
356#ifdef ETP_WORKER_COMMON
250 ETP_WORKER_COMMON 357 ETP_WORKER_COMMON
358#endif
251} etp_worker; 359} etp_worker;
252 360
253static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 361static etp_worker wrk_first; /* NOT etp */
254 362
255#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 363#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
256#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 364#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
257 365
258/* worker threads management */ 366/* worker threads management */
259 367
260static void ecb_cold 368static void ecb_cold
261etp_worker_clear (etp_worker *wrk) 369etp_worker_clear (etp_worker *wrk)
262{ 370{
263 ETP_WORKER_CLEAR (wrk);
264} 371}
265 372
266static void ecb_cold 373static void ecb_cold
267etp_worker_free (etp_worker *wrk) 374etp_worker_free (etp_worker *wrk)
268{ 375{
… …
329} etp_reqq; 436} etp_reqq;
330 437
331static etp_reqq req_queue; 438static etp_reqq req_queue;
332static etp_reqq res_queue; 439static etp_reqq res_queue;
333 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
334static int ecb_noinline 452static int ecb_noinline
335reqq_push (etp_reqq *q, ETP_REQ *req) 453reqq_push (etp_reqq *q, ETP_REQ *req)
336{ 454{
337 int pri = req->pri; 455 int pri = req->pri;
338 req->next = 0; 456 req->next = 0;
… …
372 } 490 }
373 491
374 abort (); 492 abort ();
375} 493}
376 494
377static void ecb_cold 495static int ecb_cold
378etp_thread_init (void) 496etp_init (void (*want_poll)(void), void (*done_poll)(void))
379{ 497{
380 X_MUTEX_CREATE (wrklock); 498 X_MUTEX_CREATE (wrklock);
381 X_MUTEX_CREATE (reslock); 499 X_MUTEX_CREATE (reslock);
382 X_MUTEX_CREATE (reqlock); 500 X_MUTEX_CREATE (reqlock);
383 X_COND_CREATE (reqwait); 501 X_COND_CREATE (reqwait);
384}
385 502
386static void ecb_cold 503 reqq_init (&req_queue);
387etp_atfork_prepare (void) 504 reqq_init (&res_queue);
388{
389 X_LOCK (wrklock);
390 X_LOCK (reqlock);
391 X_LOCK (reslock);
392#if !HAVE_PREADWRITE
393 X_LOCK (preadwritelock);
394#endif
395}
396 505
397static void ecb_cold 506 wrk_first.next =
398etp_atfork_parent (void) 507 wrk_first.prev = &wrk_first;
399{
400#if !HAVE_PREADWRITE
401 X_UNLOCK (preadwritelock);
402#endif
403 X_UNLOCK (reslock);
404 X_UNLOCK (reqlock);
405 X_UNLOCK (wrklock);
406}
407
408static void ecb_cold
409etp_atfork_child (void)
410{
411 ETP_REQ *prv;
412
413 while ((prv = reqq_shift (&req_queue)))
414 ETP_DESTROY (prv);
415
416 while ((prv = reqq_shift (&res_queue)))
417 ETP_DESTROY (prv);
418
419 while (wrk_first.next != &wrk_first)
420 {
421 etp_worker *wrk = wrk_first.next;
422
423 if (wrk->req)
424 ETP_DESTROY (wrk->req);
425
426 etp_worker_clear (wrk);
427 etp_worker_free (wrk);
428 }
429 508
430 started = 0; 509 started = 0;
431 idle = 0; 510 idle = 0;
432 nreqs = 0; 511 nreqs = 0;
433 nready = 0; 512 nready = 0;
434 npending = 0; 513 npending = 0;
435
436 etp_thread_init ();
437}
438
439static void ecb_cold
440etp_once_init (void)
441{
442 etp_thread_init ();
443 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
444}
445
446static int ecb_cold
447etp_init (void (*want_poll)(void), void (*done_poll)(void))
448{
449 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
450
451 pthread_once (&doinit, etp_once_init);
452 514
453 want_poll_cb = want_poll; 515 want_poll_cb = want_poll;
454 done_poll_cb = done_poll; 516 done_poll_cb = done_poll;
455 517
456 return 0; 518 return 0;
… …
583} 645}
584 646
585static void 647static void
586etp_cancel (ETP_REQ *req) 648etp_cancel (ETP_REQ *req)
587{ 649{
588 X_LOCK (wrklock); 650 req->cancelled = 1;
589 req->flags |= EIO_FLAG_CANCELLED;
590 X_UNLOCK (wrklock);
591 651
592 eio_grp_cancel (req); 652 eio_grp_cancel (req);
593} 653}
594 654
595static void 655static void
… …
711 return eio_finish (grp); 771 return eio_finish (grp);
712 else 772 else
713 return 0; 773 return 0;
714} 774}
715 775
716void 776static void
717eio_destroy (eio_req *req) 777eio_destroy (eio_req *req)
718{ 778{
719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 779 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 780 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
721 781
… …
841# undef pread 901# undef pread
842# undef pwrite 902# undef pwrite
843# define pread eio__pread 903# define pread eio__pread
844# define pwrite eio__pwrite 904# define pwrite eio__pwrite
845 905
846static ssize_t 906static eio_ssize_t
847eio__pread (int fd, void *buf, size_t count, off_t offset) 907eio__pread (int fd, void *buf, size_t count, off_t offset)
848{ 908{
849 ssize_t res; 909 eio_ssize_t res;
850 off_t ooffset; 910 off_t ooffset;
851 911
852 X_LOCK (preadwritelock); 912 X_LOCK (preadwritelock);
853 ooffset = lseek (fd, 0, SEEK_CUR); 913 ooffset = lseek (fd, 0, SEEK_CUR);
854 lseek (fd, offset, SEEK_SET); 914 lseek (fd, offset, SEEK_SET);
… …
857 X_UNLOCK (preadwritelock); 917 X_UNLOCK (preadwritelock);
858 918
859 return res; 919 return res;
860} 920}
861 921
862static ssize_t 922static eio_ssize_t
863eio__pwrite (int fd, void *buf, size_t count, off_t offset) 923eio__pwrite (int fd, void *buf, size_t count, off_t offset)
864{ 924{
865 ssize_t res; 925 eio_ssize_t res;
866 off_t ooffset; 926 off_t ooffset;
867 927
868 X_LOCK (preadwritelock); 928 X_LOCK (preadwritelock);
869 ooffset = lseek (fd, 0, SEEK_CUR); 929 ooffset = lseek (fd, 0, SEEK_CUR);
870 lseek (fd, offset, SEEK_SET); 930 lseek (fd, offset, SEEK_SET);
… …
915 975
916#if !HAVE_FDATASYNC 976#if !HAVE_FDATASYNC
917# undef fdatasync 977# undef fdatasync
918# define fdatasync(fd) fsync (fd) 978# define fdatasync(fd) fsync (fd)
919#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}
920 998
921/* sync_file_range always needs emulation */ 999/* sync_file_range always needs emulation */
922static int 1000static int
923eio__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)
924{ 1002{
… …
944 /* 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
945 * call fdatasync, as that matches the expectation of its users best */ 1023 * call fdatasync, as that matches the expectation of its users best */
946 return fdatasync (fd); 1024 return fdatasync (fd);
947} 1025}
948 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
949#if !HAVE_READAHEAD 1038#if !HAVE_READAHEAD
950# undef readahead 1039# undef readahead
951# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1040# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
952 1041
953static ssize_t 1042static eio_ssize_t
954eio__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)
955{ 1044{
956 size_t todo = count; 1045 size_t todo = count;
957 dBUF; 1046 dBUF;
958 1047
… …
963 pread (fd, eio_buf, len, offset); 1052 pread (fd, eio_buf, len, offset);
964 offset += len; 1053 offset += len;
965 todo -= len; 1054 todo -= len;
966 } 1055 }
967 1056
1057 FUBd;
1058
968 errno = 0; 1059 errno = 0;
969 return count; 1060 return count;
970} 1061}
971 1062
972#endif 1063#endif
973 1064
974/* sendfile always needs emulation */ 1065/* sendfile always needs emulation */
975static ssize_t 1066static eio_ssize_t
976eio__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)
977{ 1068{
978 ssize_t written = 0; 1069 eio_ssize_t written = 0;
979 ssize_t res; 1070 eio_ssize_t res;
980 1071
981 if (!count) 1072 if (!count)
982 return 0; 1073 return 0;
983 1074
984 for (;;) 1075 for (;;)
985 { 1076 {
1077#ifdef __APPLE__
1078# undef HAVE_SENDFILE /* broken, as everything on os x */
1079#endif
986#if HAVE_SENDFILE 1080#if HAVE_SENDFILE
987# if __linux 1081# if __linux
988 off_t soffset = offset; 1082 off_t soffset = offset;
989 res = sendfile (ofd, ifd, &soffset, count); 1083 res = sendfile (ofd, ifd, &soffset, count);
990 1084
… …
1006 1100
1007 /* according to source inspection, this is correct, and useful behaviour */ 1101 /* according to source inspection, this is correct, and useful behaviour */
1008 if (sbytes) 1102 if (sbytes)
1009 res = sbytes; 1103 res = sbytes;
1010 1104
1011# elif defined (__APPLE__) && 0 /* broken, as everything on os x */ 1105# elif defined (__APPLE__)
1012 off_t sbytes = count; 1106 off_t sbytes = count;
1013 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1107 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1014 1108
1015 /* according to the manpage, sbytes is always valid */ 1109 /* according to the manpage, sbytes is always valid */
1016 if (sbytes) 1110 if (sbytes)
… …
1033 if (res < 0 && sbytes) 1127 if (res < 0 && sbytes)
1034 res = sbytes; 1128 res = sbytes;
1035 1129
1036# endif 1130# endif
1037 1131
1038#elif defined (_WIN32) 1132#elif defined (_WIN32) && 0
1039 /* 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 */
1040 /* 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, */
1041 /* libeio guarantees that the file offset does not change, and windows */ 1135 /* libeio guarantees that the file offset does not change, and windows */
1042 /* 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 */
1043 HANDLE h = TO_SOCKET (ifd); 1137 HANDLE h = TO_SOCKET (ifd);
… …
1076 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1170 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1077 /* BSDs */ 1171 /* BSDs */
1078#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... */
1079 || errno == ENOTSUP 1173 || errno == ENOTSUP
1080#endif 1174#endif
1175#ifdef EOPNOTSUPP /* windows */
1081 || errno == EOPNOTSUPP /* BSDs */ 1176 || errno == EOPNOTSUPP /* BSDs */
1177#endif
1082#if __solaris 1178#if __solaris
1083 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1179 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1084#endif 1180#endif
1085 ) 1181 )
1086 ) 1182 )
… …
1090 1186
1091 res = 0; 1187 res = 0;
1092 1188
1093 while (count) 1189 while (count)
1094 { 1190 {
1095 ssize_t cnt; 1191 eio_ssize_t cnt;
1096 1192
1097 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);
1098 1194
1099 if (cnt <= 0) 1195 if (cnt <= 0)
1100 { 1196 {
… …
1112 1208
1113 offset += cnt; 1209 offset += cnt;
1114 res += cnt; 1210 res += cnt;
1115 count -= cnt; 1211 count -= cnt;
1116 } 1212 }
1213
1214 FUBd;
1117 } 1215 }
1118 1216
1119 return res; 1217 return res;
1120} 1218}
1121 1219
… …
1148 /* round up length */ 1246 /* round up length */
1149 *length = (*length + mask) & ~mask; 1247 *length = (*length + mask) & ~mask;
1150} 1248}
1151 1249
1152#if !_POSIX_MEMLOCK 1250#if !_POSIX_MEMLOCK
1153# define eio__mlockall(a) ((errno = ENOSYS), -1) 1251# define eio__mlockall(a) EIO_ENOSYS ()
1154#else 1252#else
1155 1253
1156static int 1254static int
1157eio__mlockall (int flags) 1255eio__mlockall (int flags)
1158{ 1256{
… …
1172 return mlockall (flags); 1270 return mlockall (flags);
1173} 1271}
1174#endif 1272#endif
1175 1273
1176#if !_POSIX_MEMLOCK_RANGE 1274#if !_POSIX_MEMLOCK_RANGE
1177# define eio__mlock(a,b) ((errno = ENOSYS), -1) 1275# define eio__mlock(a,b) EIO_ENOSYS ()
1178#else 1276#else
1179 1277
1180static int 1278static int
1181eio__mlock (void *addr, size_t length) 1279eio__mlock (void *addr, size_t length)
1182{ 1280{
… …
1186} 1284}
1187 1285
1188#endif 1286#endif
1189 1287
1190#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1288#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1191# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1289# define eio__msync(a,b,c) EIO_ENOSYS ()
1192#else 1290#else
1193 1291
1194static int 1292static int
1195eio__msync (void *mem, size_t len, int flags) 1293eio__msync (void *mem, size_t len, int flags)
1196{ 1294{
… …
1308 res += strlen (res); 1406 res += strlen (res);
1309 } 1407 }
1310 1408
1311 while (*rel) 1409 while (*rel)
1312 { 1410 {
1313 ssize_t len, linklen; 1411 eio_ssize_t len, linklen;
1314 char *beg = rel; 1412 char *beg = rel;
1315 1413
1316 while (*rel && *rel != '/') 1414 while (*rel && *rel != '/')
1317 ++rel; 1415 ++rel;
1318 1416
… …
1411 1509
1412#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 */
1413#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1511#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1414 1512
1415static void 1513static void
1416eio_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)
1417{ 1515{
1418 unsigned char bits [9 + sizeof (ino_t) * 8]; 1516 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1419 unsigned char *bit = bits; 1517 unsigned char *bit = bits;
1420 1518
1421 assert (CHAR_BIT == 8); 1519 assert (CHAR_BIT == 8);
1422 assert (sizeof (eio_dirent) * 8 < 256); 1520 assert (sizeof (eio_dirent) * 8 < 256);
1423 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1521 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1425 1523
1426 if (size <= EIO_SORT_FAST) 1524 if (size <= EIO_SORT_FAST)
1427 return; 1525 return;
1428 1526
1429 /* 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 */
1430 /* 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 */
1431 /* inode_bits must contain all inodes ORed together */ 1529 /* inode_bits must contain all inodes ORed together */
1432 /* 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 */
1433 { 1531 {
1434 ino_t endianness; 1532 eio_ino_t endianness;
1435 int i, j; 1533 int i, j;
1436 1534
1437 /* 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" */
1438 for (i = 0; i < sizeof (ino_t); ++i) 1536 for (i = 0; i < sizeof (eio_ino_t); ++i)
1439 ((unsigned char *)&endianness)[i] = i; 1537 ((unsigned char *)&endianness)[i] = i;
1440 1538
1441 *bit++ = 0; 1539 *bit++ = 0;
1442 1540
1443 for (i = 0; i < sizeof (ino_t); ++i) 1541 for (i = 0; i < sizeof (eio_ino_t); ++i)
1444 { 1542 {
1445 /* shifting off the byte offsets out of "endianness" */ 1543 /* shifting off the byte offsets out of "endianness" */
1446 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1544 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1447 endianness >>= 8; 1545 endianness >>= 8;
1448 1546
1449 for (j = 0; j < 8; ++j) 1547 for (j = 0; j < 8; ++j)
1450 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1548 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1451 *bit++ = offs + j; 1549 *bit++ = offs + j;
1452 } 1550 }
1453 1551
1454 for (j = 0; j < 8; ++j) 1552 for (j = 0; j < 8; ++j)
1455 if (score_bits & (1 << j)) 1553 if (score_bits & (1 << j))
1456 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1554 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1457 } 1555 }
1458 1556
1459 /* now actually do the sorting (a variant of MSD radix sort) */ 1557 /* now actually do the sorting (a variant of MSD radix sort) */
1460 { 1558 {
1461 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1559 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1462 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1560 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1463 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1561 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1464 int stk_idx = 0; 1562 int stk_idx = 0;
1465 1563
1466 base_stk [stk_idx] = dents; 1564 base_stk [stk_idx] = dents;
1467 end_stk [stk_idx] = dents + size; 1565 end_stk [stk_idx] = dents + size;
1468 bit_stk [stk_idx] = bit - 1; 1566 bit_stk [stk_idx] = bit - 1;
… …
1547 } 1645 }
1548 } 1646 }
1549} 1647}
1550 1648
1551static void 1649static void
1552eio_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)
1553{ 1651{
1554 if (size <= 1) 1652 if (size <= 1)
1555 return; /* our insertion sort relies on size > 0 */ 1653 return; /* our insertion sort relies on size > 0 */
1556 1654
1557 /* 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 */
… …
1565 1663
1566/* read a full directory */ 1664/* read a full directory */
1567static void 1665static void
1568eio__scandir (eio_req *req, etp_worker *self) 1666eio__scandir (eio_req *req, etp_worker *self)
1569{ 1667{
1570 DIR *dirp;
1571 EIO_STRUCT_DIRENT *entp;
1572 char *name, *names; 1668 char *name, *names;
1573 int namesalloc = 4096; 1669 int namesalloc = 4096 - sizeof (void *) * 4;
1574 int namesoffs = 0; 1670 int namesoffs = 0;
1575 int flags = req->int1; 1671 int flags = req->int1;
1576 eio_dirent *dents = 0; 1672 eio_dirent *dents = 0;
1577 int dentalloc = 128; 1673 int dentalloc = 128;
1578 int dentoffs = 0; 1674 int dentoffs = 0;
1579 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
1580 1683
1581 req->result = -1; 1684 req->result = -1;
1582 1685
1583 if (!(flags & EIO_READDIR_DENTS)) 1686 if (!(flags & EIO_READDIR_DENTS))
1584 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1687 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1585 1688
1586 X_LOCK (wrklock); 1689#ifdef _WIN32
1587 /* 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
1588 self->dirp = dirp = opendir (req->ptr1); 1734 dirp = opendir (req->ptr1);
1735#endif
1589 1736
1590 if (req->flags & EIO_FLAG_PTR1_FREE) 1737 if (req->flags & EIO_FLAG_PTR1_FREE)
1591 free (req->ptr1); 1738 free (req->ptr1);
1592 1739
1593 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1740 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1594 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1741 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1595 req->ptr2 = names = malloc (namesalloc); 1742 req->ptr2 = names = malloc (namesalloc);
1596 X_UNLOCK (wrklock);
1597 1743
1598 if (dirp && names && (!flags || dents)) 1744 if (dirp && names && (!flags || dents))
1599 for (;;) 1745 for (;;)
1600 { 1746 {
1747 int done;
1748
1749#ifdef _WIN32
1750 done = !dirp;
1751#else
1601 errno = 0; 1752 errno = 0;
1602 entp = readdir (dirp); 1753 entp = readdir (dirp);
1754 done = !entp;
1755#endif
1603 1756
1604 if (!entp) 1757 if (done)
1605 { 1758 {
1759#ifndef _WIN32
1760 int old_errno = errno;
1761 closedir (dirp);
1762 errno = old_errno;
1763
1606 if (errno) 1764 if (errno)
1607 break; 1765 break;
1766#endif
1608 1767
1609 /* sort etc. */ 1768 /* sort etc. */
1610 req->int1 = flags; 1769 req->int1 = flags;
1611 req->result = dentoffs; 1770 req->result = dentoffs;
1612 1771
… …
1641 1800
1642 break; 1801 break;
1643 } 1802 }
1644 1803
1645 /* now add the entry to our list(s) */ 1804 /* now add the entry to our list(s) */
1646 name = entp->d_name; 1805 name = D_NAME (entp);
1647 1806
1648 /* skip . and .. entries */ 1807 /* skip . and .. entries */
1649 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1808 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1650 { 1809 {
1651 int len = D_NAMLEN (entp) + 1; 1810 int len = D_NAMLEN (entp) + 1;
1652 1811
1653 while (ecb_expect_false (namesoffs + len > namesalloc)) 1812 while (ecb_expect_false (namesoffs + len > namesalloc))
1654 { 1813 {
1655 namesalloc *= 2; 1814 namesalloc *= 2;
1656 X_LOCK (wrklock);
1657 req->ptr2 = names = realloc (names, namesalloc); 1815 req->ptr2 = names = realloc (names, namesalloc);
1658 X_UNLOCK (wrklock);
1659 1816
1660 if (!names) 1817 if (!names)
1661 break; 1818 break;
1662 } 1819 }
1663 1820
… …
1668 struct eio_dirent *ent; 1825 struct eio_dirent *ent;
1669 1826
1670 if (ecb_expect_false (dentoffs == dentalloc)) 1827 if (ecb_expect_false (dentoffs == dentalloc))
1671 { 1828 {
1672 dentalloc *= 2; 1829 dentalloc *= 2;
1673 X_LOCK (wrklock);
1674 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1830 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1675 X_UNLOCK (wrklock);
1676 1831
1677 if (!dents) 1832 if (!dents)
1678 break; 1833 break;
1679 } 1834 }
1680 1835
… …
1760 if (EIO_CANCELLED (req)) 1915 if (EIO_CANCELLED (req))
1761 { 1916 {
1762 errno = ECANCELED; 1917 errno = ECANCELED;
1763 break; 1918 break;
1764 } 1919 }
1920
1921#ifdef _WIN32
1922 if (!FindNextFile (dirp, &entp))
1923 {
1924 FindClose (dirp);
1925 dirp = 0;
1926 }
1927#endif
1765 } 1928 }
1766} 1929}
1767 1930
1768/*****************************************************************************/ 1931/*****************************************************************************/
1769 1932
… …
1786{ 1949{
1787 ETP_REQ *req; 1950 ETP_REQ *req;
1788 struct timespec ts; 1951 struct timespec ts;
1789 etp_worker *self = (etp_worker *)thr_arg; 1952 etp_worker *self = (etp_worker *)thr_arg;
1790 1953
1954#if HAVE_PRCTL_SET_NAME
1955 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
1956#endif
1957
1791 /* try to distribute timeouts somewhat randomly */ 1958 /* try to distribute timeouts somewhat evenly */
1792 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1959 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1793 1960
1794 for (;;) 1961 for (;;)
1795 { 1962 {
1963 ts.tv_sec = 0;
1964
1796 X_LOCK (reqlock); 1965 X_LOCK (reqlock);
1797 1966
1798 for (;;) 1967 for (;;)
1799 { 1968 {
1800 self->req = req = reqq_shift (&req_queue); 1969 self->req = req = reqq_shift (&req_queue);
1801 1970
1802 if (req) 1971 if (req)
1803 break; 1972 break;
1804 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
1805 ++idle; 1983 ++idle;
1806 1984
1807 ts.tv_sec = time (0) + idle_timeout; 1985 if (idle <= max_idle)
1808 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
1809 { 1989 {
1810 if (idle > max_idle) 1990 /* initialise timeout once */
1811 { 1991 if (!ts.tv_sec)
1812 --idle; 1992 ts.tv_sec = time (0) + idle_timeout;
1813 X_UNLOCK (reqlock);
1814 X_LOCK (wrklock);
1815 --started;
1816 X_UNLOCK (wrklock);
1817 goto quit;
1818 }
1819 1993
1820 /* we are allowed to idle, so do so without any timeout */
1821 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.,.. */
1822 } 1996 }
1823 1997
1824 --idle; 1998 --idle;
1825 } 1999 }
1826 2000
… …
1829 X_UNLOCK (reqlock); 2003 X_UNLOCK (reqlock);
1830 2004
1831 if (req->type < 0) 2005 if (req->type < 0)
1832 goto quit; 2006 goto quit;
1833 2007
1834 if (!EIO_CANCELLED (req))
1835 ETP_EXECUTE (self, req); 2008 ETP_EXECUTE (self, req);
1836 2009
1837 X_LOCK (reslock); 2010 X_LOCK (reslock);
1838 2011
1839 ++npending; 2012 ++npending;
1840 2013
… …
1858/*****************************************************************************/ 2031/*****************************************************************************/
1859 2032
1860int ecb_cold 2033int ecb_cold
1861eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2034eio_init (void (*want_poll)(void), void (*done_poll)(void))
1862{ 2035{
2036#if !HAVE_PREADWRITE
2037 X_MUTEX_CREATE (preadwritelock);
2038#endif
2039
1863 return etp_init (want_poll, done_poll); 2040 return etp_init (want_poll, done_poll);
1864} 2041}
1865 2042
1866ecb_inline void 2043ecb_inline void
1867eio_api_destroy (eio_req *req) 2044eio_api_destroy (eio_req *req)
… …
1894 } 2071 }
1895 2072
1896static void 2073static void
1897eio_execute (etp_worker *self, eio_req *req) 2074eio_execute (etp_worker *self, eio_req *req)
1898{ 2075{
2076 if (ecb_expect_false (EIO_CANCELLED (req)))
2077 {
2078 req->result = -1;
2079 req->errorno = ECANCELED;
2080 return;
2081 }
2082
1899 switch (req->type) 2083 switch (req->type)
1900 { 2084 {
1901 case EIO_READ: ALLOC (req->size); 2085 case EIO_READ: ALLOC (req->size);
1902 req->result = req->offs >= 0 2086 req->result = req->offs >= 0
1903 ? pread (req->int1, req->ptr2, req->size, req->offs) 2087 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1905 case EIO_WRITE: req->result = req->offs >= 0 2089 case EIO_WRITE: req->result = req->offs >= 0
1906 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2090 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1907 : write (req->int1, req->ptr2, req->size); break; 2091 : write (req->int1, req->ptr2, req->size); break;
1908 2092
1909 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;
1910 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;
1911 2095
1912 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2096 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1913 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2097 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1914 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2098 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1915 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2099 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
… …
1945 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2129 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1946 2130
1947 case EIO_SYNC: req->result = 0; sync (); break; 2131 case EIO_SYNC: req->result = 0; sync (); break;
1948 case EIO_FSYNC: req->result = fsync (req->int1); break; 2132 case EIO_FSYNC: req->result = fsync (req->int1); break;
1949 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;
1950 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;
1951 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2137 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1952 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;
1953 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2139 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1954 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;
1955 2141
1956 case EIO_READDIR: eio__scandir (req, self); break; 2142 case EIO_READDIR: eio__scandir (req, self); break;
1957 2143
1958 case EIO_BUSY: 2144 case EIO_BUSY:
1959#ifdef _WIN32 2145#ifdef _WIN32
… …
2039eio_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)
2040{ 2226{
2041 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;
2042} 2228}
2043 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
2044eio_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)
2045{ 2246{
2046 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;
2047} 2248}
2048 2249
… …
2054eio_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)
2055{ 2256{
2056 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2257 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2057} 2258}
2058 2259
2059eio_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)
2060{ 2261{
2061 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;
2062}
2063
2064eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2065{
2066 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2067} 2263}
2068 2264
2069eio_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)
2070{ 2266{
2071 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2267 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
2109eio_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)
2110{ 2306{
2111 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2307 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2112} 2308}
2113 2309
2114eio_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)
2115{ 2311{
2116 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;
2117} 2313}
2118 2314
2119eio_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)
… …
2139eio_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)
2140{ 2336{
2141 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2337 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2142} 2338}
2143 2339
2144eio_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)
2145{ 2341{
2146 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;
2147} 2343}
2148 2344
2149eio_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)
… …
2296} 2492}
2297 2493
2298/*****************************************************************************/ 2494/*****************************************************************************/
2299/* misc garbage */ 2495/* misc garbage */
2300 2496
2301ssize_t 2497eio_ssize_t
2302eio_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)
2303{ 2499{
2304 etp_worker wrk;
2305 ssize_t ret;
2306
2307 wrk.dbuf = 0;
2308
2309 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2500 return eio__sendfile (ofd, ifd, offset, count);
2310
2311 if (wrk.dbuf)
2312 free (wrk.dbuf);
2313
2314 return ret;
2315} 2501}
2316 2502

Diff Legend

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