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.76 by root, Tue Jul 5 09:24:12 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 {
… …
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)
… …
804 return etp_poll (); 834 return etp_poll ();
805} 835}
806 836
807/*****************************************************************************/ 837/*****************************************************************************/
808/* 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
809 843
810#if !HAVE_PREADWRITE 844#if !HAVE_PREADWRITE
811# undef pread 845# undef pread
812# undef pwrite 846# undef pwrite
813# define pread eio__pread 847# define pread eio__pread
… …
872#ifndef HAVE_FUTIMES 906#ifndef HAVE_FUTIMES
873 907
874# undef futimes 908# undef futimes
875# define futimes(fd,times) eio__futimes (fd, times) 909# define futimes(fd,times) eio__futimes (fd, times)
876 910
911static int
877static int eio__futimes (int fd, const struct timeval tv[2]) 912eio__futimes (int fd, const struct timeval tv[2])
878{ 913{
879 errno = ENOSYS; 914 errno = ENOSYS;
880 return -1; 915 return -1;
881} 916}
882 917
… …
886# undef fdatasync 921# undef fdatasync
887# define fdatasync(fd) fsync (fd) 922# define fdatasync(fd) fsync (fd)
888#endif 923#endif
889 924
890/* sync_file_range always needs emulation */ 925/* sync_file_range always needs emulation */
891int 926static int
892eio__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)
893{ 928{
894#if HAVE_SYNC_FILE_RANGE 929#if HAVE_SYNC_FILE_RANGE
895 int res; 930 int res;
896 931
… …
942 977
943/* sendfile always needs emulation */ 978/* sendfile always needs emulation */
944static ssize_t 979static ssize_t
945eio__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)
946{ 981{
982 ssize_t written = 0;
947 ssize_t res; 983 ssize_t res;
948 984
949 if (!count) 985 if (!count)
950 return 0; 986 return 0;
951 987
988 for (;;)
989 {
952#if HAVE_SENDFILE 990#if HAVE_SENDFILE
953# if __linux 991# if __linux
992 off_t soffset = offset;
954 res = sendfile (ofd, ifd, &offset, count); 993 res = sendfile (ofd, ifd, &soffset, count);
955 994
956# elif __FreeBSD__ 995# elif __FreeBSD__
957 /* 996 /*
958 * 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
959 * wasted on making it similar to other I/O functions. 998 * wasted on making it similar to other I/O functions.
960 */ 999 */
961 {
962 off_t sbytes; 1000 off_t sbytes;
963 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 1001 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
964 1002
965 #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 */
966 /* freebsd' sendfile will return 0 on success */ 1004 /* freebsd' sendfile will return 0 on success */
967 /* 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 */
968 /* not on e.g. EIO or EPIPE - sounds broken */ 1006 /* not on e.g. EIO or EPIPE - sounds broken */
969 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 1007 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
970 res = sbytes; 1008 res = sbytes;
971 #endif 1009 #endif
972 1010
973 /* according to source inspection, this is correct, and useful behaviour */ 1011 /* according to source inspection, this is correct, and useful behaviour */
974 if (sbytes) 1012 if (sbytes)
975 res = sbytes; 1013 res = sbytes;
976 }
977 1014
978# elif defined (__APPLE__) 1015# elif defined (__APPLE__) && 0 /* broken, as everything on os x */
979
980 {
981 off_t sbytes = count; 1016 off_t sbytes = count;
982 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1017 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
983 1018
984 /* according to the manpage, sbytes is always valid */ 1019 /* according to the manpage, sbytes is always valid */
985 if (sbytes) 1020 if (sbytes)
986 res = sbytes; 1021 res = sbytes;
987 }
988 1022
989# elif __hpux 1023# elif __hpux
990 res = sendfile (ofd, ifd, offset, count, 0, 0); 1024 res = sendfile (ofd, ifd, offset, count, 0, 0);
991 1025
992# elif __solaris 1026# elif __solaris
993 {
994 struct sendfilevec vec; 1027 struct sendfilevec vec;
995 size_t sbytes; 1028 size_t sbytes;
996 1029
997 vec.sfv_fd = ifd; 1030 vec.sfv_fd = ifd;
998 vec.sfv_flag = 0; 1031 vec.sfv_flag = 0;
999 vec.sfv_off = offset; 1032 vec.sfv_off = offset;
1000 vec.sfv_len = count; 1033 vec.sfv_len = count;
1001 1034
1002 res = sendfilev (ofd, &vec, 1, &sbytes); 1035 res = sendfilev (ofd, &vec, 1, &sbytes);
1003 1036
1004 if (res < 0 && sbytes) 1037 if (res < 0 && sbytes)
1005 res = sbytes; 1038 res = sbytes;
1006 }
1007 1039
1008# endif 1040# endif
1009 1041
1010#elif defined (_WIN32) 1042#elif defined (_WIN32)
1011
1012 /* 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 */
1013 { 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 */
1014 HANDLE h = TO_SOCKET (ifd); 1047 HANDLE h = TO_SOCKET (ifd);
1015 SetFilePointer (h, offset, 0, FILE_BEGIN); 1048 SetFilePointer (h, offset, 0, FILE_BEGIN);
1016 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1049 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1017 }
1018 1050
1019#else 1051#else
1020 res = -1; 1052 res = -1;
1021 errno = ENOSYS; 1053 errno = ENOSYS;
1022#endif 1054#endif
1023 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
1024 if (res < 0 1079 if (res < 0
1025 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1080 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1026 /* BSDs */ 1081 /* BSDs */
1027#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... */
1028 || errno == ENOTSUP 1083 || errno == ENOTSUP
1029#endif 1084#endif
… …
1255 1310
1256 X_LOCK (wrklock); 1311 X_LOCK (wrklock);
1257 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1312 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1258 self->dirp = dirp = opendir (req->ptr1); 1313 self->dirp = dirp = opendir (req->ptr1);
1259 1314
1315 if (req->flags & EIO_FLAG_PTR1_FREE)
1316 free (req->ptr1);
1317
1260 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1318 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1261 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1319 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1262 req->ptr2 = names = malloc (namesalloc); 1320 req->ptr2 = names = malloc (namesalloc);
1263 X_UNLOCK (wrklock); 1321 X_UNLOCK (wrklock);
1264 1322
… …
1315 /* skip . and .. entries */ 1373 /* skip . and .. entries */
1316 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1374 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1317 { 1375 {
1318 int len = D_NAMLEN (entp) + 1; 1376 int len = D_NAMLEN (entp) + 1;
1319 1377
1320 while (expect_false (namesoffs + len > namesalloc)) 1378 while (ecb_expect_false (namesoffs + len > namesalloc))
1321 { 1379 {
1322 namesalloc *= 2; 1380 namesalloc *= 2;
1323 X_LOCK (wrklock); 1381 X_LOCK (wrklock);
1324 req->ptr2 = names = realloc (names, namesalloc); 1382 req->ptr2 = names = realloc (names, namesalloc);
1325 X_UNLOCK (wrklock); 1383 X_UNLOCK (wrklock);
… …
1332 1390
1333 if (dents) 1391 if (dents)
1334 { 1392 {
1335 struct eio_dirent *ent; 1393 struct eio_dirent *ent;
1336 1394
1337 if (expect_false (dentoffs == dentalloc)) 1395 if (ecb_expect_false (dentoffs == dentalloc))
1338 { 1396 {
1339 dentalloc *= 2; 1397 dentalloc *= 2;
1340 X_LOCK (wrklock); 1398 X_LOCK (wrklock);
1341 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1399 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1342 X_UNLOCK (wrklock); 1400 X_UNLOCK (wrklock);
… …
1502 1560
1503#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1561#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1504# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1562# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1505#else 1563#else
1506 1564
1507int 1565static int
1508eio__msync (void *mem, size_t len, int flags) 1566eio__msync (void *mem, size_t len, int flags)
1509{ 1567{
1510 eio_page_align (&mem, &len); 1568 eio_page_align (&mem, &len);
1511 1569
1512 if (EIO_MS_ASYNC != MS_SYNC 1570 if (EIO_MS_ASYNC != MS_SYNC
… …
1522 return msync (mem, len, flags); 1580 return msync (mem, len, flags);
1523} 1581}
1524 1582
1525#endif 1583#endif
1526 1584
1527int 1585static int
1528eio__mtouch (void *mem, size_t len, int flags) 1586eio__mtouch (eio_req *req)
1529{ 1587{
1588 void *mem = req->ptr2;
1589 size_t len = req->size;
1590 int flags = req->int1;
1591
1530 eio_page_align (&mem, &len); 1592 eio_page_align (&mem, &len);
1531 1593
1532 { 1594 {
1533 intptr_t addr = (intptr_t)mem; 1595 intptr_t addr = (intptr_t)mem;
1534 intptr_t end = addr + len; 1596 intptr_t end = addr + len;
1535 intptr_t page = eio_pagesize (); 1597 intptr_t page = eio_pagesize ();
1536 1598
1537 if (addr < end) 1599 if (addr < end)
1538 if (flags & EIO_MT_MODIFY) /* modify */ 1600 if (flags & EIO_MT_MODIFY) /* modify */
1539 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));
1540 else 1602 else
1541 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1603 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1542 } 1604 }
1543 1605
1544 return 0; 1606 return 0;
1545} 1607}
1546 1608
… …
1634 return 0; 1696 return 0;
1635} 1697}
1636 1698
1637/*****************************************************************************/ 1699/*****************************************************************************/
1638 1700
1701int ecb_cold
1639int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1702eio_init (void (*want_poll)(void), void (*done_poll)(void))
1640{ 1703{
1641 return etp_init (want_poll, done_poll); 1704 return etp_init (want_poll, done_poll);
1642} 1705}
1643 1706
1707ecb_inline void
1644static void eio_api_destroy (eio_req *req) 1708eio_api_destroy (eio_req *req)
1645{ 1709{
1646 free (req); 1710 free (req);
1647} 1711}
1648 1712
1649#define REQ(rtype) \ 1713#define REQ(rtype) \
… …
1668 { \ 1732 { \
1669 eio_api_destroy (req); \ 1733 eio_api_destroy (req); \
1670 return 0; \ 1734 return 0; \
1671 } 1735 }
1672 1736
1737static void
1673static void eio_execute (etp_worker *self, eio_req *req) 1738eio_execute (etp_worker *self, eio_req *req)
1674{ 1739{
1675 switch (req->type) 1740 switch (req->type)
1676 { 1741 {
1677 case EIO_READ: ALLOC (req->size); 1742 case EIO_READ: ALLOC (req->size);
1678 req->result = req->offs >= 0 1743 req->result = req->offs >= 0
… …
1713 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1778 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1714 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1779 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1715 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1780 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; 1781 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1717 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
1718 case EIO_READLINK: ALLOC (PATH_MAX); 1788 case EIO_READLINK: ALLOC (PATH_MAX);
1719 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1789 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1720 1790
1721 case EIO_SYNC: req->result = 0; sync (); break; 1791 case EIO_SYNC: req->result = 0; sync (); break;
1722 case EIO_FSYNC: req->result = fsync (req->int1); break; 1792 case EIO_FSYNC: req->result = fsync (req->int1); break;
1723 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1793 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1724 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;
1725 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1795 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1726 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;
1727 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1797 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; 1798 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1729 1799
1730 case EIO_READDIR: eio__scandir (req, self); break; 1800 case EIO_READDIR: eio__scandir (req, self); break;
… …
1774 case EIO_NOP: 1844 case EIO_NOP:
1775 req->result = 0; 1845 req->result = 0;
1776 break; 1846 break;
1777 1847
1778 case EIO_CUSTOM: 1848 case EIO_CUSTOM:
1779 ((void (*)(eio_req *))req->feed) (req); 1849 req->feed (req);
1780 break; 1850 break;
1781 1851
1782 default: 1852 default:
1783 errno = ENOSYS; 1853 errno = ENOSYS;
1784 req->result = -1; 1854 req->result = -1;
… …
1937} 2007}
1938 2008
1939eio_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)
1940{ 2010{
1941 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);
1942} 2017}
1943 2018
1944eio_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)
1945{ 2020{
1946 return eio__1path (EIO_STAT, path, pri, cb, data); 2021 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) 2080eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2006{ 2081{
2007 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2082 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2008} 2083}
2009 2084
2010eio_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)
2011{ 2086{
2012 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2087 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2013} 2088}
2014 2089
2015#endif 2090#endif
2016 2091
2017eio_req *eio_grp (eio_cb cb, void *data) 2092eio_req *eio_grp (eio_cb cb, void *data)
… …
2026#undef SEND 2101#undef SEND
2027 2102
2028/*****************************************************************************/ 2103/*****************************************************************************/
2029/* grp functions */ 2104/* grp functions */
2030 2105
2106void
2031void 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)
2032{ 2108{
2033 grp->int2 = limit; 2109 grp->int2 = limit;
2034 grp->feed = feed; 2110 grp->feed = feed;
2035 2111
2036 grp_try_feed (grp); 2112 grp_try_feed (grp);
2037} 2113}
2038 2114
2115void
2039void eio_grp_limit (eio_req *grp, int limit) 2116eio_grp_limit (eio_req *grp, int limit)
2040{ 2117{
2041 grp->int2 = limit; 2118 grp->int2 = limit;
2042 2119
2043 grp_try_feed (grp); 2120 grp_try_feed (grp);
2044} 2121}
2045 2122
2123void
2046void eio_grp_add (eio_req *grp, eio_req *req) 2124eio_grp_add (eio_req *grp, eio_req *req)
2047{ 2125{
2048 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));
2049 2127
2050 grp->flags |= EIO_FLAG_GROUPADD; 2128 grp->flags |= EIO_FLAG_GROUPADD;
2051 2129
… …
2062} 2140}
2063 2141
2064/*****************************************************************************/ 2142/*****************************************************************************/
2065/* misc garbage */ 2143/* misc garbage */
2066 2144
2145ssize_t
2067ssize_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)
2068{ 2147{
2069 etp_worker wrk; 2148 etp_worker wrk;
2070 ssize_t ret; 2149 ssize_t ret;
2071 2150
2072 wrk.dbuf = 0; 2151 wrk.dbuf = 0;

Diff Legend

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