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.66 by root, Sun Jun 5 19:58:37 2011 UTC vs.
Revision 1.79 by root, Tue Jul 5 16:57:41 2011 UTC

… …
40#ifndef _WIN32 40#ifndef _WIN32
41# include "config.h" 41# include "config.h"
42#endif 42#endif
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h"
45 46
46#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
47# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define XTHREAD_STACKSIZE EIO_STACKSIZE
48#endif 49#endif
49#include "xthread.h" 50#include "xthread.h"
… …
165 if (!eio_buf) \ 166 if (!eio_buf) \
166 return -1; 167 return -1;
167 168
168#define EIO_TICKS ((1000000 + 1023) >> 10) 169#define EIO_TICKS ((1000000 + 1023) >> 10)
169 170
170/*****************************************************************************/
171
172#if __GNUC__ >= 3
173# define expect(expr,value) __builtin_expect ((expr),(value))
174#else
175# define expect(expr,value) (expr)
176#endif
177
178#define expect_false(expr) expect ((expr) != 0, 0)
179#define expect_true(expr) expect ((expr) != 0, 1)
180
181/*****************************************************************************/
182
183#define ETP_PRI_MIN EIO_PRI_MIN 171#define ETP_PRI_MIN EIO_PRI_MIN
184#define ETP_PRI_MAX EIO_PRI_MAX 172#define ETP_PRI_MAX EIO_PRI_MAX
185 173
186struct etp_worker; 174struct etp_worker;
187 175
… …
212/*****************************************************************************/ 200/*****************************************************************************/
213 201
214#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 202#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
215 203
216/* calculate time difference in ~1/EIO_TICKS of a second */ 204/* calculate time difference in ~1/EIO_TICKS of a second */
205ecb_inline int
217static int tvdiff (struct timeval *tv1, struct timeval *tv2) 206tvdiff (struct timeval *tv1, struct timeval *tv2)
218{ 207{
219 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 208 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
220 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 209 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
221} 210}
222 211
… …
266#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 255#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
267#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 256#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
268 257
269/* worker threads management */ 258/* worker threads management */
270 259
260static void ecb_cold
271static void etp_worker_clear (etp_worker *wrk) 261etp_worker_clear (etp_worker *wrk)
272{ 262{
273 ETP_WORKER_CLEAR (wrk); 263 ETP_WORKER_CLEAR (wrk);
274} 264}
275 265
266static void ecb_cold
276static void etp_worker_free (etp_worker *wrk) 267etp_worker_free (etp_worker *wrk)
277{ 268{
278 wrk->next->prev = wrk->prev; 269 wrk->next->prev = wrk->prev;
279 wrk->prev->next = wrk->next; 270 wrk->prev->next = wrk->next;
280 271
281 free (wrk); 272 free (wrk);
282} 273}
283 274
284static unsigned int etp_nreqs (void) 275static unsigned int
276etp_nreqs (void)
285{ 277{
286 int retval; 278 int retval;
287 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 279 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
288 retval = nreqs; 280 retval = nreqs;
289 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 281 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
290 return retval; 282 return retval;
291} 283}
292 284
293static unsigned int etp_nready (void) 285static unsigned int
286etp_nready (void)
294{ 287{
295 unsigned int retval; 288 unsigned int retval;
296 289
297 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
298 retval = nready; 291 retval = nready;
299 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
300 293
301 return retval; 294 return retval;
302} 295}
303 296
304static unsigned int etp_npending (void) 297static unsigned int
298etp_npending (void)
305{ 299{
306 unsigned int retval; 300 unsigned int retval;
307 301
308 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 302 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
309 retval = npending; 303 retval = npending;
310 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 304 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
311 305
312 return retval; 306 return retval;
313} 307}
314 308
315static unsigned int etp_nthreads (void) 309static unsigned int
310etp_nthreads (void)
316{ 311{
317 unsigned int retval; 312 unsigned int retval;
318 313
319 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 314 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
320 retval = started; 315 retval = started;
… …
334} etp_reqq; 329} etp_reqq;
335 330
336static etp_reqq req_queue; 331static etp_reqq req_queue;
337static etp_reqq res_queue; 332static etp_reqq res_queue;
338 333
334static int ecb_noinline
339static int reqq_push (etp_reqq *q, ETP_REQ *req) 335reqq_push (etp_reqq *q, ETP_REQ *req)
340{ 336{
341 int pri = req->pri; 337 int pri = req->pri;
342 req->next = 0; 338 req->next = 0;
343 339
344 if (q->qe[pri]) 340 if (q->qe[pri])
… …
350 q->qe[pri] = q->qs[pri] = req; 346 q->qe[pri] = q->qs[pri] = req;
351 347
352 return q->size++; 348 return q->size++;
353} 349}
354 350
351static ETP_REQ * ecb_noinline
355static ETP_REQ *reqq_shift (etp_reqq *q) 352reqq_shift (etp_reqq *q)
356{ 353{
357 int pri; 354 int pri;
358 355
359 if (!q->size) 356 if (!q->size)
360 return 0; 357 return 0;
… …
375 } 372 }
376 373
377 abort (); 374 abort ();
378} 375}
379 376
377static void ecb_cold
380static void etp_thread_init (void) 378etp_thread_init (void)
381{ 379{
382 X_MUTEX_CREATE (wrklock); 380 X_MUTEX_CREATE (wrklock);
383 X_MUTEX_CREATE (reslock); 381 X_MUTEX_CREATE (reslock);
384 X_MUTEX_CREATE (reqlock); 382 X_MUTEX_CREATE (reqlock);
385 X_COND_CREATE (reqwait); 383 X_COND_CREATE (reqwait);
386} 384}
387 385
386static void ecb_cold
388static void etp_atfork_prepare (void) 387etp_atfork_prepare (void)
389{ 388{
390 X_LOCK (wrklock); 389 X_LOCK (wrklock);
391 X_LOCK (reqlock); 390 X_LOCK (reqlock);
392 X_LOCK (reslock); 391 X_LOCK (reslock);
393#if !HAVE_PREADWRITE 392#if !HAVE_PREADWRITE
394 X_LOCK (preadwritelock); 393 X_LOCK (preadwritelock);
395#endif 394#endif
396} 395}
397 396
397static void ecb_cold
398static void etp_atfork_parent (void) 398etp_atfork_parent (void)
399{ 399{
400#if !HAVE_PREADWRITE 400#if !HAVE_PREADWRITE
401 X_UNLOCK (preadwritelock); 401 X_UNLOCK (preadwritelock);
402#endif 402#endif
403 X_UNLOCK (reslock); 403 X_UNLOCK (reslock);
404 X_UNLOCK (reqlock); 404 X_UNLOCK (reqlock);
405 X_UNLOCK (wrklock); 405 X_UNLOCK (wrklock);
406} 406}
407 407
408static void ecb_cold
408static void etp_atfork_child (void) 409etp_atfork_child (void)
409{ 410{
410 ETP_REQ *prv; 411 ETP_REQ *prv;
411 412
412 while ((prv = reqq_shift (&req_queue))) 413 while ((prv = reqq_shift (&req_queue)))
413 ETP_DESTROY (prv); 414 ETP_DESTROY (prv);
… …
433 npending = 0; 434 npending = 0;
434 435
435 etp_thread_init (); 436 etp_thread_init ();
436} 437}
437 438
438static void 439static void ecb_cold
439etp_once_init (void) 440etp_once_init (void)
440{ 441{
441 etp_thread_init (); 442 etp_thread_init ();
442 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);
443} 444}
444 445
445static int 446static int ecb_cold
446etp_init (void (*want_poll)(void), void (*done_poll)(void)) 447etp_init (void (*want_poll)(void), void (*done_poll)(void))
447{ 448{
448 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 449 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
449 450
450 pthread_once (&doinit, etp_once_init); 451 pthread_once (&doinit, etp_once_init);
… …
455 return 0; 456 return 0;
456} 457}
457 458
458X_THREAD_PROC (etp_proc); 459X_THREAD_PROC (etp_proc);
459 460
461static void ecb_cold
460static void etp_start_thread (void) 462etp_start_thread (void)
461{ 463{
462 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 464 etp_worker *wrk = calloc (1, sizeof (etp_worker));
463 465
464 /*TODO*/ 466 /*TODO*/
465 assert (("unable to allocate worker thread data", wrk)); 467 assert (("unable to allocate worker thread data", wrk));
… …
478 free (wrk); 480 free (wrk);
479 481
480 X_UNLOCK (wrklock); 482 X_UNLOCK (wrklock);
481} 483}
482 484
485static void
483static void etp_maybe_start_thread (void) 486etp_maybe_start_thread (void)
484{ 487{
485 if (expect_true (etp_nthreads () >= wanted)) 488 if (ecb_expect_true (etp_nthreads () >= wanted))
486 return; 489 return;
487 490
488 /* todo: maybe use idle here, but might be less exact */ 491 /* todo: maybe use idle here, but might be less exact */
489 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 ()))
490 return; 493 return;
491 494
492 etp_start_thread (); 495 etp_start_thread ();
493} 496}
494 497
498static void ecb_cold
495static void etp_end_thread (void) 499etp_end_thread (void)
496{ 500{
497 eio_req *req = calloc (1, sizeof (eio_req)); 501 eio_req *req = calloc (1, sizeof (eio_req));
498 502
499 req->type = -1; 503 req->type = -1;
500 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 504 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
… …
507 X_LOCK (wrklock); 511 X_LOCK (wrklock);
508 --started; 512 --started;
509 X_UNLOCK (wrklock); 513 X_UNLOCK (wrklock);
510} 514}
511 515
512static int etp_poll (void) 516static int
517etp_poll (void)
513{ 518{
514 unsigned int maxreqs; 519 unsigned int maxreqs;
515 unsigned int maxtime; 520 unsigned int maxtime;
516 struct timeval tv_start, tv_now; 521 struct timeval tv_start, tv_now;
517 522
… …
547 552
548 X_LOCK (reqlock); 553 X_LOCK (reqlock);
549 --nreqs; 554 --nreqs;
550 X_UNLOCK (reqlock); 555 X_UNLOCK (reqlock);
551 556
552 if (expect_false (req->type == EIO_GROUP && req->size)) 557 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
553 { 558 {
554 req->int1 = 1; /* mark request as delayed */ 559 req->int1 = 1; /* mark request as delayed */
555 continue; 560 continue;
556 } 561 }
557 else 562 else
558 { 563 {
559 int res = ETP_FINISH (req); 564 int res = ETP_FINISH (req);
560 if (expect_false (res)) 565 if (ecb_expect_false (res))
561 return res; 566 return res;
562 } 567 }
563 568
564 if (expect_false (maxreqs && !--maxreqs)) 569 if (ecb_expect_false (maxreqs && !--maxreqs))
565 break; 570 break;
566 571
567 if (maxtime) 572 if (maxtime)
568 { 573 {
569 gettimeofday (&tv_now, 0); 574 gettimeofday (&tv_now, 0);
… …
575 580
576 errno = EAGAIN; 581 errno = EAGAIN;
577 return -1; 582 return -1;
578} 583}
579 584
585static void
580static void etp_cancel (ETP_REQ *req) 586etp_cancel (ETP_REQ *req)
581{ 587{
582 X_LOCK (wrklock); 588 X_LOCK (wrklock);
583 req->flags |= EIO_FLAG_CANCELLED; 589 req->flags |= EIO_FLAG_CANCELLED;
584 X_UNLOCK (wrklock); 590 X_UNLOCK (wrklock);
585 591
586 eio_grp_cancel (req); 592 eio_grp_cancel (req);
587} 593}
588 594
595static void
589static void etp_submit (ETP_REQ *req) 596etp_submit (ETP_REQ *req)
590{ 597{
591 req->pri -= ETP_PRI_MIN; 598 req->pri -= ETP_PRI_MIN;
592 599
593 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;
594 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;
595 602
596 if (expect_false (req->type == EIO_GROUP)) 603 if (ecb_expect_false (req->type == EIO_GROUP))
597 { 604 {
598 /* I hope this is worth it :/ */ 605 /* I hope this is worth it :/ */
599 X_LOCK (reqlock); 606 X_LOCK (reqlock);
600 ++nreqs; 607 ++nreqs;
601 X_UNLOCK (reqlock); 608 X_UNLOCK (reqlock);
… …
620 627
621 etp_maybe_start_thread (); 628 etp_maybe_start_thread ();
622 } 629 }
623} 630}
624 631
632static void ecb_cold
625static void etp_set_max_poll_time (double nseconds) 633etp_set_max_poll_time (double nseconds)
626{ 634{
627 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 635 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
628 max_poll_time = nseconds * EIO_TICKS; 636 max_poll_time = nseconds * EIO_TICKS;
629 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 637 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
630} 638}
631 639
640static void ecb_cold
632static void etp_set_max_poll_reqs (unsigned int maxreqs) 641etp_set_max_poll_reqs (unsigned int maxreqs)
633{ 642{
634 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 643 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
635 max_poll_reqs = maxreqs; 644 max_poll_reqs = maxreqs;
636 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 645 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
637} 646}
638 647
648static void ecb_cold
639static void etp_set_max_idle (unsigned int nthreads) 649etp_set_max_idle (unsigned int nthreads)
640{ 650{
641 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 651 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
642 max_idle = nthreads; 652 max_idle = nthreads;
643 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 653 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
644} 654}
645 655
656static void ecb_cold
646static void etp_set_idle_timeout (unsigned int seconds) 657etp_set_idle_timeout (unsigned int seconds)
647{ 658{
648 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 659 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
649 idle_timeout = seconds; 660 idle_timeout = seconds;
650 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 661 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
651} 662}
652 663
664static void ecb_cold
653static void etp_set_min_parallel (unsigned int nthreads) 665etp_set_min_parallel (unsigned int nthreads)
654{ 666{
655 if (wanted < nthreads) 667 if (wanted < nthreads)
656 wanted = nthreads; 668 wanted = nthreads;
657} 669}
658 670
671static void ecb_cold
659static void etp_set_max_parallel (unsigned int nthreads) 672etp_set_max_parallel (unsigned int nthreads)
660{ 673{
661 if (wanted > nthreads) 674 if (wanted > nthreads)
662 wanted = nthreads; 675 wanted = nthreads;
663 676
664 while (started > wanted) 677 while (started > wanted)
665 etp_end_thread (); 678 etp_end_thread ();
666} 679}
667 680
668/*****************************************************************************/ 681/*****************************************************************************/
669 682
683static void
670static void grp_try_feed (eio_req *grp) 684grp_try_feed (eio_req *grp)
671{ 685{
672 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 686 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
673 { 687 {
674 grp->flags &= ~EIO_FLAG_GROUPADD; 688 grp->flags &= ~EIO_FLAG_GROUPADD;
675 689
… …
682 break; 696 break;
683 } 697 }
684 } 698 }
685} 699}
686 700
701static int
687static int grp_dec (eio_req *grp) 702grp_dec (eio_req *grp)
688{ 703{
689 --grp->size; 704 --grp->size;
690 705
691 /* call feeder, if applicable */ 706 /* call feeder, if applicable */
692 grp_try_feed (grp); 707 grp_try_feed (grp);
… …
696 return eio_finish (grp); 711 return eio_finish (grp);
697 else 712 else
698 return 0; 713 return 0;
699} 714}
700 715
716void
701void eio_destroy (eio_req *req) 717eio_destroy (eio_req *req)
702{ 718{
703 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
704 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
705 721
706 EIO_DESTROY (req); 722 EIO_DESTROY (req);
707} 723}
708 724
725static int
709static int eio_finish (eio_req *req) 726eio_finish (eio_req *req)
710{ 727{
711 int res = EIO_FINISH (req); 728 int res = EIO_FINISH (req);
712 729
713 if (req->grp) 730 if (req->grp)
714 { 731 {
… …
722 if (grp->grp_first == req) 739 if (grp->grp_first == req)
723 grp->grp_first = req->grp_next; 740 grp->grp_first = req->grp_next;
724 741
725 res2 = grp_dec (grp); 742 res2 = grp_dec (grp);
726 743
727 if (!res && res2) 744 if (!res)
728 res = res2; 745 res = res2;
729 } 746 }
730 747
731 eio_destroy (req); 748 eio_destroy (req);
732 749
733 return res; 750 return res;
734} 751}
735 752
753void
736void eio_grp_cancel (eio_req *grp) 754eio_grp_cancel (eio_req *grp)
737{ 755{
738 for (grp = grp->grp_first; grp; grp = grp->grp_next) 756 for (grp = grp->grp_first; grp; grp = grp->grp_next)
739 eio_cancel (grp); 757 eio_cancel (grp);
740} 758}
741 759
760void
742void eio_cancel (eio_req *req) 761eio_cancel (eio_req *req)
743{ 762{
744 etp_cancel (req); 763 etp_cancel (req);
745} 764}
746 765
766void
747void eio_submit (eio_req *req) 767eio_submit (eio_req *req)
748{ 768{
749 etp_submit (req); 769 etp_submit (req);
750} 770}
751 771
752unsigned int eio_nreqs (void) 772unsigned int
773eio_nreqs (void)
753{ 774{
754 return etp_nreqs (); 775 return etp_nreqs ();
755} 776}
756 777
757unsigned int eio_nready (void) 778unsigned int
779eio_nready (void)
758{ 780{
759 return etp_nready (); 781 return etp_nready ();
760} 782}
761 783
762unsigned int eio_npending (void) 784unsigned int
785eio_npending (void)
763{ 786{
764 return etp_npending (); 787 return etp_npending ();
765} 788}
766 789
767unsigned int eio_nthreads (void) 790unsigned int ecb_cold
791eio_nthreads (void)
768{ 792{
769 return etp_nthreads (); 793 return etp_nthreads ();
770} 794}
771 795
796void ecb_cold
772void eio_set_max_poll_time (double nseconds) 797eio_set_max_poll_time (double nseconds)
773{ 798{
774 etp_set_max_poll_time (nseconds); 799 etp_set_max_poll_time (nseconds);
775} 800}
776 801
802void ecb_cold
777void eio_set_max_poll_reqs (unsigned int maxreqs) 803eio_set_max_poll_reqs (unsigned int maxreqs)
778{ 804{
779 etp_set_max_poll_reqs (maxreqs); 805 etp_set_max_poll_reqs (maxreqs);
780} 806}
781 807
808void ecb_cold
782void eio_set_max_idle (unsigned int nthreads) 809eio_set_max_idle (unsigned int nthreads)
783{ 810{
784 etp_set_max_idle (nthreads); 811 etp_set_max_idle (nthreads);
785} 812}
786 813
814void ecb_cold
787void eio_set_idle_timeout (unsigned int seconds) 815eio_set_idle_timeout (unsigned int seconds)
788{ 816{
789 etp_set_idle_timeout (seconds); 817 etp_set_idle_timeout (seconds);
790} 818}
791 819
820void ecb_cold
792void eio_set_min_parallel (unsigned int nthreads) 821eio_set_min_parallel (unsigned int nthreads)
793{ 822{
794 etp_set_min_parallel (nthreads); 823 etp_set_min_parallel (nthreads);
795} 824}
796 825
826void ecb_cold
797void eio_set_max_parallel (unsigned int nthreads) 827eio_set_max_parallel (unsigned int nthreads)
798{ 828{
799 etp_set_max_parallel (nthreads); 829 etp_set_max_parallel (nthreads);
800} 830}
801 831
802int eio_poll (void) 832int eio_poll (void)
… …
872#ifndef HAVE_FUTIMES 902#ifndef HAVE_FUTIMES
873 903
874# undef futimes 904# undef futimes
875# define futimes(fd,times) eio__futimes (fd, times) 905# define futimes(fd,times) eio__futimes (fd, times)
876 906
907static int
877static int eio__futimes (int fd, const struct timeval tv[2]) 908eio__futimes (int fd, const struct timeval tv[2])
878{ 909{
879 errno = ENOSYS; 910 errno = ENOSYS;
880 return -1; 911 return -1;
881} 912}
882 913
… …
886# undef fdatasync 917# undef fdatasync
887# define fdatasync(fd) fsync (fd) 918# define fdatasync(fd) fsync (fd)
888#endif 919#endif
889 920
890/* sync_file_range always needs emulation */ 921/* sync_file_range always needs emulation */
891int 922static int
892eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 923eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
893{ 924{
894#if HAVE_SYNC_FILE_RANGE 925#if HAVE_SYNC_FILE_RANGE
895 int res; 926 int res;
896 927
… …
942 973
943/* sendfile always needs emulation */ 974/* sendfile always needs emulation */
944static ssize_t 975static ssize_t
945eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 976eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
946{ 977{
978 ssize_t written = 0;
947 ssize_t res; 979 ssize_t res;
948 980
949 if (!count) 981 if (!count)
950 return 0; 982 return 0;
951 983
984 for (;;)
985 {
952#if HAVE_SENDFILE 986#if HAVE_SENDFILE
953# if __linux 987# if __linux
988 off_t soffset = offset;
954 res = sendfile (ofd, ifd, &offset, count); 989 res = sendfile (ofd, ifd, &soffset, count);
955 990
956# elif __FreeBSD__ 991# elif __FreeBSD__
957 /* 992 /*
958 * Of course, the freebsd sendfile is a dire hack with no thoughts 993 * Of course, the freebsd sendfile is a dire hack with no thoughts
959 * wasted on making it similar to other I/O functions. 994 * wasted on making it similar to other I/O functions.
960 */ 995 */
961 {
962 off_t sbytes; 996 off_t sbytes;
963 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 997 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
964 998
965 #if 0 /* according to the manpage, this is correct, but broken behaviour */ 999 #if 0 /* according to the manpage, this is correct, but broken behaviour */
966 /* freebsd' sendfile will return 0 on success */ 1000 /* freebsd' sendfile will return 0 on success */
967 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ 1001 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
968 /* not on e.g. EIO or EPIPE - sounds broken */ 1002 /* not on e.g. EIO or EPIPE - sounds broken */
969 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 1003 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
970 res = sbytes; 1004 res = sbytes;
971 #endif 1005 #endif
972 1006
973 /* according to source inspection, this is correct, and useful behaviour */ 1007 /* according to source inspection, this is correct, and useful behaviour */
974 if (sbytes) 1008 if (sbytes)
975 res = sbytes; 1009 res = sbytes;
976 }
977 1010
978# elif defined (__APPLE__) 1011# elif defined (__APPLE__) && 0 /* broken, as everything on os x */
979
980 {
981 off_t sbytes = count; 1012 off_t sbytes = count;
982 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1013 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
983 1014
984 /* according to the manpage, sbytes is always valid */ 1015 /* according to the manpage, sbytes is always valid */
985 if (sbytes) 1016 if (sbytes)
986 res = sbytes; 1017 res = sbytes;
987 }
988 1018
989# elif __hpux 1019# elif __hpux
990 res = sendfile (ofd, ifd, offset, count, 0, 0); 1020 res = sendfile (ofd, ifd, offset, count, 0, 0);
991 1021
992# elif __solaris 1022# elif __solaris
993 {
994 struct sendfilevec vec; 1023 struct sendfilevec vec;
995 size_t sbytes; 1024 size_t sbytes;
996 1025
997 vec.sfv_fd = ifd; 1026 vec.sfv_fd = ifd;
998 vec.sfv_flag = 0; 1027 vec.sfv_flag = 0;
999 vec.sfv_off = offset; 1028 vec.sfv_off = offset;
1000 vec.sfv_len = count; 1029 vec.sfv_len = count;
1001 1030
1002 res = sendfilev (ofd, &vec, 1, &sbytes); 1031 res = sendfilev (ofd, &vec, 1, &sbytes);
1003 1032
1004 if (res < 0 && sbytes) 1033 if (res < 0 && sbytes)
1005 res = sbytes; 1034 res = sbytes;
1006 }
1007 1035
1008# endif 1036# endif
1009 1037
1010#elif defined (_WIN32) 1038#elif defined (_WIN32)
1011
1012 /* does not work, just for documentation of what would need to be done */ 1039 /* does not work, just for documentation of what would need to be done */
1013 { 1040 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1041 /* libeio guarantees that the file offset does not change, and windows */
1042 /* has no way to get an independent handle to the same file description */
1014 HANDLE h = TO_SOCKET (ifd); 1043 HANDLE h = TO_SOCKET (ifd);
1015 SetFilePointer (h, offset, 0, FILE_BEGIN); 1044 SetFilePointer (h, offset, 0, FILE_BEGIN);
1016 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1045 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1017 }
1018 1046
1019#else 1047#else
1020 res = -1; 1048 res = -1;
1021 errno = ENOSYS; 1049 errno = ENOSYS;
1022#endif 1050#endif
1023 1051
1052 /* we assume sendfile can copy at least 128mb in one go */
1053 if (res <= 128 * 1024 * 1024)
1054 {
1055 if (res > 0)
1056 written += res;
1057
1058 if (written)
1059 return written;
1060
1061 break;
1062 }
1063 else
1064 {
1065 /* if we requested more, then probably the kernel was lazy */
1066 written += res;
1067 offset += res;
1068 count -= res;
1069
1070 if (!count)
1071 return written;
1072 }
1073 }
1074
1024 if (res < 0 1075 if (res < 0
1025 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1076 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1026 /* BSDs */ 1077 /* BSDs */
1027#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1078#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1028 || errno == ENOTSUP 1079 || errno == ENOTSUP
1029#endif 1080#endif
… …
1064 count -= cnt; 1115 count -= cnt;
1065 } 1116 }
1066 } 1117 }
1067 1118
1068 return res; 1119 return res;
1120}
1121
1122#ifdef PAGESIZE
1123# define eio_pagesize() PAGESIZE
1124#else
1125static intptr_t
1126eio_pagesize (void)
1127{
1128 static intptr_t page;
1129
1130 if (!page)
1131 page = sysconf (_SC_PAGESIZE);
1132
1133 return page;
1134}
1135#endif
1136
1137static void
1138eio_page_align (void **addr, size_t *length)
1139{
1140 intptr_t mask = eio_pagesize () - 1;
1141
1142 /* round down addr */
1143 intptr_t adj = mask & (intptr_t)*addr;
1144
1145 *addr = (void *)((intptr_t)*addr - adj);
1146 *length += adj;
1147
1148 /* round up length */
1149 *length = (*length + mask) & ~mask;
1150}
1151
1152#if !_POSIX_MEMLOCK
1153# define eio__mlockall(a) ((errno = ENOSYS), -1)
1154#else
1155
1156static int
1157eio__mlockall (int flags)
1158{
1159 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1160 extern int mallopt (int, int);
1161 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1162 #endif
1163
1164 if (EIO_MCL_CURRENT != MCL_CURRENT
1165 || EIO_MCL_FUTURE != MCL_FUTURE)
1166 {
1167 flags = 0
1168 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1169 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1170 }
1171
1172 return mlockall (flags);
1173}
1174#endif
1175
1176#if !_POSIX_MEMLOCK_RANGE
1177# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1178#else
1179
1180static int
1181eio__mlock (void *addr, size_t length)
1182{
1183 eio_page_align (&addr, &length);
1184
1185 return mlock (addr, length);
1186}
1187
1188#endif
1189
1190#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1191# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1192#else
1193
1194static int
1195eio__msync (void *mem, size_t len, int flags)
1196{
1197 eio_page_align (&mem, &len);
1198
1199 if (EIO_MS_ASYNC != MS_SYNC
1200 || EIO_MS_INVALIDATE != MS_INVALIDATE
1201 || EIO_MS_SYNC != MS_SYNC)
1202 {
1203 flags = 0
1204 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1205 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1206 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1207 }
1208
1209 return msync (mem, len, flags);
1210}
1211
1212#endif
1213
1214static int
1215eio__mtouch (eio_req *req)
1216{
1217 void *mem = req->ptr2;
1218 size_t len = req->size;
1219 int flags = req->int1;
1220
1221 eio_page_align (&mem, &len);
1222
1223 {
1224 intptr_t addr = (intptr_t)mem;
1225 intptr_t end = addr + len;
1226 intptr_t page = eio_pagesize ();
1227
1228 if (addr < end)
1229 if (flags & EIO_MT_MODIFY) /* modify */
1230 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1231 else
1232 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1233 }
1234
1235 return 0;
1236}
1237
1238/*****************************************************************************/
1239/* requests implemented outside eio_execute, because they are so large */
1240
1241static void
1242eio__realpath (eio_req *req, etp_worker *self)
1243{
1244 char *rel = req->ptr1;
1245 char *res;
1246 char *tmp1, *tmp2;
1247#if SYMLOOP_MAX > 32
1248 int symlinks = SYMLOOP_MAX;
1249#else
1250 int symlinks = 32;
1251#endif
1252
1253 req->result = -1;
1254
1255 errno = EINVAL;
1256 if (!rel)
1257 return;
1258
1259 errno = ENOENT;
1260 if (!*rel)
1261 return;
1262
1263 if (!req->ptr2)
1264 {
1265 X_LOCK (wrklock);
1266 req->flags |= EIO_FLAG_PTR2_FREE;
1267 X_UNLOCK (wrklock);
1268 req->ptr2 = malloc (PATH_MAX * 3);
1269
1270 errno = ENOMEM;
1271 if (!req->ptr2)
1272 return;
1273 }
1274
1275 res = req->ptr2;
1276 tmp1 = res + PATH_MAX;
1277 tmp2 = tmp1 + PATH_MAX;
1278
1279#if 0 /* disabled, the musl way to do things is just too racy */
1280#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1281 /* on linux we may be able to ask the kernel */
1282 {
1283 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1284
1285 if (fd >= 0)
1286 {
1287 sprintf (tmp1, "/proc/self/fd/%d", fd);
1288 req->result = readlink (tmp1, res, PATH_MAX);
1289 close (fd);
1290
1291 /* here we should probably stat the open file and the disk file, to make sure they still match */
1292
1293 if (req->result > 0)
1294 goto done;
1295 }
1296 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1297 return;
1298 }
1299#endif
1300#endif
1301
1302 if (*rel != '/')
1303 {
1304 if (!getcwd (res, PATH_MAX))
1305 return;
1306
1307 if (res [1]) /* only use if not / */
1308 res += strlen (res);
1309 }
1310
1311 while (*rel)
1312 {
1313 ssize_t len, linklen;
1314 char *beg = rel;
1315
1316 while (*rel && *rel != '/')
1317 ++rel;
1318
1319 len = rel - beg;
1320
1321 if (!len) /* skip slashes */
1322 {
1323 ++rel;
1324 continue;
1325 }
1326
1327 if (beg [0] == '.')
1328 {
1329 if (len == 1)
1330 continue; /* . - nop */
1331
1332 if (beg [1] == '.' && len == 2)
1333 {
1334 /* .. - back up one component, if possible */
1335
1336 while (res != req->ptr2)
1337 if (*--res == '/')
1338 break;
1339
1340 continue;
1341 }
1342 }
1343
1344 errno = ENAMETOOLONG;
1345 if (res + 1 + len + 1 >= tmp1)
1346 return;
1347
1348 /* copy one component */
1349 *res = '/';
1350 memcpy (res + 1, beg, len);
1351
1352 /* zero-terminate, for readlink */
1353 res [len + 1] = 0;
1354
1355 /* now check if it's a symlink */
1356 linklen = readlink (req->ptr2, tmp1, PATH_MAX);
1357
1358 if (linklen < 0)
1359 {
1360 if (errno != EINVAL)
1361 return;
1362
1363 /* it's a normal directory. hopefully */
1364 res += len + 1;
1365 }
1366 else
1367 {
1368 /* yay, it was a symlink - build new path in tmp2 */
1369 int rellen = strlen (rel);
1370
1371 errno = ENAMETOOLONG;
1372 if (linklen + 1 + rellen >= PATH_MAX)
1373 return;
1374
1375 errno = ELOOP;
1376 if (!--symlinks)
1377 return;
1378
1379 if (*tmp1 == '/')
1380 res = req->ptr2; /* symlink resolves to an absolute path */
1381
1382 /* we need to be careful, as rel might point into tmp2 already */
1383 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1384 tmp2 [linklen] = '/';
1385 memcpy (tmp2, tmp1, linklen);
1386
1387 rel = tmp2;
1388 }
1389 }
1390
1391 /* special case for the lone root path */
1392 if (res == req->ptr2)
1393 *res++ = '/';
1394
1395 req->result = res - (char *)req->ptr2;
1396
1397done:
1398 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1069} 1399}
1070 1400
1071static signed char 1401static signed char
1072eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1402eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1073{ 1403{
… …
1255 1585
1256 X_LOCK (wrklock); 1586 X_LOCK (wrklock);
1257 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1587 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1258 self->dirp = dirp = opendir (req->ptr1); 1588 self->dirp = dirp = opendir (req->ptr1);
1259 1589
1590 if (req->flags & EIO_FLAG_PTR1_FREE)
1591 free (req->ptr1);
1592
1260 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1593 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1261 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1594 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1262 req->ptr2 = names = malloc (namesalloc); 1595 req->ptr2 = names = malloc (namesalloc);
1263 X_UNLOCK (wrklock); 1596 X_UNLOCK (wrklock);
1264 1597
… …
1315 /* skip . and .. entries */ 1648 /* skip . and .. entries */
1316 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1649 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1317 { 1650 {
1318 int len = D_NAMLEN (entp) + 1; 1651 int len = D_NAMLEN (entp) + 1;
1319 1652
1320 while (expect_false (namesoffs + len > namesalloc)) 1653 while (ecb_expect_false (namesoffs + len > namesalloc))
1321 { 1654 {
1322 namesalloc *= 2; 1655 namesalloc *= 2;
1323 X_LOCK (wrklock); 1656 X_LOCK (wrklock);
1324 req->ptr2 = names = realloc (names, namesalloc); 1657 req->ptr2 = names = realloc (names, namesalloc);
1325 X_UNLOCK (wrklock); 1658 X_UNLOCK (wrklock);
… …
1332 1665
1333 if (dents) 1666 if (dents)
1334 { 1667 {
1335 struct eio_dirent *ent; 1668 struct eio_dirent *ent;
1336 1669
1337 if (expect_false (dentoffs == dentalloc)) 1670 if (ecb_expect_false (dentoffs == dentalloc))
1338 { 1671 {
1339 dentalloc *= 2; 1672 dentalloc *= 2;
1340 X_LOCK (wrklock); 1673 X_LOCK (wrklock);
1341 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1674 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1342 X_UNLOCK (wrklock); 1675 X_UNLOCK (wrklock);
… …
1430 break; 1763 break;
1431 } 1764 }
1432 } 1765 }
1433} 1766}
1434 1767
1435#ifdef PAGESIZE
1436# define eio_pagesize() PAGESIZE
1437#else
1438static intptr_t
1439eio_pagesize (void)
1440{
1441 static intptr_t page;
1442
1443 if (!page)
1444 page = sysconf (_SC_PAGESIZE);
1445
1446 return page;
1447}
1448#endif
1449
1450static void
1451eio_page_align (void **addr, size_t *length)
1452{
1453 intptr_t mask = eio_pagesize () - 1;
1454
1455 /* round down addr */
1456 intptr_t adj = mask & (intptr_t)*addr;
1457
1458 *addr = (void *)((intptr_t)*addr - adj);
1459 *length += adj;
1460
1461 /* round up length */
1462 *length = (*length + mask) & ~mask;
1463}
1464
1465#if !_POSIX_MEMLOCK
1466# define eio__mlockall(a) ((errno = ENOSYS), -1)
1467#else
1468
1469static int
1470eio__mlockall (int flags)
1471{
1472 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1473 extern int mallopt (int, int);
1474 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1475 #endif
1476
1477 if (EIO_MCL_CURRENT != MCL_CURRENT
1478 || EIO_MCL_FUTURE != MCL_FUTURE)
1479 {
1480 flags = 0
1481 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1482 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1483 }
1484
1485 return mlockall (flags);
1486}
1487#endif
1488
1489#if !_POSIX_MEMLOCK_RANGE
1490# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1491#else
1492
1493static int
1494eio__mlock (void *addr, size_t length)
1495{
1496 eio_page_align (&addr, &length);
1497
1498 return mlock (addr, length);
1499}
1500
1501#endif
1502
1503#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1504# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1505#else
1506
1507int
1508eio__msync (void *mem, size_t len, int flags)
1509{
1510 eio_page_align (&mem, &len);
1511
1512 if (EIO_MS_ASYNC != MS_SYNC
1513 || EIO_MS_INVALIDATE != MS_INVALIDATE
1514 || EIO_MS_SYNC != MS_SYNC)
1515 {
1516 flags = 0
1517 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1518 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1519 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1520 }
1521
1522 return msync (mem, len, flags);
1523}
1524
1525#endif
1526
1527int
1528eio__mtouch (void *mem, size_t len, int flags)
1529{
1530 eio_page_align (&mem, &len);
1531
1532 {
1533 intptr_t addr = (intptr_t)mem;
1534 intptr_t end = addr + len;
1535 intptr_t page = eio_pagesize ();
1536
1537 if (addr < end)
1538 if (flags & EIO_MT_MODIFY) /* modify */
1539 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1540 else
1541 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1542 }
1543
1544 return 0;
1545}
1546
1547/*****************************************************************************/ 1768/*****************************************************************************/
1548 1769
1549#define ALLOC(len) \ 1770#define ALLOC(len) \
1550 if (!req->ptr2) \ 1771 if (!req->ptr2) \
1551 { \ 1772 { \
… …
1634 return 0; 1855 return 0;
1635} 1856}
1636 1857
1637/*****************************************************************************/ 1858/*****************************************************************************/
1638 1859
1860int ecb_cold
1639int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1861eio_init (void (*want_poll)(void), void (*done_poll)(void))
1640{ 1862{
1641 return etp_init (want_poll, done_poll); 1863 return etp_init (want_poll, done_poll);
1642} 1864}
1643 1865
1866ecb_inline void
1644static void eio_api_destroy (eio_req *req) 1867eio_api_destroy (eio_req *req)
1645{ 1868{
1646 free (req); 1869 free (req);
1647} 1870}
1648 1871
1649#define REQ(rtype) \ 1872#define REQ(rtype) \
… …
1668 { \ 1891 { \
1669 eio_api_destroy (req); \ 1892 eio_api_destroy (req); \
1670 return 0; \ 1893 return 0; \
1671 } 1894 }
1672 1895
1896static void
1673static void eio_execute (etp_worker *self, eio_req *req) 1897eio_execute (etp_worker *self, eio_req *req)
1674{ 1898{
1675 switch (req->type) 1899 switch (req->type)
1676 { 1900 {
1677 case EIO_READ: ALLOC (req->size); 1901 case EIO_READ: ALLOC (req->size);
1678 req->result = req->offs >= 0 1902 req->result = req->offs >= 0
… …
1713 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1937 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1714 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1938 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1715 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1939 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1716 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1940 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1717 1941
1942 case EIO_REALPATH: eio__realpath (req, self); break;
1943
1718 case EIO_READLINK: ALLOC (PATH_MAX); 1944 case EIO_READLINK: ALLOC (PATH_MAX);
1719 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1945 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1720 1946
1721 case EIO_SYNC: req->result = 0; sync (); break; 1947 case EIO_SYNC: req->result = 0; sync (); break;
1722 case EIO_FSYNC: req->result = fsync (req->int1); break; 1948 case EIO_FSYNC: req->result = fsync (req->int1); break;
1723 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1949 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1724 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1950 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1725 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1951 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1726 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 1952 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1727 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1953 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1728 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1954 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1729 1955
1730 case EIO_READDIR: eio__scandir (req, self); break; 1956 case EIO_READDIR: eio__scandir (req, self); break;
… …
1774 case EIO_NOP: 2000 case EIO_NOP:
1775 req->result = 0; 2001 req->result = 0;
1776 break; 2002 break;
1777 2003
1778 case EIO_CUSTOM: 2004 case EIO_CUSTOM:
1779 ((void (*)(eio_req *))req->feed) (req); 2005 req->feed (req);
1780 break; 2006 break;
1781 2007
1782 default: 2008 default:
1783 errno = ENOSYS; 2009 errno = ENOSYS;
1784 req->result = -1; 2010 req->result = -1;
… …
1937} 2163}
1938 2164
1939eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2165eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1940{ 2166{
1941 return eio__1path (EIO_READLINK, path, pri, cb, data); 2167 return eio__1path (EIO_READLINK, path, pri, cb, data);
2168}
2169
2170eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2171{
2172 return eio__1path (EIO_REALPATH, path, pri, cb, data);
1942} 2173}
1943 2174
1944eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2175eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1945{ 2176{
1946 return eio__1path (EIO_STAT, path, pri, cb, data); 2177 return eio__1path (EIO_STAT, path, pri, cb, data);
… …
2005eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2236eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2006{ 2237{
2007 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2238 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2008} 2239}
2009 2240
2010eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2241eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2011{ 2242{
2012 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2243 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2013} 2244}
2014 2245
2015#endif 2246#endif
2016 2247
2017eio_req *eio_grp (eio_cb cb, void *data) 2248eio_req *eio_grp (eio_cb cb, void *data)
… …
2026#undef SEND 2257#undef SEND
2027 2258
2028/*****************************************************************************/ 2259/*****************************************************************************/
2029/* grp functions */ 2260/* grp functions */
2030 2261
2262void
2031void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2263eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
2032{ 2264{
2033 grp->int2 = limit; 2265 grp->int2 = limit;
2034 grp->feed = feed; 2266 grp->feed = feed;
2035 2267
2036 grp_try_feed (grp); 2268 grp_try_feed (grp);
2037} 2269}
2038 2270
2271void
2039void eio_grp_limit (eio_req *grp, int limit) 2272eio_grp_limit (eio_req *grp, int limit)
2040{ 2273{
2041 grp->int2 = limit; 2274 grp->int2 = limit;
2042 2275
2043 grp_try_feed (grp); 2276 grp_try_feed (grp);
2044} 2277}
2045 2278
2279void
2046void eio_grp_add (eio_req *grp, eio_req *req) 2280eio_grp_add (eio_req *grp, eio_req *req)
2047{ 2281{
2048 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2282 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2049 2283
2050 grp->flags |= EIO_FLAG_GROUPADD; 2284 grp->flags |= EIO_FLAG_GROUPADD;
2051 2285
… …
2062} 2296}
2063 2297
2064/*****************************************************************************/ 2298/*****************************************************************************/
2065/* misc garbage */ 2299/* misc garbage */
2066 2300
2301ssize_t
2067ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2302eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2068{ 2303{
2069 etp_worker wrk; 2304 etp_worker wrk;
2070 ssize_t ret; 2305 ssize_t ret;
2071 2306
2072 wrk.dbuf = 0; 2307 wrk.dbuf = 0;

Diff Legend

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