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.96 by root, Tue Jul 19 05:20:36 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>
… …
186#endif 223#endif
187#ifndef D_INO 224#ifndef D_INO
188# define D_INO(de) 0 225# define D_INO(de) 0
189#endif 226#endif
190#ifndef D_NAMLEN 227#ifndef D_NAMLEN
191# define D_NAMLEN(de) strlen ((de)->d_name) 228# define D_NAMLEN(entp) strlen (D_NAME (entp))
192#endif 229#endif
193 230
194/* used for struct dirent, AIX doesn't provide it */ 231/* used for struct dirent, AIX doesn't provide it */
195#ifndef NAME_MAX 232#ifndef NAME_MAX
196# define NAME_MAX 4096 233# define NAME_MAX 4096
… …
203 240
204/* buffer size for various temporary buffers */ 241/* buffer size for various temporary buffers */
205#define EIO_BUFSIZE 65536 242#define EIO_BUFSIZE 65536
206 243
207#define dBUF \ 244#define dBUF \
208 char *eio_buf; \
209 ETP_WORKER_LOCK (self); \
210 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 245 char *eio_buf = malloc (EIO_BUFSIZE); \
211 ETP_WORKER_UNLOCK (self); \
212 errno = ENOMEM; \ 246 errno = ENOMEM; \
213 if (!eio_buf) \ 247 if (!eio_buf) \
214 return -1; 248 return -1
249
250#define FUBd \
251 free (eio_buf)
215 252
216#define EIO_TICKS ((1000000 + 1023) >> 10) 253#define EIO_TICKS ((1000000 + 1023) >> 10)
217 254
218#define ETP_PRI_MIN EIO_PRI_MIN 255#define ETP_PRI_MIN EIO_PRI_MIN
219#define ETP_PRI_MAX EIO_PRI_MAX 256#define ETP_PRI_MAX EIO_PRI_MAX
… …
225static int eio_finish (eio_req *req); 262static int eio_finish (eio_req *req);
226#define ETP_FINISH(req) eio_finish (req) 263#define ETP_FINISH(req) eio_finish (req)
227static void eio_execute (struct etp_worker *self, eio_req *req); 264static void eio_execute (struct etp_worker *self, eio_req *req);
228#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 265#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
229 266
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/*****************************************************************************/ 267/*****************************************************************************/
248 268
249#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 269#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
250 270
251/* calculate time difference in ~1/EIO_TICKS of a second */ 271/* calculate time difference in ~1/EIO_TICKS of a second */
… …
279/* 299/*
280 * make our pread/pwrite emulation safe against themselves, but not against 300 * make our pread/pwrite emulation safe against themselves, but not against
281 * normal read/write by using a mutex. slows down execution a lot, 301 * normal read/write by using a mutex. slows down execution a lot,
282 * but that's your problem, not mine. 302 * but that's your problem, not mine.
283 */ 303 */
284static xmutex_t preadwritelock = X_MUTEX_INIT; 304static xmutex_t preadwritelock;
285#endif 305#endif
286 306
287typedef struct etp_worker 307typedef struct etp_worker
288{ 308{
289 /* locked by wrklock */ 309 /* locked by wrklock */
… …
292 xthread_t tid; 312 xthread_t tid;
293 313
294 /* locked by reslock, reqlock or wrklock */ 314 /* locked by reslock, reqlock or wrklock */
295 ETP_REQ *req; /* currently processed request */ 315 ETP_REQ *req; /* currently processed request */
296 316
317#ifdef ETP_WORKER_COMMON
297 ETP_WORKER_COMMON 318 ETP_WORKER_COMMON
319#endif
298} etp_worker; 320} etp_worker;
299 321
300static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 322static etp_worker wrk_first; /* NOT etp */
301 323
302#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 324#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
303#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 325#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
304 326
305/* worker threads management */ 327/* worker threads management */
306 328
307static void ecb_cold 329static void ecb_cold
308etp_worker_clear (etp_worker *wrk) 330etp_worker_clear (etp_worker *wrk)
309{ 331{
310 ETP_WORKER_CLEAR (wrk);
311} 332}
312 333
313static void ecb_cold 334static void ecb_cold
314etp_worker_free (etp_worker *wrk) 335etp_worker_free (etp_worker *wrk)
315{ 336{
… …
376} etp_reqq; 397} etp_reqq;
377 398
378static etp_reqq req_queue; 399static etp_reqq req_queue;
379static etp_reqq res_queue; 400static etp_reqq res_queue;
380 401
402static void ecb_noinline ecb_cold
403reqq_init (etp_reqq *q)
404{
405 int pri;
406
407 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
408 q->qs[pri] = q->qe[pri] = 0;
409
410 q->size = 0;
411}
412
381static int ecb_noinline 413static int ecb_noinline
382reqq_push (etp_reqq *q, ETP_REQ *req) 414reqq_push (etp_reqq *q, ETP_REQ *req)
383{ 415{
384 int pri = req->pri; 416 int pri = req->pri;
385 req->next = 0; 417 req->next = 0;
… …
419 } 451 }
420 452
421 abort (); 453 abort ();
422} 454}
423 455
424static void ecb_cold 456static int ecb_cold
425etp_thread_init (void) 457etp_init (void (*want_poll)(void), void (*done_poll)(void))
426{ 458{
427#if !HAVE_PREADWRITE
428 X_MUTEX_CREATE (preadwritelock);
429#endif
430 X_MUTEX_CREATE (wrklock); 459 X_MUTEX_CREATE (wrklock);
431 X_MUTEX_CREATE (reslock); 460 X_MUTEX_CREATE (reslock);
432 X_MUTEX_CREATE (reqlock); 461 X_MUTEX_CREATE (reqlock);
433 X_COND_CREATE (reqwait); 462 X_COND_CREATE (reqwait);
434}
435 463
436static void ecb_cold 464 reqq_init (&req_queue);
437etp_atfork_prepare (void) 465 reqq_init (&res_queue);
438{
439}
440 466
441static void ecb_cold 467 wrk_first.next =
442etp_atfork_parent (void) 468 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 469
468 started = 0; 470 started = 0;
469 idle = 0; 471 idle = 0;
470 nreqs = 0; 472 nreqs = 0;
471 nready = 0; 473 nready = 0;
472 npending = 0; 474 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 475
491 want_poll_cb = want_poll; 476 want_poll_cb = want_poll;
492 done_poll_cb = done_poll; 477 done_poll_cb = done_poll;
493 478
494 return 0; 479 return 0;
… …
1010 pread (fd, eio_buf, len, offset); 995 pread (fd, eio_buf, len, offset);
1011 offset += len; 996 offset += len;
1012 todo -= len; 997 todo -= len;
1013 } 998 }
1014 999
1000 FUBd;
1001
1015 errno = 0; 1002 errno = 0;
1016 return count; 1003 return count;
1017} 1004}
1018 1005
1019#endif 1006#endif
1020 1007
1021/* sendfile always needs emulation */ 1008/* sendfile always needs emulation */
1022static eio_ssize_t 1009static eio_ssize_t
1023eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1010eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
1024{ 1011{
1025 eio_ssize_t written = 0; 1012 eio_ssize_t written = 0;
1026 eio_ssize_t res; 1013 eio_ssize_t res;
1027 1014
1028 if (!count) 1015 if (!count)
… …
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 )
… …
1162 1151
1163 offset += cnt; 1152 offset += cnt;
1164 res += cnt; 1153 res += cnt;
1165 count -= cnt; 1154 count -= cnt;
1166 } 1155 }
1156
1157 FUBd;
1167 } 1158 }
1168 1159
1169 return res; 1160 return res;
1170} 1161}
1171 1162
… …
1461 1452
1462#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1453#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 */ 1454#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1464 1455
1465static void 1456static void
1466eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1457eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1467{ 1458{
1468 unsigned char bits [9 + sizeof (ino_t) * 8]; 1459 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1469 unsigned char *bit = bits; 1460 unsigned char *bit = bits;
1470 1461
1471 assert (CHAR_BIT == 8); 1462 assert (CHAR_BIT == 8);
1472 assert (sizeof (eio_dirent) * 8 < 256); 1463 assert (sizeof (eio_dirent) * 8 < 256);
1473 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1464 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1475 1466
1476 if (size <= EIO_SORT_FAST) 1467 if (size <= EIO_SORT_FAST)
1477 return; 1468 return;
1478 1469
1479 /* first prepare an array of bits to test in our radix sort */ 1470 /* 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 */ 1471 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1481 /* inode_bits must contain all inodes ORed together */ 1472 /* inode_bits must contain all inodes ORed together */
1482 /* which is used to skip bits that are 0 everywhere, which is very common */ 1473 /* which is used to skip bits that are 0 everywhere, which is very common */
1483 { 1474 {
1484 ino_t endianness; 1475 eio_ino_t endianness;
1485 int i, j; 1476 int i, j;
1486 1477
1487 /* we store the byte offset of byte n into byte n of "endianness" */ 1478 /* we store the byte offset of byte n into byte n of "endianness" */
1488 for (i = 0; i < sizeof (ino_t); ++i) 1479 for (i = 0; i < sizeof (eio_ino_t); ++i)
1489 ((unsigned char *)&endianness)[i] = i; 1480 ((unsigned char *)&endianness)[i] = i;
1490 1481
1491 *bit++ = 0; 1482 *bit++ = 0;
1492 1483
1493 for (i = 0; i < sizeof (ino_t); ++i) 1484 for (i = 0; i < sizeof (eio_ino_t); ++i)
1494 { 1485 {
1495 /* shifting off the byte offsets out of "endianness" */ 1486 /* shifting off the byte offsets out of "endianness" */
1496 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1487 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1497 endianness >>= 8; 1488 endianness >>= 8;
1498 1489
1499 for (j = 0; j < 8; ++j) 1490 for (j = 0; j < 8; ++j)
1500 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1491 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1501 *bit++ = offs + j; 1492 *bit++ = offs + j;
1502 } 1493 }
1503 1494
1504 for (j = 0; j < 8; ++j) 1495 for (j = 0; j < 8; ++j)
1505 if (score_bits & (1 << j)) 1496 if (score_bits & (1 << j))
1506 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1497 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1507 } 1498 }
1508 1499
1509 /* now actually do the sorting (a variant of MSD radix sort) */ 1500 /* now actually do the sorting (a variant of MSD radix sort) */
1510 { 1501 {
1511 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1502 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1512 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1503 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1513 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1504 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1514 int stk_idx = 0; 1505 int stk_idx = 0;
1515 1506
1516 base_stk [stk_idx] = dents; 1507 base_stk [stk_idx] = dents;
1517 end_stk [stk_idx] = dents + size; 1508 end_stk [stk_idx] = dents + size;
1518 bit_stk [stk_idx] = bit - 1; 1509 bit_stk [stk_idx] = bit - 1;
… …
1597 } 1588 }
1598 } 1589 }
1599} 1590}
1600 1591
1601static void 1592static void
1602eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1593eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1603{ 1594{
1604 if (size <= 1) 1595 if (size <= 1)
1605 return; /* our insertion sort relies on size > 0 */ 1596 return; /* our insertion sort relies on size > 0 */
1606 1597
1607 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1598 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1615 1606
1616/* read a full directory */ 1607/* read a full directory */
1617static void 1608static void
1618eio__scandir (eio_req *req, etp_worker *self) 1609eio__scandir (eio_req *req, etp_worker *self)
1619{ 1610{
1620 DIR *dirp;
1621 EIO_STRUCT_DIRENT *entp;
1622 char *name, *names; 1611 char *name, *names;
1623 int namesalloc = 4096; 1612 int namesalloc = 4096 - sizeof (void *) * 4;
1624 int namesoffs = 0; 1613 int namesoffs = 0;
1625 int flags = req->int1; 1614 int flags = req->int1;
1626 eio_dirent *dents = 0; 1615 eio_dirent *dents = 0;
1627 int dentalloc = 128; 1616 int dentalloc = 128;
1628 int dentoffs = 0; 1617 int dentoffs = 0;
1629 ino_t inode_bits = 0; 1618 eio_ino_t inode_bits = 0;
1619#ifdef _WIN32
1620 HANDLE dirp;
1621 WIN32_FIND_DATA entp;
1622#else
1623 DIR *dirp;
1624 EIO_STRUCT_DIRENT *entp;
1625#endif
1630 1626
1631 req->result = -1; 1627 req->result = -1;
1632 1628
1633 if (!(flags & EIO_READDIR_DENTS)) 1629 if (!(flags & EIO_READDIR_DENTS))
1634 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1630 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1635 1631
1636 X_LOCK (wrklock); 1632#ifdef _WIN32
1637 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1633 {
1634 int len = strlen ((const char *)req->ptr1);
1635 char *path = malloc (MAX_PATH);
1636 const char *fmt;
1637
1638 if (!len)
1639 fmt = "./*";
1640 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1641 fmt = "%s*";
1642 else
1643 fmt = "%s/*";
1644
1645 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1646 dirp = FindFirstFile (path, &entp);
1647 free (path);
1648
1649 if (dirp == INVALID_HANDLE_VALUE)
1650 {
1651 dirp = 0;
1652
1653 switch (GetLastError ())
1654 {
1655 case ERROR_FILE_NOT_FOUND:
1656 req->result = 0;
1657 break;
1658
1659 case ERROR_INVALID_NAME:
1660 case ERROR_PATH_NOT_FOUND:
1661 case ERROR_NO_MORE_FILES:
1662 errno = ENOENT;
1663 break;
1664
1665 case ERROR_NOT_ENOUGH_MEMORY:
1666 errno = ENOMEM;
1667 break;
1668
1669 default:
1670 errno = EINVAL;
1671 break;
1672 }
1673 }
1674 }
1675#else
1638 self->dirp = dirp = opendir (req->ptr1); 1676 dirp = opendir (req->ptr1);
1677#endif
1639 1678
1640 if (req->flags & EIO_FLAG_PTR1_FREE) 1679 if (req->flags & EIO_FLAG_PTR1_FREE)
1641 free (req->ptr1); 1680 free (req->ptr1);
1642 1681
1643 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1682 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1644 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1683 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1645 req->ptr2 = names = malloc (namesalloc); 1684 req->ptr2 = names = malloc (namesalloc);
1646 X_UNLOCK (wrklock);
1647 1685
1648 if (dirp && names && (!flags || dents)) 1686 if (dirp && names && (!flags || dents))
1649 for (;;) 1687 for (;;)
1650 { 1688 {
1689 int done;
1690
1691#ifdef _WIN32
1692 done = !dirp;
1693#else
1651 errno = 0; 1694 errno = 0;
1652 entp = readdir (dirp); 1695 entp = readdir (dirp);
1696 done = !entp;
1697#endif
1653 1698
1654 if (!entp) 1699 if (done)
1655 { 1700 {
1701#ifndef _WIN32
1702 int old_errno = errno;
1703 closedir (dirp);
1704 errno = old_errno;
1705
1656 if (errno) 1706 if (errno)
1657 break; 1707 break;
1708#endif
1658 1709
1659 /* sort etc. */ 1710 /* sort etc. */
1660 req->int1 = flags; 1711 req->int1 = flags;
1661 req->result = dentoffs; 1712 req->result = dentoffs;
1662 1713
… …
1691 1742
1692 break; 1743 break;
1693 } 1744 }
1694 1745
1695 /* now add the entry to our list(s) */ 1746 /* now add the entry to our list(s) */
1696 name = entp->d_name; 1747 name = D_NAME (entp);
1697 1748
1698 /* skip . and .. entries */ 1749 /* skip . and .. entries */
1699 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1750 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1700 { 1751 {
1701 int len = D_NAMLEN (entp) + 1; 1752 int len = D_NAMLEN (entp) + 1;
1702 1753
1703 while (ecb_expect_false (namesoffs + len > namesalloc)) 1754 while (ecb_expect_false (namesoffs + len > namesalloc))
1704 { 1755 {
1705 namesalloc *= 2; 1756 namesalloc *= 2;
1706 X_LOCK (wrklock);
1707 req->ptr2 = names = realloc (names, namesalloc); 1757 req->ptr2 = names = realloc (names, namesalloc);
1708 X_UNLOCK (wrklock);
1709 1758
1710 if (!names) 1759 if (!names)
1711 break; 1760 break;
1712 } 1761 }
1713 1762
… …
1718 struct eio_dirent *ent; 1767 struct eio_dirent *ent;
1719 1768
1720 if (ecb_expect_false (dentoffs == dentalloc)) 1769 if (ecb_expect_false (dentoffs == dentalloc))
1721 { 1770 {
1722 dentalloc *= 2; 1771 dentalloc *= 2;
1723 X_LOCK (wrklock);
1724 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1772 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1725 X_UNLOCK (wrklock);
1726 1773
1727 if (!dents) 1774 if (!dents)
1728 break; 1775 break;
1729 } 1776 }
1730 1777
… …
1810 if (EIO_CANCELLED (req)) 1857 if (EIO_CANCELLED (req))
1811 { 1858 {
1812 errno = ECANCELED; 1859 errno = ECANCELED;
1813 break; 1860 break;
1814 } 1861 }
1862
1863#ifdef _WIN32
1864 if (!FindNextFile (dirp, &entp))
1865 {
1866 FindClose (dirp);
1867 dirp = 0;
1868 }
1869#endif
1815 } 1870 }
1816} 1871}
1817 1872
1818/*****************************************************************************/ 1873/*****************************************************************************/
1819 1874
… …
1835X_THREAD_PROC (etp_proc) 1890X_THREAD_PROC (etp_proc)
1836{ 1891{
1837 ETP_REQ *req; 1892 ETP_REQ *req;
1838 struct timespec ts; 1893 struct timespec ts;
1839 etp_worker *self = (etp_worker *)thr_arg; 1894 etp_worker *self = (etp_worker *)thr_arg;
1840 int timeout;
1841 1895
1842 /* try to distribute timeouts somewhat evenly */ 1896 /* try to distribute timeouts somewhat evenly */
1843 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1897 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1844 1898
1845 for (;;) 1899 for (;;)
… …
1915/*****************************************************************************/ 1969/*****************************************************************************/
1916 1970
1917int ecb_cold 1971int ecb_cold
1918eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1972eio_init (void (*want_poll)(void), void (*done_poll)(void))
1919{ 1973{
1974#if !HAVE_PREADWRITE
1975 X_MUTEX_CREATE (preadwritelock);
1976#endif
1977
1920 return etp_init (want_poll, done_poll); 1978 return etp_init (want_poll, done_poll);
1921} 1979}
1922 1980
1923ecb_inline void 1981ecb_inline void
1924eio_api_destroy (eio_req *req) 1982eio_api_destroy (eio_req *req)
… …
1969 case EIO_WRITE: req->result = req->offs >= 0 2027 case EIO_WRITE: req->result = req->offs >= 0
1970 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2028 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1971 : write (req->int1, req->ptr2, req->size); break; 2029 : write (req->int1, req->ptr2, req->size); break;
1972 2030
1973 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2031 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; 2032 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1975 2033
1976 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2034 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1977 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2035 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1978 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2036 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1979 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2037 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
… …
2369/* misc garbage */ 2427/* misc garbage */
2370 2428
2371eio_ssize_t 2429eio_ssize_t
2372eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2430eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2373{ 2431{
2374 etp_worker wrk;
2375 eio_ssize_t ret;
2376
2377 wrk.dbuf = 0;
2378
2379 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2432 return eio__sendfile (ofd, ifd, offset, count);
2380
2381 if (wrk.dbuf)
2382 free (wrk.dbuf);
2383
2384 return ret;
2385} 2433}
2386 2434

Diff Legend

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