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

Comparing libeio/eio.c (file contents):
Revision 1.73 by root, Fri Jun 17 18:55:42 2011 UTC vs.
Revision 1.93 by root, Mon Jul 18 01:27:03 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
76static void eio_destroy (eio_req *req);
77
70#ifndef EIO_FINISH 78#ifndef EIO_FINISH
71# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 79# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
72#endif 80#endif
73 81
74#ifndef EIO_DESTROY 82#ifndef EIO_DESTROY
… …
77 85
78#ifndef EIO_FEED 86#ifndef EIO_FEED
79# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 87# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
80#endif 88#endif
81 89
90#ifndef EIO_FD_TO_WIN32_HANDLE
91# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
92#endif
93#ifndef EIO_WIN32_HANDLE_TO_FD
94# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
95#endif
96
97#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
98
99#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
100
82#ifdef _WIN32 101#ifdef _WIN32
83 102
84 /*doh*/ 103 #undef PAGESIZE
104 #define PAGESIZE 4096 /* GetSystemInfo? */
105
106 #ifdef EIO_STRUCT_STATI64
107 #define stat(path,buf) _stati64 (path,buf)
108 #define fstat(fd,buf) _fstati64 (path,buf)
109 #endif
110 #define lstat(path,buf) stat (path,buf)
111 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
112 #define mkdir(path,mode) _mkdir (path)
113 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
114
115 #define chmod(path,mode) _chmod (path, mode)
116 #define dup(fd) _dup (fd)
117 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
118
119 #define fchmod(fd,mode) EIO_ENOSYS ()
120 #define chown(path,uid,gid) EIO_ENOSYS ()
121 #define fchown(fd,uid,gid) EIO_ENOSYS ()
122 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
123 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
124 #define mknod(path,mode,dev) EIO_ENOSYS ()
125 #define sync() EIO_ENOSYS ()
126 #define readlink(path,buf,s) EIO_ENOSYS ()
127 #define statvfs(path,buf) EIO_ENOSYS ()
128 #define fstatvfs(fd,buf) EIO_ENOSYS ()
129
130 /* we could even stat and see if it exists */
131 static int
132 symlink (const char *old, const char *neu)
133 {
134 #if WINVER >= 0x0600
135 if (CreateSymbolicLink (neu, old, 1))
136 return 0;
137
138 if (CreateSymbolicLink (neu, old, 0))
139 return 0;
140 #endif
141
142 return EIO_ERRNO (ENOENT, -1);
143 }
144
145 /* POSIX API only */
146 #define CreateHardLink(neu,old,flags) 0
147 #define CreateSymbolicLink(neu,old,flags) 0
148
149 struct statvfs
150 {
151 int dummy;
152 };
153
154 #define DT_DIR EIO_DT_DIR
155 #define DT_REG EIO_DT_REG
156 #define D_NAME(entp) entp.cFileName
157 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
158
85#else 159#else
86 160
87# include <sys/time.h> 161 #include <sys/time.h>
88# include <sys/select.h> 162 #include <sys/select.h>
163 #include <sys/statvfs.h>
89# include <unistd.h> 164 #include <unistd.h>
90# include <utime.h> 165 #include <utime.h>
91# include <signal.h> 166 #include <signal.h>
92# include <dirent.h> 167 #include <dirent.h>
93 168
94#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
95# include <sys/mman.h> 170 #include <sys/mman.h>
96#endif 171 #endif
97 172
173 #define D_NAME(entp) entp->d_name
174
98/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 175 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
99# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 176 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
100# define _DIRENT_HAVE_D_TYPE /* sigh */ 177 #define _DIRENT_HAVE_D_TYPE /* sigh */
101# define D_INO(de) (de)->d_fileno 178 #define D_INO(de) (de)->d_fileno
102# define D_NAMLEN(de) (de)->d_namlen 179 #define D_NAMLEN(de) (de)->d_namlen
103# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 180 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
104# define D_INO(de) (de)->d_ino 181 #define D_INO(de) (de)->d_ino
105# endif 182 #endif
106 183
107#ifdef _D_EXACT_NAMLEN 184 #ifdef _D_EXACT_NAMLEN
108# undef D_NAMLEN 185 #undef D_NAMLEN
109# define D_NAMLEN(de) _D_EXACT_NAMLEN (de) 186 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
110#endif 187 #endif
111 188
112# ifdef _DIRENT_HAVE_D_TYPE 189 #ifdef _DIRENT_HAVE_D_TYPE
113# define D_TYPE(de) (de)->d_type 190 #define D_TYPE(de) (de)->d_type
114# endif 191 #endif
115 192
116# ifndef EIO_STRUCT_DIRENT 193 #ifndef EIO_STRUCT_DIRENT
117# define EIO_STRUCT_DIRENT struct dirent 194 #define EIO_STRUCT_DIRENT struct dirent
118# endif 195 #endif
119 196
120#endif 197#endif
121 198
122#if HAVE_SENDFILE 199#if HAVE_SENDFILE
123# if __linux 200# if __linux
… …
139#endif 216#endif
140#ifndef D_INO 217#ifndef D_INO
141# define D_INO(de) 0 218# define D_INO(de) 0
142#endif 219#endif
143#ifndef D_NAMLEN 220#ifndef D_NAMLEN
144# define D_NAMLEN(de) strlen ((de)->d_name) 221# define D_NAMLEN(entp) strlen (D_NAME (entp))
145#endif 222#endif
146 223
147/* used for struct dirent, AIX doesn't provide it */ 224/* used for struct dirent, AIX doesn't provide it */
148#ifndef NAME_MAX 225#ifndef NAME_MAX
149# define NAME_MAX 4096 226# define NAME_MAX 4096
… …
183#define ETP_WORKER_CLEAR(req) \ 260#define ETP_WORKER_CLEAR(req) \
184 if (wrk->dbuf) \ 261 if (wrk->dbuf) \
185 { \ 262 { \
186 free (wrk->dbuf); \ 263 free (wrk->dbuf); \
187 wrk->dbuf = 0; \ 264 wrk->dbuf = 0; \
188 } \
189 \
190 if (wrk->dirp) \
191 { \
192 closedir (wrk->dirp); \
193 wrk->dirp = 0; \
194 } 265 }
195 266
196#define ETP_WORKER_COMMON \ 267#define ETP_WORKER_COMMON \
197 void *dbuf; \ 268 void *dbuf;
198 DIR *dirp;
199 269
200/*****************************************************************************/ 270/*****************************************************************************/
201 271
202#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
203 273
… …
232/* 302/*
233 * make our pread/pwrite emulation safe against themselves, but not against 303 * make our pread/pwrite emulation safe against themselves, but not against
234 * normal read/write by using a mutex. slows down execution a lot, 304 * normal read/write by using a mutex. slows down execution a lot,
235 * but that's your problem, not mine. 305 * but that's your problem, not mine.
236 */ 306 */
237static xmutex_t preadwritelock = X_MUTEX_INIT; 307static xmutex_t preadwritelock;
238#endif 308#endif
239 309
240typedef struct etp_worker 310typedef struct etp_worker
241{ 311{
242 /* locked by wrklock */ 312 /* locked by wrklock */
… …
248 ETP_REQ *req; /* currently processed request */ 318 ETP_REQ *req; /* currently processed request */
249 319
250 ETP_WORKER_COMMON 320 ETP_WORKER_COMMON
251} etp_worker; 321} etp_worker;
252 322
253static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 323static etp_worker wrk_first; /* NOT etp */
254 324
255#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
256#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 326#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
257 327
258/* worker threads management */ 328/* worker threads management */
… …
329} etp_reqq; 399} etp_reqq;
330 400
331static etp_reqq req_queue; 401static etp_reqq req_queue;
332static etp_reqq res_queue; 402static etp_reqq res_queue;
333 403
404static void ecb_noinline ecb_cold
405reqq_init (etp_reqq *q)
406{
407 int pri;
408
409 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
410 q->qs[pri] = q->qe[pri] = 0;
411
412 q->size = 0;
413}
414
334static int ecb_noinline 415static int ecb_noinline
335reqq_push (etp_reqq *q, ETP_REQ *req) 416reqq_push (etp_reqq *q, ETP_REQ *req)
336{ 417{
337 int pri = req->pri; 418 int pri = req->pri;
338 req->next = 0; 419 req->next = 0;
… …
372 } 453 }
373 454
374 abort (); 455 abort ();
375} 456}
376 457
377static void ecb_cold 458static int ecb_cold
378etp_thread_init (void) 459etp_init (void (*want_poll)(void), void (*done_poll)(void))
379{ 460{
380 X_MUTEX_CREATE (wrklock); 461 X_MUTEX_CREATE (wrklock);
381 X_MUTEX_CREATE (reslock); 462 X_MUTEX_CREATE (reslock);
382 X_MUTEX_CREATE (reqlock); 463 X_MUTEX_CREATE (reqlock);
383 X_COND_CREATE (reqwait); 464 X_COND_CREATE (reqwait);
384}
385 465
386static void ecb_cold 466 reqq_init (&req_queue);
387etp_atfork_prepare (void) 467 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 468
397static void ecb_cold 469 wrk_first.next =
398etp_atfork_parent (void) 470 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 471
430 started = 0; 472 started = 0;
431 idle = 0; 473 idle = 0;
432 nreqs = 0; 474 nreqs = 0;
433 nready = 0; 475 nready = 0;
434 npending = 0; 476 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 477
453 want_poll_cb = want_poll; 478 want_poll_cb = want_poll;
454 done_poll_cb = done_poll; 479 done_poll_cb = done_poll;
455 480
456 return 0; 481 return 0;
… …
583} 608}
584 609
585static void 610static void
586etp_cancel (ETP_REQ *req) 611etp_cancel (ETP_REQ *req)
587{ 612{
588 X_LOCK (wrklock); 613 req->cancelled = 1;
589 req->flags |= EIO_FLAG_CANCELLED;
590 X_UNLOCK (wrklock);
591 614
592 eio_grp_cancel (req); 615 eio_grp_cancel (req);
593} 616}
594 617
595static void 618static void
… …
711 return eio_finish (grp); 734 return eio_finish (grp);
712 else 735 else
713 return 0; 736 return 0;
714} 737}
715 738
716void 739static void
717eio_destroy (eio_req *req) 740eio_destroy (eio_req *req)
718{ 741{
719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 742 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 743 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
721 744
… …
739 if (grp->grp_first == req) 762 if (grp->grp_first == req)
740 grp->grp_first = req->grp_next; 763 grp->grp_first = req->grp_next;
741 764
742 res2 = grp_dec (grp); 765 res2 = grp_dec (grp);
743 766
744 if (!res && res2) 767 if (!res)
745 res = res2; 768 res = res2;
746 } 769 }
747 770
748 eio_destroy (req); 771 eio_destroy (req);
749 772
… …
841# undef pread 864# undef pread
842# undef pwrite 865# undef pwrite
843# define pread eio__pread 866# define pread eio__pread
844# define pwrite eio__pwrite 867# define pwrite eio__pwrite
845 868
846static ssize_t 869static eio_ssize_t
847eio__pread (int fd, void *buf, size_t count, off_t offset) 870eio__pread (int fd, void *buf, size_t count, off_t offset)
848{ 871{
849 ssize_t res; 872 eio_ssize_t res;
850 off_t ooffset; 873 off_t ooffset;
851 874
852 X_LOCK (preadwritelock); 875 X_LOCK (preadwritelock);
853 ooffset = lseek (fd, 0, SEEK_CUR); 876 ooffset = lseek (fd, 0, SEEK_CUR);
854 lseek (fd, offset, SEEK_SET); 877 lseek (fd, offset, SEEK_SET);
… …
857 X_UNLOCK (preadwritelock); 880 X_UNLOCK (preadwritelock);
858 881
859 return res; 882 return res;
860} 883}
861 884
862static ssize_t 885static eio_ssize_t
863eio__pwrite (int fd, void *buf, size_t count, off_t offset) 886eio__pwrite (int fd, void *buf, size_t count, off_t offset)
864{ 887{
865 ssize_t res; 888 eio_ssize_t res;
866 off_t ooffset; 889 off_t ooffset;
867 890
868 X_LOCK (preadwritelock); 891 X_LOCK (preadwritelock);
869 ooffset = lseek (fd, 0, SEEK_CUR); 892 ooffset = lseek (fd, 0, SEEK_CUR);
870 lseek (fd, offset, SEEK_SET); 893 lseek (fd, offset, SEEK_SET);
… …
944 /* even though we could play tricks with the flags, it's better to always 967 /* 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 */ 968 * call fdatasync, as that matches the expectation of its users best */
946 return fdatasync (fd); 969 return fdatasync (fd);
947} 970}
948 971
972static int
973eio__fallocate (int fd, int mode, off_t offset, size_t len)
974{
975#if HAVE_FALLOCATE
976 return fallocate (fd, mode, offset, len);
977#else
978 errno = ENOSYS;
979 return -1;
980#endif
981}
982
949#if !HAVE_READAHEAD 983#if !HAVE_READAHEAD
950# undef readahead 984# undef readahead
951# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 985# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
952 986
953static ssize_t 987static eio_ssize_t
954eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 988eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
955{ 989{
956 size_t todo = count; 990 size_t todo = count;
957 dBUF; 991 dBUF;
958 992
… …
970} 1004}
971 1005
972#endif 1006#endif
973 1007
974/* sendfile always needs emulation */ 1008/* sendfile always needs emulation */
975static ssize_t 1009static eio_ssize_t
976eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1010eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
977{ 1011{
978 ssize_t written = 0; 1012 eio_ssize_t written = 0;
979 ssize_t res; 1013 eio_ssize_t res;
980 1014
981 if (!count) 1015 if (!count)
982 return 0; 1016 return 0;
983 1017
984 for (;;) 1018 for (;;)
985 { 1019 {
1020#ifdef __APPLE__
1021# undef HAVE_SENDFILE /* broken, as everything on os x */
1022#endif
986#if HAVE_SENDFILE 1023#if HAVE_SENDFILE
987# if __linux 1024# if __linux
988 off_t soffset = offset; 1025 off_t soffset = offset;
989 res = sendfile (ofd, ifd, &soffset, count); 1026 res = sendfile (ofd, ifd, &soffset, count);
990 1027
… …
1033 if (res < 0 && sbytes) 1070 if (res < 0 && sbytes)
1034 res = sbytes; 1071 res = sbytes;
1035 1072
1036# endif 1073# endif
1037 1074
1038#elif defined (_WIN32) 1075#elif defined (_WIN32) && 0
1039 /* does not work, just for documentation of what would need to be done */ 1076 /* 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, */ 1077 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1041 /* libeio guarantees that the file offset does not change, and windows */ 1078 /* 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 */ 1079 /* has no way to get an independent handle to the same file description */
1043 HANDLE h = TO_SOCKET (ifd); 1080 HANDLE h = TO_SOCKET (ifd);
… …
1076 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1113 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1077 /* BSDs */ 1114 /* BSDs */
1078#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1115#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1079 || errno == ENOTSUP 1116 || errno == ENOTSUP
1080#endif 1117#endif
1118#ifdef EOPNOTSUPP /* windows */
1081 || errno == EOPNOTSUPP /* BSDs */ 1119 || errno == EOPNOTSUPP /* BSDs */
1120#endif
1082#if __solaris 1121#if __solaris
1083 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1122 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1084#endif 1123#endif
1085 ) 1124 )
1086 ) 1125 )
… …
1090 1129
1091 res = 0; 1130 res = 0;
1092 1131
1093 while (count) 1132 while (count)
1094 { 1133 {
1095 ssize_t cnt; 1134 eio_ssize_t cnt;
1096 1135
1097 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1136 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1098 1137
1099 if (cnt <= 0) 1138 if (cnt <= 0)
1100 { 1139 {
… …
1117 } 1156 }
1118 1157
1119 return res; 1158 return res;
1120} 1159}
1121 1160
1161#ifdef PAGESIZE
1162# define eio_pagesize() PAGESIZE
1163#else
1164static intptr_t
1165eio_pagesize (void)
1166{
1167 static intptr_t page;
1168
1169 if (!page)
1170 page = sysconf (_SC_PAGESIZE);
1171
1172 return page;
1173}
1174#endif
1175
1176static void
1177eio_page_align (void **addr, size_t *length)
1178{
1179 intptr_t mask = eio_pagesize () - 1;
1180
1181 /* round down addr */
1182 intptr_t adj = mask & (intptr_t)*addr;
1183
1184 *addr = (void *)((intptr_t)*addr - adj);
1185 *length += adj;
1186
1187 /* round up length */
1188 *length = (*length + mask) & ~mask;
1189}
1190
1191#if !_POSIX_MEMLOCK
1192# define eio__mlockall(a) EIO_ENOSYS ()
1193#else
1194
1195static int
1196eio__mlockall (int flags)
1197{
1198 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1199 extern int mallopt (int, int);
1200 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1201 #endif
1202
1203 if (EIO_MCL_CURRENT != MCL_CURRENT
1204 || EIO_MCL_FUTURE != MCL_FUTURE)
1205 {
1206 flags = 0
1207 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1208 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1209 }
1210
1211 return mlockall (flags);
1212}
1213#endif
1214
1215#if !_POSIX_MEMLOCK_RANGE
1216# define eio__mlock(a,b) EIO_ENOSYS ()
1217#else
1218
1219static int
1220eio__mlock (void *addr, size_t length)
1221{
1222 eio_page_align (&addr, &length);
1223
1224 return mlock (addr, length);
1225}
1226
1227#endif
1228
1229#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1230# define eio__msync(a,b,c) EIO_ENOSYS ()
1231#else
1232
1233static int
1234eio__msync (void *mem, size_t len, int flags)
1235{
1236 eio_page_align (&mem, &len);
1237
1238 if (EIO_MS_ASYNC != MS_SYNC
1239 || EIO_MS_INVALIDATE != MS_INVALIDATE
1240 || EIO_MS_SYNC != MS_SYNC)
1241 {
1242 flags = 0
1243 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1244 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1245 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1246 }
1247
1248 return msync (mem, len, flags);
1249}
1250
1251#endif
1252
1253static int
1254eio__mtouch (eio_req *req)
1255{
1256 void *mem = req->ptr2;
1257 size_t len = req->size;
1258 int flags = req->int1;
1259
1260 eio_page_align (&mem, &len);
1261
1262 {
1263 intptr_t addr = (intptr_t)mem;
1264 intptr_t end = addr + len;
1265 intptr_t page = eio_pagesize ();
1266
1267 if (addr < end)
1268 if (flags & EIO_MT_MODIFY) /* modify */
1269 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1270 else
1271 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1272 }
1273
1274 return 0;
1275}
1276
1277/*****************************************************************************/
1278/* requests implemented outside eio_execute, because they are so large */
1279
1280static void
1281eio__realpath (eio_req *req, etp_worker *self)
1282{
1283 char *rel = req->ptr1;
1284 char *res;
1285 char *tmp1, *tmp2;
1286#if SYMLOOP_MAX > 32
1287 int symlinks = SYMLOOP_MAX;
1288#else
1289 int symlinks = 32;
1290#endif
1291
1292 req->result = -1;
1293
1294 errno = EINVAL;
1295 if (!rel)
1296 return;
1297
1298 errno = ENOENT;
1299 if (!*rel)
1300 return;
1301
1302 if (!req->ptr2)
1303 {
1304 X_LOCK (wrklock);
1305 req->flags |= EIO_FLAG_PTR2_FREE;
1306 X_UNLOCK (wrklock);
1307 req->ptr2 = malloc (PATH_MAX * 3);
1308
1309 errno = ENOMEM;
1310 if (!req->ptr2)
1311 return;
1312 }
1313
1314 res = req->ptr2;
1315 tmp1 = res + PATH_MAX;
1316 tmp2 = tmp1 + PATH_MAX;
1317
1318#if 0 /* disabled, the musl way to do things is just too racy */
1319#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1320 /* on linux we may be able to ask the kernel */
1321 {
1322 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1323
1324 if (fd >= 0)
1325 {
1326 sprintf (tmp1, "/proc/self/fd/%d", fd);
1327 req->result = readlink (tmp1, res, PATH_MAX);
1328 close (fd);
1329
1330 /* here we should probably stat the open file and the disk file, to make sure they still match */
1331
1332 if (req->result > 0)
1333 goto done;
1334 }
1335 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1336 return;
1337 }
1338#endif
1339#endif
1340
1341 if (*rel != '/')
1342 {
1343 if (!getcwd (res, PATH_MAX))
1344 return;
1345
1346 if (res [1]) /* only use if not / */
1347 res += strlen (res);
1348 }
1349
1350 while (*rel)
1351 {
1352 eio_ssize_t len, linklen;
1353 char *beg = rel;
1354
1355 while (*rel && *rel != '/')
1356 ++rel;
1357
1358 len = rel - beg;
1359
1360 if (!len) /* skip slashes */
1361 {
1362 ++rel;
1363 continue;
1364 }
1365
1366 if (beg [0] == '.')
1367 {
1368 if (len == 1)
1369 continue; /* . - nop */
1370
1371 if (beg [1] == '.' && len == 2)
1372 {
1373 /* .. - back up one component, if possible */
1374
1375 while (res != req->ptr2)
1376 if (*--res == '/')
1377 break;
1378
1379 continue;
1380 }
1381 }
1382
1383 errno = ENAMETOOLONG;
1384 if (res + 1 + len + 1 >= tmp1)
1385 return;
1386
1387 /* copy one component */
1388 *res = '/';
1389 memcpy (res + 1, beg, len);
1390
1391 /* zero-terminate, for readlink */
1392 res [len + 1] = 0;
1393
1394 /* now check if it's a symlink */
1395 linklen = readlink (req->ptr2, tmp1, PATH_MAX);
1396
1397 if (linklen < 0)
1398 {
1399 if (errno != EINVAL)
1400 return;
1401
1402 /* it's a normal directory. hopefully */
1403 res += len + 1;
1404 }
1405 else
1406 {
1407 /* yay, it was a symlink - build new path in tmp2 */
1408 int rellen = strlen (rel);
1409
1410 errno = ENAMETOOLONG;
1411 if (linklen + 1 + rellen >= PATH_MAX)
1412 return;
1413
1414 errno = ELOOP;
1415 if (!--symlinks)
1416 return;
1417
1418 if (*tmp1 == '/')
1419 res = req->ptr2; /* symlink resolves to an absolute path */
1420
1421 /* we need to be careful, as rel might point into tmp2 already */
1422 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1423 tmp2 [linklen] = '/';
1424 memcpy (tmp2, tmp1, linklen);
1425
1426 rel = tmp2;
1427 }
1428 }
1429
1430 /* special case for the lone root path */
1431 if (res == req->ptr2)
1432 *res++ = '/';
1433
1434 req->result = res - (char *)req->ptr2;
1435
1436done:
1437 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1438}
1439
1122static signed char 1440static signed char
1123eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1441eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1124{ 1442{
1125 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1443 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1126 : a->inode < b->inode ? -1 1444 : a->inode < b->inode ? -1
… …
1132 1450
1133#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1451#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1134#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1452#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1135 1453
1136static void 1454static void
1137eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1455eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1138{ 1456{
1139 unsigned char bits [9 + sizeof (ino_t) * 8]; 1457 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1140 unsigned char *bit = bits; 1458 unsigned char *bit = bits;
1141 1459
1142 assert (CHAR_BIT == 8); 1460 assert (CHAR_BIT == 8);
1143 assert (sizeof (eio_dirent) * 8 < 256); 1461 assert (sizeof (eio_dirent) * 8 < 256);
1144 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1462 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1146 1464
1147 if (size <= EIO_SORT_FAST) 1465 if (size <= EIO_SORT_FAST)
1148 return; 1466 return;
1149 1467
1150 /* first prepare an array of bits to test in our radix sort */ 1468 /* first prepare an array of bits to test in our radix sort */
1151 /* try to take endianness into account, as well as differences in ino_t sizes */ 1469 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1152 /* inode_bits must contain all inodes ORed together */ 1470 /* inode_bits must contain all inodes ORed together */
1153 /* which is used to skip bits that are 0 everywhere, which is very common */ 1471 /* which is used to skip bits that are 0 everywhere, which is very common */
1154 { 1472 {
1155 ino_t endianness; 1473 eio_ino_t endianness;
1156 int i, j; 1474 int i, j;
1157 1475
1158 /* we store the byte offset of byte n into byte n of "endianness" */ 1476 /* we store the byte offset of byte n into byte n of "endianness" */
1159 for (i = 0; i < sizeof (ino_t); ++i) 1477 for (i = 0; i < sizeof (eio_ino_t); ++i)
1160 ((unsigned char *)&endianness)[i] = i; 1478 ((unsigned char *)&endianness)[i] = i;
1161 1479
1162 *bit++ = 0; 1480 *bit++ = 0;
1163 1481
1164 for (i = 0; i < sizeof (ino_t); ++i) 1482 for (i = 0; i < sizeof (eio_ino_t); ++i)
1165 { 1483 {
1166 /* shifting off the byte offsets out of "endianness" */ 1484 /* shifting off the byte offsets out of "endianness" */
1167 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1485 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1168 endianness >>= 8; 1486 endianness >>= 8;
1169 1487
1170 for (j = 0; j < 8; ++j) 1488 for (j = 0; j < 8; ++j)
1171 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1489 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1172 *bit++ = offs + j; 1490 *bit++ = offs + j;
1173 } 1491 }
1174 1492
1175 for (j = 0; j < 8; ++j) 1493 for (j = 0; j < 8; ++j)
1176 if (score_bits & (1 << j)) 1494 if (score_bits & (1 << j))
1177 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1495 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1178 } 1496 }
1179 1497
1180 /* now actually do the sorting (a variant of MSD radix sort) */ 1498 /* now actually do the sorting (a variant of MSD radix sort) */
1181 { 1499 {
1182 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1500 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1183 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1501 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1184 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1502 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1185 int stk_idx = 0; 1503 int stk_idx = 0;
1186 1504
1187 base_stk [stk_idx] = dents; 1505 base_stk [stk_idx] = dents;
1188 end_stk [stk_idx] = dents + size; 1506 end_stk [stk_idx] = dents + size;
1189 bit_stk [stk_idx] = bit - 1; 1507 bit_stk [stk_idx] = bit - 1;
… …
1268 } 1586 }
1269 } 1587 }
1270} 1588}
1271 1589
1272static void 1590static void
1273eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1591eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1274{ 1592{
1275 if (size <= 1) 1593 if (size <= 1)
1276 return; /* our insertion sort relies on size > 0 */ 1594 return; /* our insertion sort relies on size > 0 */
1277 1595
1278 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1596 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1286 1604
1287/* read a full directory */ 1605/* read a full directory */
1288static void 1606static void
1289eio__scandir (eio_req *req, etp_worker *self) 1607eio__scandir (eio_req *req, etp_worker *self)
1290{ 1608{
1291 DIR *dirp;
1292 EIO_STRUCT_DIRENT *entp;
1293 char *name, *names; 1609 char *name, *names;
1294 int namesalloc = 4096; 1610 int namesalloc = 4096 - sizeof (void *) * 4;
1295 int namesoffs = 0; 1611 int namesoffs = 0;
1296 int flags = req->int1; 1612 int flags = req->int1;
1297 eio_dirent *dents = 0; 1613 eio_dirent *dents = 0;
1298 int dentalloc = 128; 1614 int dentalloc = 128;
1299 int dentoffs = 0; 1615 int dentoffs = 0;
1300 ino_t inode_bits = 0; 1616 eio_ino_t inode_bits = 0;
1617#ifdef _WIN32
1618 HANDLE dirp;
1619 WIN32_FIND_DATA entp;
1620#else
1621 DIR *dirp;
1622 EIO_STRUCT_DIRENT *entp;
1623#endif
1301 1624
1302 req->result = -1; 1625 req->result = -1;
1303 1626
1304 if (!(flags & EIO_READDIR_DENTS)) 1627 if (!(flags & EIO_READDIR_DENTS))
1305 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1628 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1306 1629
1307 X_LOCK (wrklock); 1630#ifdef _WIN32
1308 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1631 {
1632 int len = strlen ((const char *)req->ptr1);
1633 char *path = malloc (MAX_PATH);
1634 const char *fmt;
1635
1636 if (!len)
1637 fmt = "./*";
1638 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1639 fmt = "%s*";
1640 else
1641 fmt = "%s/*";
1642
1643 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1644 dirp = FindFirstFile (path, &entp);
1645 free (path);
1646
1647 if (dirp == INVALID_HANDLE_VALUE)
1648 {
1649 dirp = 0;
1650
1651 switch (GetLastError ())
1652 {
1653 case ERROR_FILE_NOT_FOUND:
1654 req->result = 0;
1655 break;
1656
1657 case ERROR_INVALID_NAME:
1658 case ERROR_PATH_NOT_FOUND:
1659 case ERROR_NO_MORE_FILES:
1660 errno = ENOENT;
1661 break;
1662
1663 case ERROR_NOT_ENOUGH_MEMORY:
1664 errno = ENOMEM;
1665 break;
1666
1667 default:
1668 errno = EINVAL;
1669 break;
1670 }
1671 }
1672 }
1673#else
1309 self->dirp = dirp = opendir (req->ptr1); 1674 dirp = opendir (req->ptr1);
1675#endif
1676
1677 if (req->flags & EIO_FLAG_PTR1_FREE)
1678 free (req->ptr1);
1310 1679
1311 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1680 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1312 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1681 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1313 req->ptr2 = names = malloc (namesalloc); 1682 req->ptr2 = names = malloc (namesalloc);
1314 X_UNLOCK (wrklock);
1315 1683
1316 if (dirp && names && (!flags || dents)) 1684 if (dirp && names && (!flags || dents))
1317 for (;;) 1685 for (;;)
1318 { 1686 {
1687 int done;
1688
1689#ifdef _WIN32
1690 done = !dirp;
1691#else
1319 errno = 0; 1692 errno = 0;
1320 entp = readdir (dirp); 1693 entp = readdir (dirp);
1694 done = !entp;
1695#endif
1321 1696
1322 if (!entp) 1697 if (done)
1323 { 1698 {
1699#ifndef _WIN32
1700 int old_errno = errno;
1701 closedir (dirp);
1702 errno = old_errno;
1703
1324 if (errno) 1704 if (errno)
1325 break; 1705 break;
1706#endif
1326 1707
1327 /* sort etc. */ 1708 /* sort etc. */
1328 req->int1 = flags; 1709 req->int1 = flags;
1329 req->result = dentoffs; 1710 req->result = dentoffs;
1330 1711
… …
1359 1740
1360 break; 1741 break;
1361 } 1742 }
1362 1743
1363 /* now add the entry to our list(s) */ 1744 /* now add the entry to our list(s) */
1364 name = entp->d_name; 1745 name = D_NAME (entp);
1365 1746
1366 /* skip . and .. entries */ 1747 /* skip . and .. entries */
1367 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1748 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1368 { 1749 {
1369 int len = D_NAMLEN (entp) + 1; 1750 int len = D_NAMLEN (entp) + 1;
1370 1751
1371 while (ecb_expect_false (namesoffs + len > namesalloc)) 1752 while (ecb_expect_false (namesoffs + len > namesalloc))
1372 { 1753 {
1373 namesalloc *= 2; 1754 namesalloc *= 2;
1374 X_LOCK (wrklock);
1375 req->ptr2 = names = realloc (names, namesalloc); 1755 req->ptr2 = names = realloc (names, namesalloc);
1376 X_UNLOCK (wrklock);
1377 1756
1378 if (!names) 1757 if (!names)
1379 break; 1758 break;
1380 } 1759 }
1381 1760
… …
1386 struct eio_dirent *ent; 1765 struct eio_dirent *ent;
1387 1766
1388 if (ecb_expect_false (dentoffs == dentalloc)) 1767 if (ecb_expect_false (dentoffs == dentalloc))
1389 { 1768 {
1390 dentalloc *= 2; 1769 dentalloc *= 2;
1391 X_LOCK (wrklock);
1392 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1770 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1393 X_UNLOCK (wrklock);
1394 1771
1395 if (!dents) 1772 if (!dents)
1396 break; 1773 break;
1397 } 1774 }
1398 1775
… …
1478 if (EIO_CANCELLED (req)) 1855 if (EIO_CANCELLED (req))
1479 { 1856 {
1480 errno = ECANCELED; 1857 errno = ECANCELED;
1481 break; 1858 break;
1482 } 1859 }
1860
1861#ifdef _WIN32
1862 if (!FindNextFile (dirp, &entp))
1863 {
1864 FindClose (dirp);
1865 dirp = 0;
1866 }
1867#endif
1483 } 1868 }
1484}
1485
1486#ifdef PAGESIZE
1487# define eio_pagesize() PAGESIZE
1488#else
1489static intptr_t
1490eio_pagesize (void)
1491{
1492 static intptr_t page;
1493
1494 if (!page)
1495 page = sysconf (_SC_PAGESIZE);
1496
1497 return page;
1498}
1499#endif
1500
1501static void
1502eio_page_align (void **addr, size_t *length)
1503{
1504 intptr_t mask = eio_pagesize () - 1;
1505
1506 /* round down addr */
1507 intptr_t adj = mask & (intptr_t)*addr;
1508
1509 *addr = (void *)((intptr_t)*addr - adj);
1510 *length += adj;
1511
1512 /* round up length */
1513 *length = (*length + mask) & ~mask;
1514}
1515
1516#if !_POSIX_MEMLOCK
1517# define eio__mlockall(a) ((errno = ENOSYS), -1)
1518#else
1519
1520static int
1521eio__mlockall (int flags)
1522{
1523 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1524 extern int mallopt (int, int);
1525 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1526 #endif
1527
1528 if (EIO_MCL_CURRENT != MCL_CURRENT
1529 || EIO_MCL_FUTURE != MCL_FUTURE)
1530 {
1531 flags = 0
1532 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1533 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1534 }
1535
1536 return mlockall (flags);
1537}
1538#endif
1539
1540#if !_POSIX_MEMLOCK_RANGE
1541# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1542#else
1543
1544static int
1545eio__mlock (void *addr, size_t length)
1546{
1547 eio_page_align (&addr, &length);
1548
1549 return mlock (addr, length);
1550}
1551
1552#endif
1553
1554#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1555# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1556#else
1557
1558static int
1559eio__msync (void *mem, size_t len, int flags)
1560{
1561 eio_page_align (&mem, &len);
1562
1563 if (EIO_MS_ASYNC != MS_SYNC
1564 || EIO_MS_INVALIDATE != MS_INVALIDATE
1565 || EIO_MS_SYNC != MS_SYNC)
1566 {
1567 flags = 0
1568 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1569 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1570 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1571 }
1572
1573 return msync (mem, len, flags);
1574}
1575
1576#endif
1577
1578static int
1579eio__mtouch (eio_req *req)
1580{
1581 void *mem = req->ptr2;
1582 size_t len = req->size;
1583 int flags = req->int1;
1584
1585 eio_page_align (&mem, &len);
1586
1587 {
1588 intptr_t addr = (intptr_t)mem;
1589 intptr_t end = addr + len;
1590 intptr_t page = eio_pagesize ();
1591
1592 if (addr < end)
1593 if (flags & EIO_MT_MODIFY) /* modify */
1594 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1595 else
1596 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1597 }
1598
1599 return 0;
1600} 1869}
1601 1870
1602/*****************************************************************************/ 1871/*****************************************************************************/
1603 1872
1604#define ALLOC(len) \ 1873#define ALLOC(len) \
… …
1620{ 1889{
1621 ETP_REQ *req; 1890 ETP_REQ *req;
1622 struct timespec ts; 1891 struct timespec ts;
1623 etp_worker *self = (etp_worker *)thr_arg; 1892 etp_worker *self = (etp_worker *)thr_arg;
1624 1893
1625 /* try to distribute timeouts somewhat randomly */ 1894 /* try to distribute timeouts somewhat evenly */
1626 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1895 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1627 1896
1628 for (;;) 1897 for (;;)
1629 { 1898 {
1899 ts.tv_sec = 0;
1900
1630 X_LOCK (reqlock); 1901 X_LOCK (reqlock);
1631 1902
1632 for (;;) 1903 for (;;)
1633 { 1904 {
1634 self->req = req = reqq_shift (&req_queue); 1905 self->req = req = reqq_shift (&req_queue);
1635 1906
1636 if (req) 1907 if (req)
1637 break; 1908 break;
1638 1909
1910 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1911 {
1912 X_UNLOCK (reqlock);
1913 X_LOCK (wrklock);
1914 --started;
1915 X_UNLOCK (wrklock);
1916 goto quit;
1917 }
1918
1639 ++idle; 1919 ++idle;
1640 1920
1641 ts.tv_sec = time (0) + idle_timeout; 1921 if (idle <= max_idle)
1642 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1922 /* we are allowed to idle, so do so without any timeout */
1923 X_COND_WAIT (reqwait, reqlock);
1924 else
1643 { 1925 {
1644 if (idle > max_idle) 1926 /* initialise timeout once */
1645 { 1927 if (!ts.tv_sec)
1646 --idle; 1928 ts.tv_sec = time (0) + idle_timeout;
1647 X_UNLOCK (reqlock);
1648 X_LOCK (wrklock);
1649 --started;
1650 X_UNLOCK (wrklock);
1651 goto quit;
1652 }
1653 1929
1654 /* we are allowed to idle, so do so without any timeout */
1655 X_COND_WAIT (reqwait, reqlock); 1930 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1931 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1656 } 1932 }
1657 1933
1658 --idle; 1934 --idle;
1659 } 1935 }
1660 1936
… …
1663 X_UNLOCK (reqlock); 1939 X_UNLOCK (reqlock);
1664 1940
1665 if (req->type < 0) 1941 if (req->type < 0)
1666 goto quit; 1942 goto quit;
1667 1943
1668 if (!EIO_CANCELLED (req))
1669 ETP_EXECUTE (self, req); 1944 ETP_EXECUTE (self, req);
1670 1945
1671 X_LOCK (reslock); 1946 X_LOCK (reslock);
1672 1947
1673 ++npending; 1948 ++npending;
1674 1949
… …
1692/*****************************************************************************/ 1967/*****************************************************************************/
1693 1968
1694int ecb_cold 1969int ecb_cold
1695eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1970eio_init (void (*want_poll)(void), void (*done_poll)(void))
1696{ 1971{
1972#if !HAVE_PREADWRITE
1973 X_MUTEX_CREATE (preadwritelock);
1974#endif
1975
1697 return etp_init (want_poll, done_poll); 1976 return etp_init (want_poll, done_poll);
1698} 1977}
1699 1978
1700ecb_inline void 1979ecb_inline void
1701eio_api_destroy (eio_req *req) 1980eio_api_destroy (eio_req *req)
… …
1728 } 2007 }
1729 2008
1730static void 2009static void
1731eio_execute (etp_worker *self, eio_req *req) 2010eio_execute (etp_worker *self, eio_req *req)
1732{ 2011{
2012 if (ecb_expect_false (EIO_CANCELLED (req)))
2013 {
2014 req->result = -1;
2015 req->errorno = ECANCELED;
2016 return;
2017 }
2018
1733 switch (req->type) 2019 switch (req->type)
1734 { 2020 {
1735 case EIO_READ: ALLOC (req->size); 2021 case EIO_READ: ALLOC (req->size);
1736 req->result = req->offs >= 0 2022 req->result = req->offs >= 0
1737 ? pread (req->int1, req->ptr2, req->size, req->offs) 2023 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1771 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 2057 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1772 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 2058 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1773 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 2059 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1774 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 2060 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1775 2061
2062 case EIO_REALPATH: eio__realpath (req, self); break;
2063
1776 case EIO_READLINK: ALLOC (PATH_MAX); 2064 case EIO_READLINK: ALLOC (PATH_MAX);
1777 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2065 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1778 2066
1779 case EIO_SYNC: req->result = 0; sync (); break; 2067 case EIO_SYNC: req->result = 0; sync (); break;
1780 case EIO_FSYNC: req->result = fsync (req->int1); break; 2068 case EIO_FSYNC: req->result = fsync (req->int1); break;
… …
1782 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2070 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1783 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2071 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1784 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2072 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1785 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2073 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1786 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2074 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2075 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1787 2076
1788 case EIO_READDIR: eio__scandir (req, self); break; 2077 case EIO_READDIR: eio__scandir (req, self); break;
1789 2078
1790 case EIO_BUSY: 2079 case EIO_BUSY:
1791#ifdef _WIN32 2080#ifdef _WIN32
… …
1891eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2180eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1892{ 2181{
1893 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2182 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1894} 2183}
1895 2184
2185eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2186{
2187 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2188}
2189
1896eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2190eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1897{ 2191{
1898 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2192 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1899} 2193}
1900 2194
… …
1941eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2235eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1942{ 2236{
1943 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2237 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1944} 2238}
1945 2239
1946eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2240eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1947{ 2241{
1948 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2242 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1949} 2243}
1950 2244
1951eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2245eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
1971eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2265eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1972{ 2266{
1973 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2267 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1974} 2268}
1975 2269
1976eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2270eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1977{ 2271{
1978 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2272 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1979} 2273}
1980 2274
1981eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2275eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
1995} 2289}
1996 2290
1997eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2291eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1998{ 2292{
1999 return eio__1path (EIO_READLINK, path, pri, cb, data); 2293 return eio__1path (EIO_READLINK, path, pri, cb, data);
2294}
2295
2296eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2297{
2298 return eio__1path (EIO_REALPATH, path, pri, cb, data);
2000} 2299}
2001 2300
2002eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2301eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
2003{ 2302{
2004 return eio__1path (EIO_STAT, path, pri, cb, data); 2303 return eio__1path (EIO_STAT, path, pri, cb, data);
… …
2123} 2422}
2124 2423
2125/*****************************************************************************/ 2424/*****************************************************************************/
2126/* misc garbage */ 2425/* misc garbage */
2127 2426
2128ssize_t 2427eio_ssize_t
2129eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2428eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2130{ 2429{
2131 etp_worker wrk; 2430 etp_worker wrk;
2132 ssize_t ret; 2431 eio_ssize_t ret;
2133 2432
2134 wrk.dbuf = 0; 2433 wrk.dbuf = 0;
2135 2434
2136 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2435 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
2137 2436

Diff Legend

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