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

Comparing libeio/eio.c (file contents):
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC vs.
Revision 1.97 by root, Sun Jul 24 03:32:54 2011 UTC

… …
67#endif 67#endif
68 68
69#ifndef ECANCELED 69#ifndef ECANCELED
70# define ECANCELED EDOM 70# define ECANCELED EDOM
71#endif 71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
77# define ENOTSOCK WSAENOTSOCK
78#endif
72 79
73static void eio_destroy (eio_req *req); 80static void eio_destroy (eio_req *req);
74 81
75#ifndef EIO_FINISH 82#ifndef EIO_FINISH
76# 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
… …
95 102
96#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 103#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
97 104
98#ifdef _WIN32 105#ifdef _WIN32
99 106
107 #undef PAGESIZE
100 #define PAGESIZE 4096 /* GetSystemInfo? */ 108 #define PAGESIZE 4096 /* GetSystemInfo? */
101 109
102 #ifdef EIO_STRUCT_STATI64 110 #ifdef EIO_STRUCT_STATI64
103 #define stat(path,buf) _stati64 (path,buf) 111 #define stat(path,buf) _stati64 (path,buf)
104 #define fstat(fd,buf) _fstati64 (path,buf) 112 #define fstat(fd,buf) _fstati64 (fd,buf)
105 #endif 113 #endif
106 #define lstat(path,buf) stat (path,buf) 114 #define lstat(path,buf) stat (path,buf)
107 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 115 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
108 #define mkdir(path,mode) _mkdir (path) 116 #define mkdir(path,mode) _mkdir (path)
109 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 117 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
110 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 ()
111 #define chown(path,uid,gid) EIO_ENOSYS () 124 #define chown(path,uid,gid) EIO_ENOSYS ()
112 #define fchown(fd,uid,gid) EIO_ENOSYS () 125 #define fchown(fd,uid,gid) EIO_ENOSYS ()
113 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 126 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
114 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 127 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
115 #define mknod(path,mode,dev) EIO_ENOSYS () 128 #define mknod(path,mode,dev) EIO_ENOSYS ()
116 #define sync() 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 ()
117 133
118 /* we could even stat and see if it exists */ 134 /* we could even stat and see if it exists */
119 static int 135 static int
120 symlink (const char *old, const char *neu) 136 symlink (const char *old, const char *neu)
121 { 137 {
138 #if WINVER >= 0x0600
122 if (CreateSymbolicLink (neu, old, 1)) 139 if (CreateSymbolicLink (neu, old, 1))
123 return 0; 140 return 0;
124 141
125 if (CreateSymbolicLink (neu, old, 0)) 142 if (CreateSymbolicLink (neu, old, 0))
126 return 0; 143 return 0;
144 #endif
127 145
128 return EIO_ERRNO (ENOENT, -1); 146 return EIO_ERRNO (ENOENT, -1);
129 } 147 }
148
149 /* POSIX API only */
150 #define CreateHardLink(neu,old,flags) 0
151 #define CreateSymbolicLink(neu,old,flags) 0
152
153 struct statvfs
154 {
155 int dummy;
156 };
157
158 #define DT_DIR EIO_DT_DIR
159 #define DT_REG EIO_DT_REG
160 #define D_NAME(entp) entp.cFileName
161 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
130 162
131#else 163#else
132 164
133 #include <sys/time.h> 165 #include <sys/time.h>
134 #include <sys/select.h> 166 #include <sys/select.h>
135 #include <sys/statvfs.h> 167 #include <sys/statvfs.h>
136 #include <unistd.h> 168 #include <unistd.h>
137 #include <utime.h>
138 #include <signal.h> 169 #include <signal.h>
139 #include <dirent.h> 170 #include <dirent.h>
140 171
141 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 172 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
142 #include <sys/mman.h> 173 #include <sys/mman.h>
143 #endif 174 #endif
175
176 #define D_NAME(entp) entp->d_name
144 177
145 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 178 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
146 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 179 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
147 #define _DIRENT_HAVE_D_TYPE /* sigh */ 180 #define _DIRENT_HAVE_D_TYPE /* sigh */
148 #define D_INO(de) (de)->d_fileno 181 #define D_INO(de) (de)->d_fileno
… …
162 195
163 #ifndef EIO_STRUCT_DIRENT 196 #ifndef EIO_STRUCT_DIRENT
164 #define EIO_STRUCT_DIRENT struct dirent 197 #define EIO_STRUCT_DIRENT struct dirent
165 #endif 198 #endif
166 199
200#endif
201
202#if HAVE_UTIMES
203# include <utime.h>
167#endif 204#endif
168 205
169#if HAVE_SENDFILE 206#if HAVE_SENDFILE
170# if __linux 207# if __linux
171# include <sys/sendfile.h> 208# include <sys/sendfile.h>
… …
179# else 216# else
180# error sendfile support requested but not available 217# error sendfile support requested but not available
181# endif 218# endif
182#endif 219#endif
183 220
221#if HAVE_SYS_SYSCALL_H
222# include <sys/syscall.h>
223#endif
224
184#ifndef D_TYPE 225#ifndef D_TYPE
185# define D_TYPE(de) 0 226# define D_TYPE(de) 0
186#endif 227#endif
187#ifndef D_INO 228#ifndef D_INO
188# define D_INO(de) 0 229# define D_INO(de) 0
189#endif 230#endif
190#ifndef D_NAMLEN 231#ifndef D_NAMLEN
191# define D_NAMLEN(de) strlen ((de)->d_name) 232# define D_NAMLEN(entp) strlen (D_NAME (entp))
192#endif 233#endif
193 234
194/* used for struct dirent, AIX doesn't provide it */ 235/* used for struct dirent, AIX doesn't provide it */
195#ifndef NAME_MAX 236#ifndef NAME_MAX
196# define NAME_MAX 4096 237# define NAME_MAX 4096
… …
203 244
204/* buffer size for various temporary buffers */ 245/* buffer size for various temporary buffers */
205#define EIO_BUFSIZE 65536 246#define EIO_BUFSIZE 65536
206 247
207#define dBUF \ 248#define dBUF \
208 char *eio_buf; \
209 ETP_WORKER_LOCK (self); \
210 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 249 char *eio_buf = malloc (EIO_BUFSIZE); \
211 ETP_WORKER_UNLOCK (self); \
212 errno = ENOMEM; \ 250 errno = ENOMEM; \
213 if (!eio_buf) \ 251 if (!eio_buf) \
214 return -1; 252 return -1
253
254#define FUBd \
255 free (eio_buf)
215 256
216#define EIO_TICKS ((1000000 + 1023) >> 10) 257#define EIO_TICKS ((1000000 + 1023) >> 10)
217 258
218#define ETP_PRI_MIN EIO_PRI_MIN 259#define ETP_PRI_MIN EIO_PRI_MIN
219#define ETP_PRI_MAX EIO_PRI_MAX 260#define ETP_PRI_MAX EIO_PRI_MAX
… …
225static int eio_finish (eio_req *req); 266static int eio_finish (eio_req *req);
226#define ETP_FINISH(req) eio_finish (req) 267#define ETP_FINISH(req) eio_finish (req)
227static void eio_execute (struct etp_worker *self, eio_req *req); 268static void eio_execute (struct etp_worker *self, eio_req *req);
228#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 269#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
229 270
230#define ETP_WORKER_CLEAR(req) \
231 if (wrk->dbuf) \
232 { \
233 free (wrk->dbuf); \
234 wrk->dbuf = 0; \
235 } \
236 \
237 if (wrk->dirp) \
238 { \
239 closedir (wrk->dirp); \
240 wrk->dirp = 0; \
241 }
242
243#define ETP_WORKER_COMMON \
244 void *dbuf; \
245 DIR *dirp;
246
247/*****************************************************************************/ 271/*****************************************************************************/
248 272
249#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 273#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250 274
251/* calculate time difference in ~1/EIO_TICKS of a second */ 275/* calculate time difference in ~1/EIO_TICKS of a second */
… …
279/* 303/*
280 * make our pread/pwrite emulation safe against themselves, but not against 304 * make our pread/pwrite emulation safe against themselves, but not against
281 * normal read/write by using a mutex. slows down execution a lot, 305 * normal read/write by using a mutex. slows down execution a lot,
282 * but that's your problem, not mine. 306 * but that's your problem, not mine.
283 */ 307 */
284static xmutex_t preadwritelock = X_MUTEX_INIT; 308static xmutex_t preadwritelock;
285#endif 309#endif
286 310
287typedef struct etp_worker 311typedef struct etp_worker
288{ 312{
289 /* locked by wrklock */ 313 /* locked by wrklock */
… …
292 xthread_t tid; 316 xthread_t tid;
293 317
294 /* locked by reslock, reqlock or wrklock */ 318 /* locked by reslock, reqlock or wrklock */
295 ETP_REQ *req; /* currently processed request */ 319 ETP_REQ *req; /* currently processed request */
296 320
321#ifdef ETP_WORKER_COMMON
297 ETP_WORKER_COMMON 322 ETP_WORKER_COMMON
323#endif
298} etp_worker; 324} etp_worker;
299 325
300static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 326static etp_worker wrk_first; /* NOT etp */
301 327
302#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 328#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 329#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304 330
305/* worker threads management */ 331/* worker threads management */
306 332
307static void ecb_cold 333static void ecb_cold
308etp_worker_clear (etp_worker *wrk) 334etp_worker_clear (etp_worker *wrk)
309{ 335{
310 ETP_WORKER_CLEAR (wrk);
311} 336}
312 337
313static void ecb_cold 338static void ecb_cold
314etp_worker_free (etp_worker *wrk) 339etp_worker_free (etp_worker *wrk)
315{ 340{
… …
376} etp_reqq; 401} etp_reqq;
377 402
378static etp_reqq req_queue; 403static etp_reqq req_queue;
379static etp_reqq res_queue; 404static etp_reqq res_queue;
380 405
406static void ecb_noinline ecb_cold
407reqq_init (etp_reqq *q)
408{
409 int pri;
410
411 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
412 q->qs[pri] = q->qe[pri] = 0;
413
414 q->size = 0;
415}
416
381static int ecb_noinline 417static int ecb_noinline
382reqq_push (etp_reqq *q, ETP_REQ *req) 418reqq_push (etp_reqq *q, ETP_REQ *req)
383{ 419{
384 int pri = req->pri; 420 int pri = req->pri;
385 req->next = 0; 421 req->next = 0;
… …
419 } 455 }
420 456
421 abort (); 457 abort ();
422} 458}
423 459
424static void ecb_cold 460static int ecb_cold
425etp_thread_init (void) 461etp_init (void (*want_poll)(void), void (*done_poll)(void))
426{ 462{
427#if !HAVE_PREADWRITE
428 X_MUTEX_CREATE (preadwritelock);
429#endif
430 X_MUTEX_CREATE (wrklock); 463 X_MUTEX_CREATE (wrklock);
431 X_MUTEX_CREATE (reslock); 464 X_MUTEX_CREATE (reslock);
432 X_MUTEX_CREATE (reqlock); 465 X_MUTEX_CREATE (reqlock);
433 X_COND_CREATE (reqwait); 466 X_COND_CREATE (reqwait);
434}
435 467
436static void ecb_cold 468 reqq_init (&req_queue);
437etp_atfork_prepare (void) 469 reqq_init (&res_queue);
438{
439}
440 470
441static void ecb_cold 471 wrk_first.next =
442etp_atfork_parent (void) 472 wrk_first.prev = &wrk_first;
443{
444}
445
446static void ecb_cold
447etp_atfork_child (void)
448{
449 ETP_REQ *prv;
450
451 while ((prv = reqq_shift (&req_queue)))
452 ETP_DESTROY (prv);
453
454 while ((prv = reqq_shift (&res_queue)))
455 ETP_DESTROY (prv);
456
457 while (wrk_first.next != &wrk_first)
458 {
459 etp_worker *wrk = wrk_first.next;
460
461 if (wrk->req)
462 ETP_DESTROY (wrk->req);
463
464 etp_worker_clear (wrk);
465 etp_worker_free (wrk);
466 }
467 473
468 started = 0; 474 started = 0;
469 idle = 0; 475 idle = 0;
470 nreqs = 0; 476 nreqs = 0;
471 nready = 0; 477 nready = 0;
472 npending = 0; 478 npending = 0;
473
474 etp_thread_init ();
475}
476
477static void ecb_cold
478etp_once_init (void)
479{
480 etp_thread_init ();
481 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
482}
483
484static int ecb_cold
485etp_init (void (*want_poll)(void), void (*done_poll)(void))
486{
487 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
488
489 pthread_once (&doinit, etp_once_init);
490 479
491 want_poll_cb = want_poll; 480 want_poll_cb = want_poll;
492 done_poll_cb = done_poll; 481 done_poll_cb = done_poll;
493 482
494 return 0; 483 return 0;
… …
952#if !HAVE_FDATASYNC 941#if !HAVE_FDATASYNC
953# undef fdatasync 942# undef fdatasync
954# define fdatasync(fd) fsync (fd) 943# define fdatasync(fd) fsync (fd)
955#endif 944#endif
956 945
946static int
947eio__syncfs (int fd)
948{
949 int res;
950
951#if HAVE_SYS_SYNCFS
952 res = (int)syscall (__NR_syncfs, (int)(fd));
953#else
954 res = -1;
955 errno = ENOSYS;
956#endif
957
958 if (res < 0 && errno == ENOSYS && fd >= 0)
959 sync ();
960
961 return res;
962}
963
957/* sync_file_range always needs emulation */ 964/* sync_file_range always needs emulation */
958static int 965static int
959eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 966eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
960{ 967{
961#if HAVE_SYNC_FILE_RANGE 968#if HAVE_SYNC_FILE_RANGE
… …
1010 pread (fd, eio_buf, len, offset); 1017 pread (fd, eio_buf, len, offset);
1011 offset += len; 1018 offset += len;
1012 todo -= len; 1019 todo -= len;
1013 } 1020 }
1014 1021
1022 FUBd;
1023
1015 errno = 0; 1024 errno = 0;
1016 return count; 1025 return count;
1017} 1026}
1018 1027
1019#endif 1028#endif
1020 1029
1021/* sendfile always needs emulation */ 1030/* sendfile always needs emulation */
1022static eio_ssize_t 1031static eio_ssize_t
1023eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1032eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024{ 1033{
1025 eio_ssize_t written = 0; 1034 eio_ssize_t written = 0;
1026 eio_ssize_t res; 1035 eio_ssize_t res;
1027 1036
1028 if (!count) 1037 if (!count)
… …
1126 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1135 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1127 /* BSDs */ 1136 /* BSDs */
1128#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1137#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129 || errno == ENOTSUP 1138 || errno == ENOTSUP
1130#endif 1139#endif
1140#ifdef EOPNOTSUPP /* windows */
1131 || errno == EOPNOTSUPP /* BSDs */ 1141 || errno == EOPNOTSUPP /* BSDs */
1142#endif
1132#if __solaris 1143#if __solaris
1133 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1144 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1134#endif 1145#endif
1135 ) 1146 )
1136 ) 1147 )
… …
1162 1173
1163 offset += cnt; 1174 offset += cnt;
1164 res += cnt; 1175 res += cnt;
1165 count -= cnt; 1176 count -= cnt;
1166 } 1177 }
1178
1179 FUBd;
1167 } 1180 }
1168 1181
1169 return res; 1182 return res;
1170} 1183}
1171 1184
… …
1461 1474
1462#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1475#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1463#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1476#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464 1477
1465static void 1478static void
1466eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1479eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467{ 1480{
1468 unsigned char bits [9 + sizeof (ino_t) * 8]; 1481 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469 unsigned char *bit = bits; 1482 unsigned char *bit = bits;
1470 1483
1471 assert (CHAR_BIT == 8); 1484 assert (CHAR_BIT == 8);
1472 assert (sizeof (eio_dirent) * 8 < 256); 1485 assert (sizeof (eio_dirent) * 8 < 256);
1473 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1486 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1475 1488
1476 if (size <= EIO_SORT_FAST) 1489 if (size <= EIO_SORT_FAST)
1477 return; 1490 return;
1478 1491
1479 /* first prepare an array of bits to test in our radix sort */ 1492 /* first prepare an array of bits to test in our radix sort */
1480 /* try to take endianness into account, as well as differences in ino_t sizes */ 1493 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481 /* inode_bits must contain all inodes ORed together */ 1494 /* inode_bits must contain all inodes ORed together */
1482 /* which is used to skip bits that are 0 everywhere, which is very common */ 1495 /* which is used to skip bits that are 0 everywhere, which is very common */
1483 { 1496 {
1484 ino_t endianness; 1497 eio_ino_t endianness;
1485 int i, j; 1498 int i, j;
1486 1499
1487 /* we store the byte offset of byte n into byte n of "endianness" */ 1500 /* we store the byte offset of byte n into byte n of "endianness" */
1488 for (i = 0; i < sizeof (ino_t); ++i) 1501 for (i = 0; i < sizeof (eio_ino_t); ++i)
1489 ((unsigned char *)&endianness)[i] = i; 1502 ((unsigned char *)&endianness)[i] = i;
1490 1503
1491 *bit++ = 0; 1504 *bit++ = 0;
1492 1505
1493 for (i = 0; i < sizeof (ino_t); ++i) 1506 for (i = 0; i < sizeof (eio_ino_t); ++i)
1494 { 1507 {
1495 /* shifting off the byte offsets out of "endianness" */ 1508 /* shifting off the byte offsets out of "endianness" */
1496 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1509 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497 endianness >>= 8; 1510 endianness >>= 8;
1498 1511
1499 for (j = 0; j < 8; ++j) 1512 for (j = 0; j < 8; ++j)
1500 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1513 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501 *bit++ = offs + j; 1514 *bit++ = offs + j;
1502 } 1515 }
1503 1516
1504 for (j = 0; j < 8; ++j) 1517 for (j = 0; j < 8; ++j)
1505 if (score_bits & (1 << j)) 1518 if (score_bits & (1 << j))
1506 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1519 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1507 } 1520 }
1508 1521
1509 /* now actually do the sorting (a variant of MSD radix sort) */ 1522 /* now actually do the sorting (a variant of MSD radix sort) */
1510 { 1523 {
1511 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1524 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1525 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1526 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514 int stk_idx = 0; 1527 int stk_idx = 0;
1515 1528
1516 base_stk [stk_idx] = dents; 1529 base_stk [stk_idx] = dents;
1517 end_stk [stk_idx] = dents + size; 1530 end_stk [stk_idx] = dents + size;
1518 bit_stk [stk_idx] = bit - 1; 1531 bit_stk [stk_idx] = bit - 1;
… …
1597 } 1610 }
1598 } 1611 }
1599} 1612}
1600 1613
1601static void 1614static void
1602eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1615eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603{ 1616{
1604 if (size <= 1) 1617 if (size <= 1)
1605 return; /* our insertion sort relies on size > 0 */ 1618 return; /* our insertion sort relies on size > 0 */
1606 1619
1607 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1620 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1615 1628
1616/* read a full directory */ 1629/* read a full directory */
1617static void 1630static void
1618eio__scandir (eio_req *req, etp_worker *self) 1631eio__scandir (eio_req *req, etp_worker *self)
1619{ 1632{
1620 DIR *dirp;
1621 EIO_STRUCT_DIRENT *entp;
1622 char *name, *names; 1633 char *name, *names;
1623 int namesalloc = 4096; 1634 int namesalloc = 4096 - sizeof (void *) * 4;
1624 int namesoffs = 0; 1635 int namesoffs = 0;
1625 int flags = req->int1; 1636 int flags = req->int1;
1626 eio_dirent *dents = 0; 1637 eio_dirent *dents = 0;
1627 int dentalloc = 128; 1638 int dentalloc = 128;
1628 int dentoffs = 0; 1639 int dentoffs = 0;
1629 ino_t inode_bits = 0; 1640 eio_ino_t inode_bits = 0;
1641#ifdef _WIN32
1642 HANDLE dirp;
1643 WIN32_FIND_DATA entp;
1644#else
1645 DIR *dirp;
1646 EIO_STRUCT_DIRENT *entp;
1647#endif
1630 1648
1631 req->result = -1; 1649 req->result = -1;
1632 1650
1633 if (!(flags & EIO_READDIR_DENTS)) 1651 if (!(flags & EIO_READDIR_DENTS))
1634 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1652 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635 1653
1636 X_LOCK (wrklock); 1654#ifdef _WIN32
1637 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1655 {
1656 int len = strlen ((const char *)req->ptr1);
1657 char *path = malloc (MAX_PATH);
1658 const char *fmt;
1659
1660 if (!len)
1661 fmt = "./*";
1662 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1663 fmt = "%s*";
1664 else
1665 fmt = "%s/*";
1666
1667 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1668 dirp = FindFirstFile (path, &entp);
1669 free (path);
1670
1671 if (dirp == INVALID_HANDLE_VALUE)
1672 {
1673 dirp = 0;
1674
1675 switch (GetLastError ())
1676 {
1677 case ERROR_FILE_NOT_FOUND:
1678 req->result = 0;
1679 break;
1680
1681 case ERROR_INVALID_NAME:
1682 case ERROR_PATH_NOT_FOUND:
1683 case ERROR_NO_MORE_FILES:
1684 errno = ENOENT;
1685 break;
1686
1687 case ERROR_NOT_ENOUGH_MEMORY:
1688 errno = ENOMEM;
1689 break;
1690
1691 default:
1692 errno = EINVAL;
1693 break;
1694 }
1695 }
1696 }
1697#else
1638 self->dirp = dirp = opendir (req->ptr1); 1698 dirp = opendir (req->ptr1);
1699#endif
1639 1700
1640 if (req->flags & EIO_FLAG_PTR1_FREE) 1701 if (req->flags & EIO_FLAG_PTR1_FREE)
1641 free (req->ptr1); 1702 free (req->ptr1);
1642 1703
1643 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1704 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1705 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645 req->ptr2 = names = malloc (namesalloc); 1706 req->ptr2 = names = malloc (namesalloc);
1646 X_UNLOCK (wrklock);
1647 1707
1648 if (dirp && names && (!flags || dents)) 1708 if (dirp && names && (!flags || dents))
1649 for (;;) 1709 for (;;)
1650 { 1710 {
1711 int done;
1712
1713#ifdef _WIN32
1714 done = !dirp;
1715#else
1651 errno = 0; 1716 errno = 0;
1652 entp = readdir (dirp); 1717 entp = readdir (dirp);
1718 done = !entp;
1719#endif
1653 1720
1654 if (!entp) 1721 if (done)
1655 { 1722 {
1723#ifndef _WIN32
1724 int old_errno = errno;
1725 closedir (dirp);
1726 errno = old_errno;
1727
1656 if (errno) 1728 if (errno)
1657 break; 1729 break;
1730#endif
1658 1731
1659 /* sort etc. */ 1732 /* sort etc. */
1660 req->int1 = flags; 1733 req->int1 = flags;
1661 req->result = dentoffs; 1734 req->result = dentoffs;
1662 1735
… …
1691 1764
1692 break; 1765 break;
1693 } 1766 }
1694 1767
1695 /* now add the entry to our list(s) */ 1768 /* now add the entry to our list(s) */
1696 name = entp->d_name; 1769 name = D_NAME (entp);
1697 1770
1698 /* skip . and .. entries */ 1771 /* skip . and .. entries */
1699 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1772 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1700 { 1773 {
1701 int len = D_NAMLEN (entp) + 1; 1774 int len = D_NAMLEN (entp) + 1;
1702 1775
1703 while (ecb_expect_false (namesoffs + len > namesalloc)) 1776 while (ecb_expect_false (namesoffs + len > namesalloc))
1704 { 1777 {
1705 namesalloc *= 2; 1778 namesalloc *= 2;
1706 X_LOCK (wrklock);
1707 req->ptr2 = names = realloc (names, namesalloc); 1779 req->ptr2 = names = realloc (names, namesalloc);
1708 X_UNLOCK (wrklock);
1709 1780
1710 if (!names) 1781 if (!names)
1711 break; 1782 break;
1712 } 1783 }
1713 1784
… …
1718 struct eio_dirent *ent; 1789 struct eio_dirent *ent;
1719 1790
1720 if (ecb_expect_false (dentoffs == dentalloc)) 1791 if (ecb_expect_false (dentoffs == dentalloc))
1721 { 1792 {
1722 dentalloc *= 2; 1793 dentalloc *= 2;
1723 X_LOCK (wrklock);
1724 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1794 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725 X_UNLOCK (wrklock);
1726 1795
1727 if (!dents) 1796 if (!dents)
1728 break; 1797 break;
1729 } 1798 }
1730 1799
… …
1810 if (EIO_CANCELLED (req)) 1879 if (EIO_CANCELLED (req))
1811 { 1880 {
1812 errno = ECANCELED; 1881 errno = ECANCELED;
1813 break; 1882 break;
1814 } 1883 }
1884
1885#ifdef _WIN32
1886 if (!FindNextFile (dirp, &entp))
1887 {
1888 FindClose (dirp);
1889 dirp = 0;
1890 }
1891#endif
1815 } 1892 }
1816} 1893}
1817 1894
1818/*****************************************************************************/ 1895/*****************************************************************************/
1819 1896
… …
1835X_THREAD_PROC (etp_proc) 1912X_THREAD_PROC (etp_proc)
1836{ 1913{
1837 ETP_REQ *req; 1914 ETP_REQ *req;
1838 struct timespec ts; 1915 struct timespec ts;
1839 etp_worker *self = (etp_worker *)thr_arg; 1916 etp_worker *self = (etp_worker *)thr_arg;
1840 int timeout;
1841 1917
1842 /* try to distribute timeouts somewhat evenly */ 1918 /* try to distribute timeouts somewhat evenly */
1843 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1919 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844 1920
1845 for (;;) 1921 for (;;)
… …
1915/*****************************************************************************/ 1991/*****************************************************************************/
1916 1992
1917int ecb_cold 1993int ecb_cold
1918eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1994eio_init (void (*want_poll)(void), void (*done_poll)(void))
1919{ 1995{
1996#if !HAVE_PREADWRITE
1997 X_MUTEX_CREATE (preadwritelock);
1998#endif
1999
1920 return etp_init (want_poll, done_poll); 2000 return etp_init (want_poll, done_poll);
1921} 2001}
1922 2002
1923ecb_inline void 2003ecb_inline void
1924eio_api_destroy (eio_req *req) 2004eio_api_destroy (eio_req *req)
… …
1969 case EIO_WRITE: req->result = req->offs >= 0 2049 case EIO_WRITE: req->result = req->offs >= 0
1970 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2050 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971 : write (req->int1, req->ptr2, req->size); break; 2051 : write (req->int1, req->ptr2, req->size); break;
1972 2052
1973 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2053 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1974 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2054 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1975 2055
1976 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2056 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2057 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1978 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2058 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2059 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
… …
2009 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2089 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2010 2090
2011 case EIO_SYNC: req->result = 0; sync (); break; 2091 case EIO_SYNC: req->result = 0; sync (); break;
2012 case EIO_FSYNC: req->result = fsync (req->int1); break; 2092 case EIO_FSYNC: req->result = fsync (req->int1); break;
2013 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2093 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2094 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2095 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2014 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2096 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2015 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2097 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2016 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2098 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2017 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2099 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2018 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2019 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 2100 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2020 2101
2021 case EIO_READDIR: eio__scandir (req, self); break; 2102 case EIO_READDIR: eio__scandir (req, self); break;
2022 2103
2023 case EIO_BUSY: 2104 case EIO_BUSY:
… …
2104eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2185eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2105{ 2186{
2106 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2187 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2107} 2188}
2108 2189
2190eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2191{
2192 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2193}
2194
2195eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2196{
2197 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2198}
2199
2200eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2201{
2202 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2203}
2204
2109eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2205eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2110{ 2206{
2111 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2207 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2112} 2208}
2113 2209
… …
2119eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2215eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2120{ 2216{
2121 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2217 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2122} 2218}
2123 2219
2124eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2125{
2126 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2127}
2128
2129eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) 2220eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2130{ 2221{
2131 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND; 2222 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2132}
2133
2134eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2135{
2136 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2137} 2223}
2138 2224
2139eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2225eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
2140{ 2226{
2141 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2227 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
2369/* misc garbage */ 2455/* misc garbage */
2370 2456
2371eio_ssize_t 2457eio_ssize_t
2372eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2458eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373{ 2459{
2374 etp_worker wrk;
2375 eio_ssize_t ret;
2376
2377 wrk.dbuf = 0;
2378
2379 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2460 return eio__sendfile (ofd, ifd, offset, count);
2380
2381 if (wrk.dbuf)
2382 free (wrk.dbuf);
2383
2384 return ret;
2385} 2461}
2386 2462

Diff Legend

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