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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.61 by root, Fri Feb 11 00:53:24 2011 UTC vs.
Revision 1.76 by root, Tue Jul 5 09:24:12 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"
… …
54#include <sys/statvfs.h> 59#include <sys/statvfs.h>
55#include <limits.h> 60#include <limits.h>
56#include <fcntl.h> 61#include <fcntl.h>
57#include <assert.h> 62#include <assert.h>
58 63
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes form stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H
67# include <stdint.h>
68#endif
69
59#ifndef EIO_FINISH 70#ifndef EIO_FINISH
60# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 71# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
61#endif 72#endif
62 73
63#ifndef EIO_DESTROY 74#ifndef EIO_DESTROY
… …
71#ifdef _WIN32 82#ifdef _WIN32
72 83
73 /*doh*/ 84 /*doh*/
74#else 85#else
75 86
76# include "config.h"
77# include <sys/time.h> 87# include <sys/time.h>
78# include <sys/select.h> 88# include <sys/select.h>
79# include <unistd.h> 89# include <unistd.h>
80# include <utime.h> 90# include <utime.h>
81# include <signal.h> 91# include <signal.h>
… …
132#endif 142#endif
133#ifndef D_NAMLEN 143#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name) 144# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif 145#endif
136 146
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 */ 147/* used for struct dirent, AIX doesn't provide it */
141#ifndef NAME_MAX 148#ifndef NAME_MAX
142# define NAME_MAX 4096 149# define NAME_MAX 4096
143#endif 150#endif
144 151
… …
158 errno = ENOMEM; \ 165 errno = ENOMEM; \
159 if (!eio_buf) \ 166 if (!eio_buf) \
160 return -1; 167 return -1;
161 168
162#define EIO_TICKS ((1000000 + 1023) >> 10) 169#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 170
177#define ETP_PRI_MIN EIO_PRI_MIN 171#define ETP_PRI_MIN EIO_PRI_MIN
178#define ETP_PRI_MAX EIO_PRI_MAX 172#define ETP_PRI_MAX EIO_PRI_MAX
179 173
180struct etp_worker; 174struct etp_worker;
… …
206/*****************************************************************************/ 200/*****************************************************************************/
207 201
208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 202#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
209 203
210/* calculate time difference in ~1/EIO_TICKS of a second */ 204/* calculate time difference in ~1/EIO_TICKS of a second */
205ecb_inline int
211static int tvdiff (struct timeval *tv1, struct timeval *tv2) 206tvdiff (struct timeval *tv1, struct timeval *tv2)
212{ 207{
213 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 208 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
214 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 209 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
215} 210}
216 211
… …
223static unsigned int max_poll_reqs; /* reslock */ 218static unsigned int max_poll_reqs; /* reslock */
224 219
225static volatile unsigned int nreqs; /* reqlock */ 220static volatile unsigned int nreqs; /* reqlock */
226static volatile unsigned int nready; /* reqlock */ 221static volatile unsigned int nready; /* reqlock */
227static volatile unsigned int npending; /* reqlock */ 222static volatile unsigned int npending; /* reqlock */
228static volatile unsigned int max_idle = 4; 223static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
224static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
229 225
230static xmutex_t wrklock = X_MUTEX_INIT; 226static xmutex_t wrklock;
231static xmutex_t reslock = X_MUTEX_INIT; 227static xmutex_t reslock;
232static xmutex_t reqlock = X_MUTEX_INIT; 228static xmutex_t reqlock;
233static xcond_t reqwait = X_COND_INIT; 229static xcond_t reqwait;
234 230
235#if !HAVE_PREADWRITE 231#if !HAVE_PREADWRITE
236/* 232/*
237 * make our pread/pwrite emulation safe against themselves, but not against 233 * make our pread/pwrite emulation safe against themselves, but not against
238 * normal read/write by using a mutex. slows down execution a lot, 234 * normal read/write by using a mutex. slows down execution a lot,
… …
259#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 255#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
260#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 256#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
261 257
262/* worker threads management */ 258/* worker threads management */
263 259
260static void ecb_cold
264static void etp_worker_clear (etp_worker *wrk) 261etp_worker_clear (etp_worker *wrk)
265{ 262{
266 ETP_WORKER_CLEAR (wrk); 263 ETP_WORKER_CLEAR (wrk);
267} 264}
268 265
266static void ecb_cold
269static void etp_worker_free (etp_worker *wrk) 267etp_worker_free (etp_worker *wrk)
270{ 268{
271 wrk->next->prev = wrk->prev; 269 wrk->next->prev = wrk->prev;
272 wrk->prev->next = wrk->next; 270 wrk->prev->next = wrk->next;
273 271
274 free (wrk); 272 free (wrk);
275} 273}
276 274
277static unsigned int etp_nreqs (void) 275static unsigned int
276etp_nreqs (void)
278{ 277{
279 int retval; 278 int retval;
280 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 279 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
281 retval = nreqs; 280 retval = nreqs;
282 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 281 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
283 return retval; 282 return retval;
284} 283}
285 284
286static unsigned int etp_nready (void) 285static unsigned int
286etp_nready (void)
287{ 287{
288 unsigned int retval; 288 unsigned int retval;
289 289
290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
291 retval = nready; 291 retval = nready;
292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
293 293
294 return retval; 294 return retval;
295} 295}
296 296
297static unsigned int etp_npending (void) 297static unsigned int
298etp_npending (void)
298{ 299{
299 unsigned int retval; 300 unsigned int retval;
300 301
301 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 302 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
302 retval = npending; 303 retval = npending;
303 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 304 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
304 305
305 return retval; 306 return retval;
306} 307}
307 308
308static unsigned int etp_nthreads (void) 309static unsigned int
310etp_nthreads (void)
309{ 311{
310 unsigned int retval; 312 unsigned int retval;
311 313
312 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 314 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
313 retval = started; 315 retval = started;
… …
327} etp_reqq; 329} etp_reqq;
328 330
329static etp_reqq req_queue; 331static etp_reqq req_queue;
330static etp_reqq res_queue; 332static etp_reqq res_queue;
331 333
334static int ecb_noinline
332static int reqq_push (etp_reqq *q, ETP_REQ *req) 335reqq_push (etp_reqq *q, ETP_REQ *req)
333{ 336{
334 int pri = req->pri; 337 int pri = req->pri;
335 req->next = 0; 338 req->next = 0;
336 339
337 if (q->qe[pri]) 340 if (q->qe[pri])
… …
343 q->qe[pri] = q->qs[pri] = req; 346 q->qe[pri] = q->qs[pri] = req;
344 347
345 return q->size++; 348 return q->size++;
346} 349}
347 350
351static ETP_REQ * ecb_noinline
348static ETP_REQ *reqq_shift (etp_reqq *q) 352reqq_shift (etp_reqq *q)
349{ 353{
350 int pri; 354 int pri;
351 355
352 if (!q->size) 356 if (!q->size)
353 return 0; 357 return 0;
… …
368 } 372 }
369 373
370 abort (); 374 abort ();
371} 375}
372 376
377static void ecb_cold
378etp_thread_init (void)
379{
380 X_MUTEX_CREATE (wrklock);
381 X_MUTEX_CREATE (reslock);
382 X_MUTEX_CREATE (reqlock);
383 X_COND_CREATE (reqwait);
384}
385
386static void ecb_cold
373static void etp_atfork_prepare (void) 387etp_atfork_prepare (void)
374{ 388{
375 X_LOCK (wrklock); 389 X_LOCK (wrklock);
376 X_LOCK (reqlock); 390 X_LOCK (reqlock);
377 X_LOCK (reslock); 391 X_LOCK (reslock);
378#if !HAVE_PREADWRITE 392#if !HAVE_PREADWRITE
379 X_LOCK (preadwritelock); 393 X_LOCK (preadwritelock);
380#endif 394#endif
381} 395}
382 396
397static void ecb_cold
383static void etp_atfork_parent (void) 398etp_atfork_parent (void)
384{ 399{
385#if !HAVE_PREADWRITE 400#if !HAVE_PREADWRITE
386 X_UNLOCK (preadwritelock); 401 X_UNLOCK (preadwritelock);
387#endif 402#endif
388 X_UNLOCK (reslock); 403 X_UNLOCK (reslock);
389 X_UNLOCK (reqlock); 404 X_UNLOCK (reqlock);
390 X_UNLOCK (wrklock); 405 X_UNLOCK (wrklock);
391} 406}
392 407
408static void ecb_cold
393static void etp_atfork_child (void) 409etp_atfork_child (void)
394{ 410{
395 ETP_REQ *prv; 411 ETP_REQ *prv;
396 412
397 while ((prv = reqq_shift (&req_queue))) 413 while ((prv = reqq_shift (&req_queue)))
398 ETP_DESTROY (prv); 414 ETP_DESTROY (prv);
… …
415 idle = 0; 431 idle = 0;
416 nreqs = 0; 432 nreqs = 0;
417 nready = 0; 433 nready = 0;
418 npending = 0; 434 npending = 0;
419 435
420 etp_atfork_parent (); 436 etp_thread_init ();
421} 437}
422 438
423static void 439static void ecb_cold
424etp_once_init (void) 440etp_once_init (void)
425{ 441{
442 etp_thread_init ();
426 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 443 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
427} 444}
428 445
429static int 446static int ecb_cold
430etp_init (void (*want_poll)(void), void (*done_poll)(void)) 447etp_init (void (*want_poll)(void), void (*done_poll)(void))
431{ 448{
432 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 449 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
433 450
434 pthread_once (&doinit, etp_once_init); 451 pthread_once (&doinit, etp_once_init);
… …
439 return 0; 456 return 0;
440} 457}
441 458
442X_THREAD_PROC (etp_proc); 459X_THREAD_PROC (etp_proc);
443 460
461static void ecb_cold
444static void etp_start_thread (void) 462etp_start_thread (void)
445{ 463{
446 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 464 etp_worker *wrk = calloc (1, sizeof (etp_worker));
447 465
448 /*TODO*/ 466 /*TODO*/
449 assert (("unable to allocate worker thread data", wrk)); 467 assert (("unable to allocate worker thread data", wrk));
… …
462 free (wrk); 480 free (wrk);
463 481
464 X_UNLOCK (wrklock); 482 X_UNLOCK (wrklock);
465} 483}
466 484
485static void
467static void etp_maybe_start_thread (void) 486etp_maybe_start_thread (void)
468{ 487{
469 if (expect_true (etp_nthreads () >= wanted)) 488 if (ecb_expect_true (etp_nthreads () >= wanted))
470 return; 489 return;
471 490
472 /* todo: maybe use idle here, but might be less exact */ 491 /* todo: maybe use idle here, but might be less exact */
473 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) 492 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
474 return; 493 return;
475 494
476 etp_start_thread (); 495 etp_start_thread ();
477} 496}
478 497
498static void ecb_cold
479static void etp_end_thread (void) 499etp_end_thread (void)
480{ 500{
481 eio_req *req = calloc (1, sizeof (eio_req)); 501 eio_req *req = calloc (1, sizeof (eio_req));
482 502
483 req->type = -1; 503 req->type = -1;
484 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 504 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
… …
491 X_LOCK (wrklock); 511 X_LOCK (wrklock);
492 --started; 512 --started;
493 X_UNLOCK (wrklock); 513 X_UNLOCK (wrklock);
494} 514}
495 515
496static int etp_poll (void) 516static int
517etp_poll (void)
497{ 518{
498 unsigned int maxreqs; 519 unsigned int maxreqs;
499 unsigned int maxtime; 520 unsigned int maxtime;
500 struct timeval tv_start, tv_now; 521 struct timeval tv_start, tv_now;
501 522
… …
531 552
532 X_LOCK (reqlock); 553 X_LOCK (reqlock);
533 --nreqs; 554 --nreqs;
534 X_UNLOCK (reqlock); 555 X_UNLOCK (reqlock);
535 556
536 if (expect_false (req->type == EIO_GROUP && req->size)) 557 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
537 { 558 {
538 req->int1 = 1; /* mark request as delayed */ 559 req->int1 = 1; /* mark request as delayed */
539 continue; 560 continue;
540 } 561 }
541 else 562 else
542 { 563 {
543 int res = ETP_FINISH (req); 564 int res = ETP_FINISH (req);
544 if (expect_false (res)) 565 if (ecb_expect_false (res))
545 return res; 566 return res;
546 } 567 }
547 568
548 if (expect_false (maxreqs && !--maxreqs)) 569 if (ecb_expect_false (maxreqs && !--maxreqs))
549 break; 570 break;
550 571
551 if (maxtime) 572 if (maxtime)
552 { 573 {
553 gettimeofday (&tv_now, 0); 574 gettimeofday (&tv_now, 0);
… …
559 580
560 errno = EAGAIN; 581 errno = EAGAIN;
561 return -1; 582 return -1;
562} 583}
563 584
585static void
564static void etp_cancel (ETP_REQ *req) 586etp_cancel (ETP_REQ *req)
565{ 587{
566 X_LOCK (wrklock); 588 X_LOCK (wrklock);
567 req->flags |= EIO_FLAG_CANCELLED; 589 req->flags |= EIO_FLAG_CANCELLED;
568 X_UNLOCK (wrklock); 590 X_UNLOCK (wrklock);
569 591
570 eio_grp_cancel (req); 592 eio_grp_cancel (req);
571} 593}
572 594
595static void
573static void etp_submit (ETP_REQ *req) 596etp_submit (ETP_REQ *req)
574{ 597{
575 req->pri -= ETP_PRI_MIN; 598 req->pri -= ETP_PRI_MIN;
576 599
577 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 600 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; 601 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
579 602
580 if (expect_false (req->type == EIO_GROUP)) 603 if (ecb_expect_false (req->type == EIO_GROUP))
581 { 604 {
582 /* I hope this is worth it :/ */ 605 /* I hope this is worth it :/ */
583 X_LOCK (reqlock); 606 X_LOCK (reqlock);
584 ++nreqs; 607 ++nreqs;
585 X_UNLOCK (reqlock); 608 X_UNLOCK (reqlock);
… …
604 627
605 etp_maybe_start_thread (); 628 etp_maybe_start_thread ();
606 } 629 }
607} 630}
608 631
632static void ecb_cold
609static void etp_set_max_poll_time (double nseconds) 633etp_set_max_poll_time (double nseconds)
610{ 634{
611 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 635 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
612 max_poll_time = nseconds * EIO_TICKS; 636 max_poll_time = nseconds * EIO_TICKS;
613 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 637 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
614} 638}
615 639
640static void ecb_cold
616static void etp_set_max_poll_reqs (unsigned int maxreqs) 641etp_set_max_poll_reqs (unsigned int maxreqs)
617{ 642{
618 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 643 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
619 max_poll_reqs = maxreqs; 644 max_poll_reqs = maxreqs;
620 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 645 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
621} 646}
622 647
648static void ecb_cold
623static void etp_set_max_idle (unsigned int nthreads) 649etp_set_max_idle (unsigned int nthreads)
624{ 650{
625 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 651 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
626 max_idle = nthreads <= 0 ? 1 : nthreads; 652 max_idle = nthreads;
627 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 653 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
628} 654}
629 655
656static void ecb_cold
657etp_set_idle_timeout (unsigned int seconds)
658{
659 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
660 idle_timeout = seconds;
661 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
662}
663
664static void ecb_cold
630static void etp_set_min_parallel (unsigned int nthreads) 665etp_set_min_parallel (unsigned int nthreads)
631{ 666{
632 if (wanted < nthreads) 667 if (wanted < nthreads)
633 wanted = nthreads; 668 wanted = nthreads;
634} 669}
635 670
671static void ecb_cold
636static void etp_set_max_parallel (unsigned int nthreads) 672etp_set_max_parallel (unsigned int nthreads)
637{ 673{
638 if (wanted > nthreads) 674 if (wanted > nthreads)
639 wanted = nthreads; 675 wanted = nthreads;
640 676
641 while (started > wanted) 677 while (started > wanted)
642 etp_end_thread (); 678 etp_end_thread ();
643} 679}
644 680
645/*****************************************************************************/ 681/*****************************************************************************/
646 682
683static void
647static void grp_try_feed (eio_req *grp) 684grp_try_feed (eio_req *grp)
648{ 685{
649 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 686 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
650 { 687 {
651 grp->flags &= ~EIO_FLAG_GROUPADD; 688 grp->flags &= ~EIO_FLAG_GROUPADD;
652 689
… …
659 break; 696 break;
660 } 697 }
661 } 698 }
662} 699}
663 700
701static int
664static int grp_dec (eio_req *grp) 702grp_dec (eio_req *grp)
665{ 703{
666 --grp->size; 704 --grp->size;
667 705
668 /* call feeder, if applicable */ 706 /* call feeder, if applicable */
669 grp_try_feed (grp); 707 grp_try_feed (grp);
… …
673 return eio_finish (grp); 711 return eio_finish (grp);
674 else 712 else
675 return 0; 713 return 0;
676} 714}
677 715
716void
678void eio_destroy (eio_req *req) 717eio_destroy (eio_req *req)
679{ 718{
680 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
681 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
682 721
683 EIO_DESTROY (req); 722 EIO_DESTROY (req);
684} 723}
685 724
725static int
686static int eio_finish (eio_req *req) 726eio_finish (eio_req *req)
687{ 727{
688 int res = EIO_FINISH (req); 728 int res = EIO_FINISH (req);
689 729
690 if (req->grp) 730 if (req->grp)
691 { 731 {
… …
708 eio_destroy (req); 748 eio_destroy (req);
709 749
710 return res; 750 return res;
711} 751}
712 752
753void
713void eio_grp_cancel (eio_req *grp) 754eio_grp_cancel (eio_req *grp)
714{ 755{
715 for (grp = grp->grp_first; grp; grp = grp->grp_next) 756 for (grp = grp->grp_first; grp; grp = grp->grp_next)
716 eio_cancel (grp); 757 eio_cancel (grp);
717} 758}
718 759
760void
719void eio_cancel (eio_req *req) 761eio_cancel (eio_req *req)
720{ 762{
721 etp_cancel (req); 763 etp_cancel (req);
722} 764}
723 765
766void
724void eio_submit (eio_req *req) 767eio_submit (eio_req *req)
725{ 768{
726 etp_submit (req); 769 etp_submit (req);
727} 770}
728 771
729unsigned int eio_nreqs (void) 772unsigned int
773eio_nreqs (void)
730{ 774{
731 return etp_nreqs (); 775 return etp_nreqs ();
732} 776}
733 777
734unsigned int eio_nready (void) 778unsigned int
779eio_nready (void)
735{ 780{
736 return etp_nready (); 781 return etp_nready ();
737} 782}
738 783
739unsigned int eio_npending (void) 784unsigned int
785eio_npending (void)
740{ 786{
741 return etp_npending (); 787 return etp_npending ();
742} 788}
743 789
744unsigned int eio_nthreads (void) 790unsigned int ecb_cold
791eio_nthreads (void)
745{ 792{
746 return etp_nthreads (); 793 return etp_nthreads ();
747} 794}
748 795
796void ecb_cold
749void eio_set_max_poll_time (double nseconds) 797eio_set_max_poll_time (double nseconds)
750{ 798{
751 etp_set_max_poll_time (nseconds); 799 etp_set_max_poll_time (nseconds);
752} 800}
753 801
802void ecb_cold
754void eio_set_max_poll_reqs (unsigned int maxreqs) 803eio_set_max_poll_reqs (unsigned int maxreqs)
755{ 804{
756 etp_set_max_poll_reqs (maxreqs); 805 etp_set_max_poll_reqs (maxreqs);
757} 806}
758 807
808void ecb_cold
759void eio_set_max_idle (unsigned int nthreads) 809eio_set_max_idle (unsigned int nthreads)
760{ 810{
761 etp_set_max_idle (nthreads); 811 etp_set_max_idle (nthreads);
762} 812}
763 813
814void ecb_cold
815eio_set_idle_timeout (unsigned int seconds)
816{
817 etp_set_idle_timeout (seconds);
818}
819
820void ecb_cold
764void eio_set_min_parallel (unsigned int nthreads) 821eio_set_min_parallel (unsigned int nthreads)
765{ 822{
766 etp_set_min_parallel (nthreads); 823 etp_set_min_parallel (nthreads);
767} 824}
768 825
826void ecb_cold
769void eio_set_max_parallel (unsigned int nthreads) 827eio_set_max_parallel (unsigned int nthreads)
770{ 828{
771 etp_set_max_parallel (nthreads); 829 etp_set_max_parallel (nthreads);
772} 830}
773 831
774int eio_poll (void) 832int eio_poll (void)
… …
776 return etp_poll (); 834 return etp_poll ();
777} 835}
778 836
779/*****************************************************************************/ 837/*****************************************************************************/
780/* work around various missing functions */ 838/* work around various missing functions */
839
840#if _POSIX_VERSION < 200809L
841# define realpath(path,resolved_path) (errno = ENOSYS, 0)
842#endif
781 843
782#if !HAVE_PREADWRITE 844#if !HAVE_PREADWRITE
783# undef pread 845# undef pread
784# undef pwrite 846# undef pwrite
785# define pread eio__pread 847# define pread eio__pread
… …
844#ifndef HAVE_FUTIMES 906#ifndef HAVE_FUTIMES
845 907
846# undef futimes 908# undef futimes
847# define futimes(fd,times) eio__futimes (fd, times) 909# define futimes(fd,times) eio__futimes (fd, times)
848 910
911static int
849static int eio__futimes (int fd, const struct timeval tv[2]) 912eio__futimes (int fd, const struct timeval tv[2])
850{ 913{
851 errno = ENOSYS; 914 errno = ENOSYS;
852 return -1; 915 return -1;
853} 916}
854 917
… …
858# undef fdatasync 921# undef fdatasync
859# define fdatasync(fd) fsync (fd) 922# define fdatasync(fd) fsync (fd)
860#endif 923#endif
861 924
862/* sync_file_range always needs emulation */ 925/* sync_file_range always needs emulation */
863int 926static int
864eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 927eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
865{ 928{
866#if HAVE_SYNC_FILE_RANGE 929#if HAVE_SYNC_FILE_RANGE
867 int res; 930 int res;
868 931
… …
914 977
915/* sendfile always needs emulation */ 978/* sendfile always needs emulation */
916static ssize_t 979static ssize_t
917eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 980eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
918{ 981{
982 ssize_t written = 0;
919 ssize_t res; 983 ssize_t res;
920 984
921 if (!count) 985 if (!count)
922 return 0; 986 return 0;
923 987
988 for (;;)
989 {
924#if HAVE_SENDFILE 990#if HAVE_SENDFILE
925# if __linux 991# if __linux
992 off_t soffset = offset;
926 res = sendfile (ofd, ifd, &offset, count); 993 res = sendfile (ofd, ifd, &soffset, count);
927 994
928# elif __FreeBSD__ 995# elif __FreeBSD__
929 /* 996 /*
930 * Of course, the freebsd sendfile is a dire hack with no thoughts 997 * Of course, the freebsd sendfile is a dire hack with no thoughts
931 * wasted on making it similar to other I/O functions. 998 * wasted on making it similar to other I/O functions.
932 */ 999 */
933 {
934 off_t sbytes; 1000 off_t sbytes;
935 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 1001 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
936 1002
937 #if 0 /* according to the manpage, this is correct, but broken behaviour */ 1003 #if 0 /* according to the manpage, this is correct, but broken behaviour */
938 /* freebsd' sendfile will return 0 on success */ 1004 /* freebsd' sendfile will return 0 on success */
939 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ 1005 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
940 /* not on e.g. EIO or EPIPE - sounds broken */ 1006 /* not on e.g. EIO or EPIPE - sounds broken */
941 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 1007 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
942 res = sbytes; 1008 res = sbytes;
943 #endif 1009 #endif
944 1010
945 /* according to source inspection, this is correct, and useful behaviour */ 1011 /* according to source inspection, this is correct, and useful behaviour */
946 if (sbytes) 1012 if (sbytes)
947 res = sbytes; 1013 res = sbytes;
948 }
949 1014
950# elif defined (__APPLE__) 1015# elif defined (__APPLE__) && 0 /* broken, as everything on os x */
951
952 {
953 off_t sbytes = count; 1016 off_t sbytes = count;
954 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1017 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
955 1018
956 /* according to the manpage, sbytes is always valid */ 1019 /* according to the manpage, sbytes is always valid */
957 if (sbytes) 1020 if (sbytes)
958 res = sbytes; 1021 res = sbytes;
959 }
960 1022
961# elif __hpux 1023# elif __hpux
962 res = sendfile (ofd, ifd, offset, count, 0, 0); 1024 res = sendfile (ofd, ifd, offset, count, 0, 0);
963 1025
964# elif __solaris 1026# elif __solaris
965 {
966 struct sendfilevec vec; 1027 struct sendfilevec vec;
967 size_t sbytes; 1028 size_t sbytes;
968 1029
969 vec.sfv_fd = ifd; 1030 vec.sfv_fd = ifd;
970 vec.sfv_flag = 0; 1031 vec.sfv_flag = 0;
971 vec.sfv_off = offset; 1032 vec.sfv_off = offset;
972 vec.sfv_len = count; 1033 vec.sfv_len = count;
973 1034
974 res = sendfilev (ofd, &vec, 1, &sbytes); 1035 res = sendfilev (ofd, &vec, 1, &sbytes);
975 1036
976 if (res < 0 && sbytes) 1037 if (res < 0 && sbytes)
977 res = sbytes; 1038 res = sbytes;
978 }
979 1039
980# endif 1040# endif
981 1041
982#elif defined (_WIN32) 1042#elif defined (_WIN32)
983
984 /* does not work, just for documentation of what would need to be done */ 1043 /* does not work, just for documentation of what would need to be done */
985 { 1044 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1045 /* libeio guarantees that the file offset does not change, and windows */
1046 /* has no way to get an independent handle to the same file description */
986 HANDLE h = TO_SOCKET (ifd); 1047 HANDLE h = TO_SOCKET (ifd);
987 SetFilePointer (h, offset, 0, FILE_BEGIN); 1048 SetFilePointer (h, offset, 0, FILE_BEGIN);
988 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1049 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
989 }
990 1050
991#else 1051#else
992 res = -1; 1052 res = -1;
993 errno = ENOSYS; 1053 errno = ENOSYS;
994#endif 1054#endif
995 1055
1056 /* we assume sendfile can copy at least 128mb in one go */
1057 if (res <= 128 * 1024 * 1024)
1058 {
1059 if (res > 0)
1060 written += res;
1061
1062 if (written)
1063 return written;
1064
1065 break;
1066 }
1067 else
1068 {
1069 /* if we requested more, then probably the kernel was lazy */
1070 written += res;
1071 offset += res;
1072 count -= res;
1073
1074 if (!count)
1075 return written;
1076 }
1077 }
1078
996 if (res < 0 1079 if (res < 0
997 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1080 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
998 /* BSDs */ 1081 /* BSDs */
999#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1082#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1000 || errno == ENOTSUP 1083 || errno == ENOTSUP
1001#endif 1084#endif
… …
1041} 1124}
1042 1125
1043static signed char 1126static signed char
1044eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1127eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1045{ 1128{
1046 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1129 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; 1130 : a->inode < b->inode ? -1
1131 : a->inode > b->inode ? 1
1132 : 0;
1048} 1133}
1049 1134
1050#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1135#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1051 1136
1052#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1137#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
… …
1058 unsigned char bits [9 + sizeof (ino_t) * 8]; 1143 unsigned char bits [9 + sizeof (ino_t) * 8];
1059 unsigned char *bit = bits; 1144 unsigned char *bit = bits;
1060 1145
1061 assert (CHAR_BIT == 8); 1146 assert (CHAR_BIT == 8);
1062 assert (sizeof (eio_dirent) * 8 < 256); 1147 assert (sizeof (eio_dirent) * 8 < 256);
1063 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1148 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1064 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1149 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1065 1150
1066 if (size <= EIO_SORT_FAST) 1151 if (size <= EIO_SORT_FAST)
1067 return; 1152 return;
1068 1153
1069 /* first prepare an array of bits to test in our radix sort */ 1154 /* first prepare an array of bits to test in our radix sort */
… …
1224 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1309 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1225 1310
1226 X_LOCK (wrklock); 1311 X_LOCK (wrklock);
1227 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1312 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1228 self->dirp = dirp = opendir (req->ptr1); 1313 self->dirp = dirp = opendir (req->ptr1);
1314
1315 if (req->flags & EIO_FLAG_PTR1_FREE)
1316 free (req->ptr1);
1317
1229 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1318 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1230 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1319 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1231 req->ptr2 = names = malloc (namesalloc); 1320 req->ptr2 = names = malloc (namesalloc);
1232 X_UNLOCK (wrklock); 1321 X_UNLOCK (wrklock);
1233 1322
… …
1245 /* sort etc. */ 1334 /* sort etc. */
1246 req->int1 = flags; 1335 req->int1 = flags;
1247 req->result = dentoffs; 1336 req->result = dentoffs;
1248 1337
1249 if (flags & EIO_READDIR_STAT_ORDER) 1338 if (flags & EIO_READDIR_STAT_ORDER)
1250 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1339 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1251 else if (flags & EIO_READDIR_DIRS_FIRST) 1340 else if (flags & EIO_READDIR_DIRS_FIRST)
1252 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1341 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1253 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1342 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1254 else 1343 else
1255 { 1344 {
… …
1257 eio_dirent *oth = dents + dentoffs; 1346 eio_dirent *oth = dents + dentoffs;
1258 eio_dirent *dir = dents; 1347 eio_dirent *dir = dents;
1259 1348
1260 /* now partition dirs to the front, and non-dirs to the back */ 1349 /* now partition dirs to the front, and non-dirs to the back */
1261 /* by walking from both sides and swapping if necessary */ 1350 /* by walking from both sides and swapping if necessary */
1262 /* also clear score, so it doesn't influence sorting */
1263 while (oth > dir) 1351 while (oth > dir)
1264 { 1352 {
1265 if (dir->type == EIO_DT_DIR) 1353 if (dir->type == EIO_DT_DIR)
1266 ++dir; 1354 ++dir;
1267 else if ((--oth)->type == EIO_DT_DIR) 1355 else if ((--oth)->type == EIO_DT_DIR)
… …
1270 1358
1271 ++dir; 1359 ++dir;
1272 } 1360 }
1273 } 1361 }
1274 1362
1275 /* now sort the dirs only */ 1363 /* now sort the dirs only (dirs all have the same score) */
1276 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1364 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1277 } 1365 }
1278 1366
1279 break; 1367 break;
1280 } 1368 }
… …
1285 /* skip . and .. entries */ 1373 /* skip . and .. entries */
1286 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1374 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1287 { 1375 {
1288 int len = D_NAMLEN (entp) + 1; 1376 int len = D_NAMLEN (entp) + 1;
1289 1377
1290 while (expect_false (namesoffs + len > namesalloc)) 1378 while (ecb_expect_false (namesoffs + len > namesalloc))
1291 { 1379 {
1292 namesalloc *= 2; 1380 namesalloc *= 2;
1293 X_LOCK (wrklock); 1381 X_LOCK (wrklock);
1294 req->ptr2 = names = realloc (names, namesalloc); 1382 req->ptr2 = names = realloc (names, namesalloc);
1295 X_UNLOCK (wrklock); 1383 X_UNLOCK (wrklock);
… …
1302 1390
1303 if (dents) 1391 if (dents)
1304 { 1392 {
1305 struct eio_dirent *ent; 1393 struct eio_dirent *ent;
1306 1394
1307 if (expect_false (dentoffs == dentalloc)) 1395 if (ecb_expect_false (dentoffs == dentalloc))
1308 { 1396 {
1309 dentalloc *= 2; 1397 dentalloc *= 2;
1310 X_LOCK (wrklock); 1398 X_LOCK (wrklock);
1311 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1399 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1312 X_UNLOCK (wrklock); 1400 X_UNLOCK (wrklock);
… …
1472 1560
1473#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1561#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1474# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1562# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1475#else 1563#else
1476 1564
1477int 1565static int
1478eio__msync (void *mem, size_t len, int flags) 1566eio__msync (void *mem, size_t len, int flags)
1479{ 1567{
1480 eio_page_align (&mem, &len); 1568 eio_page_align (&mem, &len);
1481 1569
1482 if (EIO_MS_ASYNC != MS_SYNC 1570 if (EIO_MS_ASYNC != MS_SYNC
… …
1492 return msync (mem, len, flags); 1580 return msync (mem, len, flags);
1493} 1581}
1494 1582
1495#endif 1583#endif
1496 1584
1497int 1585static int
1498eio__mtouch (void *mem, size_t len, int flags) 1586eio__mtouch (eio_req *req)
1499{ 1587{
1588 void *mem = req->ptr2;
1589 size_t len = req->size;
1590 int flags = req->int1;
1591
1500 eio_page_align (&mem, &len); 1592 eio_page_align (&mem, &len);
1501 1593
1502 { 1594 {
1503 intptr_t addr = (intptr_t)mem; 1595 intptr_t addr = (intptr_t)mem;
1504 intptr_t end = addr + len; 1596 intptr_t end = addr + len;
1505 intptr_t page = eio_pagesize (); 1597 intptr_t page = eio_pagesize ();
1506 1598
1507 if (addr < end) 1599 if (addr < end)
1508 if (flags & EIO_MT_MODIFY) /* modify */ 1600 if (flags & EIO_MT_MODIFY) /* modify */
1509 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1601 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1510 else 1602 else
1511 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1603 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1512 } 1604 }
1513 1605
1514 return 0; 1606 return 0;
1515} 1607}
1516 1608
… …
1551 if (req) 1643 if (req)
1552 break; 1644 break;
1553 1645
1554 ++idle; 1646 ++idle;
1555 1647
1556 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1648 ts.tv_sec = time (0) + idle_timeout;
1557 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1649 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1558 { 1650 {
1559 if (idle > max_idle) 1651 if (idle > max_idle)
1560 { 1652 {
1561 --idle; 1653 --idle;
… …
1604 return 0; 1696 return 0;
1605} 1697}
1606 1698
1607/*****************************************************************************/ 1699/*****************************************************************************/
1608 1700
1701int ecb_cold
1609int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1702eio_init (void (*want_poll)(void), void (*done_poll)(void))
1610{ 1703{
1611 return etp_init (want_poll, done_poll); 1704 return etp_init (want_poll, done_poll);
1612} 1705}
1613 1706
1707ecb_inline void
1614static void eio_api_destroy (eio_req *req) 1708eio_api_destroy (eio_req *req)
1615{ 1709{
1616 free (req); 1710 free (req);
1617} 1711}
1618 1712
1619#define REQ(rtype) \ 1713#define REQ(rtype) \
… …
1638 { \ 1732 { \
1639 eio_api_destroy (req); \ 1733 eio_api_destroy (req); \
1640 return 0; \ 1734 return 0; \
1641 } 1735 }
1642 1736
1737static void
1643static void eio_execute (etp_worker *self, eio_req *req) 1738eio_execute (etp_worker *self, eio_req *req)
1644{ 1739{
1645 switch (req->type) 1740 switch (req->type)
1646 { 1741 {
1647 case EIO_READ: ALLOC (req->size); 1742 case EIO_READ: ALLOC (req->size);
1648 req->result = req->offs >= 0 1743 req->result = req->offs >= 0
… …
1683 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1778 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1684 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1779 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1685 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1780 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; 1781 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1687 1782
1783 case EIO_REALPATH: req->flags |= EIO_FLAG_PTR2_FREE;
1784 req->ptr2 = realpath (req->ptr1, 0);
1785 req->result = req->ptr2 ? strlen (req->ptr2) : -1;
1786 break;
1787
1688 case EIO_READLINK: ALLOC (PATH_MAX); 1788 case EIO_READLINK: ALLOC (PATH_MAX);
1689 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1789 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1690 1790
1691 case EIO_SYNC: req->result = 0; sync (); break; 1791 case EIO_SYNC: req->result = 0; sync (); break;
1692 case EIO_FSYNC: req->result = fsync (req->int1); break; 1792 case EIO_FSYNC: req->result = fsync (req->int1); break;
1693 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1793 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1694 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1794 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; 1795 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1696 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 1796 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1697 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1797 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; 1798 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1699 1799
1700 case EIO_READDIR: eio__scandir (req, self); break; 1800 case EIO_READDIR: eio__scandir (req, self); break;
… …
1744 case EIO_NOP: 1844 case EIO_NOP:
1745 req->result = 0; 1845 req->result = 0;
1746 break; 1846 break;
1747 1847
1748 case EIO_CUSTOM: 1848 case EIO_CUSTOM:
1749 ((void (*)(eio_req *))req->feed) (req); 1849 req->feed (req);
1750 break; 1850 break;
1751 1851
1752 default: 1852 default:
1753 errno = ENOSYS; 1853 errno = ENOSYS;
1754 req->result = -1; 1854 req->result = -1;
… …
1907} 2007}
1908 2008
1909eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2009eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1910{ 2010{
1911 return eio__1path (EIO_READLINK, path, pri, cb, data); 2011 return eio__1path (EIO_READLINK, path, pri, cb, data);
2012}
2013
2014eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2015{
2016 return eio__1path (EIO_REALPATH, path, pri, cb, data);
1912} 2017}
1913 2018
1914eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2019eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1915{ 2020{
1916 return eio__1path (EIO_STAT, path, pri, cb, data); 2021 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) 2080eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1976{ 2081{
1977 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2082 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1978} 2083}
1979 2084
1980eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2085eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1981{ 2086{
1982 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2087 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1983} 2088}
1984 2089
1985#endif 2090#endif
1986 2091
1987eio_req *eio_grp (eio_cb cb, void *data) 2092eio_req *eio_grp (eio_cb cb, void *data)
… …
1996#undef SEND 2101#undef SEND
1997 2102
1998/*****************************************************************************/ 2103/*****************************************************************************/
1999/* grp functions */ 2104/* grp functions */
2000 2105
2106void
2001void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2107eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
2002{ 2108{
2003 grp->int2 = limit; 2109 grp->int2 = limit;
2004 grp->feed = feed; 2110 grp->feed = feed;
2005 2111
2006 grp_try_feed (grp); 2112 grp_try_feed (grp);
2007} 2113}
2008 2114
2115void
2009void eio_grp_limit (eio_req *grp, int limit) 2116eio_grp_limit (eio_req *grp, int limit)
2010{ 2117{
2011 grp->int2 = limit; 2118 grp->int2 = limit;
2012 2119
2013 grp_try_feed (grp); 2120 grp_try_feed (grp);
2014} 2121}
2015 2122
2123void
2016void eio_grp_add (eio_req *grp, eio_req *req) 2124eio_grp_add (eio_req *grp, eio_req *req)
2017{ 2125{
2018 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2126 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2019 2127
2020 grp->flags |= EIO_FLAG_GROUPADD; 2128 grp->flags |= EIO_FLAG_GROUPADD;
2021 2129
… …
2032} 2140}
2033 2141
2034/*****************************************************************************/ 2142/*****************************************************************************/
2035/* misc garbage */ 2143/* misc garbage */
2036 2144
2145ssize_t
2037ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2146eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2038{ 2147{
2039 etp_worker wrk; 2148 etp_worker wrk;
2040 ssize_t ret; 2149 ssize_t ret;
2041 2150
2042 wrk.dbuf = 0; 2151 wrk.dbuf = 0;

Diff Legend

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