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

Diff Legend

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