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

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

Diff Legend

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