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

Comparing libeio/eio.c (file contents):
Revision 1.85 by root, Wed Jul 13 00:53:03 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 */
… …
68#endif 67#endif
69 68
70#ifndef ECANCELED 69#ifndef ECANCELED
71# define ECANCELED EDOM 70# define ECANCELED EDOM
72#endif 71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
73 75
74static void eio_destroy (eio_req *req); 76static void eio_destroy (eio_req *req);
75 77
76#ifndef EIO_FINISH 78#ifndef EIO_FINISH
77# 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
… …
83 85
84#ifndef EIO_FEED 86#ifndef EIO_FEED
85# 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)
86#endif 88#endif
87 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
88#ifdef _WIN32 101#ifdef _WIN32
89 102
90 /*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
91#else 159#else
92 160
93# include <sys/time.h> 161 #include <sys/time.h>
94# include <sys/select.h> 162 #include <sys/select.h>
163 #include <sys/statvfs.h>
95# include <unistd.h> 164 #include <unistd.h>
96# include <utime.h> 165 #include <utime.h>
97# include <signal.h> 166 #include <signal.h>
98# include <dirent.h> 167 #include <dirent.h>
99 168
100#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
101# include <sys/mman.h> 170 #include <sys/mman.h>
102#endif 171 #endif
103 172
173 #define D_NAME(entp) entp->d_name
174
104/* 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 */
105# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 176 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
106# define _DIRENT_HAVE_D_TYPE /* sigh */ 177 #define _DIRENT_HAVE_D_TYPE /* sigh */
107# define D_INO(de) (de)->d_fileno 178 #define D_INO(de) (de)->d_fileno
108# define D_NAMLEN(de) (de)->d_namlen 179 #define D_NAMLEN(de) (de)->d_namlen
109# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 180 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
110# define D_INO(de) (de)->d_ino 181 #define D_INO(de) (de)->d_ino
111# endif 182 #endif
112 183
113#ifdef _D_EXACT_NAMLEN 184 #ifdef _D_EXACT_NAMLEN
114# undef D_NAMLEN 185 #undef D_NAMLEN
115# define D_NAMLEN(de) _D_EXACT_NAMLEN (de) 186 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
116#endif 187 #endif
117 188
118# ifdef _DIRENT_HAVE_D_TYPE 189 #ifdef _DIRENT_HAVE_D_TYPE
119# define D_TYPE(de) (de)->d_type 190 #define D_TYPE(de) (de)->d_type
120# endif 191 #endif
121 192
122# ifndef EIO_STRUCT_DIRENT 193 #ifndef EIO_STRUCT_DIRENT
123# define EIO_STRUCT_DIRENT struct dirent 194 #define EIO_STRUCT_DIRENT struct dirent
124# endif 195 #endif
125 196
126#endif 197#endif
127 198
128#if HAVE_SENDFILE 199#if HAVE_SENDFILE
129# if __linux 200# if __linux
… …
145#endif 216#endif
146#ifndef D_INO 217#ifndef D_INO
147# define D_INO(de) 0 218# define D_INO(de) 0
148#endif 219#endif
149#ifndef D_NAMLEN 220#ifndef D_NAMLEN
150# define D_NAMLEN(de) strlen ((de)->d_name) 221# define D_NAMLEN(entp) strlen (D_NAME (entp))
151#endif 222#endif
152 223
153/* used for struct dirent, AIX doesn't provide it */ 224/* used for struct dirent, AIX doesn't provide it */
154#ifndef NAME_MAX 225#ifndef NAME_MAX
155# define NAME_MAX 4096 226# define NAME_MAX 4096
… …
189#define ETP_WORKER_CLEAR(req) \ 260#define ETP_WORKER_CLEAR(req) \
190 if (wrk->dbuf) \ 261 if (wrk->dbuf) \
191 { \ 262 { \
192 free (wrk->dbuf); \ 263 free (wrk->dbuf); \
193 wrk->dbuf = 0; \ 264 wrk->dbuf = 0; \
194 } \
195 \
196 if (wrk->dirp) \
197 { \
198 closedir (wrk->dirp); \
199 wrk->dirp = 0; \
200 } 265 }
201 266
202#define ETP_WORKER_COMMON \ 267#define ETP_WORKER_COMMON \
203 void *dbuf; \ 268 void *dbuf;
204 DIR *dirp;
205 269
206/*****************************************************************************/ 270/*****************************************************************************/
207 271
208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
209 273
… …
238/* 302/*
239 * make our pread/pwrite emulation safe against themselves, but not against 303 * make our pread/pwrite emulation safe against themselves, but not against
240 * 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,
241 * but that's your problem, not mine. 305 * but that's your problem, not mine.
242 */ 306 */
243static xmutex_t preadwritelock = X_MUTEX_INIT; 307static xmutex_t preadwritelock;
244#endif 308#endif
245 309
246typedef struct etp_worker 310typedef struct etp_worker
247{ 311{
248 /* locked by wrklock */ 312 /* locked by wrklock */
… …
254 ETP_REQ *req; /* currently processed request */ 318 ETP_REQ *req; /* currently processed request */
255 319
256 ETP_WORKER_COMMON 320 ETP_WORKER_COMMON
257} etp_worker; 321} etp_worker;
258 322
259static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 323static etp_worker wrk_first; /* NOT etp */
260 324
261#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
262#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 326#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
263 327
264/* worker threads management */ 328/* worker threads management */
… …
335} etp_reqq; 399} etp_reqq;
336 400
337static etp_reqq req_queue; 401static etp_reqq req_queue;
338static etp_reqq res_queue; 402static etp_reqq res_queue;
339 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
340static int ecb_noinline 415static int ecb_noinline
341reqq_push (etp_reqq *q, ETP_REQ *req) 416reqq_push (etp_reqq *q, ETP_REQ *req)
342{ 417{
343 int pri = req->pri; 418 int pri = req->pri;
344 req->next = 0; 419 req->next = 0;
… …
378 } 453 }
379 454
380 abort (); 455 abort ();
381} 456}
382 457
383static void ecb_cold 458static int ecb_cold
384etp_thread_init (void) 459etp_init (void (*want_poll)(void), void (*done_poll)(void))
385{ 460{
386#if !HAVE_PREADWRITE
387 X_MUTEX_CREATE (preadwritelock);
388#endif
389 X_MUTEX_CREATE (wrklock); 461 X_MUTEX_CREATE (wrklock);
390 X_MUTEX_CREATE (reslock); 462 X_MUTEX_CREATE (reslock);
391 X_MUTEX_CREATE (reqlock); 463 X_MUTEX_CREATE (reqlock);
392 X_COND_CREATE (reqwait); 464 X_COND_CREATE (reqwait);
393}
394 465
395static void ecb_cold 466 reqq_init (&req_queue);
396etp_atfork_prepare (void) 467 reqq_init (&res_queue);
397{
398}
399 468
400static void ecb_cold 469 wrk_first.next =
401etp_atfork_parent (void) 470 wrk_first.prev = &wrk_first;
402{
403}
404
405static void ecb_cold
406etp_atfork_child (void)
407{
408 ETP_REQ *prv;
409
410 while ((prv = reqq_shift (&req_queue)))
411 ETP_DESTROY (prv);
412
413 while ((prv = reqq_shift (&res_queue)))
414 ETP_DESTROY (prv);
415
416 while (wrk_first.next != &wrk_first)
417 {
418 etp_worker *wrk = wrk_first.next;
419
420 if (wrk->req)
421 ETP_DESTROY (wrk->req);
422
423 etp_worker_clear (wrk);
424 etp_worker_free (wrk);
425 }
426 471
427 started = 0; 472 started = 0;
428 idle = 0; 473 idle = 0;
429 nreqs = 0; 474 nreqs = 0;
430 nready = 0; 475 nready = 0;
431 npending = 0; 476 npending = 0;
432
433 etp_thread_init ();
434}
435
436static void ecb_cold
437etp_once_init (void)
438{
439 etp_thread_init ();
440 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
441}
442
443static int ecb_cold
444etp_init (void (*want_poll)(void), void (*done_poll)(void))
445{
446 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
447
448 pthread_once (&doinit, etp_once_init);
449 477
450 want_poll_cb = want_poll; 478 want_poll_cb = want_poll;
451 done_poll_cb = done_poll; 479 done_poll_cb = done_poll;
452 480
453 return 0; 481 return 0;
… …
836# undef pread 864# undef pread
837# undef pwrite 865# undef pwrite
838# define pread eio__pread 866# define pread eio__pread
839# define pwrite eio__pwrite 867# define pwrite eio__pwrite
840 868
841static ssize_t 869static eio_ssize_t
842eio__pread (int fd, void *buf, size_t count, off_t offset) 870eio__pread (int fd, void *buf, size_t count, off_t offset)
843{ 871{
844 ssize_t res; 872 eio_ssize_t res;
845 off_t ooffset; 873 off_t ooffset;
846 874
847 X_LOCK (preadwritelock); 875 X_LOCK (preadwritelock);
848 ooffset = lseek (fd, 0, SEEK_CUR); 876 ooffset = lseek (fd, 0, SEEK_CUR);
849 lseek (fd, offset, SEEK_SET); 877 lseek (fd, offset, SEEK_SET);
… …
852 X_UNLOCK (preadwritelock); 880 X_UNLOCK (preadwritelock);
853 881
854 return res; 882 return res;
855} 883}
856 884
857static ssize_t 885static eio_ssize_t
858eio__pwrite (int fd, void *buf, size_t count, off_t offset) 886eio__pwrite (int fd, void *buf, size_t count, off_t offset)
859{ 887{
860 ssize_t res; 888 eio_ssize_t res;
861 off_t ooffset; 889 off_t ooffset;
862 890
863 X_LOCK (preadwritelock); 891 X_LOCK (preadwritelock);
864 ooffset = lseek (fd, 0, SEEK_CUR); 892 ooffset = lseek (fd, 0, SEEK_CUR);
865 lseek (fd, offset, SEEK_SET); 893 lseek (fd, offset, SEEK_SET);
… …
954 982
955#if !HAVE_READAHEAD 983#if !HAVE_READAHEAD
956# undef readahead 984# undef readahead
957# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 985# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
958 986
959static ssize_t 987static eio_ssize_t
960eio__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)
961{ 989{
962 size_t todo = count; 990 size_t todo = count;
963 dBUF; 991 dBUF;
964 992
… …
976} 1004}
977 1005
978#endif 1006#endif
979 1007
980/* sendfile always needs emulation */ 1008/* sendfile always needs emulation */
981static ssize_t 1009static eio_ssize_t
982eio__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)
983{ 1011{
984 ssize_t written = 0; 1012 eio_ssize_t written = 0;
985 ssize_t res; 1013 eio_ssize_t res;
986 1014
987 if (!count) 1015 if (!count)
988 return 0; 1016 return 0;
989 1017
990 for (;;) 1018 for (;;)
… …
1042 if (res < 0 && sbytes) 1070 if (res < 0 && sbytes)
1043 res = sbytes; 1071 res = sbytes;
1044 1072
1045# endif 1073# endif
1046 1074
1047#elif defined (_WIN32) 1075#elif defined (_WIN32) && 0
1048 /* 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 */
1049 /* 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, */
1050 /* libeio guarantees that the file offset does not change, and windows */ 1078 /* libeio guarantees that the file offset does not change, and windows */
1051 /* 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 */
1052 HANDLE h = TO_SOCKET (ifd); 1080 HANDLE h = TO_SOCKET (ifd);
… …
1085 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1113 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1086 /* BSDs */ 1114 /* BSDs */
1087#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... */
1088 || errno == ENOTSUP 1116 || errno == ENOTSUP
1089#endif 1117#endif
1118#ifdef EOPNOTSUPP /* windows */
1090 || errno == EOPNOTSUPP /* BSDs */ 1119 || errno == EOPNOTSUPP /* BSDs */
1120#endif
1091#if __solaris 1121#if __solaris
1092 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1122 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1093#endif 1123#endif
1094 ) 1124 )
1095 ) 1125 )
… …
1099 1129
1100 res = 0; 1130 res = 0;
1101 1131
1102 while (count) 1132 while (count)
1103 { 1133 {
1104 ssize_t cnt; 1134 eio_ssize_t cnt;
1105 1135
1106 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);
1107 1137
1108 if (cnt <= 0) 1138 if (cnt <= 0)
1109 { 1139 {
… …
1157 /* round up length */ 1187 /* round up length */
1158 *length = (*length + mask) & ~mask; 1188 *length = (*length + mask) & ~mask;
1159} 1189}
1160 1190
1161#if !_POSIX_MEMLOCK 1191#if !_POSIX_MEMLOCK
1162# define eio__mlockall(a) ((errno = ENOSYS), -1) 1192# define eio__mlockall(a) EIO_ENOSYS ()
1163#else 1193#else
1164 1194
1165static int 1195static int
1166eio__mlockall (int flags) 1196eio__mlockall (int flags)
1167{ 1197{
… …
1181 return mlockall (flags); 1211 return mlockall (flags);
1182} 1212}
1183#endif 1213#endif
1184 1214
1185#if !_POSIX_MEMLOCK_RANGE 1215#if !_POSIX_MEMLOCK_RANGE
1186# define eio__mlock(a,b) ((errno = ENOSYS), -1) 1216# define eio__mlock(a,b) EIO_ENOSYS ()
1187#else 1217#else
1188 1218
1189static int 1219static int
1190eio__mlock (void *addr, size_t length) 1220eio__mlock (void *addr, size_t length)
1191{ 1221{
… …
1195} 1225}
1196 1226
1197#endif 1227#endif
1198 1228
1199#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1229#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1200# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1230# define eio__msync(a,b,c) EIO_ENOSYS ()
1201#else 1231#else
1202 1232
1203static int 1233static int
1204eio__msync (void *mem, size_t len, int flags) 1234eio__msync (void *mem, size_t len, int flags)
1205{ 1235{
… …
1317 res += strlen (res); 1347 res += strlen (res);
1318 } 1348 }
1319 1349
1320 while (*rel) 1350 while (*rel)
1321 { 1351 {
1322 ssize_t len, linklen; 1352 eio_ssize_t len, linklen;
1323 char *beg = rel; 1353 char *beg = rel;
1324 1354
1325 while (*rel && *rel != '/') 1355 while (*rel && *rel != '/')
1326 ++rel; 1356 ++rel;
1327 1357
… …
1420 1450
1421#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 */
1422#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1452#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1423 1453
1424static void 1454static void
1425eio_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)
1426{ 1456{
1427 unsigned char bits [9 + sizeof (ino_t) * 8]; 1457 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1428 unsigned char *bit = bits; 1458 unsigned char *bit = bits;
1429 1459
1430 assert (CHAR_BIT == 8); 1460 assert (CHAR_BIT == 8);
1431 assert (sizeof (eio_dirent) * 8 < 256); 1461 assert (sizeof (eio_dirent) * 8 < 256);
1432 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1462 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1434 1464
1435 if (size <= EIO_SORT_FAST) 1465 if (size <= EIO_SORT_FAST)
1436 return; 1466 return;
1437 1467
1438 /* 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 */
1439 /* 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 */
1440 /* inode_bits must contain all inodes ORed together */ 1470 /* inode_bits must contain all inodes ORed together */
1441 /* 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 */
1442 { 1472 {
1443 ino_t endianness; 1473 eio_ino_t endianness;
1444 int i, j; 1474 int i, j;
1445 1475
1446 /* 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" */
1447 for (i = 0; i < sizeof (ino_t); ++i) 1477 for (i = 0; i < sizeof (eio_ino_t); ++i)
1448 ((unsigned char *)&endianness)[i] = i; 1478 ((unsigned char *)&endianness)[i] = i;
1449 1479
1450 *bit++ = 0; 1480 *bit++ = 0;
1451 1481
1452 for (i = 0; i < sizeof (ino_t); ++i) 1482 for (i = 0; i < sizeof (eio_ino_t); ++i)
1453 { 1483 {
1454 /* shifting off the byte offsets out of "endianness" */ 1484 /* shifting off the byte offsets out of "endianness" */
1455 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1485 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1456 endianness >>= 8; 1486 endianness >>= 8;
1457 1487
1458 for (j = 0; j < 8; ++j) 1488 for (j = 0; j < 8; ++j)
1459 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1489 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1460 *bit++ = offs + j; 1490 *bit++ = offs + j;
1461 } 1491 }
1462 1492
1463 for (j = 0; j < 8; ++j) 1493 for (j = 0; j < 8; ++j)
1464 if (score_bits & (1 << j)) 1494 if (score_bits & (1 << j))
1465 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1495 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1466 } 1496 }
1467 1497
1468 /* now actually do the sorting (a variant of MSD radix sort) */ 1498 /* now actually do the sorting (a variant of MSD radix sort) */
1469 { 1499 {
1470 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1500 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1471 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1501 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1472 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1502 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1473 int stk_idx = 0; 1503 int stk_idx = 0;
1474 1504
1475 base_stk [stk_idx] = dents; 1505 base_stk [stk_idx] = dents;
1476 end_stk [stk_idx] = dents + size; 1506 end_stk [stk_idx] = dents + size;
1477 bit_stk [stk_idx] = bit - 1; 1507 bit_stk [stk_idx] = bit - 1;
… …
1556 } 1586 }
1557 } 1587 }
1558} 1588}
1559 1589
1560static void 1590static void
1561eio_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)
1562{ 1592{
1563 if (size <= 1) 1593 if (size <= 1)
1564 return; /* our insertion sort relies on size > 0 */ 1594 return; /* our insertion sort relies on size > 0 */
1565 1595
1566 /* 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 */
… …
1574 1604
1575/* read a full directory */ 1605/* read a full directory */
1576static void 1606static void
1577eio__scandir (eio_req *req, etp_worker *self) 1607eio__scandir (eio_req *req, etp_worker *self)
1578{ 1608{
1579 DIR *dirp;
1580 EIO_STRUCT_DIRENT *entp;
1581 char *name, *names; 1609 char *name, *names;
1582 int namesalloc = 4096; 1610 int namesalloc = 4096 - sizeof (void *) * 4;
1583 int namesoffs = 0; 1611 int namesoffs = 0;
1584 int flags = req->int1; 1612 int flags = req->int1;
1585 eio_dirent *dents = 0; 1613 eio_dirent *dents = 0;
1586 int dentalloc = 128; 1614 int dentalloc = 128;
1587 int dentoffs = 0; 1615 int dentoffs = 0;
1588 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
1589 1624
1590 req->result = -1; 1625 req->result = -1;
1591 1626
1592 if (!(flags & EIO_READDIR_DENTS)) 1627 if (!(flags & EIO_READDIR_DENTS))
1593 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1628 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1594 1629
1595 X_LOCK (wrklock); 1630#ifdef _WIN32
1596 /* 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
1597 self->dirp = dirp = opendir (req->ptr1); 1674 dirp = opendir (req->ptr1);
1675#endif
1598 1676
1599 if (req->flags & EIO_FLAG_PTR1_FREE) 1677 if (req->flags & EIO_FLAG_PTR1_FREE)
1600 free (req->ptr1); 1678 free (req->ptr1);
1601 1679
1602 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1680 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1603 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1681 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1604 req->ptr2 = names = malloc (namesalloc); 1682 req->ptr2 = names = malloc (namesalloc);
1605 X_UNLOCK (wrklock);
1606 1683
1607 if (dirp && names && (!flags || dents)) 1684 if (dirp && names && (!flags || dents))
1608 for (;;) 1685 for (;;)
1609 { 1686 {
1687 int done;
1688
1689#ifdef _WIN32
1690 done = !dirp;
1691#else
1610 errno = 0; 1692 errno = 0;
1611 entp = readdir (dirp); 1693 entp = readdir (dirp);
1694 done = !entp;
1695#endif
1612 1696
1613 if (!entp) 1697 if (done)
1614 { 1698 {
1699#ifndef _WIN32
1700 int old_errno = errno;
1701 closedir (dirp);
1702 errno = old_errno;
1703
1615 if (errno) 1704 if (errno)
1616 break; 1705 break;
1706#endif
1617 1707
1618 /* sort etc. */ 1708 /* sort etc. */
1619 req->int1 = flags; 1709 req->int1 = flags;
1620 req->result = dentoffs; 1710 req->result = dentoffs;
1621 1711
… …
1650 1740
1651 break; 1741 break;
1652 } 1742 }
1653 1743
1654 /* now add the entry to our list(s) */ 1744 /* now add the entry to our list(s) */
1655 name = entp->d_name; 1745 name = D_NAME (entp);
1656 1746
1657 /* skip . and .. entries */ 1747 /* skip . and .. entries */
1658 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1748 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1659 { 1749 {
1660 int len = D_NAMLEN (entp) + 1; 1750 int len = D_NAMLEN (entp) + 1;
1661 1751
1662 while (ecb_expect_false (namesoffs + len > namesalloc)) 1752 while (ecb_expect_false (namesoffs + len > namesalloc))
1663 { 1753 {
1664 namesalloc *= 2; 1754 namesalloc *= 2;
1665 X_LOCK (wrklock);
1666 req->ptr2 = names = realloc (names, namesalloc); 1755 req->ptr2 = names = realloc (names, namesalloc);
1667 X_UNLOCK (wrklock);
1668 1756
1669 if (!names) 1757 if (!names)
1670 break; 1758 break;
1671 } 1759 }
1672 1760
… …
1677 struct eio_dirent *ent; 1765 struct eio_dirent *ent;
1678 1766
1679 if (ecb_expect_false (dentoffs == dentalloc)) 1767 if (ecb_expect_false (dentoffs == dentalloc))
1680 { 1768 {
1681 dentalloc *= 2; 1769 dentalloc *= 2;
1682 X_LOCK (wrklock);
1683 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1770 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1684 X_UNLOCK (wrklock);
1685 1771
1686 if (!dents) 1772 if (!dents)
1687 break; 1773 break;
1688 } 1774 }
1689 1775
… …
1769 if (EIO_CANCELLED (req)) 1855 if (EIO_CANCELLED (req))
1770 { 1856 {
1771 errno = ECANCELED; 1857 errno = ECANCELED;
1772 break; 1858 break;
1773 } 1859 }
1860
1861#ifdef _WIN32
1862 if (!FindNextFile (dirp, &entp))
1863 {
1864 FindClose (dirp);
1865 dirp = 0;
1866 }
1867#endif
1774 } 1868 }
1775} 1869}
1776 1870
1777/*****************************************************************************/ 1871/*****************************************************************************/
1778 1872
… …
1794X_THREAD_PROC (etp_proc) 1888X_THREAD_PROC (etp_proc)
1795{ 1889{
1796 ETP_REQ *req; 1890 ETP_REQ *req;
1797 struct timespec ts; 1891 struct timespec ts;
1798 etp_worker *self = (etp_worker *)thr_arg; 1892 etp_worker *self = (etp_worker *)thr_arg;
1799 int timeout;
1800 1893
1801 /* try to distribute timeouts somewhat evenly */ 1894 /* try to distribute timeouts somewhat evenly */
1802 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1895 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1803 1896
1804 for (;;) 1897 for (;;)
… …
1874/*****************************************************************************/ 1967/*****************************************************************************/
1875 1968
1876int ecb_cold 1969int ecb_cold
1877eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1970eio_init (void (*want_poll)(void), void (*done_poll)(void))
1878{ 1971{
1972#if !HAVE_PREADWRITE
1973 X_MUTEX_CREATE (preadwritelock);
1974#endif
1975
1879 return etp_init (want_poll, done_poll); 1976 return etp_init (want_poll, done_poll);
1880} 1977}
1881 1978
1882ecb_inline void 1979ecb_inline void
1883eio_api_destroy (eio_req *req) 1980eio_api_destroy (eio_req *req)
… …
2138eio_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)
2139{ 2236{
2140 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2237 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
2141} 2238}
2142 2239
2143eio_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)
2144{ 2241{
2145 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;
2146} 2243}
2147 2244
2148eio_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)
… …
2168eio_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)
2169{ 2266{
2170 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2267 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
2171} 2268}
2172 2269
2173eio_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)
2174{ 2271{
2175 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;
2176} 2273}
2177 2274
2178eio_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)
… …
2325} 2422}
2326 2423
2327/*****************************************************************************/ 2424/*****************************************************************************/
2328/* misc garbage */ 2425/* misc garbage */
2329 2426
2330ssize_t 2427eio_ssize_t
2331eio_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)
2332{ 2429{
2333 etp_worker wrk; 2430 etp_worker wrk;
2334 ssize_t ret; 2431 eio_ssize_t ret;
2335 2432
2336 wrk.dbuf = 0; 2433 wrk.dbuf = 0;
2337 2434
2338 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2435 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
2339 2436

Diff Legend

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