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

Comparing libeio/eio.c (file contents):
Revision 1.30 by root, Wed Jun 3 12:24:49 2009 UTC vs.
Revision 1.99 by root, Tue Jul 26 11:07:08 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines