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

Comparing libeio/eio.c (file contents):
Revision 1.70 by root, Fri Jun 10 06:55:10 2011 UTC vs.
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC

… …
40#ifndef _WIN32 40#ifndef _WIN32
41# include "config.h" 41# include "config.h"
42#endif 42#endif
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h"
45 46
46#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
47# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define X_STACKSIZE EIO_STACKSIZE
48#endif 49#endif
49#include "xthread.h" 50#include "xthread.h"
50 51
51#include <errno.h> 52#include <errno.h>
52#include <stddef.h> 53#include <stddef.h>
53#include <stdlib.h> 54#include <stdlib.h>
54#include <string.h> 55#include <string.h>
55#include <errno.h> 56#include <errno.h>
56#include <sys/types.h> 57#include <sys/types.h>
57#include <sys/stat.h> 58#include <sys/stat.h>
58#include <sys/statvfs.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#if _POSIX_VERSION >= 200809L
64# define HAVE_AT 1
65#else
66# define HAVE_AT 0
67#endif
68
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 69/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes form stdint.h, says idiot openbsd coder */ 70/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H 71#if HAVE_STDINT_H
66# include <stdint.h> 72# include <stdint.h>
67#endif 73#endif
68 74
75#ifndef ECANCELED
76# define ECANCELED EDOM
77#endif
78#ifndef ELOOP
79# define ELOOP EDOM
80#endif
81
82#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
83# define ENOTSOCK WSAENOTSOCK
84#endif
85
86static void eio_destroy (eio_req *req);
87
69#ifndef EIO_FINISH 88#ifndef EIO_FINISH
70# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 89# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
71#endif 90#endif
72 91
73#ifndef EIO_DESTROY 92#ifndef EIO_DESTROY
… …
76 95
77#ifndef EIO_FEED 96#ifndef EIO_FEED
78# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 97# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
79#endif 98#endif
80 99
100#ifndef EIO_FD_TO_WIN32_HANDLE
101# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
102#endif
103#ifndef EIO_WIN32_HANDLE_TO_FD
104# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
105#endif
106
107#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
108
109#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
110
81#ifdef _WIN32 111#ifdef _WIN32
82 112
83 /*doh*/ 113 #undef PAGESIZE
114 #define PAGESIZE 4096 /* GetSystemInfo? */
115
116 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
117
118 #ifdef EIO_STRUCT_STATI64
119 /* look at perl's non-sloppy stat */
120 #define stat(path,buf) _stati64 (path,buf)
121 #define fstat(fd,buf) _fstati64 (fd,buf)
122 #endif
123 #define lstat(path,buf) stat (path,buf)
124 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
125 #define mkdir(path,mode) _mkdir (path)
126 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
127
128 #define chmod(path,mode) _chmod (path, mode)
129 #define dup(fd) _dup (fd)
130 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
131
132 #define fchmod(fd,mode) EIO_ENOSYS ()
133 #define chown(path,uid,gid) EIO_ENOSYS ()
134 #define fchown(fd,uid,gid) EIO_ENOSYS ()
135 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
136 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
137 #define mknod(path,mode,dev) EIO_ENOSYS ()
138 #define sync() EIO_ENOSYS ()
139 #define readlink(path,buf,s) EIO_ENOSYS ()
140 #define statvfs(path,buf) EIO_ENOSYS ()
141 #define fstatvfs(fd,buf) EIO_ENOSYS ()
142
143 /* rename() uses MoveFile, which fails to overwrite */
144 #define rename(old,neu) eio__rename (old, neu)
145
146 static int
147 eio__rename (const char *old, const char *neu)
148 {
149 if (MoveFileEx (old, neu, MOVEFILE_REPLACE_EXISTING))
150 return 0;
151
152 /* should steal _dosmaperr */
153 switch (GetLastError ())
154 {
155 case ERROR_FILE_NOT_FOUND:
156 case ERROR_PATH_NOT_FOUND:
157 case ERROR_INVALID_DRIVE:
158 case ERROR_NO_MORE_FILES:
159 case ERROR_BAD_NETPATH:
160 case ERROR_BAD_NET_NAME:
161 case ERROR_BAD_PATHNAME:
162 case ERROR_FILENAME_EXCED_RANGE:
163 errno = ENOENT;
164 break;
165
166 default:
167 errno = EACCES;
168 break;
169 }
170
171 return -1;
172 }
173
174 /* we could even stat and see if it exists */
175 static int
176 symlink (const char *old, const char *neu)
177 {
178 #if WINVER >= 0x0600
179 if (CreateSymbolicLink (neu, old, 1))
180 return 0;
181
182 if (CreateSymbolicLink (neu, old, 0))
183 return 0;
184 #endif
185
186 return EIO_ERRNO (ENOENT, -1);
187 }
188
189 /* POSIX API only */
190 #define CreateHardLink(neu,old,flags) 0
191 #define CreateSymbolicLink(neu,old,flags) 0
192
193 struct statvfs
194 {
195 int dummy;
196 };
197
198 #define DT_DIR EIO_DT_DIR
199 #define DT_REG EIO_DT_REG
200 #define D_NAME(entp) entp.cFileName
201 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
202
84#else 203#else
85 204
86# include <sys/time.h> 205 #include <sys/time.h>
87# include <sys/select.h> 206 #include <sys/select.h>
207 #include <sys/statvfs.h>
88# include <unistd.h> 208 #include <unistd.h>
209 #include <signal.h>
210 #include <dirent.h>
211
212 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
213 #include <sys/mman.h>
214 #endif
215
216 #define D_NAME(entp) entp->d_name
217
218 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
219 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
220 #define _DIRENT_HAVE_D_TYPE /* sigh */
221 #define D_INO(de) (de)->d_fileno
222 #define D_NAMLEN(de) (de)->d_namlen
223 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
224 #define D_INO(de) (de)->d_ino
225 #endif
226
227 #ifdef _D_EXACT_NAMLEN
228 #undef D_NAMLEN
229 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
230 #endif
231
232 #ifdef _DIRENT_HAVE_D_TYPE
233 #define D_TYPE(de) (de)->d_type
234 #endif
235
236 #ifndef EIO_STRUCT_DIRENT
237 #define EIO_STRUCT_DIRENT struct dirent
238 #endif
239
240#endif
241
242#if HAVE_UTIMES
89# include <utime.h> 243# include <utime.h>
90# include <signal.h>
91# include <dirent.h>
92
93#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
94# include <sys/mman.h>
95#endif
96
97/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
98# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
99# define _DIRENT_HAVE_D_TYPE /* sigh */
100# define D_INO(de) (de)->d_fileno
101# define D_NAMLEN(de) (de)->d_namlen
102# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
103# define D_INO(de) (de)->d_ino
104# endif 244#endif
105 245
106#ifdef _D_EXACT_NAMLEN 246#if HAVE_SYS_SYSCALL_H
107# undef D_NAMLEN 247# include <sys/syscall.h>
108# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
109#endif
110
111# ifdef _DIRENT_HAVE_D_TYPE
112# define D_TYPE(de) (de)->d_type
113# endif 248#endif
114 249
115# ifndef EIO_STRUCT_DIRENT 250#if HAVE_SYS_PRCTL_H
116# define EIO_STRUCT_DIRENT struct dirent 251# include <sys/prctl.h>
117# endif
118
119#endif 252#endif
120 253
121#if HAVE_SENDFILE 254#if HAVE_SENDFILE
122# if __linux 255# if __linux
123# include <sys/sendfile.h> 256# include <sys/sendfile.h>
… …
138#endif 271#endif
139#ifndef D_INO 272#ifndef D_INO
140# define D_INO(de) 0 273# define D_INO(de) 0
141#endif 274#endif
142#ifndef D_NAMLEN 275#ifndef D_NAMLEN
143# define D_NAMLEN(de) strlen ((de)->d_name) 276# define D_NAMLEN(entp) strlen (D_NAME (entp))
144#endif 277#endif
145 278
146/* used for struct dirent, AIX doesn't provide it */ 279/* used for struct dirent, AIX doesn't provide it */
147#ifndef NAME_MAX 280#ifndef NAME_MAX
148# define NAME_MAX 4096 281# define NAME_MAX 4096
… …
155 288
156/* buffer size for various temporary buffers */ 289/* buffer size for various temporary buffers */
157#define EIO_BUFSIZE 65536 290#define EIO_BUFSIZE 65536
158 291
159#define dBUF \ 292#define dBUF \
160 char *eio_buf; \
161 ETP_WORKER_LOCK (self); \
162 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 293 char *eio_buf = malloc (EIO_BUFSIZE); \
163 ETP_WORKER_UNLOCK (self); \
164 errno = ENOMEM; \ 294 errno = ENOMEM; \
165 if (!eio_buf) \ 295 if (!eio_buf) \
166 return -1; 296 return -1
297
298#define FUBd \
299 free (eio_buf)
167 300
168#define EIO_TICKS ((1000000 + 1023) >> 10) 301#define EIO_TICKS ((1000000 + 1023) >> 10)
169 302
170/*****************************************************************************/ 303/*****************************************************************************/
171 304
172#if __GNUC__ >= 3 305struct tmpbuf
173# define expect(expr,value) __builtin_expect ((expr),(value)) 306{
174#else 307 void *ptr;
175# define expect(expr,value) (expr) 308 int len;
176#endif 309};
177 310
178#define expect_false(expr) expect ((expr) != 0, 0) 311static void *
179#define expect_true(expr) expect ((expr) != 0, 1) 312tmpbuf_get (struct tmpbuf *buf, int len)
313{
314 if (buf->len < len)
315 {
316 free (buf->ptr);
317 buf->ptr = malloc (buf->len = len);
318 }
319
320 return buf->ptr;
321}
180 322
181/*****************************************************************************/ 323/*****************************************************************************/
182 324
183#define ETP_PRI_MIN EIO_PRI_MIN 325#define ETP_PRI_MIN EIO_PRI_MIN
184#define ETP_PRI_MAX EIO_PRI_MAX 326#define ETP_PRI_MAX EIO_PRI_MAX
… …
190static int eio_finish (eio_req *req); 332static int eio_finish (eio_req *req);
191#define ETP_FINISH(req) eio_finish (req) 333#define ETP_FINISH(req) eio_finish (req)
192static void eio_execute (struct etp_worker *self, eio_req *req); 334static void eio_execute (struct etp_worker *self, eio_req *req);
193#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 335#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
194 336
195#define ETP_WORKER_CLEAR(req) \
196 if (wrk->dbuf) \
197 { \
198 free (wrk->dbuf); \
199 wrk->dbuf = 0; \
200 } \
201 \
202 if (wrk->dirp) \
203 { \
204 closedir (wrk->dirp); \
205 wrk->dirp = 0; \
206 }
207
208#define ETP_WORKER_COMMON \
209 void *dbuf; \
210 DIR *dirp;
211
212/*****************************************************************************/ 337/*****************************************************************************/
213 338
214#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 339#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
215 340
216/* calculate time difference in ~1/EIO_TICKS of a second */ 341/* calculate time difference in ~1/EIO_TICKS of a second */
342ecb_inline int
217static int tvdiff (struct timeval *tv1, struct timeval *tv2) 343tvdiff (struct timeval *tv1, struct timeval *tv2)
218{ 344{
219 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 345 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
220 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 346 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
221} 347}
222 348
… …
226static void (*done_poll_cb) (void); 352static void (*done_poll_cb) (void);
227 353
228static unsigned int max_poll_time; /* reslock */ 354static unsigned int max_poll_time; /* reslock */
229static unsigned int max_poll_reqs; /* reslock */ 355static unsigned int max_poll_reqs; /* reslock */
230 356
231static volatile unsigned int nreqs; /* reqlock */ 357static unsigned int nreqs; /* reqlock */
232static volatile unsigned int nready; /* reqlock */ 358static unsigned int nready; /* reqlock */
233static volatile unsigned int npending; /* reqlock */ 359static unsigned int npending; /* reqlock */
234static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */ 360static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
235static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */ 361static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
236 362
237static xmutex_t wrklock; 363static xmutex_t wrklock;
238static xmutex_t reslock; 364static xmutex_t reslock;
239static xmutex_t reqlock; 365static xmutex_t reqlock;
240static xcond_t reqwait; 366static xcond_t reqwait;
… …
243/* 369/*
244 * make our pread/pwrite emulation safe against themselves, but not against 370 * make our pread/pwrite emulation safe against themselves, but not against
245 * normal read/write by using a mutex. slows down execution a lot, 371 * normal read/write by using a mutex. slows down execution a lot,
246 * but that's your problem, not mine. 372 * but that's your problem, not mine.
247 */ 373 */
248static xmutex_t preadwritelock = X_MUTEX_INIT; 374static xmutex_t preadwritelock;
249#endif 375#endif
250 376
251typedef struct etp_worker 377typedef struct etp_worker
252{ 378{
379 struct tmpbuf tmpbuf;
380
253 /* locked by wrklock */ 381 /* locked by wrklock */
254 struct etp_worker *prev, *next; 382 struct etp_worker *prev, *next;
255 383
256 xthread_t tid; 384 xthread_t tid;
257 385
258 /* locked by reslock, reqlock or wrklock */ 386#ifdef ETP_WORKER_COMMON
259 ETP_REQ *req; /* currently processed request */
260
261 ETP_WORKER_COMMON 387 ETP_WORKER_COMMON
388#endif
262} etp_worker; 389} etp_worker;
263 390
264static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ 391static etp_worker wrk_first; /* NOT etp */
265 392
266#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 393#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
267#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 394#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
268 395
269/* worker threads management */ 396/* worker threads management */
270 397
398static void ecb_cold
271static void etp_worker_clear (etp_worker *wrk) 399etp_worker_clear (etp_worker *wrk)
272{ 400{
273 ETP_WORKER_CLEAR (wrk);
274} 401}
275 402
403static void ecb_cold
276static void etp_worker_free (etp_worker *wrk) 404etp_worker_free (etp_worker *wrk)
277{ 405{
406 free (wrk->tmpbuf.ptr);
407
278 wrk->next->prev = wrk->prev; 408 wrk->next->prev = wrk->prev;
279 wrk->prev->next = wrk->next; 409 wrk->prev->next = wrk->next;
280 410
281 free (wrk); 411 free (wrk);
282} 412}
283 413
284static unsigned int etp_nreqs (void) 414static unsigned int
415etp_nreqs (void)
285{ 416{
286 int retval; 417 int retval;
287 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 418 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
288 retval = nreqs; 419 retval = nreqs;
289 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 420 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
290 return retval; 421 return retval;
291} 422}
292 423
293static unsigned int etp_nready (void) 424static unsigned int
425etp_nready (void)
294{ 426{
295 unsigned int retval; 427 unsigned int retval;
296 428
297 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 429 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
298 retval = nready; 430 retval = nready;
299 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 431 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
300 432
301 return retval; 433 return retval;
302} 434}
303 435
304static unsigned int etp_npending (void) 436static unsigned int
437etp_npending (void)
305{ 438{
306 unsigned int retval; 439 unsigned int retval;
307 440
308 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 441 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
309 retval = npending; 442 retval = npending;
310 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 443 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
311 444
312 return retval; 445 return retval;
313} 446}
314 447
315static unsigned int etp_nthreads (void) 448static unsigned int
449etp_nthreads (void)
316{ 450{
317 unsigned int retval; 451 unsigned int retval;
318 452
319 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 453 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
320 retval = started; 454 retval = started;
… …
334} etp_reqq; 468} etp_reqq;
335 469
336static etp_reqq req_queue; 470static etp_reqq req_queue;
337static etp_reqq res_queue; 471static etp_reqq res_queue;
338 472
473static void ecb_noinline ecb_cold
474reqq_init (etp_reqq *q)
475{
476 int pri;
477
478 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
479 q->qs[pri] = q->qe[pri] = 0;
480
481 q->size = 0;
482}
483
484static int ecb_noinline
339static int reqq_push (etp_reqq *q, ETP_REQ *req) 485reqq_push (etp_reqq *q, ETP_REQ *req)
340{ 486{
341 int pri = req->pri; 487 int pri = req->pri;
342 req->next = 0; 488 req->next = 0;
343 489
344 if (q->qe[pri]) 490 if (q->qe[pri])
… …
350 q->qe[pri] = q->qs[pri] = req; 496 q->qe[pri] = q->qs[pri] = req;
351 497
352 return q->size++; 498 return q->size++;
353} 499}
354 500
501static ETP_REQ * ecb_noinline
355static ETP_REQ *reqq_shift (etp_reqq *q) 502reqq_shift (etp_reqq *q)
356{ 503{
357 int pri; 504 int pri;
358 505
359 if (!q->size) 506 if (!q->size)
360 return 0; 507 return 0;
… …
375 } 522 }
376 523
377 abort (); 524 abort ();
378} 525}
379 526
380static void etp_thread_init (void) 527static int ecb_cold
528etp_init (void (*want_poll)(void), void (*done_poll)(void))
381{ 529{
382 X_MUTEX_CREATE (wrklock); 530 X_MUTEX_CREATE (wrklock);
383 X_MUTEX_CREATE (reslock); 531 X_MUTEX_CREATE (reslock);
384 X_MUTEX_CREATE (reqlock); 532 X_MUTEX_CREATE (reqlock);
385 X_COND_CREATE (reqwait); 533 X_COND_CREATE (reqwait);
386}
387 534
388static void etp_atfork_prepare (void) 535 reqq_init (&req_queue);
389{ 536 reqq_init (&res_queue);
390 X_LOCK (wrklock);
391 X_LOCK (reqlock);
392 X_LOCK (reslock);
393#if !HAVE_PREADWRITE
394 X_LOCK (preadwritelock);
395#endif
396}
397 537
398static void etp_atfork_parent (void) 538 wrk_first.next =
399{ 539 wrk_first.prev = &wrk_first;
400#if !HAVE_PREADWRITE
401 X_UNLOCK (preadwritelock);
402#endif
403 X_UNLOCK (reslock);
404 X_UNLOCK (reqlock);
405 X_UNLOCK (wrklock);
406}
407
408static void etp_atfork_child (void)
409{
410 ETP_REQ *prv;
411
412 while ((prv = reqq_shift (&req_queue)))
413 ETP_DESTROY (prv);
414
415 while ((prv = reqq_shift (&res_queue)))
416 ETP_DESTROY (prv);
417
418 while (wrk_first.next != &wrk_first)
419 {
420 etp_worker *wrk = wrk_first.next;
421
422 if (wrk->req)
423 ETP_DESTROY (wrk->req);
424
425 etp_worker_clear (wrk);
426 etp_worker_free (wrk);
427 }
428 540
429 started = 0; 541 started = 0;
430 idle = 0; 542 idle = 0;
431 nreqs = 0; 543 nreqs = 0;
432 nready = 0; 544 nready = 0;
433 npending = 0; 545 npending = 0;
434 546
435 etp_thread_init ();
436}
437
438static void
439etp_once_init (void)
440{
441 etp_thread_init ();
442 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
443}
444
445static int
446etp_init (void (*want_poll)(void), void (*done_poll)(void))
447{
448 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
449
450 pthread_once (&doinit, etp_once_init);
451
452 want_poll_cb = want_poll; 547 want_poll_cb = want_poll;
453 done_poll_cb = done_poll; 548 done_poll_cb = done_poll;
454 549
455 return 0; 550 return 0;
456} 551}
457 552
458X_THREAD_PROC (etp_proc); 553X_THREAD_PROC (etp_proc);
459 554
555static void ecb_cold
460static void etp_start_thread (void) 556etp_start_thread (void)
461{ 557{
462 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 558 etp_worker *wrk = calloc (1, sizeof (etp_worker));
463 559
464 /*TODO*/ 560 /*TODO*/
465 assert (("unable to allocate worker thread data", wrk)); 561 assert (("unable to allocate worker thread data", wrk));
… …
478 free (wrk); 574 free (wrk);
479 575
480 X_UNLOCK (wrklock); 576 X_UNLOCK (wrklock);
481} 577}
482 578
579static void
483static void etp_maybe_start_thread (void) 580etp_maybe_start_thread (void)
484{ 581{
485 if (expect_true (etp_nthreads () >= wanted)) 582 if (ecb_expect_true (etp_nthreads () >= wanted))
486 return; 583 return;
487 584
488 /* todo: maybe use idle here, but might be less exact */ 585 /* todo: maybe use idle here, but might be less exact */
489 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) 586 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
490 return; 587 return;
491 588
492 etp_start_thread (); 589 etp_start_thread ();
493} 590}
494 591
592static void ecb_cold
495static void etp_end_thread (void) 593etp_end_thread (void)
496{ 594{
497 eio_req *req = calloc (1, sizeof (eio_req)); 595 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
498 596
499 req->type = -1; 597 req->type = -1;
500 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 598 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
501 599
502 X_LOCK (reqlock); 600 X_LOCK (reqlock);
… …
507 X_LOCK (wrklock); 605 X_LOCK (wrklock);
508 --started; 606 --started;
509 X_UNLOCK (wrklock); 607 X_UNLOCK (wrklock);
510} 608}
511 609
512static int etp_poll (void) 610static int
611etp_poll (void)
513{ 612{
514 unsigned int maxreqs; 613 unsigned int maxreqs;
515 unsigned int maxtime; 614 unsigned int maxtime;
516 struct timeval tv_start, tv_now; 615 struct timeval tv_start, tv_now;
517 616
… …
547 646
548 X_LOCK (reqlock); 647 X_LOCK (reqlock);
549 --nreqs; 648 --nreqs;
550 X_UNLOCK (reqlock); 649 X_UNLOCK (reqlock);
551 650
552 if (expect_false (req->type == EIO_GROUP && req->size)) 651 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
553 { 652 {
554 req->int1 = 1; /* mark request as delayed */ 653 req->int1 = 1; /* mark request as delayed */
555 continue; 654 continue;
556 } 655 }
557 else 656 else
558 { 657 {
559 int res = ETP_FINISH (req); 658 int res = ETP_FINISH (req);
560 if (expect_false (res)) 659 if (ecb_expect_false (res))
561 return res; 660 return res;
562 } 661 }
563 662
564 if (expect_false (maxreqs && !--maxreqs)) 663 if (ecb_expect_false (maxreqs && !--maxreqs))
565 break; 664 break;
566 665
567 if (maxtime) 666 if (maxtime)
568 { 667 {
569 gettimeofday (&tv_now, 0); 668 gettimeofday (&tv_now, 0);
… …
575 674
576 errno = EAGAIN; 675 errno = EAGAIN;
577 return -1; 676 return -1;
578} 677}
579 678
679static void
580static void etp_cancel (ETP_REQ *req) 680etp_cancel (ETP_REQ *req)
581{ 681{
582 X_LOCK (wrklock); 682 req->cancelled = 1;
583 req->flags |= EIO_FLAG_CANCELLED;
584 X_UNLOCK (wrklock);
585 683
586 eio_grp_cancel (req); 684 eio_grp_cancel (req);
587} 685}
588 686
687static void
589static void etp_submit (ETP_REQ *req) 688etp_submit (ETP_REQ *req)
590{ 689{
591 req->pri -= ETP_PRI_MIN; 690 req->pri -= ETP_PRI_MIN;
592 691
593 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 692 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
594 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 693 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
595 694
596 if (expect_false (req->type == EIO_GROUP)) 695 if (ecb_expect_false (req->type == EIO_GROUP))
597 { 696 {
598 /* I hope this is worth it :/ */ 697 /* I hope this is worth it :/ */
599 X_LOCK (reqlock); 698 X_LOCK (reqlock);
600 ++nreqs; 699 ++nreqs;
601 X_UNLOCK (reqlock); 700 X_UNLOCK (reqlock);
… …
620 719
621 etp_maybe_start_thread (); 720 etp_maybe_start_thread ();
622 } 721 }
623} 722}
624 723
724static void ecb_cold
625static void etp_set_max_poll_time (double nseconds) 725etp_set_max_poll_time (double nseconds)
626{ 726{
627 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 727 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
628 max_poll_time = nseconds * EIO_TICKS; 728 max_poll_time = nseconds * EIO_TICKS;
629 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 729 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
630} 730}
631 731
732static void ecb_cold
632static void etp_set_max_poll_reqs (unsigned int maxreqs) 733etp_set_max_poll_reqs (unsigned int maxreqs)
633{ 734{
634 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 735 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
635 max_poll_reqs = maxreqs; 736 max_poll_reqs = maxreqs;
636 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 737 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
637} 738}
638 739
740static void ecb_cold
639static void etp_set_max_idle (unsigned int nthreads) 741etp_set_max_idle (unsigned int nthreads)
640{ 742{
641 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 743 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
642 max_idle = nthreads; 744 max_idle = nthreads;
643 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 745 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
644} 746}
645 747
748static void ecb_cold
646static void etp_set_idle_timeout (unsigned int seconds) 749etp_set_idle_timeout (unsigned int seconds)
647{ 750{
648 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 751 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
649 idle_timeout = seconds; 752 idle_timeout = seconds;
650 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 753 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
651} 754}
652 755
756static void ecb_cold
653static void etp_set_min_parallel (unsigned int nthreads) 757etp_set_min_parallel (unsigned int nthreads)
654{ 758{
655 if (wanted < nthreads) 759 if (wanted < nthreads)
656 wanted = nthreads; 760 wanted = nthreads;
657} 761}
658 762
763static void ecb_cold
659static void etp_set_max_parallel (unsigned int nthreads) 764etp_set_max_parallel (unsigned int nthreads)
660{ 765{
661 if (wanted > nthreads) 766 if (wanted > nthreads)
662 wanted = nthreads; 767 wanted = nthreads;
663 768
664 while (started > wanted) 769 while (started > wanted)
665 etp_end_thread (); 770 etp_end_thread ();
666} 771}
667 772
668/*****************************************************************************/ 773/*****************************************************************************/
669 774
775static void
670static void grp_try_feed (eio_req *grp) 776grp_try_feed (eio_req *grp)
671{ 777{
672 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 778 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
673 { 779 {
674 grp->flags &= ~EIO_FLAG_GROUPADD; 780 grp->flags &= ~EIO_FLAG_GROUPADD;
675 781
… …
682 break; 788 break;
683 } 789 }
684 } 790 }
685} 791}
686 792
793static int
687static int grp_dec (eio_req *grp) 794grp_dec (eio_req *grp)
688{ 795{
689 --grp->size; 796 --grp->size;
690 797
691 /* call feeder, if applicable */ 798 /* call feeder, if applicable */
692 grp_try_feed (grp); 799 grp_try_feed (grp);
… …
696 return eio_finish (grp); 803 return eio_finish (grp);
697 else 804 else
698 return 0; 805 return 0;
699} 806}
700 807
808static void
701void eio_destroy (eio_req *req) 809eio_destroy (eio_req *req)
702{ 810{
703 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 811 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
704 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 812 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
705 813
706 EIO_DESTROY (req); 814 EIO_DESTROY (req);
707} 815}
708 816
817static int
709static int eio_finish (eio_req *req) 818eio_finish (eio_req *req)
710{ 819{
711 int res = EIO_FINISH (req); 820 int res = EIO_FINISH (req);
712 821
713 if (req->grp) 822 if (req->grp)
714 { 823 {
… …
722 if (grp->grp_first == req) 831 if (grp->grp_first == req)
723 grp->grp_first = req->grp_next; 832 grp->grp_first = req->grp_next;
724 833
725 res2 = grp_dec (grp); 834 res2 = grp_dec (grp);
726 835
727 if (!res && res2) 836 if (!res)
728 res = res2; 837 res = res2;
729 } 838 }
730 839
731 eio_destroy (req); 840 eio_destroy (req);
732 841
733 return res; 842 return res;
734} 843}
735 844
845void
736void eio_grp_cancel (eio_req *grp) 846eio_grp_cancel (eio_req *grp)
737{ 847{
738 for (grp = grp->grp_first; grp; grp = grp->grp_next) 848 for (grp = grp->grp_first; grp; grp = grp->grp_next)
739 eio_cancel (grp); 849 eio_cancel (grp);
740} 850}
741 851
852void
742void eio_cancel (eio_req *req) 853eio_cancel (eio_req *req)
743{ 854{
744 etp_cancel (req); 855 etp_cancel (req);
745} 856}
746 857
858void
747void eio_submit (eio_req *req) 859eio_submit (eio_req *req)
748{ 860{
749 etp_submit (req); 861 etp_submit (req);
750} 862}
751 863
752unsigned int eio_nreqs (void) 864unsigned int
865eio_nreqs (void)
753{ 866{
754 return etp_nreqs (); 867 return etp_nreqs ();
755} 868}
756 869
757unsigned int eio_nready (void) 870unsigned int
871eio_nready (void)
758{ 872{
759 return etp_nready (); 873 return etp_nready ();
760} 874}
761 875
762unsigned int eio_npending (void) 876unsigned int
877eio_npending (void)
763{ 878{
764 return etp_npending (); 879 return etp_npending ();
765} 880}
766 881
767unsigned int eio_nthreads (void) 882unsigned int ecb_cold
883eio_nthreads (void)
768{ 884{
769 return etp_nthreads (); 885 return etp_nthreads ();
770} 886}
771 887
888void ecb_cold
772void eio_set_max_poll_time (double nseconds) 889eio_set_max_poll_time (double nseconds)
773{ 890{
774 etp_set_max_poll_time (nseconds); 891 etp_set_max_poll_time (nseconds);
775} 892}
776 893
894void ecb_cold
777void eio_set_max_poll_reqs (unsigned int maxreqs) 895eio_set_max_poll_reqs (unsigned int maxreqs)
778{ 896{
779 etp_set_max_poll_reqs (maxreqs); 897 etp_set_max_poll_reqs (maxreqs);
780} 898}
781 899
900void ecb_cold
782void eio_set_max_idle (unsigned int nthreads) 901eio_set_max_idle (unsigned int nthreads)
783{ 902{
784 etp_set_max_idle (nthreads); 903 etp_set_max_idle (nthreads);
785} 904}
786 905
906void ecb_cold
787void eio_set_idle_timeout (unsigned int seconds) 907eio_set_idle_timeout (unsigned int seconds)
788{ 908{
789 etp_set_idle_timeout (seconds); 909 etp_set_idle_timeout (seconds);
790} 910}
791 911
912void ecb_cold
792void eio_set_min_parallel (unsigned int nthreads) 913eio_set_min_parallel (unsigned int nthreads)
793{ 914{
794 etp_set_min_parallel (nthreads); 915 etp_set_min_parallel (nthreads);
795} 916}
796 917
918void ecb_cold
797void eio_set_max_parallel (unsigned int nthreads) 919eio_set_max_parallel (unsigned int nthreads)
798{ 920{
799 etp_set_max_parallel (nthreads); 921 etp_set_max_parallel (nthreads);
800} 922}
801 923
802int eio_poll (void) 924int eio_poll (void)
… …
811# undef pread 933# undef pread
812# undef pwrite 934# undef pwrite
813# define pread eio__pread 935# define pread eio__pread
814# define pwrite eio__pwrite 936# define pwrite eio__pwrite
815 937
816static ssize_t 938static eio_ssize_t
817eio__pread (int fd, void *buf, size_t count, off_t offset) 939eio__pread (int fd, void *buf, size_t count, off_t offset)
818{ 940{
819 ssize_t res; 941 eio_ssize_t res;
820 off_t ooffset; 942 off_t ooffset;
821 943
822 X_LOCK (preadwritelock); 944 X_LOCK (preadwritelock);
823 ooffset = lseek (fd, 0, SEEK_CUR); 945 ooffset = lseek (fd, 0, SEEK_CUR);
824 lseek (fd, offset, SEEK_SET); 946 lseek (fd, offset, SEEK_SET);
… …
827 X_UNLOCK (preadwritelock); 949 X_UNLOCK (preadwritelock);
828 950
829 return res; 951 return res;
830} 952}
831 953
832static ssize_t 954static eio_ssize_t
833eio__pwrite (int fd, void *buf, size_t count, off_t offset) 955eio__pwrite (int fd, void *buf, size_t count, off_t offset)
834{ 956{
835 ssize_t res; 957 eio_ssize_t res;
836 off_t ooffset; 958 off_t ooffset;
837 959
838 X_LOCK (preadwritelock); 960 X_LOCK (preadwritelock);
839 ooffset = lseek (fd, 0, SEEK_CUR); 961 ooffset = lseek (fd, 0, SEEK_CUR);
840 lseek (fd, offset, SEEK_SET); 962 lseek (fd, offset, SEEK_SET);
… …
872#ifndef HAVE_FUTIMES 994#ifndef HAVE_FUTIMES
873 995
874# undef futimes 996# undef futimes
875# define futimes(fd,times) eio__futimes (fd, times) 997# define futimes(fd,times) eio__futimes (fd, times)
876 998
999static int
877static int eio__futimes (int fd, const struct timeval tv[2]) 1000eio__futimes (int fd, const struct timeval tv[2])
878{ 1001{
879 errno = ENOSYS; 1002 errno = ENOSYS;
880 return -1; 1003 return -1;
881} 1004}
882 1005
… …
885#if !HAVE_FDATASYNC 1008#if !HAVE_FDATASYNC
886# undef fdatasync 1009# undef fdatasync
887# define fdatasync(fd) fsync (fd) 1010# define fdatasync(fd) fsync (fd)
888#endif 1011#endif
889 1012
1013static int
1014eio__syncfs (int fd)
1015{
1016 int res;
1017
1018#if HAVE_SYS_SYNCFS
1019 res = (int)syscall (__NR_syncfs, (int)(fd));
1020#else
1021 res = -1;
1022 errno = ENOSYS;
1023#endif
1024
1025 if (res < 0 && errno == ENOSYS && fd >= 0)
1026 sync ();
1027
1028 return res;
1029}
1030
890/* sync_file_range always needs emulation */ 1031/* sync_file_range always needs emulation */
891int 1032static int
892eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 1033eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
893{ 1034{
894#if HAVE_SYNC_FILE_RANGE 1035#if HAVE_SYNC_FILE_RANGE
895 int res; 1036 int res;
896 1037
… …
913 /* even though we could play tricks with the flags, it's better to always 1054 /* even though we could play tricks with the flags, it's better to always
914 * call fdatasync, as that matches the expectation of its users best */ 1055 * call fdatasync, as that matches the expectation of its users best */
915 return fdatasync (fd); 1056 return fdatasync (fd);
916} 1057}
917 1058
1059static int
1060eio__fallocate (int fd, int mode, off_t offset, size_t len)
1061{
1062#if HAVE_FALLOCATE
1063 return fallocate (fd, mode, offset, len);
1064#else
1065 errno = ENOSYS;
1066 return -1;
1067#endif
1068}
1069
918#if !HAVE_READAHEAD 1070#if !HAVE_READAHEAD
919# undef readahead 1071# undef readahead
920# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1072# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
921 1073
922static ssize_t 1074static eio_ssize_t
923eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1075eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
924{ 1076{
925 size_t todo = count; 1077 size_t todo = count;
926 dBUF; 1078 dBUF;
927 1079
… …
932 pread (fd, eio_buf, len, offset); 1084 pread (fd, eio_buf, len, offset);
933 offset += len; 1085 offset += len;
934 todo -= len; 1086 todo -= len;
935 } 1087 }
936 1088
1089 FUBd;
1090
937 errno = 0; 1091 errno = 0;
938 return count; 1092 return count;
939} 1093}
940 1094
941#endif 1095#endif
942 1096
943/* sendfile always needs emulation */ 1097/* sendfile always needs emulation */
944static ssize_t 1098static eio_ssize_t
945eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1099eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
946{ 1100{
947 ssize_t written = 0; 1101 eio_ssize_t written = 0;
948 ssize_t res; 1102 eio_ssize_t res;
949 1103
950 if (!count) 1104 if (!count)
951 return 0; 1105 return 0;
952 1106
953 for (;;) 1107 for (;;)
954 { 1108 {
1109#ifdef __APPLE__
1110# undef HAVE_SENDFILE /* broken, as everything on os x */
1111#endif
955#if HAVE_SENDFILE 1112#if HAVE_SENDFILE
956# if __linux 1113# if __linux
957 off_t soffset = offset; 1114 off_t soffset = offset;
958 res = sendfile (ofd, ifd, &soffset, count); 1115 res = sendfile (ofd, ifd, &soffset, count);
959 1116
… …
1002 if (res < 0 && sbytes) 1159 if (res < 0 && sbytes)
1003 res = sbytes; 1160 res = sbytes;
1004 1161
1005# endif 1162# endif
1006 1163
1007#elif defined (_WIN32) 1164#elif defined (_WIN32) && 0
1008 /* does not work, just for documentation of what would need to be done */ 1165 /* does not work, just for documentation of what would need to be done */
1009 /* actually, cannot be done like this, as TransmitFile changes the file offset, */ 1166 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1010 /* libeio guarantees that the file offset does not change, and windows */ 1167 /* libeio guarantees that the file offset does not change, and windows */
1011 /* has no way to get an independent handle to the same file description */ 1168 /* has no way to get an independent handle to the same file description */
1012 HANDLE h = TO_SOCKET (ifd); 1169 HANDLE h = TO_SOCKET (ifd);
… …
1045 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1202 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1046 /* BSDs */ 1203 /* BSDs */
1047#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1204#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1048 || errno == ENOTSUP 1205 || errno == ENOTSUP
1049#endif 1206#endif
1207#ifdef EOPNOTSUPP /* windows */
1050 || errno == EOPNOTSUPP /* BSDs */ 1208 || errno == EOPNOTSUPP /* BSDs */
1209#endif
1051#if __solaris 1210#if __solaris
1052 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1211 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1053#endif 1212#endif
1054 ) 1213 )
1055 ) 1214 )
… …
1059 1218
1060 res = 0; 1219 res = 0;
1061 1220
1062 while (count) 1221 while (count)
1063 { 1222 {
1064 ssize_t cnt; 1223 eio_ssize_t cnt;
1065 1224
1066 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1225 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1067 1226
1068 if (cnt <= 0) 1227 if (cnt <= 0)
1069 { 1228 {
… …
1081 1240
1082 offset += cnt; 1241 offset += cnt;
1083 res += cnt; 1242 res += cnt;
1084 count -= cnt; 1243 count -= cnt;
1085 } 1244 }
1245
1246 FUBd;
1086 } 1247 }
1087 1248
1088 return res; 1249 return res;
1250}
1251
1252#ifdef PAGESIZE
1253# define eio_pagesize() PAGESIZE
1254#else
1255static intptr_t
1256eio_pagesize (void)
1257{
1258 static intptr_t page;
1259
1260 if (!page)
1261 page = sysconf (_SC_PAGESIZE);
1262
1263 return page;
1264}
1265#endif
1266
1267static void
1268eio_page_align (void **addr, size_t *length)
1269{
1270 intptr_t mask = eio_pagesize () - 1;
1271
1272 /* round down addr */
1273 intptr_t adj = mask & (intptr_t)*addr;
1274
1275 *addr = (void *)((intptr_t)*addr - adj);
1276 *length += adj;
1277
1278 /* round up length */
1279 *length = (*length + mask) & ~mask;
1280}
1281
1282#if !_POSIX_MEMLOCK
1283# define eio__mlockall(a) EIO_ENOSYS ()
1284#else
1285
1286static int
1287eio__mlockall (int flags)
1288{
1289 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1290 extern int mallopt (int, int);
1291 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1292 #endif
1293
1294 if (EIO_MCL_CURRENT != MCL_CURRENT
1295 || EIO_MCL_FUTURE != MCL_FUTURE)
1296 {
1297 flags = 0
1298 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1299 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1300 }
1301
1302 return mlockall (flags);
1303}
1304#endif
1305
1306#if !_POSIX_MEMLOCK_RANGE
1307# define eio__mlock(a,b) EIO_ENOSYS ()
1308#else
1309
1310static int
1311eio__mlock (void *addr, size_t length)
1312{
1313 eio_page_align (&addr, &length);
1314
1315 return mlock (addr, length);
1316}
1317
1318#endif
1319
1320#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1321# define eio__msync(a,b,c) EIO_ENOSYS ()
1322#else
1323
1324static int
1325eio__msync (void *mem, size_t len, int flags)
1326{
1327 eio_page_align (&mem, &len);
1328
1329 if (EIO_MS_ASYNC != MS_SYNC
1330 || EIO_MS_INVALIDATE != MS_INVALIDATE
1331 || EIO_MS_SYNC != MS_SYNC)
1332 {
1333 flags = 0
1334 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1335 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1336 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1337 }
1338
1339 return msync (mem, len, flags);
1340}
1341
1342#endif
1343
1344static int
1345eio__mtouch (eio_req *req)
1346{
1347 void *mem = req->ptr2;
1348 size_t len = req->size;
1349 int flags = req->int1;
1350
1351 eio_page_align (&mem, &len);
1352
1353 {
1354 intptr_t addr = (intptr_t)mem;
1355 intptr_t end = addr + len;
1356 intptr_t page = eio_pagesize ();
1357
1358 if (addr < end)
1359 if (flags & EIO_MT_MODIFY) /* modify */
1360 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1361 else
1362 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1363 }
1364
1365 return 0;
1366}
1367
1368/*****************************************************************************/
1369/* requests implemented outside eio_execute, because they are so large */
1370
1371/* copies some absolute path to tmpbuf */
1372static char *
1373eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1374{
1375 if (wd == EIO_CWD)
1376 return getcwd (tmpbuf->ptr, PATH_MAX);
1377
1378#if HAVE_AT
1379 abort (); /*TODO*/
1380#else
1381 strcpy (tmpbuf->ptr, wd);
1382#endif
1383 return tmpbuf->ptr;
1384}
1385
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387static int
1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1389{
1390 const char *rel = path;
1391 char *res;
1392 char *tmp1, *tmp2;
1393#if SYMLOOP_MAX > 32
1394 int symlinks = SYMLOOP_MAX;
1395#else
1396 int symlinks = 32;
1397#endif
1398
1399 /*D*/ /*TODO: wd ignored */
1400
1401 errno = EINVAL;
1402 if (!rel)
1403 return -1;
1404
1405 errno = ENOENT;
1406 if (!*rel)
1407 return -1;
1408
1409 res = tmpbuf_get (tmpbuf, PATH_MAX * 3);
1410 tmp1 = res + PATH_MAX;
1411 tmp2 = tmp1 + PATH_MAX;
1412
1413#if 0 /* disabled, the musl way to do things is just too racy */
1414#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1415 /* on linux we may be able to ask the kernel */
1416 {
1417 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1418
1419 if (fd >= 0)
1420 {
1421 sprintf (tmp1, "/proc/self/fd/%d", fd);
1422 req->result = readlink (tmp1, res, PATH_MAX);
1423 close (fd);
1424
1425 /* here we should probably stat the open file and the disk file, to make sure they still match */
1426
1427 if (req->result > 0)
1428 goto done;
1429 }
1430 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1431 return;
1432 }
1433#endif
1434#endif
1435
1436 if (*rel != '/')
1437 {
1438 if (!eio__getwd (tmpbuf, wd))
1439 return -1;
1440
1441 if (res [1]) /* only use if not / */
1442 res += strlen (res);
1443 }
1444
1445 while (*rel)
1446 {
1447 eio_ssize_t len, linklen;
1448 const char *beg = rel;
1449
1450 while (*rel && *rel != '/')
1451 ++rel;
1452
1453 len = rel - beg;
1454
1455 if (!len) /* skip slashes */
1456 {
1457 ++rel;
1458 continue;
1459 }
1460
1461 if (beg [0] == '.')
1462 {
1463 if (len == 1)
1464 continue; /* . - nop */
1465
1466 if (beg [1] == '.' && len == 2)
1467 {
1468 /* .. - back up one component, if possible */
1469
1470 while (res != tmpbuf->ptr)
1471 if (*--res == '/')
1472 break;
1473
1474 continue;
1475 }
1476 }
1477
1478 errno = ENAMETOOLONG;
1479 if (res + 1 + len + 1 >= tmp1)
1480 return;
1481
1482 /* copy one component */
1483 *res = '/';
1484 memcpy (res + 1, beg, len);
1485
1486 /* zero-terminate, for readlink */
1487 res [len + 1] = 0;
1488
1489 /* now check if it's a symlink */
1490 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX);
1491
1492 if (linklen < 0)
1493 {
1494 if (errno != EINVAL)
1495 return -1;
1496
1497 /* it's a normal directory. hopefully */
1498 res += len + 1;
1499 }
1500 else
1501 {
1502 /* yay, it was a symlink - build new path in tmp2 */
1503 int rellen = strlen (rel);
1504
1505 errno = ENAMETOOLONG;
1506 if (linklen + 1 + rellen >= PATH_MAX)
1507 return -1;
1508
1509 errno = ELOOP;
1510 if (!--symlinks)
1511 return -1;
1512
1513 if (*tmp1 == '/')
1514 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1515
1516 /* we need to be careful, as rel might point into tmp2 already */
1517 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1518 tmp2 [linklen] = '/';
1519 memcpy (tmp2, tmp1, linklen);
1520
1521 rel = tmp2;
1522 }
1523 }
1524
1525 /* special case for the lone root path */
1526 if (res == tmpbuf->ptr)
1527 *res++ = '/';
1528
1529 return res - (char *)tmpbuf->ptr;
1089} 1530}
1090 1531
1091static signed char 1532static signed char
1092eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1533eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1093{ 1534{
… …
1101 1542
1102#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1543#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1103#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1544#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1104 1545
1105static void 1546static void
1106eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1547eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1107{ 1548{
1108 unsigned char bits [9 + sizeof (ino_t) * 8]; 1549 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1109 unsigned char *bit = bits; 1550 unsigned char *bit = bits;
1110 1551
1111 assert (CHAR_BIT == 8); 1552 assert (CHAR_BIT == 8);
1112 assert (sizeof (eio_dirent) * 8 < 256); 1553 assert (sizeof (eio_dirent) * 8 < 256);
1113 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1554 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1115 1556
1116 if (size <= EIO_SORT_FAST) 1557 if (size <= EIO_SORT_FAST)
1117 return; 1558 return;
1118 1559
1119 /* first prepare an array of bits to test in our radix sort */ 1560 /* first prepare an array of bits to test in our radix sort */
1120 /* try to take endianness into account, as well as differences in ino_t sizes */ 1561 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1121 /* inode_bits must contain all inodes ORed together */ 1562 /* inode_bits must contain all inodes ORed together */
1122 /* which is used to skip bits that are 0 everywhere, which is very common */ 1563 /* which is used to skip bits that are 0 everywhere, which is very common */
1123 { 1564 {
1124 ino_t endianness; 1565 eio_ino_t endianness;
1125 int i, j; 1566 int i, j;
1126 1567
1127 /* we store the byte offset of byte n into byte n of "endianness" */ 1568 /* we store the byte offset of byte n into byte n of "endianness" */
1128 for (i = 0; i < sizeof (ino_t); ++i) 1569 for (i = 0; i < sizeof (eio_ino_t); ++i)
1129 ((unsigned char *)&endianness)[i] = i; 1570 ((unsigned char *)&endianness)[i] = i;
1130 1571
1131 *bit++ = 0; 1572 *bit++ = 0;
1132 1573
1133 for (i = 0; i < sizeof (ino_t); ++i) 1574 for (i = 0; i < sizeof (eio_ino_t); ++i)
1134 { 1575 {
1135 /* shifting off the byte offsets out of "endianness" */ 1576 /* shifting off the byte offsets out of "endianness" */
1136 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1577 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1137 endianness >>= 8; 1578 endianness >>= 8;
1138 1579
1139 for (j = 0; j < 8; ++j) 1580 for (j = 0; j < 8; ++j)
1140 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1581 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1141 *bit++ = offs + j; 1582 *bit++ = offs + j;
1142 } 1583 }
1143 1584
1144 for (j = 0; j < 8; ++j) 1585 for (j = 0; j < 8; ++j)
1145 if (score_bits & (1 << j)) 1586 if (score_bits & (1 << j))
1146 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1587 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1147 } 1588 }
1148 1589
1149 /* now actually do the sorting (a variant of MSD radix sort) */ 1590 /* now actually do the sorting (a variant of MSD radix sort) */
1150 { 1591 {
1151 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1592 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1152 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1593 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1153 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1594 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1154 int stk_idx = 0; 1595 int stk_idx = 0;
1155 1596
1156 base_stk [stk_idx] = dents; 1597 base_stk [stk_idx] = dents;
1157 end_stk [stk_idx] = dents + size; 1598 end_stk [stk_idx] = dents + size;
1158 bit_stk [stk_idx] = bit - 1; 1599 bit_stk [stk_idx] = bit - 1;
… …
1237 } 1678 }
1238 } 1679 }
1239} 1680}
1240 1681
1241static void 1682static void
1242eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1683eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1243{ 1684{
1244 if (size <= 1) 1685 if (size <= 1)
1245 return; /* our insertion sort relies on size > 0 */ 1686 return; /* our insertion sort relies on size > 0 */
1246 1687
1247 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1688 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1253 eio_dent_insertion_sort (dents, size); 1694 eio_dent_insertion_sort (dents, size);
1254} 1695}
1255 1696
1256/* read a full directory */ 1697/* read a full directory */
1257static void 1698static void
1258eio__scandir (eio_req *req, etp_worker *self) 1699eio__scandir (eio_req *req)
1259{ 1700{
1260 DIR *dirp;
1261 EIO_STRUCT_DIRENT *entp;
1262 char *name, *names; 1701 char *name, *names;
1263 int namesalloc = 4096; 1702 int namesalloc = 4096 - sizeof (void *) * 4;
1264 int namesoffs = 0; 1703 int namesoffs = 0;
1265 int flags = req->int1; 1704 int flags = req->int1;
1266 eio_dirent *dents = 0; 1705 eio_dirent *dents = 0;
1267 int dentalloc = 128; 1706 int dentalloc = 128;
1268 int dentoffs = 0; 1707 int dentoffs = 0;
1269 ino_t inode_bits = 0; 1708 eio_ino_t inode_bits = 0;
1709#ifdef _WIN32
1710 HANDLE dirp;
1711 WIN32_FIND_DATA entp;
1712#else
1713 DIR *dirp;
1714 EIO_STRUCT_DIRENT *entp;
1715#endif
1270 1716
1271 req->result = -1; 1717 req->result = -1;
1272 1718
1273 if (!(flags & EIO_READDIR_DENTS)) 1719 if (!(flags & EIO_READDIR_DENTS))
1274 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1720 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1275 1721
1276 X_LOCK (wrklock); 1722#ifdef _WIN32
1277 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1723 {
1724 int len = strlen ((const char *)req->ptr1);
1725 char *path = malloc (MAX_PATH);
1726 const char *fmt;
1727
1728 if (!len)
1729 fmt = "./*";
1730 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\')
1731 fmt = "%s*";
1732 else
1733 fmt = "%s/*";
1734
1735 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1);
1736 dirp = FindFirstFile (path, &entp);
1737 free (path);
1738
1739 if (dirp == INVALID_HANDLE_VALUE)
1740 {
1741 /* should steal _dosmaperr */
1742 switch (GetLastError ())
1743 {
1744 case ERROR_FILE_NOT_FOUND:
1745 req->result = 0;
1746 break;
1747
1748 case ERROR_INVALID_NAME:
1749 case ERROR_PATH_NOT_FOUND:
1750 case ERROR_NO_MORE_FILES:
1751 errno = ENOENT;
1752 break;
1753
1754 case ERROR_NOT_ENOUGH_MEMORY:
1755 errno = ENOMEM;
1756 break;
1757
1758 default:
1759 errno = EINVAL;
1760 break;
1761 }
1762
1763 return;
1764 }
1765 }
1766#else
1278 self->dirp = dirp = opendir (req->ptr1); 1767 dirp = opendir (req->ptr1);
1768
1769 if (!dirp)
1770 return;
1771#endif
1772
1773 if (req->flags & EIO_FLAG_PTR1_FREE)
1774 free (req->ptr1);
1279 1775
1280 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1776 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1281 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1777 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1282 req->ptr2 = names = malloc (namesalloc); 1778 req->ptr2 = names = malloc (namesalloc);
1283 X_UNLOCK (wrklock);
1284 1779
1285 if (dirp && names && (!flags || dents)) 1780 if (!names || (flags && !dents))
1781 return;
1782
1286 for (;;) 1783 for (;;)
1287 { 1784 {
1785 int done;
1786
1787#ifdef _WIN32
1788 done = !dirp;
1789#else
1288 errno = 0; 1790 errno = 0;
1289 entp = readdir (dirp); 1791 entp = readdir (dirp);
1792 done = !entp;
1793#endif
1290 1794
1291 if (!entp) 1795 if (done)
1292 { 1796 {
1797#ifndef _WIN32
1798 int old_errno = errno;
1799 closedir (dirp);
1800 errno = old_errno;
1801
1293 if (errno) 1802 if (errno)
1294 break; 1803 break;
1804#endif
1295 1805
1296 /* sort etc. */ 1806 /* sort etc. */
1297 req->int1 = flags; 1807 req->int1 = flags;
1298 req->result = dentoffs; 1808 req->result = dentoffs;
1299 1809
1300 if (flags & EIO_READDIR_STAT_ORDER) 1810 if (flags & EIO_READDIR_STAT_ORDER)
1301 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1811 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1302 else if (flags & EIO_READDIR_DIRS_FIRST) 1812 else if (flags & EIO_READDIR_DIRS_FIRST)
1303 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1813 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1304 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1814 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1305 else 1815 else
1816 {
1817 /* in this case, all is known, and we just put dirs first and sort them */
1818 eio_dirent *oth = dents + dentoffs;
1819 eio_dirent *dir = dents;
1820
1821 /* now partition dirs to the front, and non-dirs to the back */
1822 /* by walking from both sides and swapping if necessary */
1823 while (oth > dir)
1824 {
1825 if (dir->type == EIO_DT_DIR)
1826 ++dir;
1827 else if ((--oth)->type == EIO_DT_DIR)
1828 {
1829 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1830
1831 ++dir;
1832 }
1833 }
1834
1835 /* now sort the dirs only (dirs all have the same score) */
1836 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1837 }
1838
1839 break;
1840 }
1841
1842 /* now add the entry to our list(s) */
1843 name = D_NAME (entp);
1844
1845 /* skip . and .. entries */
1846 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1847 {
1848 int len = D_NAMLEN (entp) + 1;
1849
1850 while (ecb_expect_false (namesoffs + len > namesalloc))
1851 {
1852 namesalloc *= 2;
1853 req->ptr2 = names = realloc (names, namesalloc);
1854
1855 if (!names)
1856 break;
1857 }
1858
1859 memcpy (names + namesoffs, name, len);
1860
1861 if (dents)
1862 {
1863 struct eio_dirent *ent;
1864
1865 if (ecb_expect_false (dentoffs == dentalloc))
1306 { 1866 {
1307 /* in this case, all is known, and we just put dirs first and sort them */ 1867 dentalloc *= 2;
1868 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1869
1870 if (!dents)
1871 break;
1872 }
1873
1308 eio_dirent *oth = dents + dentoffs; 1874 ent = dents + dentoffs;
1309 eio_dirent *dir = dents;
1310 1875
1311 /* now partition dirs to the front, and non-dirs to the back */ 1876 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1312 /* by walking from both sides and swapping if necessary */ 1877 ent->namelen = len - 1;
1313 while (oth > dir) 1878 ent->inode = D_INO (entp);
1879
1880 inode_bits |= ent->inode;
1881
1882 switch (D_TYPE (entp))
1883 {
1884 default:
1885 ent->type = EIO_DT_UNKNOWN;
1886 flags |= EIO_READDIR_FOUND_UNKNOWN;
1887 break;
1888
1889 #ifdef DT_FIFO
1890 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1891 #endif
1892 #ifdef DT_CHR
1893 case DT_CHR: ent->type = EIO_DT_CHR; break;
1894 #endif
1895 #ifdef DT_MPC
1896 case DT_MPC: ent->type = EIO_DT_MPC; break;
1897 #endif
1898 #ifdef DT_DIR
1899 case DT_DIR: ent->type = EIO_DT_DIR; break;
1900 #endif
1901 #ifdef DT_NAM
1902 case DT_NAM: ent->type = EIO_DT_NAM; break;
1903 #endif
1904 #ifdef DT_BLK
1905 case DT_BLK: ent->type = EIO_DT_BLK; break;
1906 #endif
1907 #ifdef DT_MPB
1908 case DT_MPB: ent->type = EIO_DT_MPB; break;
1909 #endif
1910 #ifdef DT_REG
1911 case DT_REG: ent->type = EIO_DT_REG; break;
1912 #endif
1913 #ifdef DT_NWK
1914 case DT_NWK: ent->type = EIO_DT_NWK; break;
1915 #endif
1916 #ifdef DT_CMP
1917 case DT_CMP: ent->type = EIO_DT_CMP; break;
1918 #endif
1919 #ifdef DT_LNK
1920 case DT_LNK: ent->type = EIO_DT_LNK; break;
1921 #endif
1922 #ifdef DT_SOCK
1923 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1924 #endif
1925 #ifdef DT_DOOR
1926 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1927 #endif
1928 #ifdef DT_WHT
1929 case DT_WHT: ent->type = EIO_DT_WHT; break;
1930 #endif
1931 }
1932
1933 ent->score = 7;
1934
1935 if (flags & EIO_READDIR_DIRS_FIRST)
1936 {
1937 if (ent->type == EIO_DT_UNKNOWN)
1314 { 1938 {
1315 if (dir->type == EIO_DT_DIR) 1939 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1316 ++dir; 1940 ent->score = 1;
1317 else if ((--oth)->type == EIO_DT_DIR) 1941 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1318 { 1942 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1319 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1320
1321 ++dir;
1322 }
1323 } 1943 }
1324 1944 else if (ent->type == EIO_DT_DIR)
1325 /* now sort the dirs only (dirs all have the same score) */ 1945 ent->score = 0;
1326 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1327 } 1946 }
1328
1329 break;
1330 }
1331
1332 /* now add the entry to our list(s) */
1333 name = entp->d_name;
1334
1335 /* skip . and .. entries */
1336 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1337 {
1338 int len = D_NAMLEN (entp) + 1;
1339
1340 while (expect_false (namesoffs + len > namesalloc))
1341 {
1342 namesalloc *= 2;
1343 X_LOCK (wrklock);
1344 req->ptr2 = names = realloc (names, namesalloc);
1345 X_UNLOCK (wrklock);
1346
1347 if (!names)
1348 break;
1349 } 1947 }
1350 1948
1351 memcpy (names + namesoffs, name, len);
1352
1353 if (dents)
1354 {
1355 struct eio_dirent *ent;
1356
1357 if (expect_false (dentoffs == dentalloc))
1358 {
1359 dentalloc *= 2;
1360 X_LOCK (wrklock);
1361 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1362 X_UNLOCK (wrklock);
1363
1364 if (!dents)
1365 break;
1366 }
1367
1368 ent = dents + dentoffs;
1369
1370 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1371 ent->namelen = len - 1;
1372 ent->inode = D_INO (entp);
1373
1374 inode_bits |= ent->inode;
1375
1376 switch (D_TYPE (entp))
1377 {
1378 default:
1379 ent->type = EIO_DT_UNKNOWN;
1380 flags |= EIO_READDIR_FOUND_UNKNOWN;
1381 break;
1382
1383 #ifdef DT_FIFO
1384 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1385 #endif
1386 #ifdef DT_CHR
1387 case DT_CHR: ent->type = EIO_DT_CHR; break;
1388 #endif
1389 #ifdef DT_MPC
1390 case DT_MPC: ent->type = EIO_DT_MPC; break;
1391 #endif
1392 #ifdef DT_DIR
1393 case DT_DIR: ent->type = EIO_DT_DIR; break;
1394 #endif
1395 #ifdef DT_NAM
1396 case DT_NAM: ent->type = EIO_DT_NAM; break;
1397 #endif
1398 #ifdef DT_BLK
1399 case DT_BLK: ent->type = EIO_DT_BLK; break;
1400 #endif
1401 #ifdef DT_MPB
1402 case DT_MPB: ent->type = EIO_DT_MPB; break;
1403 #endif
1404 #ifdef DT_REG
1405 case DT_REG: ent->type = EIO_DT_REG; break;
1406 #endif
1407 #ifdef DT_NWK
1408 case DT_NWK: ent->type = EIO_DT_NWK; break;
1409 #endif
1410 #ifdef DT_CMP
1411 case DT_CMP: ent->type = EIO_DT_CMP; break;
1412 #endif
1413 #ifdef DT_LNK
1414 case DT_LNK: ent->type = EIO_DT_LNK; break;
1415 #endif
1416 #ifdef DT_SOCK
1417 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1418 #endif
1419 #ifdef DT_DOOR
1420 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1421 #endif
1422 #ifdef DT_WHT
1423 case DT_WHT: ent->type = EIO_DT_WHT; break;
1424 #endif
1425 }
1426
1427 ent->score = 7;
1428
1429 if (flags & EIO_READDIR_DIRS_FIRST)
1430 {
1431 if (ent->type == EIO_DT_UNKNOWN)
1432 {
1433 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1434 ent->score = 1;
1435 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1436 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1437 }
1438 else if (ent->type == EIO_DT_DIR)
1439 ent->score = 0;
1440 }
1441 }
1442
1443 namesoffs += len; 1949 namesoffs += len;
1444 ++dentoffs; 1950 ++dentoffs;
1445 } 1951 }
1446 1952
1447 if (EIO_CANCELLED (req)) 1953 if (EIO_CANCELLED (req))
1448 { 1954 {
1449 errno = ECANCELED; 1955 errno = ECANCELED;
1450 break; 1956 break;
1451 } 1957 }
1958
1959#ifdef _WIN32
1960 if (!FindNextFile (dirp, &entp))
1961 {
1962 FindClose (dirp);
1963 dirp = 0;
1452 } 1964 }
1965#endif
1966 }
1453} 1967}
1454 1968
1455#ifdef PAGESIZE 1969/*****************************************************************************/
1456# define eio_pagesize() PAGESIZE 1970/* working directory stuff */
1971
1972#if HAVE_AT
1973
1974#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD)
1975
1976#ifndef O_SEARCH
1977# define O_SEARCH O_RDONLY
1978#endif
1979
1980eio_wd
1981eio_wd_open_sync (eio_wd wd, const char *path)
1982{
1983 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1984
1985 return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1986}
1987
1988static eio_wd
1989eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1990{
1991 return eio_wd_open_sync (wd, path);
1992}
1993
1994void
1995eio_wd_close_sync (eio_wd wd)
1996{
1997 int fd = WD2FD (wd);
1998
1999 if (fd >= 0)
2000 close (fd);
2001}
2002
2003static int
2004eio__truncateat (int dirfd, const char *path, off_t length)
2005{
2006 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2007 int res;
2008
2009 if (fd < 0)
2010 return fd;
2011
2012 res = ftruncate (fd, length);
2013 close (fd);
2014 return res;
2015}
2016
2017static int
2018eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
2019{
2020 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
2021 int res;
2022
2023 if (fd < 0)
2024 return fd;
2025
2026 res = fstatvfs (fd, buf);
2027 close (fd);
2028 return res;
2029
2030}
2031
1457#else 2032#else
1458static intptr_t
1459eio_pagesize (void)
1460{
1461 static intptr_t page;
1462 2033
1463 if (!page) 2034/* on legacy systems, we represent the working directories simply by their path strings */
1464 page = sysconf (_SC_PAGESIZE);
1465 2035
2036static const char *
2037wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2038{
2039 if (!wd || *path == '/')
1466 return page; 2040 return path;
1467}
1468#endif
1469 2041
2042 {
2043 int l1 = strlen ((const char *)wd);
2044 int l2 = strlen (path);
2045
2046 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2047
2048 memcpy (res, wd, l1);
2049 res [l1] = '/';
2050 memcpy (res + l1 + 1, path, l2 + 1);
2051
2052 return res;
2053 }
2054}
2055
1470static void 2056static eio_wd
1471eio_page_align (void **addr, size_t *length) 2057eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1472{ 2058{
1473 intptr_t mask = eio_pagesize () - 1; 2059 if (*path == '/') /* absolute paths ignore wd */
1474 2060 path = strdup (path);
1475 /* round down addr */ 2061 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
1476 intptr_t adj = mask & (intptr_t)*addr; 2062 return wd;
1477 2063 else
1478 *addr = (void *)((intptr_t)*addr - adj);
1479 *length += adj;
1480
1481 /* round up length */
1482 *length = (*length + mask) & ~mask;
1483}
1484
1485#if !_POSIX_MEMLOCK
1486# define eio__mlockall(a) ((errno = ENOSYS), -1)
1487#else
1488
1489static int
1490eio__mlockall (int flags)
1491{
1492 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1493 extern int mallopt (int, int);
1494 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1495 #endif
1496
1497 if (EIO_MCL_CURRENT != MCL_CURRENT
1498 || EIO_MCL_FUTURE != MCL_FUTURE)
1499 { 2064 {
1500 flags = 0 2065 int len = eio__realpath (tmpbuf, wd, path);
1501 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1502 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1503 }
1504 2066
1505 return mlockall (flags); 2067 path = EIO_INVALID_WD;
1506}
1507#endif
1508 2068
1509#if !_POSIX_MEMLOCK_RANGE 2069 if (len >= 0)
1510# define eio__mlock(a,b) ((errno = ENOSYS), -1) 2070 {
1511#else 2071 ((char *)tmpbuf->ptr)[len] = 0;
1512 2072 path = strdup (tmpbuf->ptr);
1513static int 2073 }
1514eio__mlock (void *addr, size_t length)
1515{
1516 eio_page_align (&addr, &length);
1517
1518 return mlock (addr, length);
1519}
1520
1521#endif
1522
1523#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1524# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1525#else
1526
1527int
1528eio__msync (void *mem, size_t len, int flags)
1529{
1530 eio_page_align (&mem, &len);
1531
1532 if (EIO_MS_ASYNC != MS_SYNC
1533 || EIO_MS_INVALIDATE != MS_INVALIDATE
1534 || EIO_MS_SYNC != MS_SYNC)
1535 { 2074 }
1536 flags = 0
1537 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1538 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1539 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1540 }
1541 2075
1542 return msync (mem, len, flags); 2076 if (!path)
1543} 2077 path = EIO_INVALID_WD;
1544 2078
1545#endif 2079 return (eio_wd)path;
2080}
1546 2081
1547int 2082eio_wd
1548eio__mtouch (eio_req *req) 2083eio_wd_open_sync (eio_wd wd, const char *path)
1549{ 2084{
1550 void *mem = req->ptr2; 2085 struct tmpbuf tmpbuf = { 0 };
1551 size_t len = req->size; 2086 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1552 int flags = req->int1; 2087 free (tmpbuf.ptr);
1553 2088
1554 eio_page_align (&mem, &len);
1555
1556 {
1557 intptr_t addr = (intptr_t)mem;
1558 intptr_t end = addr + len;
1559 intptr_t page = eio_pagesize ();
1560
1561 if (addr < end)
1562 if (flags & EIO_MT_MODIFY) /* modify */
1563 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1564 else
1565 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1566 }
1567
1568 return 0; 2089 return wd;
1569} 2090}
2091
2092void
2093eio_wd_close_sync (eio_wd wd)
2094{
2095 if (wd != EIO_INVALID_WD)
2096 free (wd);
2097}
2098
2099#endif
1570 2100
1571/*****************************************************************************/ 2101/*****************************************************************************/
1572 2102
1573#define ALLOC(len) \ 2103#define ALLOC(len) \
1574 if (!req->ptr2) \ 2104 if (!req->ptr2) \
… …
1589{ 2119{
1590 ETP_REQ *req; 2120 ETP_REQ *req;
1591 struct timespec ts; 2121 struct timespec ts;
1592 etp_worker *self = (etp_worker *)thr_arg; 2122 etp_worker *self = (etp_worker *)thr_arg;
1593 2123
2124#if HAVE_PRCTL_SET_NAME
2125 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2126#endif
2127
1594 /* try to distribute timeouts somewhat randomly */ 2128 /* try to distribute timeouts somewhat evenly */
1595 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2129 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1596 2130
1597 for (;;) 2131 for (;;)
1598 { 2132 {
2133 ts.tv_sec = 0;
2134
1599 X_LOCK (reqlock); 2135 X_LOCK (reqlock);
1600 2136
1601 for (;;) 2137 for (;;)
1602 { 2138 {
1603 self->req = req = reqq_shift (&req_queue); 2139 req = reqq_shift (&req_queue);
1604 2140
1605 if (req) 2141 if (req)
1606 break; 2142 break;
1607 2143
2144 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2145 {
2146 X_UNLOCK (reqlock);
2147 X_LOCK (wrklock);
2148 --started;
2149 X_UNLOCK (wrklock);
2150 goto quit;
2151 }
2152
1608 ++idle; 2153 ++idle;
1609 2154
1610 ts.tv_sec = time (0) + idle_timeout; 2155 if (idle <= max_idle)
1611 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 2156 /* we are allowed to idle, so do so without any timeout */
2157 X_COND_WAIT (reqwait, reqlock);
2158 else
1612 { 2159 {
1613 if (idle > max_idle) 2160 /* initialise timeout once */
1614 { 2161 if (!ts.tv_sec)
1615 --idle; 2162 ts.tv_sec = time (0) + idle_timeout;
1616 X_UNLOCK (reqlock);
1617 X_LOCK (wrklock);
1618 --started;
1619 X_UNLOCK (wrklock);
1620 goto quit;
1621 }
1622 2163
1623 /* we are allowed to idle, so do so without any timeout */
1624 X_COND_WAIT (reqwait, reqlock); 2164 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
2165 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1625 } 2166 }
1626 2167
1627 --idle; 2168 --idle;
1628 } 2169 }
1629 2170
… …
1632 X_UNLOCK (reqlock); 2173 X_UNLOCK (reqlock);
1633 2174
1634 if (req->type < 0) 2175 if (req->type < 0)
1635 goto quit; 2176 goto quit;
1636 2177
1637 if (!EIO_CANCELLED (req))
1638 ETP_EXECUTE (self, req); 2178 ETP_EXECUTE (self, req);
1639 2179
1640 X_LOCK (reslock); 2180 X_LOCK (reslock);
1641 2181
1642 ++npending; 2182 ++npending;
1643 2183
1644 if (!reqq_push (&res_queue, req) && want_poll_cb) 2184 if (!reqq_push (&res_queue, req) && want_poll_cb)
1645 want_poll_cb (); 2185 want_poll_cb ();
1646 2186
1647 self->req = 0;
1648 etp_worker_clear (self); 2187 etp_worker_clear (self);
1649 2188
1650 X_UNLOCK (reslock); 2189 X_UNLOCK (reslock);
1651 } 2190 }
1652 2191
1653quit: 2192quit:
2193 free (req);
2194
1654 X_LOCK (wrklock); 2195 X_LOCK (wrklock);
1655 etp_worker_free (self); 2196 etp_worker_free (self);
1656 X_UNLOCK (wrklock); 2197 X_UNLOCK (wrklock);
1657 2198
1658 return 0; 2199 return 0;
1659} 2200}
1660 2201
1661/*****************************************************************************/ 2202/*****************************************************************************/
1662 2203
2204int ecb_cold
1663int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 2205eio_init (void (*want_poll)(void), void (*done_poll)(void))
1664{ 2206{
2207#if !HAVE_PREADWRITE
2208 X_MUTEX_CREATE (preadwritelock);
2209#endif
2210
1665 return etp_init (want_poll, done_poll); 2211 return etp_init (want_poll, done_poll);
1666} 2212}
1667 2213
2214ecb_inline void
1668static void eio_api_destroy (eio_req *req) 2215eio_api_destroy (eio_req *req)
1669{ 2216{
1670 free (req); 2217 free (req);
1671} 2218}
1672 2219
1673#define REQ(rtype) \ 2220#define REQ(rtype) \
… …
1692 { \ 2239 { \
1693 eio_api_destroy (req); \ 2240 eio_api_destroy (req); \
1694 return 0; \ 2241 return 0; \
1695 } 2242 }
1696 2243
2244static void
1697static void eio_execute (etp_worker *self, eio_req *req) 2245eio_execute (etp_worker *self, eio_req *req)
1698{ 2246{
2247#if HAVE_AT
2248 int dirfd;
2249#else
2250 const char *path;
2251#endif
2252
2253 if (ecb_expect_false (EIO_CANCELLED (req)))
2254 {
2255 req->result = -1;
2256 req->errorno = ECANCELED;
2257 return;
2258 }
2259
2260 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
2261 {
2262 req->result = -1;
2263 req->errorno = ENOENT;
2264 return;
2265 }
2266
2267 if (req->type >= EIO_OPEN)
2268 {
2269 #if HAVE_AT
2270 dirfd = WD2FD (req->wd);
2271 #else
2272 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
2273 #endif
2274 }
2275
1699 switch (req->type) 2276 switch (req->type)
1700 { 2277 {
2278 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2279 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2280 break;
2281 case EIO_WD_CLOSE: req->result = 0;
2282 eio_wd_close_sync (req->wd); break;
2283
1701 case EIO_READ: ALLOC (req->size); 2284 case EIO_READ: ALLOC (req->size);
1702 req->result = req->offs >= 0 2285 req->result = req->offs >= 0
1703 ? pread (req->int1, req->ptr2, req->size, req->offs) 2286 ? pread (req->int1, req->ptr2, req->size, req->offs)
1704 : read (req->int1, req->ptr2, req->size); break; 2287 : read (req->int1, req->ptr2, req->size); break;
1705 case EIO_WRITE: req->result = req->offs >= 0 2288 case EIO_WRITE: req->result = req->offs >= 0
1706 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 2289 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1707 : write (req->int1, req->ptr2, req->size); break; 2290 : write (req->int1, req->ptr2, req->size); break;
1708 2291
1709 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 2292 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1710 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; 2293 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2294
2295#if HAVE_AT
1711 2296
1712 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2297 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1713 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2298 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
1714 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2299 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2300 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2301 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2302 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2303 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2304 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2305
2306 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2307 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2308 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2309 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break;
2310 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break;
2311 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2312 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2313 case EIO_READLINK: ALLOC (PATH_MAX);
2314 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2315 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2316 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2317 case EIO_UTIME:
2318 case EIO_FUTIME:
2319 {
2320 struct timespec ts[2];
2321 struct timespec *times;
2322
2323 if (req->nv1 != -1. || req->nv2 != -1.)
2324 {
2325 ts[0].tv_sec = req->nv1;
2326 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
2327 ts[1].tv_sec = req->nv2;
2328 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
2329
2330 times = ts;
2331 }
2332 else
2333 times = 0;
2334
2335 req->result = req->type == EIO_FUTIME
2336 ? futimens (req->int1, times)
2337 : utimensat (dirfd, req->ptr1, times, 0);
2338 }
2339 break;
2340
2341#else
2342
2343 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2344 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2345 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1715 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 2346 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2347 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2348 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
2349 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
2350 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2351
2352 case EIO_UNLINK: req->result = unlink (path ); break;
2353 case EIO_RMDIR: req->result = rmdir (path ); break;
2354 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2355 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2356 case EIO_LINK: req->result = link (path , req->ptr2); break;
2357 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2358 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2359 case EIO_READLINK: ALLOC (PATH_MAX);
2360 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2361 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2362 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2363
2364 case EIO_UTIME:
2365 case EIO_FUTIME:
2366 {
2367 struct timeval tv[2];
2368 struct timeval *times;
2369
2370 if (req->nv1 != -1. || req->nv2 != -1.)
2371 {
2372 tv[0].tv_sec = req->nv1;
2373 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
2374 tv[1].tv_sec = req->nv2;
2375 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2376
2377 times = tv;
2378 }
2379 else
2380 times = 0;
2381
2382 req->result = req->type == EIO_FUTIME
2383 ? futimes (req->int1, times)
2384 : utimes (req->ptr1, times);
2385 }
2386 break;
2387
2388#endif
2389
2390 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2391 {
2392 ALLOC (req->result);
2393 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2394 }
2395 break;
2396
1716 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2397 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1717 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2398 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1718 2399
1719 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1720 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1721 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2400 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1722 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2401 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1723 2402
1724 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1725 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2403 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1726 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1727 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2404 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1728 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1729 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2405 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1730 2406
1731 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1732 case EIO_CLOSE: req->result = close (req->int1); break; 2407 case EIO_CLOSE: req->result = close (req->int1); break;
1733 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2408 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1734 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1735 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1736 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1737 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1738 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1739 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1740 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1741
1742 case EIO_READLINK: ALLOC (PATH_MAX);
1743 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1744
1745 case EIO_SYNC: req->result = 0; sync (); break; 2409 case EIO_SYNC: req->result = 0; sync (); break;
1746 case EIO_FSYNC: req->result = fsync (req->int1); break; 2410 case EIO_FSYNC: req->result = fsync (req->int1); break;
1747 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2411 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2412 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2413 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1748 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2414 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1749 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2415 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1750 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2416 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1751 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2417 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1752 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2418 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1753 2419
1754 case EIO_READDIR: eio__scandir (req, self); break; 2420 case EIO_READDIR: eio__scandir (req); break;
1755 2421
1756 case EIO_BUSY: 2422 case EIO_BUSY:
1757#ifdef _WIN32 2423#ifdef _WIN32
1758 Sleep (req->nv1 * 1e3); 2424 Sleep (req->nv1 * 1e3);
1759#else 2425#else
… …
1766 req->result = select (0, 0, 0, 0, &tv); 2432 req->result = select (0, 0, 0, 0, &tv);
1767 } 2433 }
1768#endif 2434#endif
1769 break; 2435 break;
1770 2436
1771 case EIO_UTIME:
1772 case EIO_FUTIME:
1773 {
1774 struct timeval tv[2];
1775 struct timeval *times;
1776
1777 if (req->nv1 != -1. || req->nv2 != -1.)
1778 {
1779 tv[0].tv_sec = req->nv1;
1780 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1781 tv[1].tv_sec = req->nv2;
1782 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1783
1784 times = tv;
1785 }
1786 else
1787 times = 0;
1788
1789 req->result = req->type == EIO_FUTIME
1790 ? futimes (req->int1, times)
1791 : utimes (req->ptr1, times);
1792 }
1793 break;
1794
1795 case EIO_GROUP: 2437 case EIO_GROUP:
1796 abort (); /* handled in eio_request */ 2438 abort (); /* handled in eio_request */
1797 2439
1798 case EIO_NOP: 2440 case EIO_NOP:
1799 req->result = 0; 2441 req->result = 0;
… …
1837eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2479eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1838{ 2480{
1839 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2481 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1840} 2482}
1841 2483
2484eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
2485{
2486 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
2487}
2488
2489eio_req *eio_syncfs (int fd, int pri, eio_cb cb, void *data)
2490{
2491 REQ (EIO_SYNCFS); req->int1 = fd; SEND;
2492}
2493
2494eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
2495{
2496 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
2497}
2498
1842eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 2499eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1843{ 2500{
1844 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 2501 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1845} 2502}
1846 2503
… …
1852eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data) 2509eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1853{ 2510{
1854 REQ (EIO_MLOCKALL); req->int1 = flags; SEND; 2511 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1855} 2512}
1856 2513
1857eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2514eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
1858{ 2515{
1859 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2516 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
1860}
1861
1862eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1863{
1864 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1865} 2517}
1866 2518
1867eio_req *eio_close (int fd, int pri, eio_cb cb, void *data) 2519eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
1868{ 2520{
1869 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2521 REQ (EIO_CLOSE); req->int1 = fd; SEND;
… …
1907eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2559eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1908{ 2560{
1909 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2561 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1910} 2562}
1911 2563
1912eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2564eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1913{ 2565{
1914 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2566 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1915} 2567}
1916 2568
1917eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2569eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
1937eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2589eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1938{ 2590{
1939 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2591 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1940} 2592}
1941 2593
1942eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2594eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1943{ 2595{
1944 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2596 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1945} 2597}
1946 2598
1947eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2599eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
1961} 2613}
1962 2614
1963eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2615eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1964{ 2616{
1965 return eio__1path (EIO_READLINK, path, pri, cb, data); 2617 return eio__1path (EIO_READLINK, path, pri, cb, data);
2618}
2619
2620eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2621{
2622 return eio__1path (EIO_REALPATH, path, pri, cb, data);
1966} 2623}
1967 2624
1968eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2625eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1969{ 2626{
1970 return eio__1path (EIO_STAT, path, pri, cb, data); 2627 return eio__1path (EIO_STAT, path, pri, cb, data);
… …
2029eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2686eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2030{ 2687{
2031 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2688 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2032} 2689}
2033 2690
2034eio_req *eio_custom (void (*)(eio_req *) execute, int pri, eio_cb cb, void *data); 2691eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2035{ 2692{
2036 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2693 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2037} 2694}
2038 2695
2039#endif 2696#endif
… …
2050#undef SEND 2707#undef SEND
2051 2708
2052/*****************************************************************************/ 2709/*****************************************************************************/
2053/* grp functions */ 2710/* grp functions */
2054 2711
2712void
2055void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2713eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
2056{ 2714{
2057 grp->int2 = limit; 2715 grp->int2 = limit;
2058 grp->feed = feed; 2716 grp->feed = feed;
2059 2717
2060 grp_try_feed (grp); 2718 grp_try_feed (grp);
2061} 2719}
2062 2720
2721void
2063void eio_grp_limit (eio_req *grp, int limit) 2722eio_grp_limit (eio_req *grp, int limit)
2064{ 2723{
2065 grp->int2 = limit; 2724 grp->int2 = limit;
2066 2725
2067 grp_try_feed (grp); 2726 grp_try_feed (grp);
2068} 2727}
2069 2728
2729void
2070void eio_grp_add (eio_req *grp, eio_req *req) 2730eio_grp_add (eio_req *grp, eio_req *req)
2071{ 2731{
2072 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2732 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2073 2733
2074 grp->flags |= EIO_FLAG_GROUPADD; 2734 grp->flags |= EIO_FLAG_GROUPADD;
2075 2735
… …
2086} 2746}
2087 2747
2088/*****************************************************************************/ 2748/*****************************************************************************/
2089/* misc garbage */ 2749/* misc garbage */
2090 2750
2751eio_ssize_t
2091ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2752eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2092{ 2753{
2093 etp_worker wrk;
2094 ssize_t ret;
2095
2096 wrk.dbuf = 0;
2097
2098 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2754 return eio__sendfile (ofd, ifd, offset, count);
2099
2100 if (wrk.dbuf)
2101 free (wrk.dbuf);
2102
2103 return ret;
2104} 2755}
2105 2756

Diff Legend

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