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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.19 by root, Tue Jun 17 23:34:20 2008 UTC vs.
Revision 1.115 by root, Tue Mar 27 18:54:45 2012 UTC

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

Diff Legend

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