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.95 by root, Tue Jul 19 04:56:43 2011 UTC

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

Diff Legend

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