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

Comparing libeio/eio.c (file contents):
Revision 1.88 by root, Thu Jul 14 19:31:43 2011 UTC vs.
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC

… …
58#include <sys/stat.h> 58#include <sys/stat.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63#include <sys/statvfs.h>
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 from 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
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
… …
96 98
97#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1) 99#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
98 100
99#ifdef _WIN32 101#ifdef _WIN32
100 102
103 #undef PAGESIZE
101 #define PAGESIZE 4096 /* GetSystemInfo? */ 104 #define PAGESIZE 4096 /* GetSystemInfo? */
102 105
103 #ifdef EIO_STRUCT_STATI64 106 #ifdef EIO_STRUCT_STATI64
104 #define stat(path,buf) _stati64 (path,buf) 107 #define stat(path,buf) _stati64 (path,buf)
105 #define fstat(fd,buf) _fstati64 (path,buf) 108 #define fstat(fd,buf) _fstati64 (path,buf)
106 #endif 109 #endif
107 #define lstat(path,buf) stat (path,buf) 110 #define lstat(path,buf) stat (path,buf)
108 #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))
109 #define mkdir(path,mode) _mkdir (path) 112 #define mkdir(path,mode) _mkdir (path)
110 #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))
111 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 ()
112 #define chown(path,uid,gid) EIO_ENOSYS () 120 #define chown(path,uid,gid) EIO_ENOSYS ()
113 #define fchown(fd,uid,gid) EIO_ENOSYS () 121 #define fchown(fd,uid,gid) EIO_ENOSYS ()
114 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 122 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
115 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 123 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
116 #define mknod(path,mode,dev) EIO_ENOSYS () 124 #define mknod(path,mode,dev) EIO_ENOSYS ()
117 #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 ()
118 129
119 /* we could even stat and see if it exists */ 130 /* we could even stat and see if it exists */
120 static int 131 static int
121 symlink (const char *old, const char *neu) 132 symlink (const char *old, const char *neu)
122 { 133 {
134 #if WINVER >= 0x0600
123 if (CreateSymbolicLink (neu, old, 1)) 135 if (CreateSymbolicLink (neu, old, 1))
124 return 0; 136 return 0;
125 137
126 if (CreateSymbolicLink (neu, old, 0)) 138 if (CreateSymbolicLink (neu, old, 0))
127 return 0; 139 return 0;
140 #endif
128 141
129 return EIO_ERRNO (ENOENT, -1); 142 return EIO_ERRNO (ENOENT, -1);
130 } 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)
131 158
132#else 159#else
133 160
134 #include <sys/time.h> 161 #include <sys/time.h>
135 #include <sys/select.h> 162 #include <sys/select.h>
… …
140 #include <dirent.h> 167 #include <dirent.h>
141 168
142 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
143 #include <sys/mman.h> 170 #include <sys/mman.h>
144 #endif 171 #endif
172
173 #define D_NAME(entp) entp->d_name
145 174
146 /* 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 */
147 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 176 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
148 #define _DIRENT_HAVE_D_TYPE /* sigh */ 177 #define _DIRENT_HAVE_D_TYPE /* sigh */
149 #define D_INO(de) (de)->d_fileno 178 #define D_INO(de) (de)->d_fileno
… …
187#endif 216#endif
188#ifndef D_INO 217#ifndef D_INO
189# define D_INO(de) 0 218# define D_INO(de) 0
190#endif 219#endif
191#ifndef D_NAMLEN 220#ifndef D_NAMLEN
192# define D_NAMLEN(de) strlen ((de)->d_name) 221# define D_NAMLEN(entp) strlen (D_NAME (entp))
193#endif 222#endif
194 223
195/* used for struct dirent, AIX doesn't provide it */ 224/* used for struct dirent, AIX doesn't provide it */
196#ifndef NAME_MAX 225#ifndef NAME_MAX
197# define NAME_MAX 4096 226# define NAME_MAX 4096
… …
231#define ETP_WORKER_CLEAR(req) \ 260#define ETP_WORKER_CLEAR(req) \
232 if (wrk->dbuf) \ 261 if (wrk->dbuf) \
233 { \ 262 { \
234 free (wrk->dbuf); \ 263 free (wrk->dbuf); \
235 wrk->dbuf = 0; \ 264 wrk->dbuf = 0; \
236 } \
237 \
238 if (wrk->dirp) \
239 { \
240 closedir (wrk->dirp); \
241 wrk->dirp = 0; \
242 } 265 }
243 266
244#define ETP_WORKER_COMMON \ 267#define ETP_WORKER_COMMON \
245 void *dbuf; \ 268 void *dbuf;
246 DIR *dirp;
247 269
248/*****************************************************************************/ 270/*****************************************************************************/
249 271
250#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
251 273
… …
280/* 302/*
281 * make our pread/pwrite emulation safe against themselves, but not against 303 * make our pread/pwrite emulation safe against themselves, but not against
282 * 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,
283 * but that's your problem, not mine. 305 * but that's your problem, not mine.
284 */ 306 */
285static xmutex_t preadwritelock = X_MUTEX_INIT; 307static xmutex_t preadwritelock;
286#endif 308#endif
287 309
288typedef struct etp_worker 310typedef struct etp_worker
289{ 311{
290 /* locked by wrklock */ 312 /* locked by wrklock */
… …
296 ETP_REQ *req; /* currently processed request */ 318 ETP_REQ *req; /* currently processed request */
297 319
298 ETP_WORKER_COMMON 320 ETP_WORKER_COMMON
299} etp_worker; 321} etp_worker;
300 322
301static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 323static etp_worker wrk_first; /* NOT etp */
302 324
303#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
304#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 326#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
305 327
306/* worker threads management */ 328/* worker threads management */
… …
377} etp_reqq; 399} etp_reqq;
378 400
379static etp_reqq req_queue; 401static etp_reqq req_queue;
380static etp_reqq res_queue; 402static etp_reqq res_queue;
381 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
382static int ecb_noinline 415static int ecb_noinline
383reqq_push (etp_reqq *q, ETP_REQ *req) 416reqq_push (etp_reqq *q, ETP_REQ *req)
384{ 417{
385 int pri = req->pri; 418 int pri = req->pri;
386 req->next = 0; 419 req->next = 0;
… …
420 } 453 }
421 454
422 abort (); 455 abort ();
423} 456}
424 457
425static void ecb_cold 458static int ecb_cold
426etp_thread_init (void) 459etp_init (void (*want_poll)(void), void (*done_poll)(void))
427{ 460{
428#if !HAVE_PREADWRITE
429 X_MUTEX_CREATE (preadwritelock);
430#endif
431 X_MUTEX_CREATE (wrklock); 461 X_MUTEX_CREATE (wrklock);
432 X_MUTEX_CREATE (reslock); 462 X_MUTEX_CREATE (reslock);
433 X_MUTEX_CREATE (reqlock); 463 X_MUTEX_CREATE (reqlock);
434 X_COND_CREATE (reqwait); 464 X_COND_CREATE (reqwait);
435}
436 465
437static void ecb_cold 466 reqq_init (&req_queue);
438etp_atfork_prepare (void) 467 reqq_init (&res_queue);
439{
440}
441 468
442static void ecb_cold 469 wrk_first.next =
443etp_atfork_parent (void) 470 wrk_first.prev = &wrk_first;
444{
445}
446
447static void ecb_cold
448etp_atfork_child (void)
449{
450 ETP_REQ *prv;
451
452 while ((prv = reqq_shift (&req_queue)))
453 ETP_DESTROY (prv);
454
455 while ((prv = reqq_shift (&res_queue)))
456 ETP_DESTROY (prv);
457
458 while (wrk_first.next != &wrk_first)
459 {
460 etp_worker *wrk = wrk_first.next;
461
462 if (wrk->req)
463 ETP_DESTROY (wrk->req);
464
465 etp_worker_clear (wrk);
466 etp_worker_free (wrk);
467 }
468 471
469 started = 0; 472 started = 0;
470 idle = 0; 473 idle = 0;
471 nreqs = 0; 474 nreqs = 0;
472 nready = 0; 475 nready = 0;
473 npending = 0; 476 npending = 0;
474
475 etp_thread_init ();
476}
477
478static void ecb_cold
479etp_once_init (void)
480{
481 etp_thread_init ();
482 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
483}
484
485static int ecb_cold
486etp_init (void (*want_poll)(void), void (*done_poll)(void))
487{
488 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
489
490 pthread_once (&doinit, etp_once_init);
491 477
492 want_poll_cb = want_poll; 478 want_poll_cb = want_poll;
493 done_poll_cb = done_poll; 479 done_poll_cb = done_poll;
494 480
495 return 0; 481 return 0;
… …
1127 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1113 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1128 /* BSDs */ 1114 /* BSDs */
1129#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... */
1130 || errno == ENOTSUP 1116 || errno == ENOTSUP
1131#endif 1117#endif
1118#ifdef EOPNOTSUPP /* windows */
1132 || errno == EOPNOTSUPP /* BSDs */ 1119 || errno == EOPNOTSUPP /* BSDs */
1120#endif
1133#if __solaris 1121#if __solaris
1134 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1122 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1135#endif 1123#endif
1136 ) 1124 )
1137 ) 1125 )
… …
1199 /* round up length */ 1187 /* round up length */
1200 *length = (*length + mask) & ~mask; 1188 *length = (*length + mask) & ~mask;
1201} 1189}
1202 1190
1203#if !_POSIX_MEMLOCK 1191#if !_POSIX_MEMLOCK
1204# define eio__mlockall(a) eio_nosyscall() 1192# define eio__mlockall(a) EIO_ENOSYS ()
1205#else 1193#else
1206 1194
1207static int 1195static int
1208eio__mlockall (int flags) 1196eio__mlockall (int flags)
1209{ 1197{
… …
1462 1450
1463#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 */
1464#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1452#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1465 1453
1466static void 1454static void
1467eio_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)
1468{ 1456{
1469 unsigned char bits [9 + sizeof (ino_t) * 8]; 1457 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1470 unsigned char *bit = bits; 1458 unsigned char *bit = bits;
1471 1459
1472 assert (CHAR_BIT == 8); 1460 assert (CHAR_BIT == 8);
1473 assert (sizeof (eio_dirent) * 8 < 256); 1461 assert (sizeof (eio_dirent) * 8 < 256);
1474 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1462 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1476 1464
1477 if (size <= EIO_SORT_FAST) 1465 if (size <= EIO_SORT_FAST)
1478 return; 1466 return;
1479 1467
1480 /* 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 */
1481 /* 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 */
1482 /* inode_bits must contain all inodes ORed together */ 1470 /* inode_bits must contain all inodes ORed together */
1483 /* 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 */
1484 { 1472 {
1485 ino_t endianness; 1473 eio_ino_t endianness;
1486 int i, j; 1474 int i, j;
1487 1475
1488 /* 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" */
1489 for (i = 0; i < sizeof (ino_t); ++i) 1477 for (i = 0; i < sizeof (eio_ino_t); ++i)
1490 ((unsigned char *)&endianness)[i] = i; 1478 ((unsigned char *)&endianness)[i] = i;
1491 1479
1492 *bit++ = 0; 1480 *bit++ = 0;
1493 1481
1494 for (i = 0; i < sizeof (ino_t); ++i) 1482 for (i = 0; i < sizeof (eio_ino_t); ++i)
1495 { 1483 {
1496 /* shifting off the byte offsets out of "endianness" */ 1484 /* shifting off the byte offsets out of "endianness" */
1497 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1485 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1498 endianness >>= 8; 1486 endianness >>= 8;
1499 1487
1500 for (j = 0; j < 8; ++j) 1488 for (j = 0; j < 8; ++j)
1501 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1489 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1502 *bit++ = offs + j; 1490 *bit++ = offs + j;
1503 } 1491 }
1504 1492
1505 for (j = 0; j < 8; ++j) 1493 for (j = 0; j < 8; ++j)
1506 if (score_bits & (1 << j)) 1494 if (score_bits & (1 << j))
1507 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1495 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1508 } 1496 }
1509 1497
1510 /* now actually do the sorting (a variant of MSD radix sort) */ 1498 /* now actually do the sorting (a variant of MSD radix sort) */
1511 { 1499 {
1512 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1500 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1513 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1501 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1514 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1502 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1515 int stk_idx = 0; 1503 int stk_idx = 0;
1516 1504
1517 base_stk [stk_idx] = dents; 1505 base_stk [stk_idx] = dents;
1518 end_stk [stk_idx] = dents + size; 1506 end_stk [stk_idx] = dents + size;
1519 bit_stk [stk_idx] = bit - 1; 1507 bit_stk [stk_idx] = bit - 1;
… …
1598 } 1586 }
1599 } 1587 }
1600} 1588}
1601 1589
1602static void 1590static void
1603eio_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)
1604{ 1592{
1605 if (size <= 1) 1593 if (size <= 1)
1606 return; /* our insertion sort relies on size > 0 */ 1594 return; /* our insertion sort relies on size > 0 */
1607 1595
1608 /* 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 */
… …
1616 1604
1617/* read a full directory */ 1605/* read a full directory */
1618static void 1606static void
1619eio__scandir (eio_req *req, etp_worker *self) 1607eio__scandir (eio_req *req, etp_worker *self)
1620{ 1608{
1621 DIR *dirp;
1622 EIO_STRUCT_DIRENT *entp;
1623 char *name, *names; 1609 char *name, *names;
1624 int namesalloc = 4096; 1610 int namesalloc = 4096 - sizeof (void *) * 4;
1625 int namesoffs = 0; 1611 int namesoffs = 0;
1626 int flags = req->int1; 1612 int flags = req->int1;
1627 eio_dirent *dents = 0; 1613 eio_dirent *dents = 0;
1628 int dentalloc = 128; 1614 int dentalloc = 128;
1629 int dentoffs = 0; 1615 int dentoffs = 0;
1630 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
1631 1624
1632 req->result = -1; 1625 req->result = -1;
1633 1626
1634 if (!(flags & EIO_READDIR_DENTS)) 1627 if (!(flags & EIO_READDIR_DENTS))
1635 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1628 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1636 1629
1637 X_LOCK (wrklock); 1630#ifdef _WIN32
1638 /* 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
1639 self->dirp = dirp = opendir (req->ptr1); 1674 dirp = opendir (req->ptr1);
1675#endif
1640 1676
1641 if (req->flags & EIO_FLAG_PTR1_FREE) 1677 if (req->flags & EIO_FLAG_PTR1_FREE)
1642 free (req->ptr1); 1678 free (req->ptr1);
1643 1679
1644 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1680 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1645 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1681 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1646 req->ptr2 = names = malloc (namesalloc); 1682 req->ptr2 = names = malloc (namesalloc);
1647 X_UNLOCK (wrklock);
1648 1683
1649 if (dirp && names && (!flags || dents)) 1684 if (dirp && names && (!flags || dents))
1650 for (;;) 1685 for (;;)
1651 { 1686 {
1687 int done;
1688
1689#ifdef _WIN32
1690 done = !dirp;
1691#else
1652 errno = 0; 1692 errno = 0;
1653 entp = readdir (dirp); 1693 entp = readdir (dirp);
1694 done = !entp;
1695#endif
1654 1696
1655 if (!entp) 1697 if (done)
1656 { 1698 {
1699#ifndef _WIN32
1700 int old_errno = errno;
1701 closedir (dirp);
1702 errno = old_errno;
1703
1657 if (errno) 1704 if (errno)
1658 break; 1705 break;
1706#endif
1659 1707
1660 /* sort etc. */ 1708 /* sort etc. */
1661 req->int1 = flags; 1709 req->int1 = flags;
1662 req->result = dentoffs; 1710 req->result = dentoffs;
1663 1711
… …
1692 1740
1693 break; 1741 break;
1694 } 1742 }
1695 1743
1696 /* now add the entry to our list(s) */ 1744 /* now add the entry to our list(s) */
1697 name = entp->d_name; 1745 name = D_NAME (entp);
1698 1746
1699 /* skip . and .. entries */ 1747 /* skip . and .. entries */
1700 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1748 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1701 { 1749 {
1702 int len = D_NAMLEN (entp) + 1; 1750 int len = D_NAMLEN (entp) + 1;
1703 1751
1704 while (ecb_expect_false (namesoffs + len > namesalloc)) 1752 while (ecb_expect_false (namesoffs + len > namesalloc))
1705 { 1753 {
1706 namesalloc *= 2; 1754 namesalloc *= 2;
1707 X_LOCK (wrklock);
1708 req->ptr2 = names = realloc (names, namesalloc); 1755 req->ptr2 = names = realloc (names, namesalloc);
1709 X_UNLOCK (wrklock);
1710 1756
1711 if (!names) 1757 if (!names)
1712 break; 1758 break;
1713 } 1759 }
1714 1760
… …
1719 struct eio_dirent *ent; 1765 struct eio_dirent *ent;
1720 1766
1721 if (ecb_expect_false (dentoffs == dentalloc)) 1767 if (ecb_expect_false (dentoffs == dentalloc))
1722 { 1768 {
1723 dentalloc *= 2; 1769 dentalloc *= 2;
1724 X_LOCK (wrklock);
1725 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1770 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1726 X_UNLOCK (wrklock);
1727 1771
1728 if (!dents) 1772 if (!dents)
1729 break; 1773 break;
1730 } 1774 }
1731 1775
… …
1811 if (EIO_CANCELLED (req)) 1855 if (EIO_CANCELLED (req))
1812 { 1856 {
1813 errno = ECANCELED; 1857 errno = ECANCELED;
1814 break; 1858 break;
1815 } 1859 }
1860
1861#ifdef _WIN32
1862 if (!FindNextFile (dirp, &entp))
1863 {
1864 FindClose (dirp);
1865 dirp = 0;
1866 }
1867#endif
1816 } 1868 }
1817} 1869}
1818 1870
1819/*****************************************************************************/ 1871/*****************************************************************************/
1820 1872
… …
1836X_THREAD_PROC (etp_proc) 1888X_THREAD_PROC (etp_proc)
1837{ 1889{
1838 ETP_REQ *req; 1890 ETP_REQ *req;
1839 struct timespec ts; 1891 struct timespec ts;
1840 etp_worker *self = (etp_worker *)thr_arg; 1892 etp_worker *self = (etp_worker *)thr_arg;
1841 int timeout;
1842 1893
1843 /* try to distribute timeouts somewhat evenly */ 1894 /* try to distribute timeouts somewhat evenly */
1844 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1895 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1845 1896
1846 for (;;) 1897 for (;;)
… …
1916/*****************************************************************************/ 1967/*****************************************************************************/
1917 1968
1918int ecb_cold 1969int ecb_cold
1919eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1970eio_init (void (*want_poll)(void), void (*done_poll)(void))
1920{ 1971{
1972#if !HAVE_PREADWRITE
1973 X_MUTEX_CREATE (preadwritelock);
1974#endif
1975
1921 return etp_init (want_poll, done_poll); 1976 return etp_init (want_poll, done_poll);
1922} 1977}
1923 1978
1924ecb_inline void 1979ecb_inline void
1925eio_api_destroy (eio_req *req) 1980eio_api_destroy (eio_req *req)

Diff Legend

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