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.94 by root, Mon Jul 18 02:59:58 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
72 75
73static void eio_destroy (eio_req *req); 76static void eio_destroy (eio_req *req);
74 77
75#ifndef EIO_FINISH 78#ifndef EIO_FINISH
76# 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
… …
95 98
96#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 99#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
97 100
98#ifdef _WIN32 101#ifdef _WIN32
99 102
103 #undef PAGESIZE
100 #define PAGESIZE 4096 /* GetSystemInfo? */ 104 #define PAGESIZE 4096 /* GetSystemInfo? */
101 105
102 #ifdef EIO_STRUCT_STATI64 106 #ifdef EIO_STRUCT_STATI64
103 #define stat(path,buf) _stati64 (path,buf) 107 #define stat(path,buf) _stati64 (path,buf)
104 #define fstat(fd,buf) _fstati64 (path,buf) 108 #define fstat(fd,buf) _fstati64 (path,buf)
105 #endif 109 #endif
106 #define lstat(path,buf) stat (path,buf) 110 #define lstat(path,buf) stat (path,buf)
107 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 111 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
108 #define mkdir(path,mode) _mkdir (path) 112 #define mkdir(path,mode) _mkdir (path)
109 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 113 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
110 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 ()
111 #define chown(path,uid,gid) EIO_ENOSYS () 120 #define chown(path,uid,gid) EIO_ENOSYS ()
112 #define fchown(fd,uid,gid) EIO_ENOSYS () 121 #define fchown(fd,uid,gid) EIO_ENOSYS ()
113 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 122 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
114 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 123 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
115 #define mknod(path,mode,dev) EIO_ENOSYS () 124 #define mknod(path,mode,dev) EIO_ENOSYS ()
116 #define sync() 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 ()
117 129
118 /* we could even stat and see if it exists */ 130 /* we could even stat and see if it exists */
119 static int 131 static int
120 symlink (const char *old, const char *neu) 132 symlink (const char *old, const char *neu)
121 { 133 {
134 #if WINVER >= 0x0600
122 if (CreateSymbolicLink (neu, old, 1)) 135 if (CreateSymbolicLink (neu, old, 1))
123 return 0; 136 return 0;
124 137
125 if (CreateSymbolicLink (neu, old, 0)) 138 if (CreateSymbolicLink (neu, old, 0))
126 return 0; 139 return 0;
140 #endif
127 141
128 return EIO_ERRNO (ENOENT, -1); 142 return EIO_ERRNO (ENOENT, -1);
129 } 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)
130 158
131#else 159#else
132 160
133 #include <sys/time.h> 161 #include <sys/time.h>
134 #include <sys/select.h> 162 #include <sys/select.h>
… …
139 #include <dirent.h> 167 #include <dirent.h>
140 168
141 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
142 #include <sys/mman.h> 170 #include <sys/mman.h>
143 #endif 171 #endif
172
173 #define D_NAME(entp) entp->d_name
144 174
145 /* 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 */
146 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 176 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
147 #define _DIRENT_HAVE_D_TYPE /* sigh */ 177 #define _DIRENT_HAVE_D_TYPE /* sigh */
148 #define D_INO(de) (de)->d_fileno 178 #define D_INO(de) (de)->d_fileno
… …
186#endif 216#endif
187#ifndef D_INO 217#ifndef D_INO
188# define D_INO(de) 0 218# define D_INO(de) 0
189#endif 219#endif
190#ifndef D_NAMLEN 220#ifndef D_NAMLEN
191# define D_NAMLEN(de) strlen ((de)->d_name) 221# define D_NAMLEN(entp) strlen (D_NAME (entp))
192#endif 222#endif
193 223
194/* used for struct dirent, AIX doesn't provide it */ 224/* used for struct dirent, AIX doesn't provide it */
195#ifndef NAME_MAX 225#ifndef NAME_MAX
196# define NAME_MAX 4096 226# define NAME_MAX 4096
… …
203 233
204/* buffer size for various temporary buffers */ 234/* buffer size for various temporary buffers */
205#define EIO_BUFSIZE 65536 235#define EIO_BUFSIZE 65536
206 236
207#define dBUF \ 237#define dBUF \
208 char *eio_buf; \
209 ETP_WORKER_LOCK (self); \
210 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 238 char *eio_buf = malloc (EIO_BUFSIZE); \
211 ETP_WORKER_UNLOCK (self); \
212 errno = ENOMEM; \ 239 errno = ENOMEM; \
213 if (!eio_buf) \ 240 if (!eio_buf) \
214 return -1; 241 return -1
242
243#define FUBd \
244 free (eio_buf)
215 245
216#define EIO_TICKS ((1000000 + 1023) >> 10) 246#define EIO_TICKS ((1000000 + 1023) >> 10)
217 247
218#define ETP_PRI_MIN EIO_PRI_MIN 248#define ETP_PRI_MIN EIO_PRI_MIN
219#define ETP_PRI_MAX EIO_PRI_MAX 249#define ETP_PRI_MAX EIO_PRI_MAX
… …
225static int eio_finish (eio_req *req); 255static int eio_finish (eio_req *req);
226#define ETP_FINISH(req) eio_finish (req) 256#define ETP_FINISH(req) eio_finish (req)
227static void eio_execute (struct etp_worker *self, eio_req *req); 257static void eio_execute (struct etp_worker *self, eio_req *req);
228#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 258#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
229 259
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/*****************************************************************************/ 260/*****************************************************************************/
248 261
249#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 262#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250 263
251/* calculate time difference in ~1/EIO_TICKS of a second */ 264/* calculate time difference in ~1/EIO_TICKS of a second */
… …
279/* 292/*
280 * make our pread/pwrite emulation safe against themselves, but not against 293 * make our pread/pwrite emulation safe against themselves, but not against
281 * normal read/write by using a mutex. slows down execution a lot, 294 * normal read/write by using a mutex. slows down execution a lot,
282 * but that's your problem, not mine. 295 * but that's your problem, not mine.
283 */ 296 */
284static xmutex_t preadwritelock = X_MUTEX_INIT; 297static xmutex_t preadwritelock;
285#endif 298#endif
286 299
287typedef struct etp_worker 300typedef struct etp_worker
288{ 301{
289 /* locked by wrklock */ 302 /* locked by wrklock */
… …
292 xthread_t tid; 305 xthread_t tid;
293 306
294 /* locked by reslock, reqlock or wrklock */ 307 /* locked by reslock, reqlock or wrklock */
295 ETP_REQ *req; /* currently processed request */ 308 ETP_REQ *req; /* currently processed request */
296 309
310#ifdef ETP_WORKER_COMMON
297 ETP_WORKER_COMMON 311 ETP_WORKER_COMMON
312#endif
298} etp_worker; 313} etp_worker;
299 314
300static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 315static etp_worker wrk_first; /* NOT etp */
301 316
302#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 317#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 318#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304 319
305/* worker threads management */ 320/* worker threads management */
306 321
307static void ecb_cold 322static void ecb_cold
308etp_worker_clear (etp_worker *wrk) 323etp_worker_clear (etp_worker *wrk)
309{ 324{
310 ETP_WORKER_CLEAR (wrk);
311} 325}
312 326
313static void ecb_cold 327static void ecb_cold
314etp_worker_free (etp_worker *wrk) 328etp_worker_free (etp_worker *wrk)
315{ 329{
… …
376} etp_reqq; 390} etp_reqq;
377 391
378static etp_reqq req_queue; 392static etp_reqq req_queue;
379static etp_reqq res_queue; 393static etp_reqq res_queue;
380 394
395static void ecb_noinline ecb_cold
396reqq_init (etp_reqq *q)
397{
398 int pri;
399
400 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
401 q->qs[pri] = q->qe[pri] = 0;
402
403 q->size = 0;
404}
405
381static int ecb_noinline 406static int ecb_noinline
382reqq_push (etp_reqq *q, ETP_REQ *req) 407reqq_push (etp_reqq *q, ETP_REQ *req)
383{ 408{
384 int pri = req->pri; 409 int pri = req->pri;
385 req->next = 0; 410 req->next = 0;
… …
419 } 444 }
420 445
421 abort (); 446 abort ();
422} 447}
423 448
424static void ecb_cold 449static int ecb_cold
425etp_thread_init (void) 450etp_init (void (*want_poll)(void), void (*done_poll)(void))
426{ 451{
427#if !HAVE_PREADWRITE
428 X_MUTEX_CREATE (preadwritelock);
429#endif
430 X_MUTEX_CREATE (wrklock); 452 X_MUTEX_CREATE (wrklock);
431 X_MUTEX_CREATE (reslock); 453 X_MUTEX_CREATE (reslock);
432 X_MUTEX_CREATE (reqlock); 454 X_MUTEX_CREATE (reqlock);
433 X_COND_CREATE (reqwait); 455 X_COND_CREATE (reqwait);
434}
435 456
436static void ecb_cold 457 reqq_init (&req_queue);
437etp_atfork_prepare (void) 458 reqq_init (&res_queue);
438{
439}
440 459
441static void ecb_cold 460 wrk_first.next =
442etp_atfork_parent (void) 461 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 462
468 started = 0; 463 started = 0;
469 idle = 0; 464 idle = 0;
470 nreqs = 0; 465 nreqs = 0;
471 nready = 0; 466 nready = 0;
472 npending = 0; 467 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 468
491 want_poll_cb = want_poll; 469 want_poll_cb = want_poll;
492 done_poll_cb = done_poll; 470 done_poll_cb = done_poll;
493 471
494 return 0; 472 return 0;
… …
1010 pread (fd, eio_buf, len, offset); 988 pread (fd, eio_buf, len, offset);
1011 offset += len; 989 offset += len;
1012 todo -= len; 990 todo -= len;
1013 } 991 }
1014 992
993 FUBd;
994
1015 errno = 0; 995 errno = 0;
1016 return count; 996 return count;
1017} 997}
1018 998
1019#endif 999#endif
1020 1000
1021/* sendfile always needs emulation */ 1001/* sendfile always needs emulation */
1022static eio_ssize_t 1002static eio_ssize_t
1023eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1003eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024{ 1004{
1025 eio_ssize_t written = 0; 1005 eio_ssize_t written = 0;
1026 eio_ssize_t res; 1006 eio_ssize_t res;
1027 1007
1028 if (!count) 1008 if (!count)
… …
1126 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1106 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1127 /* BSDs */ 1107 /* BSDs */
1128#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1108#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1129 || errno == ENOTSUP 1109 || errno == ENOTSUP
1130#endif 1110#endif
1111#ifdef EOPNOTSUPP /* windows */
1131 || errno == EOPNOTSUPP /* BSDs */ 1112 || errno == EOPNOTSUPP /* BSDs */
1113#endif
1132#if __solaris 1114#if __solaris
1133 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1115 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1134#endif 1116#endif
1135 ) 1117 )
1136 ) 1118 )
… …
1162 1144
1163 offset += cnt; 1145 offset += cnt;
1164 res += cnt; 1146 res += cnt;
1165 count -= cnt; 1147 count -= cnt;
1166 } 1148 }
1149
1150 FUBd;
1167 } 1151 }
1168 1152
1169 return res; 1153 return res;
1170} 1154}
1171 1155
… …
1461 1445
1462#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1446#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 */ 1447#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464 1448
1465static void 1449static void
1466eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1450eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467{ 1451{
1468 unsigned char bits [9 + sizeof (ino_t) * 8]; 1452 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469 unsigned char *bit = bits; 1453 unsigned char *bit = bits;
1470 1454
1471 assert (CHAR_BIT == 8); 1455 assert (CHAR_BIT == 8);
1472 assert (sizeof (eio_dirent) * 8 < 256); 1456 assert (sizeof (eio_dirent) * 8 < 256);
1473 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1457 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1475 1459
1476 if (size <= EIO_SORT_FAST) 1460 if (size <= EIO_SORT_FAST)
1477 return; 1461 return;
1478 1462
1479 /* first prepare an array of bits to test in our radix sort */ 1463 /* 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 */ 1464 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481 /* inode_bits must contain all inodes ORed together */ 1465 /* inode_bits must contain all inodes ORed together */
1482 /* which is used to skip bits that are 0 everywhere, which is very common */ 1466 /* which is used to skip bits that are 0 everywhere, which is very common */
1483 { 1467 {
1484 ino_t endianness; 1468 eio_ino_t endianness;
1485 int i, j; 1469 int i, j;
1486 1470
1487 /* we store the byte offset of byte n into byte n of "endianness" */ 1471 /* we store the byte offset of byte n into byte n of "endianness" */
1488 for (i = 0; i < sizeof (ino_t); ++i) 1472 for (i = 0; i < sizeof (eio_ino_t); ++i)
1489 ((unsigned char *)&endianness)[i] = i; 1473 ((unsigned char *)&endianness)[i] = i;
1490 1474
1491 *bit++ = 0; 1475 *bit++ = 0;
1492 1476
1493 for (i = 0; i < sizeof (ino_t); ++i) 1477 for (i = 0; i < sizeof (eio_ino_t); ++i)
1494 { 1478 {
1495 /* shifting off the byte offsets out of "endianness" */ 1479 /* shifting off the byte offsets out of "endianness" */
1496 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1480 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497 endianness >>= 8; 1481 endianness >>= 8;
1498 1482
1499 for (j = 0; j < 8; ++j) 1483 for (j = 0; j < 8; ++j)
1500 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1484 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501 *bit++ = offs + j; 1485 *bit++ = offs + j;
1502 } 1486 }
1503 1487
1504 for (j = 0; j < 8; ++j) 1488 for (j = 0; j < 8; ++j)
1505 if (score_bits & (1 << j)) 1489 if (score_bits & (1 << j))
1506 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1490 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1507 } 1491 }
1508 1492
1509 /* now actually do the sorting (a variant of MSD radix sort) */ 1493 /* now actually do the sorting (a variant of MSD radix sort) */
1510 { 1494 {
1511 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1495 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1496 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1497 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514 int stk_idx = 0; 1498 int stk_idx = 0;
1515 1499
1516 base_stk [stk_idx] = dents; 1500 base_stk [stk_idx] = dents;
1517 end_stk [stk_idx] = dents + size; 1501 end_stk [stk_idx] = dents + size;
1518 bit_stk [stk_idx] = bit - 1; 1502 bit_stk [stk_idx] = bit - 1;
… …
1597 } 1581 }
1598 } 1582 }
1599} 1583}
1600 1584
1601static void 1585static void
1602eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1586eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603{ 1587{
1604 if (size <= 1) 1588 if (size <= 1)
1605 return; /* our insertion sort relies on size > 0 */ 1589 return; /* our insertion sort relies on size > 0 */
1606 1590
1607 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1591 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1615 1599
1616/* read a full directory */ 1600/* read a full directory */
1617static void 1601static void
1618eio__scandir (eio_req *req, etp_worker *self) 1602eio__scandir (eio_req *req, etp_worker *self)
1619{ 1603{
1620 DIR *dirp;
1621 EIO_STRUCT_DIRENT *entp;
1622 char *name, *names; 1604 char *name, *names;
1623 int namesalloc = 4096; 1605 int namesalloc = 4096 - sizeof (void *) * 4;
1624 int namesoffs = 0; 1606 int namesoffs = 0;
1625 int flags = req->int1; 1607 int flags = req->int1;
1626 eio_dirent *dents = 0; 1608 eio_dirent *dents = 0;
1627 int dentalloc = 128; 1609 int dentalloc = 128;
1628 int dentoffs = 0; 1610 int dentoffs = 0;
1629 ino_t inode_bits = 0; 1611 eio_ino_t inode_bits = 0;
1612#ifdef _WIN32
1613 HANDLE dirp;
1614 WIN32_FIND_DATA entp;
1615#else
1616 DIR *dirp;
1617 EIO_STRUCT_DIRENT *entp;
1618#endif
1630 1619
1631 req->result = -1; 1620 req->result = -1;
1632 1621
1633 if (!(flags & EIO_READDIR_DENTS)) 1622 if (!(flags & EIO_READDIR_DENTS))
1634 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1623 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635 1624
1636 X_LOCK (wrklock); 1625#ifdef _WIN32
1637 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1626 {
1627 int len = strlen ((const char *)req->ptr1);
1628 char *path = malloc (MAX_PATH);
1629 const char *fmt;
1630
1631 if (!len)
1632 fmt = "./*";
1633 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1634 fmt = "%s*";
1635 else
1636 fmt = "%s/*";
1637
1638 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1639 dirp = FindFirstFile (path, &entp);
1640 free (path);
1641
1642 if (dirp == INVALID_HANDLE_VALUE)
1643 {
1644 dirp = 0;
1645
1646 switch (GetLastError ())
1647 {
1648 case ERROR_FILE_NOT_FOUND:
1649 req->result = 0;
1650 break;
1651
1652 case ERROR_INVALID_NAME:
1653 case ERROR_PATH_NOT_FOUND:
1654 case ERROR_NO_MORE_FILES:
1655 errno = ENOENT;
1656 break;
1657
1658 case ERROR_NOT_ENOUGH_MEMORY:
1659 errno = ENOMEM;
1660 break;
1661
1662 default:
1663 errno = EINVAL;
1664 break;
1665 }
1666 }
1667 }
1668#else
1638 self->dirp = dirp = opendir (req->ptr1); 1669 dirp = opendir (req->ptr1);
1670#endif
1639 1671
1640 if (req->flags & EIO_FLAG_PTR1_FREE) 1672 if (req->flags & EIO_FLAG_PTR1_FREE)
1641 free (req->ptr1); 1673 free (req->ptr1);
1642 1674
1643 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1675 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1676 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645 req->ptr2 = names = malloc (namesalloc); 1677 req->ptr2 = names = malloc (namesalloc);
1646 X_UNLOCK (wrklock);
1647 1678
1648 if (dirp && names && (!flags || dents)) 1679 if (dirp && names && (!flags || dents))
1649 for (;;) 1680 for (;;)
1650 { 1681 {
1682 int done;
1683
1684#ifdef _WIN32
1685 done = !dirp;
1686#else
1651 errno = 0; 1687 errno = 0;
1652 entp = readdir (dirp); 1688 entp = readdir (dirp);
1689 done = !entp;
1690#endif
1653 1691
1654 if (!entp) 1692 if (done)
1655 { 1693 {
1694#ifndef _WIN32
1695 int old_errno = errno;
1696 closedir (dirp);
1697 errno = old_errno;
1698
1656 if (errno) 1699 if (errno)
1657 break; 1700 break;
1701#endif
1658 1702
1659 /* sort etc. */ 1703 /* sort etc. */
1660 req->int1 = flags; 1704 req->int1 = flags;
1661 req->result = dentoffs; 1705 req->result = dentoffs;
1662 1706
… …
1691 1735
1692 break; 1736 break;
1693 } 1737 }
1694 1738
1695 /* now add the entry to our list(s) */ 1739 /* now add the entry to our list(s) */
1696 name = entp->d_name; 1740 name = D_NAME (entp);
1697 1741
1698 /* skip . and .. entries */ 1742 /* skip . and .. entries */
1699 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1743 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1700 { 1744 {
1701 int len = D_NAMLEN (entp) + 1; 1745 int len = D_NAMLEN (entp) + 1;
1702 1746
1703 while (ecb_expect_false (namesoffs + len > namesalloc)) 1747 while (ecb_expect_false (namesoffs + len > namesalloc))
1704 { 1748 {
1705 namesalloc *= 2; 1749 namesalloc *= 2;
1706 X_LOCK (wrklock);
1707 req->ptr2 = names = realloc (names, namesalloc); 1750 req->ptr2 = names = realloc (names, namesalloc);
1708 X_UNLOCK (wrklock);
1709 1751
1710 if (!names) 1752 if (!names)
1711 break; 1753 break;
1712 } 1754 }
1713 1755
… …
1718 struct eio_dirent *ent; 1760 struct eio_dirent *ent;
1719 1761
1720 if (ecb_expect_false (dentoffs == dentalloc)) 1762 if (ecb_expect_false (dentoffs == dentalloc))
1721 { 1763 {
1722 dentalloc *= 2; 1764 dentalloc *= 2;
1723 X_LOCK (wrklock);
1724 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1765 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725 X_UNLOCK (wrklock);
1726 1766
1727 if (!dents) 1767 if (!dents)
1728 break; 1768 break;
1729 } 1769 }
1730 1770
… …
1810 if (EIO_CANCELLED (req)) 1850 if (EIO_CANCELLED (req))
1811 { 1851 {
1812 errno = ECANCELED; 1852 errno = ECANCELED;
1813 break; 1853 break;
1814 } 1854 }
1855
1856#ifdef _WIN32
1857 if (!FindNextFile (dirp, &entp))
1858 {
1859 FindClose (dirp);
1860 dirp = 0;
1861 }
1862#endif
1815 } 1863 }
1816} 1864}
1817 1865
1818/*****************************************************************************/ 1866/*****************************************************************************/
1819 1867
… …
1835X_THREAD_PROC (etp_proc) 1883X_THREAD_PROC (etp_proc)
1836{ 1884{
1837 ETP_REQ *req; 1885 ETP_REQ *req;
1838 struct timespec ts; 1886 struct timespec ts;
1839 etp_worker *self = (etp_worker *)thr_arg; 1887 etp_worker *self = (etp_worker *)thr_arg;
1840 int timeout;
1841 1888
1842 /* try to distribute timeouts somewhat evenly */ 1889 /* try to distribute timeouts somewhat evenly */
1843 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1890 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844 1891
1845 for (;;) 1892 for (;;)
… …
1915/*****************************************************************************/ 1962/*****************************************************************************/
1916 1963
1917int ecb_cold 1964int ecb_cold
1918eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1965eio_init (void (*want_poll)(void), void (*done_poll)(void))
1919{ 1966{
1967#if !HAVE_PREADWRITE
1968 X_MUTEX_CREATE (preadwritelock);
1969#endif
1970
1920 return etp_init (want_poll, done_poll); 1971 return etp_init (want_poll, done_poll);
1921} 1972}
1922 1973
1923ecb_inline void 1974ecb_inline void
1924eio_api_destroy (eio_req *req) 1975eio_api_destroy (eio_req *req)
… …
1969 case EIO_WRITE: req->result = req->offs >= 0 2020 case EIO_WRITE: req->result = req->offs >= 0
1970 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2021 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971 : write (req->int1, req->ptr2, req->size); break; 2022 : write (req->int1, req->ptr2, req->size); break;
1972 2023
1973 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2024 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; 2025 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1975 2026
1976 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2027 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2028 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1978 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2029 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2030 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
… …
2369/* misc garbage */ 2420/* misc garbage */
2370 2421
2371eio_ssize_t 2422eio_ssize_t
2372eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2423eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373{ 2424{
2374 etp_worker wrk;
2375 eio_ssize_t ret;
2376
2377 wrk.dbuf = 0;
2378
2379 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2425 return eio__sendfile (ofd, ifd, offset, count);
2380
2381 if (wrk.dbuf)
2382 free (wrk.dbuf);
2383
2384 return ret;
2385} 2426}
2386 2427

Diff Legend

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