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

Comparing libeio/eio.c (file contents):
Revision 1.49 by root, Sat Jan 2 14:24:32 2010 UTC vs.
Revision 1.98 by root, Sun Jul 24 05:53:34 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines