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

Comparing libeio/eio.c (file contents):
Revision 1.62 by root, Tue Feb 15 03:15:16 2011 UTC vs.
Revision 1.101 by root, Wed Aug 3 15:25:38 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines