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

Comparing libeio/eio.c (file contents):
Revision 1.33 by root, Sat Jun 6 19:44:17 2009 UTC vs.
Revision 1.93 by root, Mon Jul 18 01:27:03 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines