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

Comparing libeio/eio.c (file contents):
Revision 1.9 by root, Mon May 12 00:31:43 2008 UTC vs.
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC

1/*
2 * libeio implementation
3 *
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Alternatively, the contents of this file may be used under the terms of
29 * the GNU General Public License ("GPL") version 2 or any later version,
30 * in which case the provisions of the GPL are applicable instead of
31 * the above. If you wish to allow the use of your version of this file
32 * only under the terms of the GPL and not to allow others to use your
33 * version of this file under the BSD license, indicate your decision
34 * by deleting the provisions above and replace them with the notice
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
37 * either the BSD or the GPL.
38 */
39
40#ifndef _WIN32
41# include "config.h"
42#endif
43
1#include "eio.h" 44#include "eio.h"
45#include "ecb.h"
46
47#ifdef EIO_STACKSIZE
48# define X_STACKSIZE EIO_STACKSIZE
49#endif
2#include "xthread.h" 50#include "xthread.h"
3 51
4#include <errno.h> 52#include <errno.h>
5#include <stddef.h> 53#include <stddef.h>
6#include <stdlib.h> 54#include <stdlib.h>
… …
10#include <sys/stat.h> 58#include <sys/stat.h>
11#include <limits.h> 59#include <limits.h>
12#include <fcntl.h> 60#include <fcntl.h>
13#include <assert.h> 61#include <assert.h>
14 62
63#if _POSIX_VERSION >= 200809L
64# define HAVE_AT 1
65#else
66# define HAVE_AT 0
67#endif
68
69/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
70/* intptr_t only comes from stdint.h, says idiot openbsd coder */
71#if HAVE_STDINT_H
72# include <stdint.h>
73#endif
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
15#ifndef EIO_FINISH 88#ifndef EIO_FINISH
16# 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
17#endif 90#endif
18 91
19#ifndef EIO_DESTROY 92#ifndef EIO_DESTROY
… …
22 95
23#ifndef EIO_FEED 96#ifndef EIO_FEED
24# 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)
25#endif 98#endif
26 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
27#ifdef _WIN32 111#ifdef _WIN32
28 112
29 /*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)
30 202
31#else 203#else
32 204
33# include "config.h"
34# include <sys/time.h> 205 #include <sys/time.h>
35# include <sys/select.h> 206 #include <sys/select.h>
207 #include <sys/statvfs.h>
36# 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
37# include <utime.h> 243# include <utime.h>
38# include <signal.h>
39# include <dirent.h>
40
41# ifndef EIO_STRUCT_DIRENT
42# define EIO_STRUCT_DIRENT struct dirent
43# endif 244#endif
44 245
246#if HAVE_SYS_SYSCALL_H
247# include <sys/syscall.h>
248#endif
249
250#if HAVE_SYS_PRCTL_H
251# include <sys/prctl.h>
45#endif 252#endif
46 253
47#if HAVE_SENDFILE 254#if HAVE_SENDFILE
48# if __linux 255# if __linux
49# include <sys/sendfile.h> 256# include <sys/sendfile.h>
50# elif __freebsd 257# elif __FreeBSD__ || defined __APPLE__
51# include <sys/socket.h> 258# include <sys/socket.h>
52# include <sys/uio.h> 259# include <sys/uio.h>
53# elif __hpux 260# elif __hpux
54# include <sys/socket.h> 261# include <sys/socket.h>
55# elif __solaris /* not yet */ 262# elif __solaris
56# include <sys/sendfile.h> 263# include <sys/sendfile.h>
57# else 264# else
58# error sendfile support requested but not available 265# error sendfile support requested but not available
59# endif 266# endif
60#endif 267#endif
61 268
62/* number of seconds after which an idle threads exit */ 269#ifndef D_TYPE
63#define IDLE_TIMEOUT 10 270# define D_TYPE(de) 0
271#endif
272#ifndef D_INO
273# define D_INO(de) 0
274#endif
275#ifndef D_NAMLEN
276# define D_NAMLEN(entp) strlen (D_NAME (entp))
277#endif
64 278
65/* used for struct dirent, AIX doesn't provide it */ 279/* used for struct dirent, AIX doesn't provide it */
66#ifndef NAME_MAX 280#ifndef NAME_MAX
67# define NAME_MAX 4096 281# define NAME_MAX 4096
68#endif 282#endif
69 283
284/* used for readlink etc. */
285#ifndef PATH_MAX
286# define PATH_MAX 4096
287#endif
288
70/* buffer size for various temporary buffers */ 289/* buffer size for various temporary buffers */
71#define EIO_BUFSIZE 65536 290#define EIO_BUFSIZE 65536
72 291
73#define dBUF \ 292#define dBUF \
74 char *eio_buf; \
75 X_LOCK (wrklock); \
76 self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ 293 char *eio_buf = malloc (EIO_BUFSIZE); \
77 X_UNLOCK (wrklock); \
78 errno = ENOMEM; \ 294 errno = ENOMEM; \
79 if (!eio_buf) \ 295 if (!eio_buf) \
80 return -1; 296 return -1
297
298#define FUBd \
299 free (eio_buf)
81 300
82#define EIO_TICKS ((1000000 + 1023) >> 10) 301#define EIO_TICKS ((1000000 + 1023) >> 10)
302
303/*****************************************************************************/
304
305struct tmpbuf
306{
307 void *ptr;
308 int len;
309};
310
311static void *
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}
322
323/*****************************************************************************/
324
325#define ETP_PRI_MIN EIO_PRI_MIN
326#define ETP_PRI_MAX EIO_PRI_MAX
327
328struct etp_worker;
329
330#define ETP_REQ eio_req
331#define ETP_DESTROY(req) eio_destroy (req)
332static int eio_finish (eio_req *req);
333#define ETP_FINISH(req) eio_finish (req)
334static void eio_execute (struct etp_worker *self, eio_req *req);
335#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
336
337/*****************************************************************************/
338
339#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
340
341/* calculate time difference in ~1/EIO_TICKS of a second */
342ecb_inline int
343tvdiff (struct timeval *tv1, struct timeval *tv2)
344{
345 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
346 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
347}
348
349static unsigned int started, idle, wanted = 4;
83 350
84static void (*want_poll_cb) (void); 351static void (*want_poll_cb) (void);
85static void (*done_poll_cb) (void); 352static void (*done_poll_cb) (void);
86 353
87static unsigned int max_poll_time = 0; 354static unsigned int max_poll_time; /* reslock */
88static unsigned int max_poll_reqs = 0; 355static unsigned int max_poll_reqs; /* reslock */
89 356
90/* calculcate time difference in ~1/EIO_TICKS of a second */ 357static unsigned int nreqs; /* reqlock */
91static int tvdiff (struct timeval *tv1, struct timeval *tv2) 358static unsigned int nready; /* reqlock */
92{ 359static unsigned int npending; /* reqlock */
93 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 360static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
94 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 361static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
95}
96 362
97static unsigned int started, idle, wanted = 4; 363static xmutex_t wrklock;
364static xmutex_t reslock;
365static xmutex_t reqlock;
366static xcond_t reqwait;
367
368#if !HAVE_PREADWRITE
369/*
370 * make our pread/pwrite emulation safe against themselves, but not against
371 * normal read/write by using a mutex. slows down execution a lot,
372 * but that's your problem, not mine.
373 */
374static xmutex_t preadwritelock;
375#endif
376
377typedef struct etp_worker
378{
379 struct tmpbuf tmpbuf;
380
381 /* locked by wrklock */
382 struct etp_worker *prev, *next;
383
384 xthread_t tid;
385
386#ifdef ETP_WORKER_COMMON
387 ETP_WORKER_COMMON
388#endif
389} etp_worker;
390
391static etp_worker wrk_first; /* NOT etp */
392
393#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
394#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
98 395
99/* worker threads management */ 396/* worker threads management */
100static mutex_t wrklock = X_MUTEX_INIT;
101 397
102typedef struct worker 398static void ecb_cold
103{
104 /* locked by wrklock */
105 struct worker *prev, *next;
106
107 thread_t tid;
108
109 /* locked by reslock, reqlock or wrklock */
110 eio_req *req; /* currently processed request */
111 void *dbuf;
112 DIR *dirp;
113} worker;
114
115static worker wrk_first = { &wrk_first, &wrk_first, 0 };
116
117static void worker_clear (worker *wrk) 399etp_worker_clear (etp_worker *wrk)
118{ 400{
119 if (wrk->dirp) 401}
120 {
121 closedir (wrk->dirp);
122 wrk->dirp = 0;
123 }
124 402
125 if (wrk->dbuf) 403static void ecb_cold
126 { 404etp_worker_free (etp_worker *wrk)
405{
127 free (wrk->dbuf); 406 free (wrk->tmpbuf.ptr);
128 wrk->dbuf = 0;
129 }
130}
131 407
132static void worker_free (worker *wrk)
133{
134 wrk->next->prev = wrk->prev; 408 wrk->next->prev = wrk->prev;
135 wrk->prev->next = wrk->next; 409 wrk->prev->next = wrk->next;
136 410
137 free (wrk); 411 free (wrk);
138} 412}
139 413
140static volatile unsigned int nreqs, nready, npending; 414static unsigned int
141static volatile unsigned int max_idle = 4; 415etp_nreqs (void)
142
143static mutex_t reslock = X_MUTEX_INIT;
144static mutex_t reqlock = X_MUTEX_INIT;
145static cond_t reqwait = X_COND_INIT;
146
147unsigned int eio_nreqs (void)
148{ 416{
417 int retval;
418 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
419 retval = nreqs;
420 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
149 return nreqs; 421 return retval;
150} 422}
151 423
152unsigned int eio_nready (void) 424static unsigned int
425etp_nready (void)
153{ 426{
154 unsigned int retval; 427 unsigned int retval;
155 428
156 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 429 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
157 retval = nready; 430 retval = nready;
158 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 431 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
159 432
160 return retval; 433 return retval;
161} 434}
162 435
163unsigned int eio_npending (void) 436static unsigned int
437etp_npending (void)
164{ 438{
165 unsigned int retval; 439 unsigned int retval;
166 440
167 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 441 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
168 retval = npending; 442 retval = npending;
169 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 443 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
170 444
171 return retval; 445 return retval;
172} 446}
173 447
174unsigned int eio_nthreads (void) 448static unsigned int
449etp_nthreads (void)
175{ 450{
176 unsigned int retval; 451 unsigned int retval;
177 452
178 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 453 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
179 retval = started; 454 retval = started;
… …
186 * a somewhat faster data structure might be nice, but 461 * a somewhat faster data structure might be nice, but
187 * with 8 priorities this actually needs <20 insns 462 * with 8 priorities this actually needs <20 insns
188 * per shift, the most expensive operation. 463 * per shift, the most expensive operation.
189 */ 464 */
190typedef struct { 465typedef struct {
191 eio_req *qs[EIO_NUM_PRI], *qe[EIO_NUM_PRI]; /* qstart, qend */ 466 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
192 int size; 467 int size;
193} reqq; 468} etp_reqq;
194 469
195static reqq req_queue; 470static etp_reqq req_queue;
196static reqq res_queue; 471static etp_reqq res_queue;
197 472
198static int reqq_push (reqq *q, eio_req *req) 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
485reqq_push (etp_reqq *q, ETP_REQ *req)
199{ 486{
200 int pri = req->pri; 487 int pri = req->pri;
201 req->next = 0; 488 req->next = 0;
202 489
203 if (q->qe[pri]) 490 if (q->qe[pri])
… …
209 q->qe[pri] = q->qs[pri] = req; 496 q->qe[pri] = q->qs[pri] = req;
210 497
211 return q->size++; 498 return q->size++;
212} 499}
213 500
214static eio_req *reqq_shift (reqq *q) 501static ETP_REQ * ecb_noinline
502reqq_shift (etp_reqq *q)
215{ 503{
216 int pri; 504 int pri;
217 505
218 if (!q->size) 506 if (!q->size)
219 return 0; 507 return 0;
220 508
221 --q->size; 509 --q->size;
222 510
223 for (pri = EIO_NUM_PRI; pri--; ) 511 for (pri = ETP_NUM_PRI; pri--; )
224 { 512 {
225 eio_req *req = q->qs[pri]; 513 eio_req *req = q->qs[pri];
226 514
227 if (req) 515 if (req)
228 { 516 {
… …
234 } 522 }
235 523
236 abort (); 524 abort ();
237} 525}
238 526
239static void grp_try_feed (eio_req *grp) 527static int ecb_cold
528etp_init (void (*want_poll)(void), void (*done_poll)(void))
240{ 529{
241 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 530 X_MUTEX_CREATE (wrklock);
242 { 531 X_MUTEX_CREATE (reslock);
243 int old_len = grp->size; 532 X_MUTEX_CREATE (reqlock);
533 X_COND_CREATE (reqwait);
244 534
245 EIO_FEED (grp); 535 reqq_init (&req_queue);
536 reqq_init (&res_queue);
246 537
247 /* stop if no progress has been made */ 538 wrk_first.next =
248 if (old_len == grp->size) 539 wrk_first.prev = &wrk_first;
249 {
250 grp->feed = 0;
251 break;
252 }
253 }
254}
255 540
256static int eio_finish (eio_req *req); 541 started = 0;
542 idle = 0;
543 nreqs = 0;
544 nready = 0;
545 npending = 0;
257 546
258static int grp_dec (eio_req *grp) 547 want_poll_cb = want_poll;
259{ 548 done_poll_cb = done_poll;
260 --grp->size;
261 549
262 /* call feeder, if applicable */
263 grp_try_feed (grp);
264
265 /* finish, if done */
266 if (!grp->size && grp->int1)
267 return eio_finish (grp);
268 else
269 return 0; 550 return 0;
270} 551}
271 552
272void eio_destroy (eio_req *req)
273{
274 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
275 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
276
277 EIO_DESTROY (req);
278}
279
280static int eio_finish (eio_req *req)
281{
282 int res = EIO_FINISH (req);
283
284 if (req->grp)
285 {
286 int res2;
287 eio_req *grp = req->grp;
288
289 /* unlink request */
290 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
291 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
292
293 if (grp->grp_first == req)
294 grp->grp_first = req->grp_next;
295
296 res2 = grp_dec (grp);
297
298 if (!res && res2)
299 res = res2;
300 }
301
302 eio_destroy (req);
303
304 return res;
305}
306
307void eio_grp_cancel (eio_req *grp)
308{
309 for (grp = grp->grp_first; grp; grp = grp->grp_next)
310 eio_cancel (grp);
311}
312
313void eio_cancel (eio_req *req)
314{
315 X_LOCK (wrklock);
316 req->flags |= EIO_FLAG_CANCELLED;
317 X_UNLOCK (wrklock);
318
319 eio_grp_cancel (req);
320}
321
322X_THREAD_PROC (eio_proc); 553X_THREAD_PROC (etp_proc);
323 554
324static void start_thread (void) 555static void ecb_cold
556etp_start_thread (void)
325{ 557{
326 worker *wrk = calloc (1, sizeof (worker)); 558 etp_worker *wrk = calloc (1, sizeof (etp_worker));
327 559
328 /*TODO*/ 560 /*TODO*/
329 assert (("unable to allocate worker thread data", wrk)); 561 assert (("unable to allocate worker thread data", wrk));
330 562
331 X_LOCK (wrklock); 563 X_LOCK (wrklock);
332 564
333 if (thread_create (&wrk->tid, eio_proc, (void *)wrk)) 565 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
334 { 566 {
335 wrk->prev = &wrk_first; 567 wrk->prev = &wrk_first;
336 wrk->next = wrk_first.next; 568 wrk->next = wrk_first.next;
337 wrk_first.next->prev = wrk; 569 wrk_first.next->prev = wrk;
338 wrk_first.next = wrk; 570 wrk_first.next = wrk;
… …
342 free (wrk); 574 free (wrk);
343 575
344 X_UNLOCK (wrklock); 576 X_UNLOCK (wrklock);
345} 577}
346 578
579static void
347static void maybe_start_thread (void) 580etp_maybe_start_thread (void)
348{ 581{
349 if (eio_nthreads () >= wanted) 582 if (ecb_expect_true (etp_nthreads () >= wanted))
350 return; 583 return;
351 584
352 /* todo: maybe use idle here, but might be less exact */ 585 /* todo: maybe use idle here, but might be less exact */
353 if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ()) 586 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
354 return; 587 return;
355 588
356 start_thread (); 589 etp_start_thread ();
357} 590}
358 591
359void eio_submit (eio_req *req) 592static void ecb_cold
593etp_end_thread (void)
360{ 594{
361 ++nreqs;
362
363 X_LOCK (reqlock);
364 ++nready;
365 reqq_push (&req_queue, req);
366 X_COND_SIGNAL (reqwait);
367 X_UNLOCK (reqlock);
368
369 maybe_start_thread ();
370}
371
372static void end_thread (void)
373{
374 eio_req *req = calloc (1, sizeof (eio_req)); 595 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
375 596
376 req->type = EIO_QUIT; 597 req->type = -1;
377 req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; 598 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
378 599
379 X_LOCK (reqlock); 600 X_LOCK (reqlock);
380 reqq_push (&req_queue, req); 601 reqq_push (&req_queue, req);
381 X_COND_SIGNAL (reqwait); 602 X_COND_SIGNAL (reqwait);
382 X_UNLOCK (reqlock); 603 X_UNLOCK (reqlock);
… …
384 X_LOCK (wrklock); 605 X_LOCK (wrklock);
385 --started; 606 --started;
386 X_UNLOCK (wrklock); 607 X_UNLOCK (wrklock);
387} 608}
388 609
389void eio_set_max_poll_time (double nseconds) 610static int
390{
391 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
392 max_poll_time = nseconds;
393 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
394}
395
396void eio_set_max_poll_reqs (unsigned int maxreqs)
397{
398 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
399 max_poll_reqs = maxreqs;
400 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
401}
402
403void eio_set_max_idle (unsigned int nthreads)
404{
405 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
406 max_idle = nthreads <= 0 ? 1 : nthreads;
407 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
408}
409
410void eio_set_min_parallel (unsigned int nthreads)
411{
412 if (wanted < nthreads)
413 wanted = nthreads;
414}
415
416void eio_set_max_parallel (unsigned int nthreads)
417{
418 if (wanted > nthreads)
419 wanted = nthreads;
420
421 while (started > wanted)
422 end_thread ();
423}
424
425int eio_poll (void) 611etp_poll (void)
426{ 612{
427 int maxreqs = max_poll_reqs; 613 unsigned int maxreqs;
614 unsigned int maxtime;
428 struct timeval tv_start, tv_now; 615 struct timeval tv_start, tv_now;
429 eio_req *req;
430 616
617 X_LOCK (reslock);
618 maxreqs = max_poll_reqs;
619 maxtime = max_poll_time;
620 X_UNLOCK (reslock);
621
431 if (max_poll_time) 622 if (maxtime)
432 gettimeofday (&tv_start, 0); 623 gettimeofday (&tv_start, 0);
433 624
434 for (;;) 625 for (;;)
435 { 626 {
627 ETP_REQ *req;
628
436 maybe_start_thread (); 629 etp_maybe_start_thread ();
437 630
438 X_LOCK (reslock); 631 X_LOCK (reslock);
439 req = reqq_shift (&res_queue); 632 req = reqq_shift (&res_queue);
440 633
441 if (req) 634 if (req)
… …
449 X_UNLOCK (reslock); 642 X_UNLOCK (reslock);
450 643
451 if (!req) 644 if (!req)
452 return 0; 645 return 0;
453 646
647 X_LOCK (reqlock);
454 --nreqs; 648 --nreqs;
649 X_UNLOCK (reqlock);
455 650
456 if (req->type == EIO_GROUP && req->size) 651 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
457 { 652 {
458 req->int1 = 1; /* mark request as delayed */ 653 req->int1 = 1; /* mark request as delayed */
459 continue; 654 continue;
460 } 655 }
461 else 656 else
462 { 657 {
463 int res = eio_finish (req); 658 int res = ETP_FINISH (req);
464 if (res) 659 if (ecb_expect_false (res))
465 return res; 660 return res;
466 } 661 }
467 662
468 if (maxreqs && !--maxreqs) 663 if (ecb_expect_false (maxreqs && !--maxreqs))
469 break; 664 break;
470 665
471 if (max_poll_time) 666 if (maxtime)
472 { 667 {
473 gettimeofday (&tv_now, 0); 668 gettimeofday (&tv_now, 0);
474 669
475 if (tvdiff (&tv_start, &tv_now) >= max_poll_time) 670 if (tvdiff (&tv_start, &tv_now) >= maxtime)
476 break; 671 break;
477 } 672 }
478 } 673 }
479 674
480 errno = EAGAIN; 675 errno = EAGAIN;
481 return -1; 676 return -1;
482} 677}
483 678
679static void
680etp_cancel (ETP_REQ *req)
681{
682 req->cancelled = 1;
683
684 eio_grp_cancel (req);
685}
686
687static void
688etp_submit (ETP_REQ *req)
689{
690 req->pri -= ETP_PRI_MIN;
691
692 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
693 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
694
695 if (ecb_expect_false (req->type == EIO_GROUP))
696 {
697 /* I hope this is worth it :/ */
698 X_LOCK (reqlock);
699 ++nreqs;
700 X_UNLOCK (reqlock);
701
702 X_LOCK (reslock);
703
704 ++npending;
705
706 if (!reqq_push (&res_queue, req) && want_poll_cb)
707 want_poll_cb ();
708
709 X_UNLOCK (reslock);
710 }
711 else
712 {
713 X_LOCK (reqlock);
714 ++nreqs;
715 ++nready;
716 reqq_push (&req_queue, req);
717 X_COND_SIGNAL (reqwait);
718 X_UNLOCK (reqlock);
719
720 etp_maybe_start_thread ();
721 }
722}
723
724static void ecb_cold
725etp_set_max_poll_time (double nseconds)
726{
727 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
728 max_poll_time = nseconds * EIO_TICKS;
729 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
730}
731
732static void ecb_cold
733etp_set_max_poll_reqs (unsigned int maxreqs)
734{
735 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
736 max_poll_reqs = maxreqs;
737 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
738}
739
740static void ecb_cold
741etp_set_max_idle (unsigned int nthreads)
742{
743 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
744 max_idle = nthreads;
745 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
746}
747
748static void ecb_cold
749etp_set_idle_timeout (unsigned int seconds)
750{
751 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
752 idle_timeout = seconds;
753 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
754}
755
756static void ecb_cold
757etp_set_min_parallel (unsigned int nthreads)
758{
759 if (wanted < nthreads)
760 wanted = nthreads;
761}
762
763static void ecb_cold
764etp_set_max_parallel (unsigned int nthreads)
765{
766 if (wanted > nthreads)
767 wanted = nthreads;
768
769 while (started > wanted)
770 etp_end_thread ();
771}
772
773/*****************************************************************************/
774
775static void
776grp_try_feed (eio_req *grp)
777{
778 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
779 {
780 grp->flags &= ~EIO_FLAG_GROUPADD;
781
782 EIO_FEED (grp);
783
784 /* stop if no progress has been made */
785 if (!(grp->flags & EIO_FLAG_GROUPADD))
786 {
787 grp->feed = 0;
788 break;
789 }
790 }
791}
792
793static int
794grp_dec (eio_req *grp)
795{
796 --grp->size;
797
798 /* call feeder, if applicable */
799 grp_try_feed (grp);
800
801 /* finish, if done */
802 if (!grp->size && grp->int1)
803 return eio_finish (grp);
804 else
805 return 0;
806}
807
808static void
809eio_destroy (eio_req *req)
810{
811 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
812 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
813
814 EIO_DESTROY (req);
815}
816
817static int
818eio_finish (eio_req *req)
819{
820 int res = EIO_FINISH (req);
821
822 if (req->grp)
823 {
824 int res2;
825 eio_req *grp = req->grp;
826
827 /* unlink request */
828 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
829 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
830
831 if (grp->grp_first == req)
832 grp->grp_first = req->grp_next;
833
834 res2 = grp_dec (grp);
835
836 if (!res)
837 res = res2;
838 }
839
840 eio_destroy (req);
841
842 return res;
843}
844
845void
846eio_grp_cancel (eio_req *grp)
847{
848 for (grp = grp->grp_first; grp; grp = grp->grp_next)
849 eio_cancel (grp);
850}
851
852void
853eio_cancel (eio_req *req)
854{
855 etp_cancel (req);
856}
857
858void
859eio_submit (eio_req *req)
860{
861 etp_submit (req);
862}
863
864unsigned int
865eio_nreqs (void)
866{
867 return etp_nreqs ();
868}
869
870unsigned int
871eio_nready (void)
872{
873 return etp_nready ();
874}
875
876unsigned int
877eio_npending (void)
878{
879 return etp_npending ();
880}
881
882unsigned int ecb_cold
883eio_nthreads (void)
884{
885 return etp_nthreads ();
886}
887
888void ecb_cold
889eio_set_max_poll_time (double nseconds)
890{
891 etp_set_max_poll_time (nseconds);
892}
893
894void ecb_cold
895eio_set_max_poll_reqs (unsigned int maxreqs)
896{
897 etp_set_max_poll_reqs (maxreqs);
898}
899
900void ecb_cold
901eio_set_max_idle (unsigned int nthreads)
902{
903 etp_set_max_idle (nthreads);
904}
905
906void ecb_cold
907eio_set_idle_timeout (unsigned int seconds)
908{
909 etp_set_idle_timeout (seconds);
910}
911
912void ecb_cold
913eio_set_min_parallel (unsigned int nthreads)
914{
915 etp_set_min_parallel (nthreads);
916}
917
918void ecb_cold
919eio_set_max_parallel (unsigned int nthreads)
920{
921 etp_set_max_parallel (nthreads);
922}
923
924int eio_poll (void)
925{
926 return etp_poll ();
927}
928
484/*****************************************************************************/ 929/*****************************************************************************/
485/* work around various missing functions */ 930/* work around various missing functions */
486 931
487#if !HAVE_PREADWRITE 932#if !HAVE_PREADWRITE
933# undef pread
934# undef pwrite
488# define pread eio__pread 935# define pread eio__pread
489# define pwrite eio__pwrite 936# define pwrite eio__pwrite
490 937
491/*
492 * make our pread/pwrite safe against themselves, but not against
493 * normal read/write by using a mutex. slows down execution a lot,
494 * but that's your problem, not mine.
495 */
496static mutex_t preadwritelock = X_MUTEX_INIT;
497
498static ssize_t 938static eio_ssize_t
499eio__pread (int fd, void *buf, size_t count, off_t offset) 939eio__pread (int fd, void *buf, size_t count, off_t offset)
500{ 940{
501 ssize_t res; 941 eio_ssize_t res;
502 off_t ooffset; 942 off_t ooffset;
503 943
504 X_LOCK (preadwritelock); 944 X_LOCK (preadwritelock);
505 ooffset = lseek (fd, 0, SEEK_CUR); 945 ooffset = lseek (fd, 0, SEEK_CUR);
506 lseek (fd, offset, SEEK_SET); 946 lseek (fd, offset, SEEK_SET);
… …
509 X_UNLOCK (preadwritelock); 949 X_UNLOCK (preadwritelock);
510 950
511 return res; 951 return res;
512} 952}
513 953
514static ssize_t 954static eio_ssize_t
515eio__pwrite (int fd, void *buf, size_t count, off_t offset) 955eio__pwrite (int fd, void *buf, size_t count, off_t offset)
516{ 956{
517 ssize_t res; 957 eio_ssize_t res;
518 off_t ooffset; 958 off_t ooffset;
519 959
520 X_LOCK (preadwritelock); 960 X_LOCK (preadwritelock);
521 ooffset = lseek (fd, 0, SEEK_CUR); 961 ooffset = lseek (fd, 0, SEEK_CUR);
522 lseek (fd, offset, SEEK_SET); 962 lseek (fd, offset, SEEK_SET);
523 res = write (fd, buf, count); 963 res = write (fd, buf, count);
524 lseek (fd, offset, SEEK_SET); 964 lseek (fd, ooffset, SEEK_SET);
525 X_UNLOCK (preadwritelock); 965 X_UNLOCK (preadwritelock);
526 966
527 return res; 967 return res;
528} 968}
529#endif 969#endif
530 970
531#ifndef HAVE_FUTIMES 971#ifndef HAVE_UTIMES
532 972
973# undef utimes
533# define utimes(path,times) eio__utimes (path, times) 974# define utimes(path,times) eio__utimes (path, times)
534# define futimes(fd,times) eio__futimes (fd, times)
535 975
536static int 976static int
537eio__utimes (const char *filename, const struct timeval times[2]) 977eio__utimes (const char *filename, const struct timeval times[2])
538{ 978{
539 if (times) 979 if (times)
… …
547 } 987 }
548 else 988 else
549 return utime (filename, 0); 989 return utime (filename, 0);
550} 990}
551 991
992#endif
993
994#ifndef HAVE_FUTIMES
995
996# undef futimes
997# define futimes(fd,times) eio__futimes (fd, times)
998
999static int
552static int eio__futimes (int fd, const struct timeval tv[2]) 1000eio__futimes (int fd, const struct timeval tv[2])
553{ 1001{
554 errno = ENOSYS; 1002 errno = ENOSYS;
555 return -1; 1003 return -1;
556} 1004}
557 1005
558#endif 1006#endif
559 1007
560#if !HAVE_FDATASYNC 1008#if !HAVE_FDATASYNC
1009# undef fdatasync
561# define fdatasync fsync 1010# define fdatasync(fd) fsync (fd)
562#endif 1011#endif
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
1031/* sync_file_range always needs emulation */
1032static int
1033eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
1034{
1035#if HAVE_SYNC_FILE_RANGE
1036 int res;
1037
1038 if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
1039 || EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
1040 || EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
1041 {
1042 flags = 0
1043 | (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
1044 | (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
1045 | (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
1046 }
1047
1048 res = sync_file_range (fd, offset, nbytes, flags);
1049
1050 if (!res || errno != ENOSYS)
1051 return res;
1052#endif
1053
1054 /* even though we could play tricks with the flags, it's better to always
1055 * call fdatasync, as that matches the expectation of its users best */
1056 return fdatasync (fd);
1057}
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}
563 1069
564#if !HAVE_READAHEAD 1070#if !HAVE_READAHEAD
1071# undef readahead
565# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1072# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
566 1073
567static ssize_t 1074static eio_ssize_t
568eio__readahead (int fd, off_t offset, size_t count, worker *self) 1075eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
569{ 1076{
570 size_t todo = count; 1077 size_t todo = count;
571 dBUF; 1078 dBUF;
572 1079
573 while (todo > 0) 1080 while (todo > 0)
… …
577 pread (fd, eio_buf, len, offset); 1084 pread (fd, eio_buf, len, offset);
578 offset += len; 1085 offset += len;
579 todo -= len; 1086 todo -= len;
580 } 1087 }
581 1088
1089 FUBd;
1090
582 errno = 0; 1091 errno = 0;
583 return count; 1092 return count;
584} 1093}
585 1094
586#endif 1095#endif
587 1096
588#if !HAVE_READDIR_R
589# define readdir_r eio__readdir_r
590
591static mutex_t readdirlock = X_MUTEX_INIT;
592
593static int
594eio__readdir_r (DIR *dirp, EIO_STRUCT_DIRENT *ent, EIO_STRUCT_DIRENT **res)
595{
596 EIO_STRUCT_DIRENT *e;
597 int errorno;
598
599 X_LOCK (readdirlock);
600
601 e = readdir (dirp);
602 errorno = errno;
603
604 if (e)
605 {
606 *res = ent;
607 strcpy (ent->d_name, e->d_name);
608 }
609 else
610 *res = 0;
611
612 X_UNLOCK (readdirlock);
613
614 errno = errorno;
615 return e ? 0 : -1;
616}
617#endif
618
619/* sendfile always needs emulation */ 1097/* sendfile always needs emulation */
620static ssize_t 1098static eio_ssize_t
621eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self) 1099eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
622{ 1100{
1101 eio_ssize_t written = 0;
623 ssize_t res; 1102 eio_ssize_t res;
624 1103
625 if (!count) 1104 if (!count)
626 return 0; 1105 return 0;
627 1106
1107 for (;;)
1108 {
1109#ifdef __APPLE__
1110# undef HAVE_SENDFILE /* broken, as everything on os x */
1111#endif
628#if HAVE_SENDFILE 1112#if HAVE_SENDFILE
629# if __linux 1113# if __linux
1114 off_t soffset = offset;
630 res = sendfile (ofd, ifd, &offset, count); 1115 res = sendfile (ofd, ifd, &soffset, count);
631 1116
632# elif __freebsd 1117# elif __FreeBSD__
633 /* 1118 /*
634 * Of course, the freebsd sendfile is a dire hack with no thoughts 1119 * Of course, the freebsd sendfile is a dire hack with no thoughts
635 * wasted on making it similar to other I/O functions. 1120 * wasted on making it similar to other I/O functions.
636 */ 1121 */
637 {
638 off_t sbytes; 1122 off_t sbytes;
639 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 1123 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
640 1124
641 if (res < 0 && sbytes) 1125 #if 0 /* according to the manpage, this is correct, but broken behaviour */
642 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 1126 /* freebsd' sendfile will return 0 on success */
1127 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
1128 /* not on e.g. EIO or EPIPE - sounds broken */
1129 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
643 res = sbytes; 1130 res = sbytes;
644 } 1131 #endif
1132
1133 /* according to source inspection, this is correct, and useful behaviour */
1134 if (sbytes)
1135 res = sbytes;
1136
1137# elif defined (__APPLE__)
1138 off_t sbytes = count;
1139 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1140
1141 /* according to the manpage, sbytes is always valid */
1142 if (sbytes)
1143 res = sbytes;
645 1144
646# elif __hpux 1145# elif __hpux
647 res = sendfile (ofd, ifd, offset, count, 0, 0); 1146 res = sendfile (ofd, ifd, offset, count, 0, 0);
648 1147
649# elif __solaris 1148# elif __solaris
650 {
651 struct sendfilevec vec; 1149 struct sendfilevec vec;
652 size_t sbytes; 1150 size_t sbytes;
653 1151
654 vec.sfv_fd = ifd; 1152 vec.sfv_fd = ifd;
655 vec.sfv_flag = 0; 1153 vec.sfv_flag = 0;
656 vec.sfv_off = offset; 1154 vec.sfv_off = offset;
657 vec.sfv_len = count; 1155 vec.sfv_len = count;
658 1156
659 res = sendfilev (ofd, &vec, 1, &sbytes); 1157 res = sendfilev (ofd, &vec, 1, &sbytes);
660 1158
661 if (res < 0 && sbytes) 1159 if (res < 0 && sbytes)
662 res = sbytes; 1160 res = sbytes;
663 }
664 1161
665# endif 1162# endif
1163
1164#elif defined (_WIN32) && 0
1165 /* does not work, just for documentation of what would need to be done */
1166 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1167 /* libeio guarantees that the file offset does not change, and windows */
1168 /* has no way to get an independent handle to the same file description */
1169 HANDLE h = TO_SOCKET (ifd);
1170 SetFilePointer (h, offset, 0, FILE_BEGIN);
1171 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1172
666#else 1173#else
667 res = -1; 1174 res = -1;
668 errno = ENOSYS; 1175 errno = ENOSYS;
669#endif 1176#endif
670 1177
1178 /* we assume sendfile can copy at least 128mb in one go */
1179 if (res <= 128 * 1024 * 1024)
1180 {
1181 if (res > 0)
1182 written += res;
1183
1184 if (written)
1185 return written;
1186
1187 break;
1188 }
1189 else
1190 {
1191 /* if we requested more, then probably the kernel was lazy */
1192 written += res;
1193 offset += res;
1194 count -= res;
1195
1196 if (!count)
1197 return written;
1198 }
1199 }
1200
671 if (res < 0 1201 if (res < 0
672 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1202 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1203 /* BSDs */
1204#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1205 || errno == ENOTSUP
1206#endif
1207#ifdef EOPNOTSUPP /* windows */
1208 || errno == EOPNOTSUPP /* BSDs */
1209#endif
673#if __solaris 1210#if __solaris
674 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1211 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
675#endif 1212#endif
676 ) 1213 )
677 ) 1214 )
… …
681 1218
682 res = 0; 1219 res = 0;
683 1220
684 while (count) 1221 while (count)
685 { 1222 {
686 ssize_t cnt; 1223 eio_ssize_t cnt;
687 1224
688 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);
689 1226
690 if (cnt <= 0) 1227 if (cnt <= 0)
691 { 1228 {
… …
703 1240
704 offset += cnt; 1241 offset += cnt;
705 res += cnt; 1242 res += cnt;
706 count -= cnt; 1243 count -= cnt;
707 } 1244 }
1245
1246 FUBd;
708 } 1247 }
709 1248
710 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;
1530}
1531
1532static signed char
1533eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1534{
1535 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1536 : a->inode < b->inode ? -1
1537 : a->inode > b->inode ? 1
1538 : 0;
1539}
1540
1541#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1542
1543#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1544#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1545
1546static void
1547eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1548{
1549 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1550 unsigned char *bit = bits;
1551
1552 assert (CHAR_BIT == 8);
1553 assert (sizeof (eio_dirent) * 8 < 256);
1554 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1555 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1556
1557 if (size <= EIO_SORT_FAST)
1558 return;
1559
1560 /* first prepare an array of bits to test in our radix sort */
1561 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1562 /* inode_bits must contain all inodes ORed together */
1563 /* which is used to skip bits that are 0 everywhere, which is very common */
1564 {
1565 eio_ino_t endianness;
1566 int i, j;
1567
1568 /* we store the byte offset of byte n into byte n of "endianness" */
1569 for (i = 0; i < sizeof (eio_ino_t); ++i)
1570 ((unsigned char *)&endianness)[i] = i;
1571
1572 *bit++ = 0;
1573
1574 for (i = 0; i < sizeof (eio_ino_t); ++i)
1575 {
1576 /* shifting off the byte offsets out of "endianness" */
1577 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1578 endianness >>= 8;
1579
1580 for (j = 0; j < 8; ++j)
1581 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1582 *bit++ = offs + j;
1583 }
1584
1585 for (j = 0; j < 8; ++j)
1586 if (score_bits & (1 << j))
1587 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1588 }
1589
1590 /* now actually do the sorting (a variant of MSD radix sort) */
1591 {
1592 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1593 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1594 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1595 int stk_idx = 0;
1596
1597 base_stk [stk_idx] = dents;
1598 end_stk [stk_idx] = dents + size;
1599 bit_stk [stk_idx] = bit - 1;
1600
1601 do
1602 {
1603 base = base_stk [stk_idx];
1604 end = end_stk [stk_idx];
1605 bit = bit_stk [stk_idx];
1606
1607 for (;;)
1608 {
1609 unsigned char O = *bit >> 3;
1610 unsigned char M = 1 << (*bit & 7);
1611
1612 eio_dirent *a = base;
1613 eio_dirent *b = end;
1614
1615 if (b - a < EIO_SORT_CUTOFF)
1616 break;
1617
1618 /* now bit-partition the array on the bit */
1619 /* this ugly asymmetric loop seems to perform much better than typical */
1620 /* partition algos found in the literature */
1621 do
1622 if (!(((unsigned char *)a)[O] & M))
1623 ++a;
1624 else if (!(((unsigned char *)--b)[O] & M))
1625 {
1626 eio_dirent tmp = *a; *a = *b; *b = tmp;
1627 ++a;
1628 }
1629 while (b > a);
1630
1631 /* next bit, or stop, if no bits left in this path */
1632 if (!*--bit)
1633 break;
1634
1635 base_stk [stk_idx] = a;
1636 end_stk [stk_idx] = end;
1637 bit_stk [stk_idx] = bit;
1638 ++stk_idx;
1639
1640 end = a;
1641 }
1642 }
1643 while (stk_idx--);
1644 }
1645}
1646
1647static void
1648eio_dent_insertion_sort (eio_dirent *dents, int size)
1649{
1650 /* first move the smallest element to the front, to act as a sentinel */
1651 {
1652 int i;
1653 eio_dirent *min = dents;
1654
1655 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1656 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1657 if (EIO_DENT_CMP (dents [i], <, *min))
1658 min = &dents [i];
1659
1660 /* swap elements 0 and j (minimum) */
1661 {
1662 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1663 }
1664 }
1665
1666 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1667 {
1668 eio_dirent *i, *j;
1669
1670 for (i = dents + 1; i < dents + size; ++i)
1671 {
1672 eio_dirent value = *i;
1673
1674 for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
1675 j [1] = j [0];
1676
1677 j [1] = value;
1678 }
1679 }
1680}
1681
1682static void
1683eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1684{
1685 if (size <= 1)
1686 return; /* our insertion sort relies on size > 0 */
1687
1688 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1689 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1690 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1691
1692 /* use an insertion sort at the end, or for small arrays, */
1693 /* as insertion sort is more efficient for small partitions */
1694 eio_dent_insertion_sort (dents, size);
711} 1695}
712 1696
713/* read a full directory */ 1697/* read a full directory */
714static void 1698static void
715eio__scandir (eio_req *req, worker *self) 1699eio__scandir (eio_req *req)
716{ 1700{
1701 char *name, *names;
1702 int namesalloc = 4096 - sizeof (void *) * 4;
1703 int namesoffs = 0;
1704 int flags = req->int1;
1705 eio_dirent *dents = 0;
1706 int dentalloc = 128;
1707 int dentoffs = 0;
1708 eio_ino_t inode_bits = 0;
1709#ifdef _WIN32
1710 HANDLE dirp;
1711 WIN32_FIND_DATA entp;
1712#else
717 DIR *dirp; 1713 DIR *dirp;
718 union
719 {
720 EIO_STRUCT_DIRENT d;
721 char b [offsetof (EIO_STRUCT_DIRENT, d_name) + NAME_MAX + 1];
722 } *u;
723 EIO_STRUCT_DIRENT *entp; 1714 EIO_STRUCT_DIRENT *entp;
724 char *name, *names; 1715#endif
725 int memlen = 4096;
726 int memofs = 0;
727 int res = 0;
728 1716
729 X_LOCK (wrklock); 1717 req->result = -1;
730 self->dirp = dirp = opendir (req->ptr1);
731 self->dbuf = u = malloc (sizeof (*u));
732 req->flags |= EIO_FLAG_PTR2_FREE;
733 req->ptr2 = names = malloc (memlen);
734 X_UNLOCK (wrklock);
735 1718
736 if (dirp && u && names) 1719 if (!(flags & EIO_READDIR_DENTS))
737 for (;;) 1720 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1721
1722#ifdef _WIN32
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)
738 { 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
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);
1775
1776 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1777 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1778 req->ptr2 = names = malloc (namesalloc);
1779
1780 if (!names || (flags && !dents))
1781 return;
1782
1783 for (;;)
1784 {
1785 int done;
1786
1787#ifdef _WIN32
1788 done = !dirp;
1789#else
739 errno = 0; 1790 errno = 0;
740 readdir_r (dirp, &u->d, &entp); 1791 entp = readdir (dirp);
1792 done = !entp;
1793#endif
741 1794
1795 if (done)
1796 {
1797#ifndef _WIN32
1798 int old_errno = errno;
1799 closedir (dirp);
1800 errno = old_errno;
1801
742 if (!entp) 1802 if (errno)
1803 break;
1804#endif
1805
1806 /* sort etc. */
1807 req->int1 = flags;
1808 req->result = dentoffs;
1809
1810 if (flags & EIO_READDIR_STAT_ORDER)
1811 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1812 else if (flags & EIO_READDIR_DIRS_FIRST)
1813 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1814 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
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
743 break; 1839 break;
1840 }
744 1841
745 name = entp->d_name; 1842 /* now add the entry to our list(s) */
1843 name = D_NAME (entp);
746 1844
1845 /* skip . and .. entries */
747 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1846 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
748 { 1847 {
749 int len = strlen (name) + 1; 1848 int len = D_NAMLEN (entp) + 1;
750 1849
751 res++; 1850 while (ecb_expect_false (namesoffs + len > namesalloc))
752
753 while (memofs + len > memlen)
754 { 1851 {
755 memlen *= 2; 1852 namesalloc *= 2;
756 X_LOCK (wrklock);
757 req->ptr2 = names = realloc (names, memlen); 1853 req->ptr2 = names = realloc (names, namesalloc);
758 X_UNLOCK (wrklock);
759 1854
760 if (!names) 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))
1866 {
1867 dentalloc *= 2;
1868 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1869
1870 if (!dents)
761 break; 1871 break;
762 } 1872 }
763 1873
764 memcpy (names + memofs, name, len); 1874 ent = dents + dentoffs;
765 memofs += len; 1875
1876 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1877 ent->namelen = len - 1;
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)
1938 {
1939 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1940 ent->score = 1;
1941 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1942 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1943 }
1944 else if (ent->type == EIO_DT_DIR)
1945 ent->score = 0;
1946 }
766 } 1947 }
1948
1949 namesoffs += len;
1950 ++dentoffs;
767 } 1951 }
768 1952
769 if (errno) 1953 if (EIO_CANCELLED (req))
770 res = -1; 1954 {
1955 errno = ECANCELED;
1956 break;
1957 }
1958
1959#ifdef _WIN32
1960 if (!FindNextFile (dirp, &entp))
1961 {
1962 FindClose (dirp);
1963 dirp = 0;
1964 }
1965#endif
1966 }
1967}
1968
1969/*****************************************************************************/
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
2032#else
2033
2034/* on legacy systems, we represent the working directories simply by their path strings */
2035
2036static const char *
2037wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2038{
2039 if (!wd || *path == '/')
2040 return path;
2041
771 2042 {
772 req->result = res; 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 }
773} 2054}
2055
2056static eio_wd
2057eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2058{
2059 if (*path == '/') /* absolute paths ignore wd */
2060 path = strdup (path);
2061 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2062 return wd;
2063 else
2064 {
2065 int len = eio__realpath (tmpbuf, wd, path);
2066
2067 path = EIO_INVALID_WD;
2068
2069 if (len >= 0)
2070 {
2071 ((char *)tmpbuf->ptr)[len] = 0;
2072 path = strdup (tmpbuf->ptr);
2073 }
2074 }
2075
2076 if (!path)
2077 path = EIO_INVALID_WD;
2078
2079 return (eio_wd)path;
2080}
2081
2082eio_wd
2083eio_wd_open_sync (eio_wd wd, const char *path)
2084{
2085 struct tmpbuf tmpbuf = { 0 };
2086 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2087 free (tmpbuf.ptr);
2088
2089 return wd;
2090}
2091
2092void
2093eio_wd_close_sync (eio_wd wd)
2094{
2095 if (wd != EIO_INVALID_WD)
2096 free (wd);
2097}
2098
2099#endif
774 2100
775/*****************************************************************************/ 2101/*****************************************************************************/
776 2102
777#define ALLOC(len) \ 2103#define ALLOC(len) \
778 if (!req->ptr2) \ 2104 if (!req->ptr2) \
… …
787 req->result = -1; \ 2113 req->result = -1; \
788 break; \ 2114 break; \
789 } \ 2115 } \
790 } 2116 }
791 2117
792X_THREAD_PROC (eio_proc) 2118X_THREAD_PROC (etp_proc)
793{ 2119{
794 eio_req *req; 2120 ETP_REQ *req;
795 struct timespec ts; 2121 struct timespec ts;
796 worker *self = (worker *)thr_arg; 2122 etp_worker *self = (etp_worker *)thr_arg;
797 2123
2124#if HAVE_PRCTL_SET_NAME
2125 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2126#endif
2127
798 /* try to distribute timeouts somewhat randomly */ 2128 /* try to distribute timeouts somewhat evenly */
799 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 2129 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
800 2130
801 for (;;) 2131 for (;;)
802 { 2132 {
803 ts.tv_sec = time (0) + IDLE_TIMEOUT; 2133 ts.tv_sec = 0;
804 2134
805 X_LOCK (reqlock); 2135 X_LOCK (reqlock);
806 2136
807 for (;;) 2137 for (;;)
808 { 2138 {
809 self->req = req = reqq_shift (&req_queue); 2139 req = reqq_shift (&req_queue);
810 2140
811 if (req) 2141 if (req)
812 break; 2142 break;
813 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
814 ++idle; 2153 ++idle;
815 2154
816 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 2155 if (idle <= max_idle)
2156 /* we are allowed to idle, so do so without any timeout */
2157 X_COND_WAIT (reqwait, reqlock);
2158 else
817 { 2159 {
818 if (idle > max_idle) 2160 /* initialise timeout once */
819 { 2161 if (!ts.tv_sec)
820 --idle; 2162 ts.tv_sec = time (0) + idle_timeout;
821 X_UNLOCK (reqlock);
822 X_LOCK (wrklock);
823 --started;
824 X_UNLOCK (wrklock);
825 goto quit;
826 }
827 2163
828 /* we are allowed to idle, so do so without any timeout */
829 X_COND_WAIT (reqwait, reqlock); 2164 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
830 ts.tv_sec = time (0) + IDLE_TIMEOUT; 2165 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
831 } 2166 }
832 2167
833 --idle; 2168 --idle;
834 } 2169 }
835 2170
836 --nready; 2171 --nready;
837 2172
838 X_UNLOCK (reqlock); 2173 X_UNLOCK (reqlock);
839 2174
840 errno = 0; /* strictly unnecessary */
841
842 if (!EIO_CANCELLED (req))
843 switch (req->type) 2175 if (req->type < 0)
844 {
845 case EIO_READ: ALLOC (req->size);
846 req->result = req->offs >= 0
847 ? pread (req->int1, req->ptr2, req->size, req->offs)
848 : read (req->int1, req->ptr2, req->size); break;
849 case EIO_WRITE: req->result = req->offs >= 0
850 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
851 : write (req->int1, req->ptr2, req->size); break;
852
853 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
854 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
855
856 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
857 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
858 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
859 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
860 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
861 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
862
863 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
864 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
865 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
866 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
867 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
868 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
869
870 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
871 case EIO_CLOSE: req->result = close (req->int1); break;
872 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
873 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
874 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
875 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
876 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
877 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
878 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
879 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
880
881 case EIO_READLINK: ALLOC (NAME_MAX);
882 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
883
884 case EIO_SYNC: req->result = 0; sync (); break;
885 case EIO_FSYNC: req->result = fsync (req->int1); break;
886 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
887
888 case EIO_READDIR: eio__scandir (req, self); break;
889
890 case EIO_BUSY:
891#ifdef _WIN32
892 Sleep (req->nv1 * 1000.);
893#else
894 {
895 struct timeval tv;
896
897 tv.tv_sec = req->nv1;
898 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
899
900 req->result = select (0, 0, 0, 0, &tv);
901 }
902#endif
903 break;
904
905 case EIO_UTIME:
906 case EIO_FUTIME:
907 {
908 struct timeval tv[2];
909 struct timeval *times;
910
911 if (req->nv1 != -1. || req->nv2 != -1.)
912 {
913 tv[0].tv_sec = req->nv1;
914 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
915 tv[1].tv_sec = req->nv2;
916 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
917
918 times = tv;
919 }
920 else
921 times = 0;
922
923
924 req->result = req->type == EIO_FUTIME
925 ? futimes (req->int1, times)
926 : utimes (req->ptr1, times);
927 }
928
929 case EIO_GROUP:
930 case EIO_NOP:
931 req->result = 0;
932 break;
933
934 case EIO_QUIT:
935 goto quit; 2176 goto quit;
936 2177
937 default: 2178 ETP_EXECUTE (self, req);
938 req->result = -1;
939 break;
940 }
941
942 req->errorno = errno;
943 2179
944 X_LOCK (reslock); 2180 X_LOCK (reslock);
945 2181
946 ++npending; 2182 ++npending;
947 2183
948 if (!reqq_push (&res_queue, req) && want_poll_cb) 2184 if (!reqq_push (&res_queue, req) && want_poll_cb)
949 want_poll_cb (); 2185 want_poll_cb ();
950 2186
951 self->req = 0;
952 worker_clear (self); 2187 etp_worker_clear (self);
953 2188
954 X_UNLOCK (reslock); 2189 X_UNLOCK (reslock);
955 } 2190 }
956 2191
957quit: 2192quit:
2193 free (req);
2194
958 X_LOCK (wrklock); 2195 X_LOCK (wrklock);
959 worker_free (self); 2196 etp_worker_free (self);
960 X_UNLOCK (wrklock); 2197 X_UNLOCK (wrklock);
961 2198
962 return 0; 2199 return 0;
963} 2200}
964 2201
965/*****************************************************************************/ 2202/*****************************************************************************/
966 2203
967static void eio_atfork_prepare (void) 2204int ecb_cold
2205eio_init (void (*want_poll)(void), void (*done_poll)(void))
968{ 2206{
969 X_LOCK (wrklock);
970 X_LOCK (reqlock);
971 X_LOCK (reslock);
972#if !HAVE_PREADWRITE 2207#if !HAVE_PREADWRITE
973 X_LOCK (preadwritelock);
974#endif
975#if !HAVE_READDIR_R
976 X_LOCK (readdirlock);
977#endif
978}
979
980static void eio_atfork_parent (void)
981{
982#if !HAVE_READDIR_R
983 X_UNLOCK (readdirlock);
984#endif
985#if !HAVE_PREADWRITE
986 X_UNLOCK (preadwritelock);
987#endif
988 X_UNLOCK (reslock);
989 X_UNLOCK (reqlock);
990 X_UNLOCK (wrklock);
991}
992
993static void eio_atfork_child (void)
994{
995 eio_req *prv;
996
997 while (prv = reqq_shift (&req_queue))
998 eio_destroy (prv);
999
1000 while (prv = reqq_shift (&res_queue))
1001 eio_destroy (prv);
1002
1003 while (wrk_first.next != &wrk_first)
1004 {
1005 worker *wrk = wrk_first.next;
1006
1007 if (wrk->req)
1008 eio_destroy (wrk->req);
1009
1010 worker_clear (wrk);
1011 worker_free (wrk);
1012 }
1013
1014 started = 0;
1015 idle = 0;
1016 nreqs = 0;
1017 nready = 0;
1018 npending = 0;
1019
1020 eio_atfork_parent ();
1021}
1022
1023int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1024{
1025 want_poll_cb = want_poll;
1026 done_poll_cb = done_poll;
1027
1028#ifdef _WIN32
1029 X_MUTEX_CHECK (wrklock);
1030 X_MUTEX_CHECK (reslock);
1031 X_MUTEX_CHECK (reqlock);
1032 X_MUTEX_CHECK (reqwait);
1033 X_MUTEX_CHECK (preadwritelock); 2208 X_MUTEX_CREATE (preadwritelock);
1034 X_MUTEX_CHECK (readdirlock);
1035
1036 X_COND_CHECK (reqwait);
1037#endif 2209#endif
1038 2210
1039 X_THREAD_ATFORK (eio_atfork_prepare, eio_atfork_parent, eio_atfork_child); 2211 return etp_init (want_poll, done_poll);
1040} 2212}
1041 2213
2214ecb_inline void
1042static void eio_api_destroy (eio_req *req) 2215eio_api_destroy (eio_req *req)
1043{ 2216{
1044 free (req); 2217 free (req);
1045} 2218}
1046 2219
1047#define REQ(rtype) \ 2220#define REQ(rtype) \
… …
1049 \ 2222 \
1050 req = (eio_req *)calloc (1, sizeof *req); \ 2223 req = (eio_req *)calloc (1, sizeof *req); \
1051 if (!req) \ 2224 if (!req) \
1052 return 0; \ 2225 return 0; \
1053 \ 2226 \
1054 req->type = rtype; \ 2227 req->type = rtype; \
1055 req->pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 2228 req->pri = pri; \
1056 req->finish = cb; \ 2229 req->finish = cb; \
2230 req->data = data; \
1057 req->destroy = eio_api_destroy; 2231 req->destroy = eio_api_destroy;
1058 2232
1059#define SEND eio_submit (req); return req 2233#define SEND eio_submit (req); return req
1060 2234
1061#define PATH \ 2235#define PATH \
… …
1065 { \ 2239 { \
1066 eio_api_destroy (req); \ 2240 eio_api_destroy (req); \
1067 return 0; \ 2241 return 0; \
1068 } 2242 }
1069 2243
1070eio_req *eio_nop (eio_cb cb) 2244static void
2245eio_execute (etp_worker *self, eio_req *req)
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
2276 switch (req->type)
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
2284 case EIO_READ: ALLOC (req->size);
2285 req->result = req->offs >= 0
2286 ? pread (req->int1, req->ptr2, req->size, req->offs)
2287 : read (req->int1, req->ptr2, req->size); break;
2288 case EIO_WRITE: req->result = req->offs >= 0
2289 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2290 : write (req->int1, req->ptr2, req->size); break;
2291
2292 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2293 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2294
2295#if HAVE_AT
2296
2297 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2298 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
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));
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
2397 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2398 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2399
2400 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2401 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2402
2403 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2404 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2405 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2406
2407 case EIO_CLOSE: req->result = close (req->int1); break;
2408 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2409 case EIO_SYNC: req->result = 0; sync (); break;
2410 case EIO_FSYNC: req->result = fsync (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;
2414 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
2415 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2416 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2417 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2418 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2419
2420 case EIO_READDIR: eio__scandir (req); break;
2421
2422 case EIO_BUSY:
2423#ifdef _WIN32
2424 Sleep (req->nv1 * 1e3);
2425#else
2426 {
2427 struct timeval tv;
2428
2429 tv.tv_sec = req->nv1;
2430 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
2431
2432 req->result = select (0, 0, 0, 0, &tv);
2433 }
2434#endif
2435 break;
2436
2437 case EIO_GROUP:
2438 abort (); /* handled in eio_request */
2439
2440 case EIO_NOP:
2441 req->result = 0;
2442 break;
2443
2444 case EIO_CUSTOM:
2445 req->feed (req);
2446 break;
2447
2448 default:
2449 errno = ENOSYS;
2450 req->result = -1;
2451 break;
2452 }
2453
2454 req->errorno = errno;
2455}
2456
2457#ifndef EIO_NO_WRAPPERS
2458
2459eio_req *eio_nop (int pri, eio_cb cb, void *data)
1071{ 2460{
1072 REQ (EIO_NOP); SEND; 2461 REQ (EIO_NOP); SEND;
1073} 2462}
1074 2463
1075eio_req *eio_busy (double delay, eio_cb cb) 2464eio_req *eio_busy (double delay, int pri, eio_cb cb, void *data)
1076{ 2465{
1077 REQ (EIO_BUSY); req->nv1 = delay; SEND; 2466 REQ (EIO_BUSY); req->nv1 = delay; SEND;
1078} 2467}
1079 2468
1080eio_req *eio_sync (eio_cb cb) 2469eio_req *eio_sync (int pri, eio_cb cb, void *data)
1081{ 2470{
1082 REQ (EIO_SYNC); SEND; 2471 REQ (EIO_SYNC); SEND;
1083} 2472}
1084 2473
1085eio_req *eio_fsync (int fd, eio_cb cb) 2474eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data)
1086{ 2475{
1087 REQ (EIO_FSYNC); req->int1 = fd; SEND; 2476 REQ (EIO_FSYNC); req->int1 = fd; SEND;
1088} 2477}
1089 2478
2479eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2480{
2481 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2482}
2483
1090eio_req *eio_fdatasync (int fd, eio_cb cb) 2484eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1091{ 2485{
1092 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2486 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1093} 2487}
1094 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
2499eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
2500{
2501 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
2502}
2503
2504eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
2505{
2506 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
2507}
2508
2509eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
2510{
2511 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
2512}
2513
2514eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2515{
2516 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2517}
2518
1095eio_req *eio_close (int fd, eio_cb cb) 2519eio_req *eio_close (int fd, int pri, eio_cb cb, void *data)
1096{ 2520{
1097 REQ (EIO_CLOSE); req->int1 = fd; SEND; 2521 REQ (EIO_CLOSE); req->int1 = fd; SEND;
1098} 2522}
1099 2523
1100eio_req *eio_readahead (int fd, off_t offset, size_t length, eio_cb cb) 2524eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
1101{ 2525{
1102 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2526 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
1103} 2527}
1104 2528
1105eio_req *eio_read (int fd, void *data, size_t length, off_t offset, eio_cb cb) 2529eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1106{ 2530{
1107 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = data; SEND; 2531 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1108} 2532}
1109 2533
1110eio_req *eio_write (int fd, void *data, size_t length, off_t offset, eio_cb cb) 2534eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1111{ 2535{
1112 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = data; SEND; 2536 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1113} 2537}
1114 2538
1115eio_req *eio_fstat (int fd, eio_cb cb) 2539eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1116{ 2540{
1117 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2541 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1118} 2542}
1119 2543
2544eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
2545{
2546 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
2547}
2548
1120eio_req *eio_futime (int fd, double atime, double mtime, eio_cb cb) 2549eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1121{ 2550{
1122 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 2551 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1123} 2552}
1124 2553
1125eio_req *eio_ftruncate (int fd, off_t offset, eio_cb cb) 2554eio_req *eio_ftruncate (int fd, off_t offset, int pri, eio_cb cb, void *data)
1126{ 2555{
1127 REQ (EIO_FTRUNCATE); req->int1 = fd; req->offs = offset; SEND; 2556 REQ (EIO_FTRUNCATE); req->int1 = fd; req->offs = offset; SEND;
1128} 2557}
1129 2558
1130eio_req *eio_fchmod (int fd, mode_t mode, eio_cb cb) 2559eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1131{ 2560{
1132 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2561 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1133} 2562}
1134 2563
1135eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, eio_cb cb) 2564eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1136{ 2565{
1137 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;
1138} 2567}
1139 2568
1140eio_req *eio_dup2 (int fd, int fd2, eio_cb cb) 2569eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
1141{ 2570{
1142 REQ (EIO_DUP2); req->int1 = fd; req->int2 = fd2; SEND; 2571 REQ (EIO_DUP2); req->int1 = fd; req->int2 = fd2; SEND;
1143} 2572}
1144 2573
1145eio_req *eio_sendfile (int out_fd, int in_fd, off_t in_offset, size_t length, eio_cb cb) 2574eio_req *eio_sendfile (int out_fd, int in_fd, off_t in_offset, size_t length, int pri, eio_cb cb, void *data)
1146{ 2575{
1147 REQ (EIO_SENDFILE); req->int1 = out_fd; req->int2 = in_fd; req->offs = in_offset; req->size = length; SEND; 2576 REQ (EIO_SENDFILE); req->int1 = out_fd; req->int2 = in_fd; req->offs = in_offset; req->size = length; SEND;
1148} 2577}
1149 2578
1150eio_req *eio_open (const char *path, int flags, mode_t mode, eio_cb cb) 2579eio_req *eio_open (const char *path, int flags, mode_t mode, int pri, eio_cb cb, void *data)
1151{ 2580{
1152 REQ (EIO_OPEN); PATH; req->int1 = flags; req->int2 = (long)mode; SEND; 2581 REQ (EIO_OPEN); PATH; req->int1 = flags; req->int2 = (long)mode; SEND;
1153} 2582}
1154 2583
1155eio_req *eio_utime (const char *path, double atime, double mtime, eio_cb cb) 2584eio_req *eio_utime (const char *path, double atime, double mtime, int pri, eio_cb cb, void *data)
1156{ 2585{
1157 REQ (EIO_UTIME); PATH; req->nv1 = atime; req->nv2 = mtime; SEND; 2586 REQ (EIO_UTIME); PATH; req->nv1 = atime; req->nv2 = mtime; SEND;
1158} 2587}
1159 2588
1160eio_req *eio_truncate (const char *path, off_t offset, eio_cb cb) 2589eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1161{ 2590{
1162 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2591 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1163} 2592}
1164 2593
1165eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, eio_cb cb) 2594eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1166{ 2595{
1167 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;
1168} 2597}
1169 2598
1170eio_req *eio_chmod (const char *path, mode_t mode, eio_cb cb) 2599eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
1171{ 2600{
1172 REQ (EIO_CHMOD); PATH; req->int2 = (long)mode; SEND; 2601 REQ (EIO_CHMOD); PATH; req->int2 = (long)mode; SEND;
1173} 2602}
1174 2603
1175eio_req *eio_mkdir (const char *path, mode_t mode, eio_cb cb) 2604eio_req *eio_mkdir (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
1176{ 2605{
1177 REQ (EIO_MKDIR); PATH; req->int2 = (long)mode; SEND; 2606 REQ (EIO_MKDIR); PATH; req->int2 = (long)mode; SEND;
1178} 2607}
1179 2608
1180static eio_req * 2609static eio_req *
1181eio__1path (int type, const char *path, eio_cb cb) 2610eio__1path (int type, const char *path, int pri, eio_cb cb, void *data)
1182{ 2611{
1183 REQ (type); PATH; SEND; 2612 REQ (type); PATH; SEND;
1184} 2613}
1185 2614
1186eio_req *eio_readlink (const char *path, eio_cb cb) 2615eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1187{ 2616{
1188 return eio__1path (EIO_READLINK, path, cb); 2617 return eio__1path (EIO_READLINK, path, pri, cb, data);
1189} 2618}
1190 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);
2623}
2624
1191eio_req *eio_stat (const char *path, eio_cb cb) 2625eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1192{ 2626{
1193 return eio__1path (EIO_STAT, path, cb); 2627 return eio__1path (EIO_STAT, path, pri, cb, data);
1194} 2628}
1195 2629
1196eio_req *eio_lstat (const char *path, eio_cb cb) 2630eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1197{ 2631{
1198 return eio__1path (EIO_LSTAT, path, cb); 2632 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1199} 2633}
1200 2634
2635eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
2636{
2637 return eio__1path (EIO_STATVFS, path, pri, cb, data);
2638}
2639
1201eio_req *eio_unlink (const char *path, eio_cb cb) 2640eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1202{ 2641{
1203 return eio__1path (EIO_UNLINK, path, cb); 2642 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1204} 2643}
1205 2644
1206eio_req *eio_rmdir (const char *path, eio_cb cb) 2645eio_req *eio_rmdir (const char *path, int pri, eio_cb cb, void *data)
1207{ 2646{
1208 return eio__1path (EIO_RMDIR, path, cb); 2647 return eio__1path (EIO_RMDIR, path, pri, cb, data);
1209} 2648}
1210 2649
1211eio_req *eio_readdir (const char *path, eio_cb cb) 2650eio_req *eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data)
1212{ 2651{
1213 return eio__1path (EIO_READDIR, path, cb); 2652 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1214} 2653}
1215 2654
1216eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, eio_cb cb) 2655eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1217{ 2656{
1218 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 2657 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1219} 2658}
1220 2659
1221static eio_req * 2660static eio_req *
1222eio__2path (int type, const char *path, const char *new_path, eio_cb cb) 2661eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1223{ 2662{
1224 REQ (type); PATH; 2663 REQ (type); PATH;
1225 2664
1226 req->flags |= EIO_FLAG_PTR2_FREE; 2665 req->flags |= EIO_FLAG_PTR2_FREE;
1227 req->ptr2 = strdup (new_path); 2666 req->ptr2 = strdup (new_path);
… …
1232 } 2671 }
1233 2672
1234 SEND; 2673 SEND;
1235} 2674}
1236 2675
1237eio_req *eio_link (const char *path, const char *new_path, eio_cb cb) 2676eio_req *eio_link (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1238{ 2677{
1239 return eio__2path (EIO_LINK, path, new_path, cb); 2678 return eio__2path (EIO_LINK, path, new_path, pri, cb, data);
1240} 2679}
1241 2680
1242eio_req *eio_symlink (const char *path, const char *new_path, eio_cb cb) 2681eio_req *eio_symlink (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1243{ 2682{
1244 return eio__2path (EIO_SYMLINK, path, new_path, cb); 2683 return eio__2path (EIO_SYMLINK, path, new_path, pri, cb, data);
1245} 2684}
1246 2685
1247eio_req *eio_rename (const char *path, const char *new_path, eio_cb cb) 2686eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1248{ 2687{
1249 return eio__2path (EIO_RENAME, path, new_path, cb); 2688 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2689}
2690
2691eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2692{
2693 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2694}
2695
2696#endif
2697
2698eio_req *eio_grp (eio_cb cb, void *data)
2699{
2700 const int pri = EIO_PRI_MAX;
2701
2702 REQ (EIO_GROUP); SEND;
1250} 2703}
1251 2704
1252#undef REQ 2705#undef REQ
1253#undef PATH 2706#undef PATH
1254#undef SEND 2707#undef SEND
1255 2708
1256/*****************************************************************************/ 2709/*****************************************************************************/
1257/* grp functions */ 2710/* grp functions */
1258 2711
2712void
1259void 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)
1260{ 2714{
1261 grp->int2 = limit; 2715 grp->int2 = limit;
1262 grp->feed = feed; 2716 grp->feed = feed;
1263 2717
1264 grp_try_feed (grp); 2718 grp_try_feed (grp);
1265} 2719}
1266 2720
2721void
1267void eio_grp_limit (eio_req *grp, int limit) 2722eio_grp_limit (eio_req *grp, int limit)
1268{ 2723{
1269 grp->int2 = limit; 2724 grp->int2 = limit;
1270 2725
1271 grp_try_feed (grp); 2726 grp_try_feed (grp);
1272} 2727}
1273 2728
2729void
1274void eio_grp_add (eio_req *grp, eio_req *req) 2730eio_grp_add (eio_req *grp, eio_req *req)
1275{ 2731{
1276 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));
2733
2734 grp->flags |= EIO_FLAG_GROUPADD;
1277 2735
1278 ++grp->size; 2736 ++grp->size;
1279 req->grp = grp; 2737 req->grp = grp;
1280 2738
1281 req->grp_prev = 0; 2739 req->grp_prev = 0;
… …
1288} 2746}
1289 2747
1290/*****************************************************************************/ 2748/*****************************************************************************/
1291/* misc garbage */ 2749/* misc garbage */
1292 2750
2751eio_ssize_t
1293ssize_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)
1294{ 2753{
1295 worker wrk;
1296
1297 wrk.dbuf = 0;
1298
1299 eio__sendfile (ofd, ifd, offset, count, &wrk); 2754 return eio__sendfile (ofd, ifd, offset, count);
1300
1301 if (wrk.dbuf)
1302 free (wrk.dbuf);
1303} 2755}
1304 2756

Diff Legend

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