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

Comparing libeio/eio.c (file contents):
Revision 1.27 by root, Wed Oct 22 18:15:36 2008 UTC vs.
Revision 1.94 by root, Mon Jul 18 02:59:58 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines