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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines