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

Comparing libeio/eio.c (file contents):
Revision 1.61 by root, Fri Feb 11 00:53:24 2011 UTC vs.
Revision 1.86 by root, Thu Jul 14 18:30:10 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#include <sys/statvfs.h>
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes from stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H
67# include <stdint.h>
68#endif
69
70#ifndef ECANCELED
71# define ECANCELED EDOM
72#endif
73
74static void eio_destroy (eio_req *req);
75
59#ifndef EIO_FINISH 76#ifndef EIO_FINISH
60# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 77# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
61#endif 78#endif
62 79
63#ifndef EIO_DESTROY 80#ifndef EIO_DESTROY
66 83
67#ifndef EIO_FEED 84#ifndef EIO_FEED
68# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 85# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
69#endif 86#endif
70 87
88#ifndef EIO_FD_TO_WIN32_HANDLE
89# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
90#endif
91#ifndef EIO_WIN32_HANDLE_TO_FD
92# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
93#endif
94
95#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
96
97#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
98
71#ifdef _WIN32 99#ifdef _WIN32
72 100
73 /*doh*/ 101 #define PAGESIZE 4096 /* GetSystemInfo? */
102
103 #define stat(path,buf) _stati64 (path,buf)
104 #define lstat(path,buf) stat (path,buf)
105 #define fstat(fd,buf) _fstati64 (path,buf)
106 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
107 #define mkdir(path,mode) _mkdir (path)
108 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
109
110 #define chown(path,uid,gid) EIO_ENOSYS ()
111 #define fchown(fd,uid,gid) EIO_ENOSYS ()
112 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
113 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
114 #define mknod(path,mode,dev) EIO_ENOSYS ()
115 #define sync() EIO_ENOSYS ()
116
117 /* we could even stat and see if it exists */
118 static int
119 symlink (const char *old, const char *neu)
120 {
121 if (CreateSymbolicLink (neu, old, 1))
122 return 0;
123
124 if (CreateSymbolicLink (neu, old, 0))
125 return 0;
126
127 return EIO_ERRNO (ENOENT, -1);
128 }
129
74#else 130#else
75 131
76# include "config.h"
77# include <sys/time.h> 132 #include <sys/time.h>
78# include <sys/select.h> 133 #include <sys/select.h>
134 #include <sys/statvfs.h>
79# include <unistd.h> 135 #include <unistd.h>
80# include <utime.h> 136 #include <utime.h>
81# include <signal.h> 137 #include <signal.h>
82# include <dirent.h> 138 #include <dirent.h>
83 139
84#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 140 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h> 141 #include <sys/mman.h>
86#endif 142 #endif
87 143
88/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 144 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 145 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
90# define _DIRENT_HAVE_D_TYPE /* sigh */ 146 #define _DIRENT_HAVE_D_TYPE /* sigh */
91# define D_INO(de) (de)->d_fileno 147 #define D_INO(de) (de)->d_fileno
92# define D_NAMLEN(de) (de)->d_namlen 148 #define D_NAMLEN(de) (de)->d_namlen
93# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 149 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
94# define D_INO(de) (de)->d_ino 150 #define D_INO(de) (de)->d_ino
95# endif 151 #endif
96 152
97#ifdef _D_EXACT_NAMLEN 153 #ifdef _D_EXACT_NAMLEN
98# undef D_NAMLEN 154 #undef D_NAMLEN
99# define D_NAMLEN(de) _D_EXACT_NAMLEN (de) 155 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
100#endif 156 #endif
101 157
102# ifdef _DIRENT_HAVE_D_TYPE 158 #ifdef _DIRENT_HAVE_D_TYPE
103# define D_TYPE(de) (de)->d_type 159 #define D_TYPE(de) (de)->d_type
104# endif 160 #endif
105 161
106# ifndef EIO_STRUCT_DIRENT 162 #ifndef EIO_STRUCT_DIRENT
107# define EIO_STRUCT_DIRENT struct dirent 163 #define EIO_STRUCT_DIRENT struct dirent
108# endif 164 #endif
109 165
110#endif 166#endif
111 167
112#if HAVE_SENDFILE 168#if HAVE_SENDFILE
113# if __linux 169# if __linux
132#endif 188#endif
133#ifndef D_NAMLEN 189#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name) 190# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif 191#endif
136 192
137/* number of seconds after which an idle threads exit */
138#define IDLE_TIMEOUT 10
139
140/* used for struct dirent, AIX doesn't provide it */ 193/* used for struct dirent, AIX doesn't provide it */
141#ifndef NAME_MAX 194#ifndef NAME_MAX
142# define NAME_MAX 4096 195# define NAME_MAX 4096
143#endif 196#endif
144 197
158 errno = ENOMEM; \ 211 errno = ENOMEM; \
159 if (!eio_buf) \ 212 if (!eio_buf) \
160 return -1; 213 return -1;
161 214
162#define EIO_TICKS ((1000000 + 1023) >> 10) 215#define EIO_TICKS ((1000000 + 1023) >> 10)
163
164/*****************************************************************************/
165
166#if __GNUC__ >= 3
167# define expect(expr,value) __builtin_expect ((expr),(value))
168#else
169# define expect(expr,value) (expr)
170#endif
171
172#define expect_false(expr) expect ((expr) != 0, 0)
173#define expect_true(expr) expect ((expr) != 0, 1)
174
175/*****************************************************************************/
176 216
177#define ETP_PRI_MIN EIO_PRI_MIN 217#define ETP_PRI_MIN EIO_PRI_MIN
178#define ETP_PRI_MAX EIO_PRI_MAX 218#define ETP_PRI_MAX EIO_PRI_MAX
179 219
180struct etp_worker; 220struct etp_worker;
206/*****************************************************************************/ 246/*****************************************************************************/
207 247
208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 248#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
209 249
210/* calculate time difference in ~1/EIO_TICKS of a second */ 250/* calculate time difference in ~1/EIO_TICKS of a second */
251ecb_inline int
211static int tvdiff (struct timeval *tv1, struct timeval *tv2) 252tvdiff (struct timeval *tv1, struct timeval *tv2)
212{ 253{
213 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 254 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
214 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 255 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
215} 256}
216 257
223static unsigned int max_poll_reqs; /* reslock */ 264static unsigned int max_poll_reqs; /* reslock */
224 265
225static volatile unsigned int nreqs; /* reqlock */ 266static volatile unsigned int nreqs; /* reqlock */
226static volatile unsigned int nready; /* reqlock */ 267static volatile unsigned int nready; /* reqlock */
227static volatile unsigned int npending; /* reqlock */ 268static volatile unsigned int npending; /* reqlock */
228static volatile unsigned int max_idle = 4; 269static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
270static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
229 271
230static xmutex_t wrklock = X_MUTEX_INIT; 272static xmutex_t wrklock;
231static xmutex_t reslock = X_MUTEX_INIT; 273static xmutex_t reslock;
232static xmutex_t reqlock = X_MUTEX_INIT; 274static xmutex_t reqlock;
233static xcond_t reqwait = X_COND_INIT; 275static xcond_t reqwait;
234 276
235#if !HAVE_PREADWRITE 277#if !HAVE_PREADWRITE
236/* 278/*
237 * make our pread/pwrite emulation safe against themselves, but not against 279 * make our pread/pwrite emulation safe against themselves, but not against
238 * normal read/write by using a mutex. slows down execution a lot, 280 * normal read/write by using a mutex. slows down execution a lot,
259#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 301#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
260#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 302#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
261 303
262/* worker threads management */ 304/* worker threads management */
263 305
306static void ecb_cold
264static void etp_worker_clear (etp_worker *wrk) 307etp_worker_clear (etp_worker *wrk)
265{ 308{
266 ETP_WORKER_CLEAR (wrk); 309 ETP_WORKER_CLEAR (wrk);
267} 310}
268 311
312static void ecb_cold
269static void etp_worker_free (etp_worker *wrk) 313etp_worker_free (etp_worker *wrk)
270{ 314{
271 wrk->next->prev = wrk->prev; 315 wrk->next->prev = wrk->prev;
272 wrk->prev->next = wrk->next; 316 wrk->prev->next = wrk->next;
273 317
274 free (wrk); 318 free (wrk);
275} 319}
276 320
277static unsigned int etp_nreqs (void) 321static unsigned int
322etp_nreqs (void)
278{ 323{
279 int retval; 324 int retval;
280 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 325 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
281 retval = nreqs; 326 retval = nreqs;
282 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 327 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
283 return retval; 328 return retval;
284} 329}
285 330
286static unsigned int etp_nready (void) 331static unsigned int
332etp_nready (void)
287{ 333{
288 unsigned int retval; 334 unsigned int retval;
289 335
290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 336 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
291 retval = nready; 337 retval = nready;
292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 338 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
293 339
294 return retval; 340 return retval;
295} 341}
296 342
297static unsigned int etp_npending (void) 343static unsigned int
344etp_npending (void)
298{ 345{
299 unsigned int retval; 346 unsigned int retval;
300 347
301 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 348 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
302 retval = npending; 349 retval = npending;
303 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 350 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
304 351
305 return retval; 352 return retval;
306} 353}
307 354
308static unsigned int etp_nthreads (void) 355static unsigned int
356etp_nthreads (void)
309{ 357{
310 unsigned int retval; 358 unsigned int retval;
311 359
312 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 360 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
313 retval = started; 361 retval = started;
327} etp_reqq; 375} etp_reqq;
328 376
329static etp_reqq req_queue; 377static etp_reqq req_queue;
330static etp_reqq res_queue; 378static etp_reqq res_queue;
331 379
380static int ecb_noinline
332static int reqq_push (etp_reqq *q, ETP_REQ *req) 381reqq_push (etp_reqq *q, ETP_REQ *req)
333{ 382{
334 int pri = req->pri; 383 int pri = req->pri;
335 req->next = 0; 384 req->next = 0;
336 385
337 if (q->qe[pri]) 386 if (q->qe[pri])
343 q->qe[pri] = q->qs[pri] = req; 392 q->qe[pri] = q->qs[pri] = req;
344 393
345 return q->size++; 394 return q->size++;
346} 395}
347 396
397static ETP_REQ * ecb_noinline
348static ETP_REQ *reqq_shift (etp_reqq *q) 398reqq_shift (etp_reqq *q)
349{ 399{
350 int pri; 400 int pri;
351 401
352 if (!q->size) 402 if (!q->size)
353 return 0; 403 return 0;
368 } 418 }
369 419
370 abort (); 420 abort ();
371} 421}
372 422
373static void etp_atfork_prepare (void) 423static void ecb_cold
424etp_thread_init (void)
374{ 425{
375 X_LOCK (wrklock);
376 X_LOCK (reqlock);
377 X_LOCK (reslock);
378#if !HAVE_PREADWRITE 426#if !HAVE_PREADWRITE
379 X_LOCK (preadwritelock); 427 X_MUTEX_CREATE (preadwritelock);
380#endif 428#endif
429 X_MUTEX_CREATE (wrklock);
430 X_MUTEX_CREATE (reslock);
431 X_MUTEX_CREATE (reqlock);
432 X_COND_CREATE (reqwait);
381} 433}
382 434
435static void ecb_cold
436etp_atfork_prepare (void)
437{
438}
439
440static void ecb_cold
383static void etp_atfork_parent (void) 441etp_atfork_parent (void)
384{ 442{
385#if !HAVE_PREADWRITE
386 X_UNLOCK (preadwritelock);
387#endif
388 X_UNLOCK (reslock);
389 X_UNLOCK (reqlock);
390 X_UNLOCK (wrklock);
391} 443}
392 444
445static void ecb_cold
393static void etp_atfork_child (void) 446etp_atfork_child (void)
394{ 447{
395 ETP_REQ *prv; 448 ETP_REQ *prv;
396 449
397 while ((prv = reqq_shift (&req_queue))) 450 while ((prv = reqq_shift (&req_queue)))
398 ETP_DESTROY (prv); 451 ETP_DESTROY (prv);
415 idle = 0; 468 idle = 0;
416 nreqs = 0; 469 nreqs = 0;
417 nready = 0; 470 nready = 0;
418 npending = 0; 471 npending = 0;
419 472
420 etp_atfork_parent (); 473 etp_thread_init ();
421} 474}
422 475
423static void 476static void ecb_cold
424etp_once_init (void) 477etp_once_init (void)
425{ 478{
479 etp_thread_init ();
426 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 480 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
427} 481}
428 482
429static int 483static int ecb_cold
430etp_init (void (*want_poll)(void), void (*done_poll)(void)) 484etp_init (void (*want_poll)(void), void (*done_poll)(void))
431{ 485{
432 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 486 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
433 487
434 pthread_once (&doinit, etp_once_init); 488 pthread_once (&doinit, etp_once_init);
439 return 0; 493 return 0;
440} 494}
441 495
442X_THREAD_PROC (etp_proc); 496X_THREAD_PROC (etp_proc);
443 497
498static void ecb_cold
444static void etp_start_thread (void) 499etp_start_thread (void)
445{ 500{
446 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 501 etp_worker *wrk = calloc (1, sizeof (etp_worker));
447 502
448 /*TODO*/ 503 /*TODO*/
449 assert (("unable to allocate worker thread data", wrk)); 504 assert (("unable to allocate worker thread data", wrk));
462 free (wrk); 517 free (wrk);
463 518
464 X_UNLOCK (wrklock); 519 X_UNLOCK (wrklock);
465} 520}
466 521
522static void
467static void etp_maybe_start_thread (void) 523etp_maybe_start_thread (void)
468{ 524{
469 if (expect_true (etp_nthreads () >= wanted)) 525 if (ecb_expect_true (etp_nthreads () >= wanted))
470 return; 526 return;
471 527
472 /* todo: maybe use idle here, but might be less exact */ 528 /* todo: maybe use idle here, but might be less exact */
473 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) 529 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
474 return; 530 return;
475 531
476 etp_start_thread (); 532 etp_start_thread ();
477} 533}
478 534
535static void ecb_cold
479static void etp_end_thread (void) 536etp_end_thread (void)
480{ 537{
481 eio_req *req = calloc (1, sizeof (eio_req)); 538 eio_req *req = calloc (1, sizeof (eio_req));
482 539
483 req->type = -1; 540 req->type = -1;
484 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 541 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
491 X_LOCK (wrklock); 548 X_LOCK (wrklock);
492 --started; 549 --started;
493 X_UNLOCK (wrklock); 550 X_UNLOCK (wrklock);
494} 551}
495 552
496static int etp_poll (void) 553static int
554etp_poll (void)
497{ 555{
498 unsigned int maxreqs; 556 unsigned int maxreqs;
499 unsigned int maxtime; 557 unsigned int maxtime;
500 struct timeval tv_start, tv_now; 558 struct timeval tv_start, tv_now;
501 559
531 589
532 X_LOCK (reqlock); 590 X_LOCK (reqlock);
533 --nreqs; 591 --nreqs;
534 X_UNLOCK (reqlock); 592 X_UNLOCK (reqlock);
535 593
536 if (expect_false (req->type == EIO_GROUP && req->size)) 594 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
537 { 595 {
538 req->int1 = 1; /* mark request as delayed */ 596 req->int1 = 1; /* mark request as delayed */
539 continue; 597 continue;
540 } 598 }
541 else 599 else
542 { 600 {
543 int res = ETP_FINISH (req); 601 int res = ETP_FINISH (req);
544 if (expect_false (res)) 602 if (ecb_expect_false (res))
545 return res; 603 return res;
546 } 604 }
547 605
548 if (expect_false (maxreqs && !--maxreqs)) 606 if (ecb_expect_false (maxreqs && !--maxreqs))
549 break; 607 break;
550 608
551 if (maxtime) 609 if (maxtime)
552 { 610 {
553 gettimeofday (&tv_now, 0); 611 gettimeofday (&tv_now, 0);
559 617
560 errno = EAGAIN; 618 errno = EAGAIN;
561 return -1; 619 return -1;
562} 620}
563 621
622static void
564static void etp_cancel (ETP_REQ *req) 623etp_cancel (ETP_REQ *req)
565{ 624{
566 X_LOCK (wrklock); 625 req->cancelled = 1;
567 req->flags |= EIO_FLAG_CANCELLED;
568 X_UNLOCK (wrklock);
569 626
570 eio_grp_cancel (req); 627 eio_grp_cancel (req);
571} 628}
572 629
630static void
573static void etp_submit (ETP_REQ *req) 631etp_submit (ETP_REQ *req)
574{ 632{
575 req->pri -= ETP_PRI_MIN; 633 req->pri -= ETP_PRI_MIN;
576 634
577 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 635 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
578 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 636 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
579 637
580 if (expect_false (req->type == EIO_GROUP)) 638 if (ecb_expect_false (req->type == EIO_GROUP))
581 { 639 {
582 /* I hope this is worth it :/ */ 640 /* I hope this is worth it :/ */
583 X_LOCK (reqlock); 641 X_LOCK (reqlock);
584 ++nreqs; 642 ++nreqs;
585 X_UNLOCK (reqlock); 643 X_UNLOCK (reqlock);
604 662
605 etp_maybe_start_thread (); 663 etp_maybe_start_thread ();
606 } 664 }
607} 665}
608 666
667static void ecb_cold
609static void etp_set_max_poll_time (double nseconds) 668etp_set_max_poll_time (double nseconds)
610{ 669{
611 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 670 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
612 max_poll_time = nseconds * EIO_TICKS; 671 max_poll_time = nseconds * EIO_TICKS;
613 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 672 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
614} 673}
615 674
675static void ecb_cold
616static void etp_set_max_poll_reqs (unsigned int maxreqs) 676etp_set_max_poll_reqs (unsigned int maxreqs)
617{ 677{
618 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 678 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
619 max_poll_reqs = maxreqs; 679 max_poll_reqs = maxreqs;
620 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 680 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
621} 681}
622 682
683static void ecb_cold
623static void etp_set_max_idle (unsigned int nthreads) 684etp_set_max_idle (unsigned int nthreads)
624{ 685{
625 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 686 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
626 max_idle = nthreads <= 0 ? 1 : nthreads; 687 max_idle = nthreads;
627 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 688 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
628} 689}
629 690
691static void ecb_cold
692etp_set_idle_timeout (unsigned int seconds)
693{
694 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
695 idle_timeout = seconds;
696 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
697}
698
699static void ecb_cold
630static void etp_set_min_parallel (unsigned int nthreads) 700etp_set_min_parallel (unsigned int nthreads)
631{ 701{
632 if (wanted < nthreads) 702 if (wanted < nthreads)
633 wanted = nthreads; 703 wanted = nthreads;
634} 704}
635 705
706static void ecb_cold
636static void etp_set_max_parallel (unsigned int nthreads) 707etp_set_max_parallel (unsigned int nthreads)
637{ 708{
638 if (wanted > nthreads) 709 if (wanted > nthreads)
639 wanted = nthreads; 710 wanted = nthreads;
640 711
641 while (started > wanted) 712 while (started > wanted)
642 etp_end_thread (); 713 etp_end_thread ();
643} 714}
644 715
645/*****************************************************************************/ 716/*****************************************************************************/
646 717
718static void
647static void grp_try_feed (eio_req *grp) 719grp_try_feed (eio_req *grp)
648{ 720{
649 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 721 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
650 { 722 {
651 grp->flags &= ~EIO_FLAG_GROUPADD; 723 grp->flags &= ~EIO_FLAG_GROUPADD;
652 724
659 break; 731 break;
660 } 732 }
661 } 733 }
662} 734}
663 735
736static int
664static int grp_dec (eio_req *grp) 737grp_dec (eio_req *grp)
665{ 738{
666 --grp->size; 739 --grp->size;
667 740
668 /* call feeder, if applicable */ 741 /* call feeder, if applicable */
669 grp_try_feed (grp); 742 grp_try_feed (grp);
673 return eio_finish (grp); 746 return eio_finish (grp);
674 else 747 else
675 return 0; 748 return 0;
676} 749}
677 750
751static void
678void eio_destroy (eio_req *req) 752eio_destroy (eio_req *req)
679{ 753{
680 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 754 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
681 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 755 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
682 756
683 EIO_DESTROY (req); 757 EIO_DESTROY (req);
684} 758}
685 759
760static int
686static int eio_finish (eio_req *req) 761eio_finish (eio_req *req)
687{ 762{
688 int res = EIO_FINISH (req); 763 int res = EIO_FINISH (req);
689 764
690 if (req->grp) 765 if (req->grp)
691 { 766 {
699 if (grp->grp_first == req) 774 if (grp->grp_first == req)
700 grp->grp_first = req->grp_next; 775 grp->grp_first = req->grp_next;
701 776
702 res2 = grp_dec (grp); 777 res2 = grp_dec (grp);
703 778
704 if (!res && res2) 779 if (!res)
705 res = res2; 780 res = res2;
706 } 781 }
707 782
708 eio_destroy (req); 783 eio_destroy (req);
709 784
710 return res; 785 return res;
711} 786}
712 787
788void
713void eio_grp_cancel (eio_req *grp) 789eio_grp_cancel (eio_req *grp)
714{ 790{
715 for (grp = grp->grp_first; grp; grp = grp->grp_next) 791 for (grp = grp->grp_first; grp; grp = grp->grp_next)
716 eio_cancel (grp); 792 eio_cancel (grp);
717} 793}
718 794
795void
719void eio_cancel (eio_req *req) 796eio_cancel (eio_req *req)
720{ 797{
721 etp_cancel (req); 798 etp_cancel (req);
722} 799}
723 800
801void
724void eio_submit (eio_req *req) 802eio_submit (eio_req *req)
725{ 803{
726 etp_submit (req); 804 etp_submit (req);
727} 805}
728 806
729unsigned int eio_nreqs (void) 807unsigned int
808eio_nreqs (void)
730{ 809{
731 return etp_nreqs (); 810 return etp_nreqs ();
732} 811}
733 812
734unsigned int eio_nready (void) 813unsigned int
814eio_nready (void)
735{ 815{
736 return etp_nready (); 816 return etp_nready ();
737} 817}
738 818
739unsigned int eio_npending (void) 819unsigned int
820eio_npending (void)
740{ 821{
741 return etp_npending (); 822 return etp_npending ();
742} 823}
743 824
744unsigned int eio_nthreads (void) 825unsigned int ecb_cold
826eio_nthreads (void)
745{ 827{
746 return etp_nthreads (); 828 return etp_nthreads ();
747} 829}
748 830
831void ecb_cold
749void eio_set_max_poll_time (double nseconds) 832eio_set_max_poll_time (double nseconds)
750{ 833{
751 etp_set_max_poll_time (nseconds); 834 etp_set_max_poll_time (nseconds);
752} 835}
753 836
837void ecb_cold
754void eio_set_max_poll_reqs (unsigned int maxreqs) 838eio_set_max_poll_reqs (unsigned int maxreqs)
755{ 839{
756 etp_set_max_poll_reqs (maxreqs); 840 etp_set_max_poll_reqs (maxreqs);
757} 841}
758 842
843void ecb_cold
759void eio_set_max_idle (unsigned int nthreads) 844eio_set_max_idle (unsigned int nthreads)
760{ 845{
761 etp_set_max_idle (nthreads); 846 etp_set_max_idle (nthreads);
762} 847}
763 848
849void ecb_cold
850eio_set_idle_timeout (unsigned int seconds)
851{
852 etp_set_idle_timeout (seconds);
853}
854
855void ecb_cold
764void eio_set_min_parallel (unsigned int nthreads) 856eio_set_min_parallel (unsigned int nthreads)
765{ 857{
766 etp_set_min_parallel (nthreads); 858 etp_set_min_parallel (nthreads);
767} 859}
768 860
861void ecb_cold
769void eio_set_max_parallel (unsigned int nthreads) 862eio_set_max_parallel (unsigned int nthreads)
770{ 863{
771 etp_set_max_parallel (nthreads); 864 etp_set_max_parallel (nthreads);
772} 865}
773 866
774int eio_poll (void) 867int eio_poll (void)
844#ifndef HAVE_FUTIMES 937#ifndef HAVE_FUTIMES
845 938
846# undef futimes 939# undef futimes
847# define futimes(fd,times) eio__futimes (fd, times) 940# define futimes(fd,times) eio__futimes (fd, times)
848 941
942static int
849static int eio__futimes (int fd, const struct timeval tv[2]) 943eio__futimes (int fd, const struct timeval tv[2])
850{ 944{
851 errno = ENOSYS; 945 errno = ENOSYS;
852 return -1; 946 return -1;
853} 947}
854 948
858# undef fdatasync 952# undef fdatasync
859# define fdatasync(fd) fsync (fd) 953# define fdatasync(fd) fsync (fd)
860#endif 954#endif
861 955
862/* sync_file_range always needs emulation */ 956/* sync_file_range always needs emulation */
863int 957static int
864eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 958eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
865{ 959{
866#if HAVE_SYNC_FILE_RANGE 960#if HAVE_SYNC_FILE_RANGE
867 int res; 961 int res;
868 962
885 /* even though we could play tricks with the flags, it's better to always 979 /* even though we could play tricks with the flags, it's better to always
886 * call fdatasync, as that matches the expectation of its users best */ 980 * call fdatasync, as that matches the expectation of its users best */
887 return fdatasync (fd); 981 return fdatasync (fd);
888} 982}
889 983
984static int
985eio__fallocate (int fd, int mode, off_t offset, size_t len)
986{
987#if HAVE_FALLOCATE
988 return fallocate (fd, mode, offset, len);
989#else
990 errno = ENOSYS;
991 return -1;
992#endif
993}
994
890#if !HAVE_READAHEAD 995#if !HAVE_READAHEAD
891# undef readahead 996# undef readahead
892# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 997# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
893 998
894static ssize_t 999static ssize_t
914 1019
915/* sendfile always needs emulation */ 1020/* sendfile always needs emulation */
916static ssize_t 1021static ssize_t
917eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1022eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
918{ 1023{
1024 ssize_t written = 0;
919 ssize_t res; 1025 ssize_t res;
920 1026
921 if (!count) 1027 if (!count)
922 return 0; 1028 return 0;
923 1029
1030 for (;;)
1031 {
1032#ifdef __APPLE__
1033# undef HAVE_SENDFILE /* broken, as everything on os x */
1034#endif
924#if HAVE_SENDFILE 1035#if HAVE_SENDFILE
925# if __linux 1036# if __linux
1037 off_t soffset = offset;
926 res = sendfile (ofd, ifd, &offset, count); 1038 res = sendfile (ofd, ifd, &soffset, count);
927 1039
928# elif __FreeBSD__ 1040# elif __FreeBSD__
929 /* 1041 /*
930 * Of course, the freebsd sendfile is a dire hack with no thoughts 1042 * Of course, the freebsd sendfile is a dire hack with no thoughts
931 * wasted on making it similar to other I/O functions. 1043 * wasted on making it similar to other I/O functions.
932 */ 1044 */
933 {
934 off_t sbytes; 1045 off_t sbytes;
935 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 1046 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
936 1047
937 #if 0 /* according to the manpage, this is correct, but broken behaviour */ 1048 #if 0 /* according to the manpage, this is correct, but broken behaviour */
938 /* freebsd' sendfile will return 0 on success */ 1049 /* freebsd' sendfile will return 0 on success */
939 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ 1050 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
940 /* not on e.g. EIO or EPIPE - sounds broken */ 1051 /* not on e.g. EIO or EPIPE - sounds broken */
941 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 1052 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
942 res = sbytes; 1053 res = sbytes;
943 #endif 1054 #endif
944 1055
945 /* according to source inspection, this is correct, and useful behaviour */ 1056 /* according to source inspection, this is correct, and useful behaviour */
946 if (sbytes) 1057 if (sbytes)
947 res = sbytes; 1058 res = sbytes;
948 }
949 1059
950# elif defined (__APPLE__) 1060# elif defined (__APPLE__)
951
952 {
953 off_t sbytes = count; 1061 off_t sbytes = count;
954 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1062 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
955 1063
956 /* according to the manpage, sbytes is always valid */ 1064 /* according to the manpage, sbytes is always valid */
957 if (sbytes) 1065 if (sbytes)
958 res = sbytes; 1066 res = sbytes;
959 }
960 1067
961# elif __hpux 1068# elif __hpux
962 res = sendfile (ofd, ifd, offset, count, 0, 0); 1069 res = sendfile (ofd, ifd, offset, count, 0, 0);
963 1070
964# elif __solaris 1071# elif __solaris
965 {
966 struct sendfilevec vec; 1072 struct sendfilevec vec;
967 size_t sbytes; 1073 size_t sbytes;
968 1074
969 vec.sfv_fd = ifd; 1075 vec.sfv_fd = ifd;
970 vec.sfv_flag = 0; 1076 vec.sfv_flag = 0;
971 vec.sfv_off = offset; 1077 vec.sfv_off = offset;
972 vec.sfv_len = count; 1078 vec.sfv_len = count;
973 1079
974 res = sendfilev (ofd, &vec, 1, &sbytes); 1080 res = sendfilev (ofd, &vec, 1, &sbytes);
975 1081
976 if (res < 0 && sbytes) 1082 if (res < 0 && sbytes)
977 res = sbytes; 1083 res = sbytes;
978 }
979 1084
980# endif 1085# endif
981 1086
982#elif defined (_WIN32) 1087#elif defined (_WIN32) && 0
983
984 /* does not work, just for documentation of what would need to be done */ 1088 /* does not work, just for documentation of what would need to be done */
985 { 1089 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1090 /* libeio guarantees that the file offset does not change, and windows */
1091 /* has no way to get an independent handle to the same file description */
986 HANDLE h = TO_SOCKET (ifd); 1092 HANDLE h = TO_SOCKET (ifd);
987 SetFilePointer (h, offset, 0, FILE_BEGIN); 1093 SetFilePointer (h, offset, 0, FILE_BEGIN);
988 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1094 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
989 }
990 1095
991#else 1096#else
992 res = -1; 1097 res = -1;
993 errno = ENOSYS; 1098 errno = ENOSYS;
994#endif 1099#endif
995 1100
1101 /* we assume sendfile can copy at least 128mb in one go */
1102 if (res <= 128 * 1024 * 1024)
1103 {
1104 if (res > 0)
1105 written += res;
1106
1107 if (written)
1108 return written;
1109
1110 break;
1111 }
1112 else
1113 {
1114 /* if we requested more, then probably the kernel was lazy */
1115 written += res;
1116 offset += res;
1117 count -= res;
1118
1119 if (!count)
1120 return written;
1121 }
1122 }
1123
996 if (res < 0 1124 if (res < 0
997 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1125 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
998 /* BSDs */ 1126 /* BSDs */
999#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1127#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1000 || errno == ENOTSUP 1128 || errno == ENOTSUP
1001#endif 1129#endif
1038 } 1166 }
1039 1167
1040 return res; 1168 return res;
1041} 1169}
1042 1170
1171#ifdef PAGESIZE
1172# define eio_pagesize() PAGESIZE
1173#else
1174static intptr_t
1175eio_pagesize (void)
1176{
1177 static intptr_t page;
1178
1179 if (!page)
1180 page = sysconf (_SC_PAGESIZE);
1181
1182 return page;
1183}
1184#endif
1185
1186static void
1187eio_page_align (void **addr, size_t *length)
1188{
1189 intptr_t mask = eio_pagesize () - 1;
1190
1191 /* round down addr */
1192 intptr_t adj = mask & (intptr_t)*addr;
1193
1194 *addr = (void *)((intptr_t)*addr - adj);
1195 *length += adj;
1196
1197 /* round up length */
1198 *length = (*length + mask) & ~mask;
1199}
1200
1201#if !_POSIX_MEMLOCK
1202# define eio__mlockall(a) eio_nosyscall()
1203#else
1204
1205static int
1206eio__mlockall (int flags)
1207{
1208 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1209 extern int mallopt (int, int);
1210 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1211 #endif
1212
1213 if (EIO_MCL_CURRENT != MCL_CURRENT
1214 || EIO_MCL_FUTURE != MCL_FUTURE)
1215 {
1216 flags = 0
1217 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1218 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1219 }
1220
1221 return mlockall (flags);
1222}
1223#endif
1224
1225#if !_POSIX_MEMLOCK_RANGE
1226# define eio__mlock(a,b) EIO_ENOSYS ()
1227#else
1228
1229static int
1230eio__mlock (void *addr, size_t length)
1231{
1232 eio_page_align (&addr, &length);
1233
1234 return mlock (addr, length);
1235}
1236
1237#endif
1238
1239#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1240# define eio__msync(a,b,c) EIO_ENOSYS ()
1241#else
1242
1243static int
1244eio__msync (void *mem, size_t len, int flags)
1245{
1246 eio_page_align (&mem, &len);
1247
1248 if (EIO_MS_ASYNC != MS_SYNC
1249 || EIO_MS_INVALIDATE != MS_INVALIDATE
1250 || EIO_MS_SYNC != MS_SYNC)
1251 {
1252 flags = 0
1253 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1254 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1255 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1256 }
1257
1258 return msync (mem, len, flags);
1259}
1260
1261#endif
1262
1263static int
1264eio__mtouch (eio_req *req)
1265{
1266 void *mem = req->ptr2;
1267 size_t len = req->size;
1268 int flags = req->int1;
1269
1270 eio_page_align (&mem, &len);
1271
1272 {
1273 intptr_t addr = (intptr_t)mem;
1274 intptr_t end = addr + len;
1275 intptr_t page = eio_pagesize ();
1276
1277 if (addr < end)
1278 if (flags & EIO_MT_MODIFY) /* modify */
1279 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1280 else
1281 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1282 }
1283
1284 return 0;
1285}
1286
1287/*****************************************************************************/
1288/* requests implemented outside eio_execute, because they are so large */
1289
1290static void
1291eio__realpath (eio_req *req, etp_worker *self)
1292{
1293 char *rel = req->ptr1;
1294 char *res;
1295 char *tmp1, *tmp2;
1296#if SYMLOOP_MAX > 32
1297 int symlinks = SYMLOOP_MAX;
1298#else
1299 int symlinks = 32;
1300#endif
1301
1302 req->result = -1;
1303
1304 errno = EINVAL;
1305 if (!rel)
1306 return;
1307
1308 errno = ENOENT;
1309 if (!*rel)
1310 return;
1311
1312 if (!req->ptr2)
1313 {
1314 X_LOCK (wrklock);
1315 req->flags |= EIO_FLAG_PTR2_FREE;
1316 X_UNLOCK (wrklock);
1317 req->ptr2 = malloc (PATH_MAX * 3);
1318
1319 errno = ENOMEM;
1320 if (!req->ptr2)
1321 return;
1322 }
1323
1324 res = req->ptr2;
1325 tmp1 = res + PATH_MAX;
1326 tmp2 = tmp1 + PATH_MAX;
1327
1328#if 0 /* disabled, the musl way to do things is just too racy */
1329#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1330 /* on linux we may be able to ask the kernel */
1331 {
1332 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1333
1334 if (fd >= 0)
1335 {
1336 sprintf (tmp1, "/proc/self/fd/%d", fd);
1337 req->result = readlink (tmp1, res, PATH_MAX);
1338 close (fd);
1339
1340 /* here we should probably stat the open file and the disk file, to make sure they still match */
1341
1342 if (req->result > 0)
1343 goto done;
1344 }
1345 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1346 return;
1347 }
1348#endif
1349#endif
1350
1351 if (*rel != '/')
1352 {
1353 if (!getcwd (res, PATH_MAX))
1354 return;
1355
1356 if (res [1]) /* only use if not / */
1357 res += strlen (res);
1358 }
1359
1360 while (*rel)
1361 {
1362 ssize_t len, linklen;
1363 char *beg = rel;
1364
1365 while (*rel && *rel != '/')
1366 ++rel;
1367
1368 len = rel - beg;
1369
1370 if (!len) /* skip slashes */
1371 {
1372 ++rel;
1373 continue;
1374 }
1375
1376 if (beg [0] == '.')
1377 {
1378 if (len == 1)
1379 continue; /* . - nop */
1380
1381 if (beg [1] == '.' && len == 2)
1382 {
1383 /* .. - back up one component, if possible */
1384
1385 while (res != req->ptr2)
1386 if (*--res == '/')
1387 break;
1388
1389 continue;
1390 }
1391 }
1392
1393 errno = ENAMETOOLONG;
1394 if (res + 1 + len + 1 >= tmp1)
1395 return;
1396
1397 /* copy one component */
1398 *res = '/';
1399 memcpy (res + 1, beg, len);
1400
1401 /* zero-terminate, for readlink */
1402 res [len + 1] = 0;
1403
1404 /* now check if it's a symlink */
1405 linklen = readlink (req->ptr2, tmp1, PATH_MAX);
1406
1407 if (linklen < 0)
1408 {
1409 if (errno != EINVAL)
1410 return;
1411
1412 /* it's a normal directory. hopefully */
1413 res += len + 1;
1414 }
1415 else
1416 {
1417 /* yay, it was a symlink - build new path in tmp2 */
1418 int rellen = strlen (rel);
1419
1420 errno = ENAMETOOLONG;
1421 if (linklen + 1 + rellen >= PATH_MAX)
1422 return;
1423
1424 errno = ELOOP;
1425 if (!--symlinks)
1426 return;
1427
1428 if (*tmp1 == '/')
1429 res = req->ptr2; /* symlink resolves to an absolute path */
1430
1431 /* we need to be careful, as rel might point into tmp2 already */
1432 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1433 tmp2 [linklen] = '/';
1434 memcpy (tmp2, tmp1, linklen);
1435
1436 rel = tmp2;
1437 }
1438 }
1439
1440 /* special case for the lone root path */
1441 if (res == req->ptr2)
1442 *res++ = '/';
1443
1444 req->result = res - (char *)req->ptr2;
1445
1446done:
1447 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1448}
1449
1043static signed char 1450static signed char
1044eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1451eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1045{ 1452{
1046 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1453 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1047 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; 1454 : a->inode < b->inode ? -1
1455 : a->inode > b->inode ? 1
1456 : 0;
1048} 1457}
1049 1458
1050#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1459#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1051 1460
1052#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1461#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1058 unsigned char bits [9 + sizeof (ino_t) * 8]; 1467 unsigned char bits [9 + sizeof (ino_t) * 8];
1059 unsigned char *bit = bits; 1468 unsigned char *bit = bits;
1060 1469
1061 assert (CHAR_BIT == 8); 1470 assert (CHAR_BIT == 8);
1062 assert (sizeof (eio_dirent) * 8 < 256); 1471 assert (sizeof (eio_dirent) * 8 < 256);
1063 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1472 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1064 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1473 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1065 1474
1066 if (size <= EIO_SORT_FAST) 1475 if (size <= EIO_SORT_FAST)
1067 return; 1476 return;
1068 1477
1069 /* first prepare an array of bits to test in our radix sort */ 1478 /* first prepare an array of bits to test in our radix sort */
1224 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1633 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1225 1634
1226 X_LOCK (wrklock); 1635 X_LOCK (wrklock);
1227 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1636 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1228 self->dirp = dirp = opendir (req->ptr1); 1637 self->dirp = dirp = opendir (req->ptr1);
1638
1639 if (req->flags & EIO_FLAG_PTR1_FREE)
1640 free (req->ptr1);
1641
1229 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1642 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1230 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1643 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1231 req->ptr2 = names = malloc (namesalloc); 1644 req->ptr2 = names = malloc (namesalloc);
1232 X_UNLOCK (wrklock); 1645 X_UNLOCK (wrklock);
1233 1646
1245 /* sort etc. */ 1658 /* sort etc. */
1246 req->int1 = flags; 1659 req->int1 = flags;
1247 req->result = dentoffs; 1660 req->result = dentoffs;
1248 1661
1249 if (flags & EIO_READDIR_STAT_ORDER) 1662 if (flags & EIO_READDIR_STAT_ORDER)
1250 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1663 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1251 else if (flags & EIO_READDIR_DIRS_FIRST) 1664 else if (flags & EIO_READDIR_DIRS_FIRST)
1252 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1665 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1253 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1666 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1254 else 1667 else
1255 { 1668 {
1257 eio_dirent *oth = dents + dentoffs; 1670 eio_dirent *oth = dents + dentoffs;
1258 eio_dirent *dir = dents; 1671 eio_dirent *dir = dents;
1259 1672
1260 /* now partition dirs to the front, and non-dirs to the back */ 1673 /* now partition dirs to the front, and non-dirs to the back */
1261 /* by walking from both sides and swapping if necessary */ 1674 /* by walking from both sides and swapping if necessary */
1262 /* also clear score, so it doesn't influence sorting */
1263 while (oth > dir) 1675 while (oth > dir)
1264 { 1676 {
1265 if (dir->type == EIO_DT_DIR) 1677 if (dir->type == EIO_DT_DIR)
1266 ++dir; 1678 ++dir;
1267 else if ((--oth)->type == EIO_DT_DIR) 1679 else if ((--oth)->type == EIO_DT_DIR)
1270 1682
1271 ++dir; 1683 ++dir;
1272 } 1684 }
1273 } 1685 }
1274 1686
1275 /* now sort the dirs only */ 1687 /* now sort the dirs only (dirs all have the same score) */
1276 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1688 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1277 } 1689 }
1278 1690
1279 break; 1691 break;
1280 } 1692 }
1285 /* skip . and .. entries */ 1697 /* skip . and .. entries */
1286 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1698 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1287 { 1699 {
1288 int len = D_NAMLEN (entp) + 1; 1700 int len = D_NAMLEN (entp) + 1;
1289 1701
1290 while (expect_false (namesoffs + len > namesalloc)) 1702 while (ecb_expect_false (namesoffs + len > namesalloc))
1291 { 1703 {
1292 namesalloc *= 2; 1704 namesalloc *= 2;
1293 X_LOCK (wrklock); 1705 X_LOCK (wrklock);
1294 req->ptr2 = names = realloc (names, namesalloc); 1706 req->ptr2 = names = realloc (names, namesalloc);
1295 X_UNLOCK (wrklock); 1707 X_UNLOCK (wrklock);
1302 1714
1303 if (dents) 1715 if (dents)
1304 { 1716 {
1305 struct eio_dirent *ent; 1717 struct eio_dirent *ent;
1306 1718
1307 if (expect_false (dentoffs == dentalloc)) 1719 if (ecb_expect_false (dentoffs == dentalloc))
1308 { 1720 {
1309 dentalloc *= 2; 1721 dentalloc *= 2;
1310 X_LOCK (wrklock); 1722 X_LOCK (wrklock);
1311 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1723 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1312 X_UNLOCK (wrklock); 1724 X_UNLOCK (wrklock);
1400 break; 1812 break;
1401 } 1813 }
1402 } 1814 }
1403} 1815}
1404 1816
1405#ifdef PAGESIZE
1406# define eio_pagesize() PAGESIZE
1407#else
1408static intptr_t
1409eio_pagesize (void)
1410{
1411 static intptr_t page;
1412
1413 if (!page)
1414 page = sysconf (_SC_PAGESIZE);
1415
1416 return page;
1417}
1418#endif
1419
1420static void
1421eio_page_align (void **addr, size_t *length)
1422{
1423 intptr_t mask = eio_pagesize () - 1;
1424
1425 /* round down addr */
1426 intptr_t adj = mask & (intptr_t)*addr;
1427
1428 *addr = (void *)((intptr_t)*addr - adj);
1429 *length += adj;
1430
1431 /* round up length */
1432 *length = (*length + mask) & ~mask;
1433}
1434
1435#if !_POSIX_MEMLOCK
1436# define eio__mlockall(a) ((errno = ENOSYS), -1)
1437#else
1438
1439static int
1440eio__mlockall (int flags)
1441{
1442 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1443 extern int mallopt (int, int);
1444 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1445 #endif
1446
1447 if (EIO_MCL_CURRENT != MCL_CURRENT
1448 || EIO_MCL_FUTURE != MCL_FUTURE)
1449 {
1450 flags = 0
1451 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1452 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1453 }
1454
1455 return mlockall (flags);
1456}
1457#endif
1458
1459#if !_POSIX_MEMLOCK_RANGE
1460# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1461#else
1462
1463static int
1464eio__mlock (void *addr, size_t length)
1465{
1466 eio_page_align (&addr, &length);
1467
1468 return mlock (addr, length);
1469}
1470
1471#endif
1472
1473#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1474# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1475#else
1476
1477int
1478eio__msync (void *mem, size_t len, int flags)
1479{
1480 eio_page_align (&mem, &len);
1481
1482 if (EIO_MS_ASYNC != MS_SYNC
1483 || EIO_MS_INVALIDATE != MS_INVALIDATE
1484 || EIO_MS_SYNC != MS_SYNC)
1485 {
1486 flags = 0
1487 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1488 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1489 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1490 }
1491
1492 return msync (mem, len, flags);
1493}
1494
1495#endif
1496
1497int
1498eio__mtouch (void *mem, size_t len, int flags)
1499{
1500 eio_page_align (&mem, &len);
1501
1502 {
1503 intptr_t addr = (intptr_t)mem;
1504 intptr_t end = addr + len;
1505 intptr_t page = eio_pagesize ();
1506
1507 if (addr < end)
1508 if (flags & EIO_MT_MODIFY) /* modify */
1509 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1510 else
1511 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1512 }
1513
1514 return 0;
1515}
1516
1517/*****************************************************************************/ 1817/*****************************************************************************/
1518 1818
1519#define ALLOC(len) \ 1819#define ALLOC(len) \
1520 if (!req->ptr2) \ 1820 if (!req->ptr2) \
1521 { \ 1821 { \
1534X_THREAD_PROC (etp_proc) 1834X_THREAD_PROC (etp_proc)
1535{ 1835{
1536 ETP_REQ *req; 1836 ETP_REQ *req;
1537 struct timespec ts; 1837 struct timespec ts;
1538 etp_worker *self = (etp_worker *)thr_arg; 1838 etp_worker *self = (etp_worker *)thr_arg;
1839 int timeout;
1539 1840
1540 /* try to distribute timeouts somewhat randomly */ 1841 /* try to distribute timeouts somewhat evenly */
1541 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1842 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1542 1843
1543 for (;;) 1844 for (;;)
1544 { 1845 {
1846 ts.tv_sec = 0;
1847
1545 X_LOCK (reqlock); 1848 X_LOCK (reqlock);
1546 1849
1547 for (;;) 1850 for (;;)
1548 { 1851 {
1549 self->req = req = reqq_shift (&req_queue); 1852 self->req = req = reqq_shift (&req_queue);
1550 1853
1551 if (req) 1854 if (req)
1552 break; 1855 break;
1553 1856
1857 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1858 {
1859 X_UNLOCK (reqlock);
1860 X_LOCK (wrklock);
1861 --started;
1862 X_UNLOCK (wrklock);
1863 goto quit;
1864 }
1865
1554 ++idle; 1866 ++idle;
1555 1867
1556 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1868 if (idle <= max_idle)
1557 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1869 /* we are allowed to idle, so do so without any timeout */
1870 X_COND_WAIT (reqwait, reqlock);
1871 else
1558 { 1872 {
1559 if (idle > max_idle) 1873 /* initialise timeout once */
1560 { 1874 if (!ts.tv_sec)
1561 --idle; 1875 ts.tv_sec = time (0) + idle_timeout;
1562 X_UNLOCK (reqlock);
1563 X_LOCK (wrklock);
1564 --started;
1565 X_UNLOCK (wrklock);
1566 goto quit;
1567 }
1568 1876
1569 /* we are allowed to idle, so do so without any timeout */
1570 X_COND_WAIT (reqwait, reqlock); 1877 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1878 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1571 } 1879 }
1572 1880
1573 --idle; 1881 --idle;
1574 } 1882 }
1575 1883
1578 X_UNLOCK (reqlock); 1886 X_UNLOCK (reqlock);
1579 1887
1580 if (req->type < 0) 1888 if (req->type < 0)
1581 goto quit; 1889 goto quit;
1582 1890
1583 if (!EIO_CANCELLED (req))
1584 ETP_EXECUTE (self, req); 1891 ETP_EXECUTE (self, req);
1585 1892
1586 X_LOCK (reslock); 1893 X_LOCK (reslock);
1587 1894
1588 ++npending; 1895 ++npending;
1589 1896
1604 return 0; 1911 return 0;
1605} 1912}
1606 1913
1607/*****************************************************************************/ 1914/*****************************************************************************/
1608 1915
1916int ecb_cold
1609int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1917eio_init (void (*want_poll)(void), void (*done_poll)(void))
1610{ 1918{
1611 return etp_init (want_poll, done_poll); 1919 return etp_init (want_poll, done_poll);
1612} 1920}
1613 1921
1922ecb_inline void
1614static void eio_api_destroy (eio_req *req) 1923eio_api_destroy (eio_req *req)
1615{ 1924{
1616 free (req); 1925 free (req);
1617} 1926}
1618 1927
1619#define REQ(rtype) \ 1928#define REQ(rtype) \
1638 { \ 1947 { \
1639 eio_api_destroy (req); \ 1948 eio_api_destroy (req); \
1640 return 0; \ 1949 return 0; \
1641 } 1950 }
1642 1951
1952static void
1643static void eio_execute (etp_worker *self, eio_req *req) 1953eio_execute (etp_worker *self, eio_req *req)
1644{ 1954{
1955 if (ecb_expect_false (EIO_CANCELLED (req)))
1956 {
1957 req->result = -1;
1958 req->errorno = ECANCELED;
1959 return;
1960 }
1961
1645 switch (req->type) 1962 switch (req->type)
1646 { 1963 {
1647 case EIO_READ: ALLOC (req->size); 1964 case EIO_READ: ALLOC (req->size);
1648 req->result = req->offs >= 0 1965 req->result = req->offs >= 0
1649 ? pread (req->int1, req->ptr2, req->size, req->offs) 1966 ? pread (req->int1, req->ptr2, req->size, req->offs)
1683 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 2000 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1684 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 2001 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1685 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 2002 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1686 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 2003 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1687 2004
2005 case EIO_REALPATH: eio__realpath (req, self); break;
2006
1688 case EIO_READLINK: ALLOC (PATH_MAX); 2007 case EIO_READLINK: ALLOC (PATH_MAX);
1689 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2008 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1690 2009
1691 case EIO_SYNC: req->result = 0; sync (); break; 2010 case EIO_SYNC: req->result = 0; sync (); break;
1692 case EIO_FSYNC: req->result = fsync (req->int1); break; 2011 case EIO_FSYNC: req->result = fsync (req->int1); break;
1693 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2012 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1694 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2013 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1695 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 2014 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1696 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2015 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1697 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2016 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1698 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2017 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2018 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1699 2019
1700 case EIO_READDIR: eio__scandir (req, self); break; 2020 case EIO_READDIR: eio__scandir (req, self); break;
1701 2021
1702 case EIO_BUSY: 2022 case EIO_BUSY:
1703#ifdef _WIN32 2023#ifdef _WIN32
1744 case EIO_NOP: 2064 case EIO_NOP:
1745 req->result = 0; 2065 req->result = 0;
1746 break; 2066 break;
1747 2067
1748 case EIO_CUSTOM: 2068 case EIO_CUSTOM:
1749 ((void (*)(eio_req *))req->feed) (req); 2069 req->feed (req);
1750 break; 2070 break;
1751 2071
1752 default: 2072 default:
1753 errno = ENOSYS; 2073 errno = ENOSYS;
1754 req->result = -1; 2074 req->result = -1;
1803eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2123eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1804{ 2124{
1805 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2125 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1806} 2126}
1807 2127
2128eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2129{
2130 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2131}
2132
1808eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2133eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1809{ 2134{
1810 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2135 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1811} 2136}
1812 2137
1907} 2232}
1908 2233
1909eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2234eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1910{ 2235{
1911 return eio__1path (EIO_READLINK, path, pri, cb, data); 2236 return eio__1path (EIO_READLINK, path, pri, cb, data);
2237}
2238
2239eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2240{
2241 return eio__1path (EIO_REALPATH, path, pri, cb, data);
1912} 2242}
1913 2243
1914eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2244eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1915{ 2245{
1916 return eio__1path (EIO_STAT, path, pri, cb, data); 2246 return eio__1path (EIO_STAT, path, pri, cb, data);
1975eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2305eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1976{ 2306{
1977 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2307 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1978} 2308}
1979 2309
1980eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2310eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1981{ 2311{
1982 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2312 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1983} 2313}
1984 2314
1985#endif 2315#endif
1986 2316
1987eio_req *eio_grp (eio_cb cb, void *data) 2317eio_req *eio_grp (eio_cb cb, void *data)
1996#undef SEND 2326#undef SEND
1997 2327
1998/*****************************************************************************/ 2328/*****************************************************************************/
1999/* grp functions */ 2329/* grp functions */
2000 2330
2331void
2001void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2332eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
2002{ 2333{
2003 grp->int2 = limit; 2334 grp->int2 = limit;
2004 grp->feed = feed; 2335 grp->feed = feed;
2005 2336
2006 grp_try_feed (grp); 2337 grp_try_feed (grp);
2007} 2338}
2008 2339
2340void
2009void eio_grp_limit (eio_req *grp, int limit) 2341eio_grp_limit (eio_req *grp, int limit)
2010{ 2342{
2011 grp->int2 = limit; 2343 grp->int2 = limit;
2012 2344
2013 grp_try_feed (grp); 2345 grp_try_feed (grp);
2014} 2346}
2015 2347
2348void
2016void eio_grp_add (eio_req *grp, eio_req *req) 2349eio_grp_add (eio_req *grp, eio_req *req)
2017{ 2350{
2018 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2351 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2019 2352
2020 grp->flags |= EIO_FLAG_GROUPADD; 2353 grp->flags |= EIO_FLAG_GROUPADD;
2021 2354
2032} 2365}
2033 2366
2034/*****************************************************************************/ 2367/*****************************************************************************/
2035/* misc garbage */ 2368/* misc garbage */
2036 2369
2370ssize_t
2037ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2371eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2038{ 2372{
2039 etp_worker wrk; 2373 etp_worker wrk;
2040 ssize_t ret; 2374 ssize_t ret;
2041 2375
2042 wrk.dbuf = 0; 2376 wrk.dbuf = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines