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

Diff Legend

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