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

Diff Legend

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