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.93 by root, Mon Jul 18 01:27:03 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
… …
230#define ETP_WORKER_CLEAR(req) \ 260#define ETP_WORKER_CLEAR(req) \
231 if (wrk->dbuf) \ 261 if (wrk->dbuf) \
232 { \ 262 { \
233 free (wrk->dbuf); \ 263 free (wrk->dbuf); \
234 wrk->dbuf = 0; \ 264 wrk->dbuf = 0; \
235 } \
236 \
237 if (wrk->dirp) \
238 { \
239 closedir (wrk->dirp); \
240 wrk->dirp = 0; \
241 } 265 }
242 266
243#define ETP_WORKER_COMMON \ 267#define ETP_WORKER_COMMON \
244 void *dbuf; \ 268 void *dbuf;
245 DIR *dirp;
246 269
247/*****************************************************************************/ 270/*****************************************************************************/
248 271
249#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250 273
… …
279/* 302/*
280 * make our pread/pwrite emulation safe against themselves, but not against 303 * make our pread/pwrite emulation safe against themselves, but not against
281 * 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,
282 * but that's your problem, not mine. 305 * but that's your problem, not mine.
283 */ 306 */
284static xmutex_t preadwritelock = X_MUTEX_INIT; 307static xmutex_t preadwritelock;
285#endif 308#endif
286 309
287typedef struct etp_worker 310typedef struct etp_worker
288{ 311{
289 /* locked by wrklock */ 312 /* locked by wrklock */
… …
295 ETP_REQ *req; /* currently processed request */ 318 ETP_REQ *req; /* currently processed request */
296 319
297 ETP_WORKER_COMMON 320 ETP_WORKER_COMMON
298} etp_worker; 321} etp_worker;
299 322
300static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 323static etp_worker wrk_first; /* NOT etp */
301 324
302#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 326#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304 327
305/* worker threads management */ 328/* worker threads management */
… …
376} etp_reqq; 399} etp_reqq;
377 400
378static etp_reqq req_queue; 401static etp_reqq req_queue;
379static etp_reqq res_queue; 402static etp_reqq res_queue;
380 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
381static int ecb_noinline 415static int ecb_noinline
382reqq_push (etp_reqq *q, ETP_REQ *req) 416reqq_push (etp_reqq *q, ETP_REQ *req)
383{ 417{
384 int pri = req->pri; 418 int pri = req->pri;
385 req->next = 0; 419 req->next = 0;
… …
419 } 453 }
420 454
421 abort (); 455 abort ();
422} 456}
423 457
424static void ecb_cold 458static int ecb_cold
425etp_thread_init (void) 459etp_init (void (*want_poll)(void), void (*done_poll)(void))
426{ 460{
427#if !HAVE_PREADWRITE
428 X_MUTEX_CREATE (preadwritelock);
429#endif
430 X_MUTEX_CREATE (wrklock); 461 X_MUTEX_CREATE (wrklock);
431 X_MUTEX_CREATE (reslock); 462 X_MUTEX_CREATE (reslock);
432 X_MUTEX_CREATE (reqlock); 463 X_MUTEX_CREATE (reqlock);
433 X_COND_CREATE (reqwait); 464 X_COND_CREATE (reqwait);
434}
435 465
436static void ecb_cold 466 reqq_init (&req_queue);
437etp_atfork_prepare (void) 467 reqq_init (&res_queue);
438{
439}
440 468
441static void ecb_cold 469 wrk_first.next =
442etp_atfork_parent (void) 470 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 471
468 started = 0; 472 started = 0;
469 idle = 0; 473 idle = 0;
470 nreqs = 0; 474 nreqs = 0;
471 nready = 0; 475 nready = 0;
472 npending = 0; 476 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 477
491 want_poll_cb = want_poll; 478 want_poll_cb = want_poll;
492 done_poll_cb = done_poll; 479 done_poll_cb = done_poll;
493 480
494 return 0; 481 return 0;
… …
1126 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1113 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1127 /* BSDs */ 1114 /* BSDs */
1128#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... */
1129 || errno == ENOTSUP 1116 || errno == ENOTSUP
1130#endif 1117#endif
1118#ifdef EOPNOTSUPP /* windows */
1131 || errno == EOPNOTSUPP /* BSDs */ 1119 || errno == EOPNOTSUPP /* BSDs */
1120#endif
1132#if __solaris 1121#if __solaris
1133 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1122 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1134#endif 1123#endif
1135 ) 1124 )
1136 ) 1125 )
… …
1461 1450
1462#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 */
1463#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1452#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464 1453
1465static void 1454static void
1466eio_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)
1467{ 1456{
1468 unsigned char bits [9 + sizeof (ino_t) * 8]; 1457 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469 unsigned char *bit = bits; 1458 unsigned char *bit = bits;
1470 1459
1471 assert (CHAR_BIT == 8); 1460 assert (CHAR_BIT == 8);
1472 assert (sizeof (eio_dirent) * 8 < 256); 1461 assert (sizeof (eio_dirent) * 8 < 256);
1473 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1462 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1475 1464
1476 if (size <= EIO_SORT_FAST) 1465 if (size <= EIO_SORT_FAST)
1477 return; 1466 return;
1478 1467
1479 /* 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 */
1480 /* 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 */
1481 /* inode_bits must contain all inodes ORed together */ 1470 /* inode_bits must contain all inodes ORed together */
1482 /* 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 */
1483 { 1472 {
1484 ino_t endianness; 1473 eio_ino_t endianness;
1485 int i, j; 1474 int i, j;
1486 1475
1487 /* 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" */
1488 for (i = 0; i < sizeof (ino_t); ++i) 1477 for (i = 0; i < sizeof (eio_ino_t); ++i)
1489 ((unsigned char *)&endianness)[i] = i; 1478 ((unsigned char *)&endianness)[i] = i;
1490 1479
1491 *bit++ = 0; 1480 *bit++ = 0;
1492 1481
1493 for (i = 0; i < sizeof (ino_t); ++i) 1482 for (i = 0; i < sizeof (eio_ino_t); ++i)
1494 { 1483 {
1495 /* shifting off the byte offsets out of "endianness" */ 1484 /* shifting off the byte offsets out of "endianness" */
1496 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1485 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497 endianness >>= 8; 1486 endianness >>= 8;
1498 1487
1499 for (j = 0; j < 8; ++j) 1488 for (j = 0; j < 8; ++j)
1500 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1489 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501 *bit++ = offs + j; 1490 *bit++ = offs + j;
1502 } 1491 }
1503 1492
1504 for (j = 0; j < 8; ++j) 1493 for (j = 0; j < 8; ++j)
1505 if (score_bits & (1 << j)) 1494 if (score_bits & (1 << j))
1506 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1495 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1507 } 1496 }
1508 1497
1509 /* now actually do the sorting (a variant of MSD radix sort) */ 1498 /* now actually do the sorting (a variant of MSD radix sort) */
1510 { 1499 {
1511 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1500 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1501 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1502 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514 int stk_idx = 0; 1503 int stk_idx = 0;
1515 1504
1516 base_stk [stk_idx] = dents; 1505 base_stk [stk_idx] = dents;
1517 end_stk [stk_idx] = dents + size; 1506 end_stk [stk_idx] = dents + size;
1518 bit_stk [stk_idx] = bit - 1; 1507 bit_stk [stk_idx] = bit - 1;
… …
1597 } 1586 }
1598 } 1587 }
1599} 1588}
1600 1589
1601static void 1590static void
1602eio_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)
1603{ 1592{
1604 if (size <= 1) 1593 if (size <= 1)
1605 return; /* our insertion sort relies on size > 0 */ 1594 return; /* our insertion sort relies on size > 0 */
1606 1595
1607 /* 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 */
… …
1615 1604
1616/* read a full directory */ 1605/* read a full directory */
1617static void 1606static void
1618eio__scandir (eio_req *req, etp_worker *self) 1607eio__scandir (eio_req *req, etp_worker *self)
1619{ 1608{
1620 DIR *dirp;
1621 EIO_STRUCT_DIRENT *entp;
1622 char *name, *names; 1609 char *name, *names;
1623 int namesalloc = 4096; 1610 int namesalloc = 4096 - sizeof (void *) * 4;
1624 int namesoffs = 0; 1611 int namesoffs = 0;
1625 int flags = req->int1; 1612 int flags = req->int1;
1626 eio_dirent *dents = 0; 1613 eio_dirent *dents = 0;
1627 int dentalloc = 128; 1614 int dentalloc = 128;
1628 int dentoffs = 0; 1615 int dentoffs = 0;
1629 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
1630 1624
1631 req->result = -1; 1625 req->result = -1;
1632 1626
1633 if (!(flags & EIO_READDIR_DENTS)) 1627 if (!(flags & EIO_READDIR_DENTS))
1634 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1628 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635 1629
1636 X_LOCK (wrklock); 1630#ifdef _WIN32
1637 /* 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
1638 self->dirp = dirp = opendir (req->ptr1); 1674 dirp = opendir (req->ptr1);
1675#endif
1639 1676
1640 if (req->flags & EIO_FLAG_PTR1_FREE) 1677 if (req->flags & EIO_FLAG_PTR1_FREE)
1641 free (req->ptr1); 1678 free (req->ptr1);
1642 1679
1643 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1680 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1681 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645 req->ptr2 = names = malloc (namesalloc); 1682 req->ptr2 = names = malloc (namesalloc);
1646 X_UNLOCK (wrklock);
1647 1683
1648 if (dirp && names && (!flags || dents)) 1684 if (dirp && names && (!flags || dents))
1649 for (;;) 1685 for (;;)
1650 { 1686 {
1687 int done;
1688
1689#ifdef _WIN32
1690 done = !dirp;
1691#else
1651 errno = 0; 1692 errno = 0;
1652 entp = readdir (dirp); 1693 entp = readdir (dirp);
1694 done = !entp;
1695#endif
1653 1696
1654 if (!entp) 1697 if (done)
1655 { 1698 {
1699#ifndef _WIN32
1700 int old_errno = errno;
1701 closedir (dirp);
1702 errno = old_errno;
1703
1656 if (errno) 1704 if (errno)
1657 break; 1705 break;
1706#endif
1658 1707
1659 /* sort etc. */ 1708 /* sort etc. */
1660 req->int1 = flags; 1709 req->int1 = flags;
1661 req->result = dentoffs; 1710 req->result = dentoffs;
1662 1711
… …
1691 1740
1692 break; 1741 break;
1693 } 1742 }
1694 1743
1695 /* now add the entry to our list(s) */ 1744 /* now add the entry to our list(s) */
1696 name = entp->d_name; 1745 name = D_NAME (entp);
1697 1746
1698 /* skip . and .. entries */ 1747 /* skip . and .. entries */
1699 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1748 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1700 { 1749 {
1701 int len = D_NAMLEN (entp) + 1; 1750 int len = D_NAMLEN (entp) + 1;
1702 1751
1703 while (ecb_expect_false (namesoffs + len > namesalloc)) 1752 while (ecb_expect_false (namesoffs + len > namesalloc))
1704 { 1753 {
1705 namesalloc *= 2; 1754 namesalloc *= 2;
1706 X_LOCK (wrklock);
1707 req->ptr2 = names = realloc (names, namesalloc); 1755 req->ptr2 = names = realloc (names, namesalloc);
1708 X_UNLOCK (wrklock);
1709 1756
1710 if (!names) 1757 if (!names)
1711 break; 1758 break;
1712 } 1759 }
1713 1760
… …
1718 struct eio_dirent *ent; 1765 struct eio_dirent *ent;
1719 1766
1720 if (ecb_expect_false (dentoffs == dentalloc)) 1767 if (ecb_expect_false (dentoffs == dentalloc))
1721 { 1768 {
1722 dentalloc *= 2; 1769 dentalloc *= 2;
1723 X_LOCK (wrklock);
1724 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1770 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725 X_UNLOCK (wrklock);
1726 1771
1727 if (!dents) 1772 if (!dents)
1728 break; 1773 break;
1729 } 1774 }
1730 1775
… …
1810 if (EIO_CANCELLED (req)) 1855 if (EIO_CANCELLED (req))
1811 { 1856 {
1812 errno = ECANCELED; 1857 errno = ECANCELED;
1813 break; 1858 break;
1814 } 1859 }
1860
1861#ifdef _WIN32
1862 if (!FindNextFile (dirp, &entp))
1863 {
1864 FindClose (dirp);
1865 dirp = 0;
1866 }
1867#endif
1815 } 1868 }
1816} 1869}
1817 1870
1818/*****************************************************************************/ 1871/*****************************************************************************/
1819 1872
… …
1835X_THREAD_PROC (etp_proc) 1888X_THREAD_PROC (etp_proc)
1836{ 1889{
1837 ETP_REQ *req; 1890 ETP_REQ *req;
1838 struct timespec ts; 1891 struct timespec ts;
1839 etp_worker *self = (etp_worker *)thr_arg; 1892 etp_worker *self = (etp_worker *)thr_arg;
1840 int timeout;
1841 1893
1842 /* try to distribute timeouts somewhat evenly */ 1894 /* try to distribute timeouts somewhat evenly */
1843 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1895 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844 1896
1845 for (;;) 1897 for (;;)
… …
1915/*****************************************************************************/ 1967/*****************************************************************************/
1916 1968
1917int ecb_cold 1969int ecb_cold
1918eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1970eio_init (void (*want_poll)(void), void (*done_poll)(void))
1919{ 1971{
1972#if !HAVE_PREADWRITE
1973 X_MUTEX_CREATE (preadwritelock);
1974#endif
1975
1920 return etp_init (want_poll, done_poll); 1976 return etp_init (want_poll, done_poll);
1921} 1977}
1922 1978
1923ecb_inline void 1979ecb_inline void
1924eio_api_destroy (eio_req *req) 1980eio_api_destroy (eio_req *req)

Diff Legend

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