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.82 by root, Thu Jul 7 15:44:44 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 from stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H
67# include <stdint.h>
68#endif
69
70#ifndef ECANCELED
71# define ECANCELED EDOM
72#endif
73
74static void eio_destroy (eio_req *req);
75
59#ifndef EIO_FINISH 76#ifndef EIO_FINISH
60# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 77# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
61#endif 78#endif
62 79
63#ifndef EIO_DESTROY 80#ifndef EIO_DESTROY
… …
71#ifdef _WIN32 88#ifdef _WIN32
72 89
73 /*doh*/ 90 /*doh*/
74#else 91#else
75 92
76# include "config.h"
77# include <sys/time.h> 93# include <sys/time.h>
78# include <sys/select.h> 94# include <sys/select.h>
79# include <unistd.h> 95# include <unistd.h>
80# include <utime.h> 96# include <utime.h>
81# include <signal.h> 97# include <signal.h>
… …
132#endif 148#endif
133#ifndef D_NAMLEN 149#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name) 150# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif 151#endif
136 152
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 */ 153/* used for struct dirent, AIX doesn't provide it */
141#ifndef NAME_MAX 154#ifndef NAME_MAX
142# define NAME_MAX 4096 155# define NAME_MAX 4096
143#endif 156#endif
144 157
… …
158 errno = ENOMEM; \ 171 errno = ENOMEM; \
159 if (!eio_buf) \ 172 if (!eio_buf) \
160 return -1; 173 return -1;
161 174
162#define EIO_TICKS ((1000000 + 1023) >> 10) 175#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 176
177#define ETP_PRI_MIN EIO_PRI_MIN 177#define ETP_PRI_MIN EIO_PRI_MIN
178#define ETP_PRI_MAX EIO_PRI_MAX 178#define ETP_PRI_MAX EIO_PRI_MAX
179 179
180struct etp_worker; 180struct etp_worker;
… …
206/*****************************************************************************/ 206/*****************************************************************************/
207 207
208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
209 209
210/* calculate time difference in ~1/EIO_TICKS of a second */ 210/* calculate time difference in ~1/EIO_TICKS of a second */
211ecb_inline int
211static int tvdiff (struct timeval *tv1, struct timeval *tv2) 212tvdiff (struct timeval *tv1, struct timeval *tv2)
212{ 213{
213 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 214 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
214 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 215 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
215} 216}
216 217
… …
223static unsigned int max_poll_reqs; /* reslock */ 224static unsigned int max_poll_reqs; /* reslock */
224 225
225static volatile unsigned int nreqs; /* reqlock */ 226static volatile unsigned int nreqs; /* reqlock */
226static volatile unsigned int nready; /* reqlock */ 227static volatile unsigned int nready; /* reqlock */
227static volatile unsigned int npending; /* reqlock */ 228static volatile unsigned int npending; /* reqlock */
228static volatile unsigned int max_idle = 4; 229static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
230static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
229 231
230static xmutex_t wrklock = X_MUTEX_INIT; 232static xmutex_t wrklock;
231static xmutex_t reslock = X_MUTEX_INIT; 233static xmutex_t reslock;
232static xmutex_t reqlock = X_MUTEX_INIT; 234static xmutex_t reqlock;
233static xcond_t reqwait = X_COND_INIT; 235static xcond_t reqwait;
234 236
235#if !HAVE_PREADWRITE 237#if !HAVE_PREADWRITE
236/* 238/*
237 * make our pread/pwrite emulation safe against themselves, but not against 239 * make our pread/pwrite emulation safe against themselves, but not against
238 * normal read/write by using a mutex. slows down execution a lot, 240 * normal read/write by using a mutex. slows down execution a lot,
… …
259#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 261#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
260#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 262#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
261 263
262/* worker threads management */ 264/* worker threads management */
263 265
266static void ecb_cold
264static void etp_worker_clear (etp_worker *wrk) 267etp_worker_clear (etp_worker *wrk)
265{ 268{
266 ETP_WORKER_CLEAR (wrk); 269 ETP_WORKER_CLEAR (wrk);
267} 270}
268 271
272static void ecb_cold
269static void etp_worker_free (etp_worker *wrk) 273etp_worker_free (etp_worker *wrk)
270{ 274{
271 wrk->next->prev = wrk->prev; 275 wrk->next->prev = wrk->prev;
272 wrk->prev->next = wrk->next; 276 wrk->prev->next = wrk->next;
273 277
274 free (wrk); 278 free (wrk);
275} 279}
276 280
277static unsigned int etp_nreqs (void) 281static unsigned int
282etp_nreqs (void)
278{ 283{
279 int retval; 284 int retval;
280 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 285 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
281 retval = nreqs; 286 retval = nreqs;
282 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 287 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
283 return retval; 288 return retval;
284} 289}
285 290
286static unsigned int etp_nready (void) 291static unsigned int
292etp_nready (void)
287{ 293{
288 unsigned int retval; 294 unsigned int retval;
289 295
290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 296 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
291 retval = nready; 297 retval = nready;
292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 298 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
293 299
294 return retval; 300 return retval;
295} 301}
296 302
297static unsigned int etp_npending (void) 303static unsigned int
304etp_npending (void)
298{ 305{
299 unsigned int retval; 306 unsigned int retval;
300 307
301 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 308 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
302 retval = npending; 309 retval = npending;
303 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 310 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
304 311
305 return retval; 312 return retval;
306} 313}
307 314
308static unsigned int etp_nthreads (void) 315static unsigned int
316etp_nthreads (void)
309{ 317{
310 unsigned int retval; 318 unsigned int retval;
311 319
312 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 320 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
313 retval = started; 321 retval = started;
… …
327} etp_reqq; 335} etp_reqq;
328 336
329static etp_reqq req_queue; 337static etp_reqq req_queue;
330static etp_reqq res_queue; 338static etp_reqq res_queue;
331 339
340static int ecb_noinline
332static int reqq_push (etp_reqq *q, ETP_REQ *req) 341reqq_push (etp_reqq *q, ETP_REQ *req)
333{ 342{
334 int pri = req->pri; 343 int pri = req->pri;
335 req->next = 0; 344 req->next = 0;
336 345
337 if (q->qe[pri]) 346 if (q->qe[pri])
… …
343 q->qe[pri] = q->qs[pri] = req; 352 q->qe[pri] = q->qs[pri] = req;
344 353
345 return q->size++; 354 return q->size++;
346} 355}
347 356
357static ETP_REQ * ecb_noinline
348static ETP_REQ *reqq_shift (etp_reqq *q) 358reqq_shift (etp_reqq *q)
349{ 359{
350 int pri; 360 int pri;
351 361
352 if (!q->size) 362 if (!q->size)
353 return 0; 363 return 0;
… …
368 } 378 }
369 379
370 abort (); 380 abort ();
371} 381}
372 382
383static void ecb_cold
384etp_thread_init (void)
385{
386 X_MUTEX_CREATE (wrklock);
387 X_MUTEX_CREATE (reslock);
388 X_MUTEX_CREATE (reqlock);
389 X_COND_CREATE (reqwait);
390}
391
392static void ecb_cold
373static void etp_atfork_prepare (void) 393etp_atfork_prepare (void)
374{ 394{
375 X_LOCK (wrklock); 395 X_LOCK (wrklock);
376 X_LOCK (reqlock); 396 X_LOCK (reqlock);
377 X_LOCK (reslock); 397 X_LOCK (reslock);
378#if !HAVE_PREADWRITE 398#if !HAVE_PREADWRITE
379 X_LOCK (preadwritelock); 399 X_LOCK (preadwritelock);
380#endif 400#endif
381} 401}
382 402
403static void ecb_cold
383static void etp_atfork_parent (void) 404etp_atfork_parent (void)
384{ 405{
385#if !HAVE_PREADWRITE 406#if !HAVE_PREADWRITE
386 X_UNLOCK (preadwritelock); 407 X_UNLOCK (preadwritelock);
387#endif 408#endif
388 X_UNLOCK (reslock); 409 X_UNLOCK (reslock);
389 X_UNLOCK (reqlock); 410 X_UNLOCK (reqlock);
390 X_UNLOCK (wrklock); 411 X_UNLOCK (wrklock);
391} 412}
392 413
414static void ecb_cold
393static void etp_atfork_child (void) 415etp_atfork_child (void)
394{ 416{
395 ETP_REQ *prv; 417 ETP_REQ *prv;
396 418
397 while ((prv = reqq_shift (&req_queue))) 419 while ((prv = reqq_shift (&req_queue)))
398 ETP_DESTROY (prv); 420 ETP_DESTROY (prv);
… …
415 idle = 0; 437 idle = 0;
416 nreqs = 0; 438 nreqs = 0;
417 nready = 0; 439 nready = 0;
418 npending = 0; 440 npending = 0;
419 441
420 etp_atfork_parent (); 442 etp_thread_init ();
421} 443}
422 444
423static void 445static void ecb_cold
424etp_once_init (void) 446etp_once_init (void)
425{ 447{
448 etp_thread_init ();
426 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 449 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
427} 450}
428 451
429static int 452static int ecb_cold
430etp_init (void (*want_poll)(void), void (*done_poll)(void)) 453etp_init (void (*want_poll)(void), void (*done_poll)(void))
431{ 454{
432 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 455 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
433 456
434 pthread_once (&doinit, etp_once_init); 457 pthread_once (&doinit, etp_once_init);
… …
439 return 0; 462 return 0;
440} 463}
441 464
442X_THREAD_PROC (etp_proc); 465X_THREAD_PROC (etp_proc);
443 466
467static void ecb_cold
444static void etp_start_thread (void) 468etp_start_thread (void)
445{ 469{
446 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 470 etp_worker *wrk = calloc (1, sizeof (etp_worker));
447 471
448 /*TODO*/ 472 /*TODO*/
449 assert (("unable to allocate worker thread data", wrk)); 473 assert (("unable to allocate worker thread data", wrk));
… …
462 free (wrk); 486 free (wrk);
463 487
464 X_UNLOCK (wrklock); 488 X_UNLOCK (wrklock);
465} 489}
466 490
491static void
467static void etp_maybe_start_thread (void) 492etp_maybe_start_thread (void)
468{ 493{
469 if (expect_true (etp_nthreads () >= wanted)) 494 if (ecb_expect_true (etp_nthreads () >= wanted))
470 return; 495 return;
471 496
472 /* todo: maybe use idle here, but might be less exact */ 497 /* todo: maybe use idle here, but might be less exact */
473 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) 498 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
474 return; 499 return;
475 500
476 etp_start_thread (); 501 etp_start_thread ();
477} 502}
478 503
504static void ecb_cold
479static void etp_end_thread (void) 505etp_end_thread (void)
480{ 506{
481 eio_req *req = calloc (1, sizeof (eio_req)); 507 eio_req *req = calloc (1, sizeof (eio_req));
482 508
483 req->type = -1; 509 req->type = -1;
484 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 510 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
… …
491 X_LOCK (wrklock); 517 X_LOCK (wrklock);
492 --started; 518 --started;
493 X_UNLOCK (wrklock); 519 X_UNLOCK (wrklock);
494} 520}
495 521
496static int etp_poll (void) 522static int
523etp_poll (void)
497{ 524{
498 unsigned int maxreqs; 525 unsigned int maxreqs;
499 unsigned int maxtime; 526 unsigned int maxtime;
500 struct timeval tv_start, tv_now; 527 struct timeval tv_start, tv_now;
501 528
… …
531 558
532 X_LOCK (reqlock); 559 X_LOCK (reqlock);
533 --nreqs; 560 --nreqs;
534 X_UNLOCK (reqlock); 561 X_UNLOCK (reqlock);
535 562
536 if (expect_false (req->type == EIO_GROUP && req->size)) 563 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
537 { 564 {
538 req->int1 = 1; /* mark request as delayed */ 565 req->int1 = 1; /* mark request as delayed */
539 continue; 566 continue;
540 } 567 }
541 else 568 else
542 { 569 {
543 int res = ETP_FINISH (req); 570 int res = ETP_FINISH (req);
544 if (expect_false (res)) 571 if (ecb_expect_false (res))
545 return res; 572 return res;
546 } 573 }
547 574
548 if (expect_false (maxreqs && !--maxreqs)) 575 if (ecb_expect_false (maxreqs && !--maxreqs))
549 break; 576 break;
550 577
551 if (maxtime) 578 if (maxtime)
552 { 579 {
553 gettimeofday (&tv_now, 0); 580 gettimeofday (&tv_now, 0);
… …
559 586
560 errno = EAGAIN; 587 errno = EAGAIN;
561 return -1; 588 return -1;
562} 589}
563 590
591static void
564static void etp_cancel (ETP_REQ *req) 592etp_cancel (ETP_REQ *req)
565{ 593{
566 X_LOCK (wrklock); 594 req->cancelled = 1;
567 req->flags |= EIO_FLAG_CANCELLED;
568 X_UNLOCK (wrklock);
569 595
570 eio_grp_cancel (req); 596 eio_grp_cancel (req);
571} 597}
572 598
599static void
573static void etp_submit (ETP_REQ *req) 600etp_submit (ETP_REQ *req)
574{ 601{
575 req->pri -= ETP_PRI_MIN; 602 req->pri -= ETP_PRI_MIN;
576 603
577 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 604 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; 605 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
579 606
580 if (expect_false (req->type == EIO_GROUP)) 607 if (ecb_expect_false (req->type == EIO_GROUP))
581 { 608 {
582 /* I hope this is worth it :/ */ 609 /* I hope this is worth it :/ */
583 X_LOCK (reqlock); 610 X_LOCK (reqlock);
584 ++nreqs; 611 ++nreqs;
585 X_UNLOCK (reqlock); 612 X_UNLOCK (reqlock);
… …
604 631
605 etp_maybe_start_thread (); 632 etp_maybe_start_thread ();
606 } 633 }
607} 634}
608 635
636static void ecb_cold
609static void etp_set_max_poll_time (double nseconds) 637etp_set_max_poll_time (double nseconds)
610{ 638{
611 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 639 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
612 max_poll_time = nseconds * EIO_TICKS; 640 max_poll_time = nseconds * EIO_TICKS;
613 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 641 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
614} 642}
615 643
644static void ecb_cold
616static void etp_set_max_poll_reqs (unsigned int maxreqs) 645etp_set_max_poll_reqs (unsigned int maxreqs)
617{ 646{
618 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 647 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
619 max_poll_reqs = maxreqs; 648 max_poll_reqs = maxreqs;
620 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 649 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
621} 650}
622 651
652static void ecb_cold
623static void etp_set_max_idle (unsigned int nthreads) 653etp_set_max_idle (unsigned int nthreads)
624{ 654{
625 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 655 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
626 max_idle = nthreads <= 0 ? 1 : nthreads; 656 max_idle = nthreads;
627 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 657 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
628} 658}
629 659
660static void ecb_cold
661etp_set_idle_timeout (unsigned int seconds)
662{
663 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
664 idle_timeout = seconds;
665 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
666}
667
668static void ecb_cold
630static void etp_set_min_parallel (unsigned int nthreads) 669etp_set_min_parallel (unsigned int nthreads)
631{ 670{
632 if (wanted < nthreads) 671 if (wanted < nthreads)
633 wanted = nthreads; 672 wanted = nthreads;
634} 673}
635 674
675static void ecb_cold
636static void etp_set_max_parallel (unsigned int nthreads) 676etp_set_max_parallel (unsigned int nthreads)
637{ 677{
638 if (wanted > nthreads) 678 if (wanted > nthreads)
639 wanted = nthreads; 679 wanted = nthreads;
640 680
641 while (started > wanted) 681 while (started > wanted)
642 etp_end_thread (); 682 etp_end_thread ();
643} 683}
644 684
645/*****************************************************************************/ 685/*****************************************************************************/
646 686
687static void
647static void grp_try_feed (eio_req *grp) 688grp_try_feed (eio_req *grp)
648{ 689{
649 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 690 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
650 { 691 {
651 grp->flags &= ~EIO_FLAG_GROUPADD; 692 grp->flags &= ~EIO_FLAG_GROUPADD;
652 693
… …
659 break; 700 break;
660 } 701 }
661 } 702 }
662} 703}
663 704
705static int
664static int grp_dec (eio_req *grp) 706grp_dec (eio_req *grp)
665{ 707{
666 --grp->size; 708 --grp->size;
667 709
668 /* call feeder, if applicable */ 710 /* call feeder, if applicable */
669 grp_try_feed (grp); 711 grp_try_feed (grp);
… …
673 return eio_finish (grp); 715 return eio_finish (grp);
674 else 716 else
675 return 0; 717 return 0;
676} 718}
677 719
720static void
678void eio_destroy (eio_req *req) 721eio_destroy (eio_req *req)
679{ 722{
680 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 723 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
681 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 724 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
682 725
683 EIO_DESTROY (req); 726 EIO_DESTROY (req);
684} 727}
685 728
729static int
686static int eio_finish (eio_req *req) 730eio_finish (eio_req *req)
687{ 731{
688 int res = EIO_FINISH (req); 732 int res = EIO_FINISH (req);
689 733
690 if (req->grp) 734 if (req->grp)
691 { 735 {
… …
699 if (grp->grp_first == req) 743 if (grp->grp_first == req)
700 grp->grp_first = req->grp_next; 744 grp->grp_first = req->grp_next;
701 745
702 res2 = grp_dec (grp); 746 res2 = grp_dec (grp);
703 747
704 if (!res && res2) 748 if (!res)
705 res = res2; 749 res = res2;
706 } 750 }
707 751
708 eio_destroy (req); 752 eio_destroy (req);
709 753
710 return res; 754 return res;
711} 755}
712 756
757void
713void eio_grp_cancel (eio_req *grp) 758eio_grp_cancel (eio_req *grp)
714{ 759{
715 for (grp = grp->grp_first; grp; grp = grp->grp_next) 760 for (grp = grp->grp_first; grp; grp = grp->grp_next)
716 eio_cancel (grp); 761 eio_cancel (grp);
717} 762}
718 763
764void
719void eio_cancel (eio_req *req) 765eio_cancel (eio_req *req)
720{ 766{
721 etp_cancel (req); 767 etp_cancel (req);
722} 768}
723 769
770void
724void eio_submit (eio_req *req) 771eio_submit (eio_req *req)
725{ 772{
726 etp_submit (req); 773 etp_submit (req);
727} 774}
728 775
729unsigned int eio_nreqs (void) 776unsigned int
777eio_nreqs (void)
730{ 778{
731 return etp_nreqs (); 779 return etp_nreqs ();
732} 780}
733 781
734unsigned int eio_nready (void) 782unsigned int
783eio_nready (void)
735{ 784{
736 return etp_nready (); 785 return etp_nready ();
737} 786}
738 787
739unsigned int eio_npending (void) 788unsigned int
789eio_npending (void)
740{ 790{
741 return etp_npending (); 791 return etp_npending ();
742} 792}
743 793
744unsigned int eio_nthreads (void) 794unsigned int ecb_cold
795eio_nthreads (void)
745{ 796{
746 return etp_nthreads (); 797 return etp_nthreads ();
747} 798}
748 799
800void ecb_cold
749void eio_set_max_poll_time (double nseconds) 801eio_set_max_poll_time (double nseconds)
750{ 802{
751 etp_set_max_poll_time (nseconds); 803 etp_set_max_poll_time (nseconds);
752} 804}
753 805
806void ecb_cold
754void eio_set_max_poll_reqs (unsigned int maxreqs) 807eio_set_max_poll_reqs (unsigned int maxreqs)
755{ 808{
756 etp_set_max_poll_reqs (maxreqs); 809 etp_set_max_poll_reqs (maxreqs);
757} 810}
758 811
812void ecb_cold
759void eio_set_max_idle (unsigned int nthreads) 813eio_set_max_idle (unsigned int nthreads)
760{ 814{
761 etp_set_max_idle (nthreads); 815 etp_set_max_idle (nthreads);
762} 816}
763 817
818void ecb_cold
819eio_set_idle_timeout (unsigned int seconds)
820{
821 etp_set_idle_timeout (seconds);
822}
823
824void ecb_cold
764void eio_set_min_parallel (unsigned int nthreads) 825eio_set_min_parallel (unsigned int nthreads)
765{ 826{
766 etp_set_min_parallel (nthreads); 827 etp_set_min_parallel (nthreads);
767} 828}
768 829
830void ecb_cold
769void eio_set_max_parallel (unsigned int nthreads) 831eio_set_max_parallel (unsigned int nthreads)
770{ 832{
771 etp_set_max_parallel (nthreads); 833 etp_set_max_parallel (nthreads);
772} 834}
773 835
774int eio_poll (void) 836int eio_poll (void)
… …
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 {
990#ifdef __APPLE__
991# undef HAVE_SENDFILE /* broken, as everything on os x */
992#endif
924#if HAVE_SENDFILE 993#if HAVE_SENDFILE
925# if __linux 994# if __linux
995 off_t soffset = offset;
926 res = sendfile (ofd, ifd, &offset, count); 996 res = sendfile (ofd, ifd, &soffset, count);
927 997
928# elif __FreeBSD__ 998# elif __FreeBSD__
929 /* 999 /*
930 * Of course, the freebsd sendfile is a dire hack with no thoughts 1000 * Of course, the freebsd sendfile is a dire hack with no thoughts
931 * wasted on making it similar to other I/O functions. 1001 * wasted on making it similar to other I/O functions.
932 */ 1002 */
933 {
934 off_t sbytes; 1003 off_t sbytes;
935 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 1004 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
936 1005
937 #if 0 /* according to the manpage, this is correct, but broken behaviour */ 1006 #if 0 /* according to the manpage, this is correct, but broken behaviour */
938 /* freebsd' sendfile will return 0 on success */ 1007 /* freebsd' sendfile will return 0 on success */
939 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ 1008 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
940 /* not on e.g. EIO or EPIPE - sounds broken */ 1009 /* not on e.g. EIO or EPIPE - sounds broken */
941 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 1010 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
942 res = sbytes; 1011 res = sbytes;
943 #endif 1012 #endif
944 1013
945 /* according to source inspection, this is correct, and useful behaviour */ 1014 /* according to source inspection, this is correct, and useful behaviour */
946 if (sbytes) 1015 if (sbytes)
947 res = sbytes; 1016 res = sbytes;
948 }
949 1017
950# elif defined (__APPLE__) 1018# elif defined (__APPLE__)
951
952 {
953 off_t sbytes = count; 1019 off_t sbytes = count;
954 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1020 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
955 1021
956 /* according to the manpage, sbytes is always valid */ 1022 /* according to the manpage, sbytes is always valid */
957 if (sbytes) 1023 if (sbytes)
958 res = sbytes; 1024 res = sbytes;
959 }
960 1025
961# elif __hpux 1026# elif __hpux
962 res = sendfile (ofd, ifd, offset, count, 0, 0); 1027 res = sendfile (ofd, ifd, offset, count, 0, 0);
963 1028
964# elif __solaris 1029# elif __solaris
965 {
966 struct sendfilevec vec; 1030 struct sendfilevec vec;
967 size_t sbytes; 1031 size_t sbytes;
968 1032
969 vec.sfv_fd = ifd; 1033 vec.sfv_fd = ifd;
970 vec.sfv_flag = 0; 1034 vec.sfv_flag = 0;
971 vec.sfv_off = offset; 1035 vec.sfv_off = offset;
972 vec.sfv_len = count; 1036 vec.sfv_len = count;
973 1037
974 res = sendfilev (ofd, &vec, 1, &sbytes); 1038 res = sendfilev (ofd, &vec, 1, &sbytes);
975 1039
976 if (res < 0 && sbytes) 1040 if (res < 0 && sbytes)
977 res = sbytes; 1041 res = sbytes;
978 }
979 1042
980# endif 1043# endif
981 1044
982#elif defined (_WIN32) 1045#elif defined (_WIN32)
983
984 /* does not work, just for documentation of what would need to be done */ 1046 /* does not work, just for documentation of what would need to be done */
985 { 1047 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1048 /* libeio guarantees that the file offset does not change, and windows */
1049 /* has no way to get an independent handle to the same file description */
986 HANDLE h = TO_SOCKET (ifd); 1050 HANDLE h = TO_SOCKET (ifd);
987 SetFilePointer (h, offset, 0, FILE_BEGIN); 1051 SetFilePointer (h, offset, 0, FILE_BEGIN);
988 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1052 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
989 }
990 1053
991#else 1054#else
992 res = -1; 1055 res = -1;
993 errno = ENOSYS; 1056 errno = ENOSYS;
994#endif 1057#endif
995 1058
1059 /* we assume sendfile can copy at least 128mb in one go */
1060 if (res <= 128 * 1024 * 1024)
1061 {
1062 if (res > 0)
1063 written += res;
1064
1065 if (written)
1066 return written;
1067
1068 break;
1069 }
1070 else
1071 {
1072 /* if we requested more, then probably the kernel was lazy */
1073 written += res;
1074 offset += res;
1075 count -= res;
1076
1077 if (!count)
1078 return written;
1079 }
1080 }
1081
996 if (res < 0 1082 if (res < 0
997 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1083 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
998 /* BSDs */ 1084 /* BSDs */
999#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1085#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1000 || errno == ENOTSUP 1086 || errno == ENOTSUP
1001#endif 1087#endif
… …
1038 } 1124 }
1039 1125
1040 return res; 1126 return res;
1041} 1127}
1042 1128
1129#ifdef PAGESIZE
1130# define eio_pagesize() PAGESIZE
1131#else
1132static intptr_t
1133eio_pagesize (void)
1134{
1135 static intptr_t page;
1136
1137 if (!page)
1138 page = sysconf (_SC_PAGESIZE);
1139
1140 return page;
1141}
1142#endif
1143
1144static void
1145eio_page_align (void **addr, size_t *length)
1146{
1147 intptr_t mask = eio_pagesize () - 1;
1148
1149 /* round down addr */
1150 intptr_t adj = mask & (intptr_t)*addr;
1151
1152 *addr = (void *)((intptr_t)*addr - adj);
1153 *length += adj;
1154
1155 /* round up length */
1156 *length = (*length + mask) & ~mask;
1157}
1158
1159#if !_POSIX_MEMLOCK
1160# define eio__mlockall(a) ((errno = ENOSYS), -1)
1161#else
1162
1163static int
1164eio__mlockall (int flags)
1165{
1166 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1167 extern int mallopt (int, int);
1168 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1169 #endif
1170
1171 if (EIO_MCL_CURRENT != MCL_CURRENT
1172 || EIO_MCL_FUTURE != MCL_FUTURE)
1173 {
1174 flags = 0
1175 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1176 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1177 }
1178
1179 return mlockall (flags);
1180}
1181#endif
1182
1183#if !_POSIX_MEMLOCK_RANGE
1184# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1185#else
1186
1187static int
1188eio__mlock (void *addr, size_t length)
1189{
1190 eio_page_align (&addr, &length);
1191
1192 return mlock (addr, length);
1193}
1194
1195#endif
1196
1197#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1198# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1199#else
1200
1201static int
1202eio__msync (void *mem, size_t len, int flags)
1203{
1204 eio_page_align (&mem, &len);
1205
1206 if (EIO_MS_ASYNC != MS_SYNC
1207 || EIO_MS_INVALIDATE != MS_INVALIDATE
1208 || EIO_MS_SYNC != MS_SYNC)
1209 {
1210 flags = 0
1211 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1212 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1213 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1214 }
1215
1216 return msync (mem, len, flags);
1217}
1218
1219#endif
1220
1221static int
1222eio__mtouch (eio_req *req)
1223{
1224 void *mem = req->ptr2;
1225 size_t len = req->size;
1226 int flags = req->int1;
1227
1228 eio_page_align (&mem, &len);
1229
1230 {
1231 intptr_t addr = (intptr_t)mem;
1232 intptr_t end = addr + len;
1233 intptr_t page = eio_pagesize ();
1234
1235 if (addr < end)
1236 if (flags & EIO_MT_MODIFY) /* modify */
1237 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1238 else
1239 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1240 }
1241
1242 return 0;
1243}
1244
1245/*****************************************************************************/
1246/* requests implemented outside eio_execute, because they are so large */
1247
1248static void
1249eio__realpath (eio_req *req, etp_worker *self)
1250{
1251 char *rel = req->ptr1;
1252 char *res;
1253 char *tmp1, *tmp2;
1254#if SYMLOOP_MAX > 32
1255 int symlinks = SYMLOOP_MAX;
1256#else
1257 int symlinks = 32;
1258#endif
1259
1260 req->result = -1;
1261
1262 errno = EINVAL;
1263 if (!rel)
1264 return;
1265
1266 errno = ENOENT;
1267 if (!*rel)
1268 return;
1269
1270 if (!req->ptr2)
1271 {
1272 X_LOCK (wrklock);
1273 req->flags |= EIO_FLAG_PTR2_FREE;
1274 X_UNLOCK (wrklock);
1275 req->ptr2 = malloc (PATH_MAX * 3);
1276
1277 errno = ENOMEM;
1278 if (!req->ptr2)
1279 return;
1280 }
1281
1282 res = req->ptr2;
1283 tmp1 = res + PATH_MAX;
1284 tmp2 = tmp1 + PATH_MAX;
1285
1286#if 0 /* disabled, the musl way to do things is just too racy */
1287#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1288 /* on linux we may be able to ask the kernel */
1289 {
1290 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1291
1292 if (fd >= 0)
1293 {
1294 sprintf (tmp1, "/proc/self/fd/%d", fd);
1295 req->result = readlink (tmp1, res, PATH_MAX);
1296 close (fd);
1297
1298 /* here we should probably stat the open file and the disk file, to make sure they still match */
1299
1300 if (req->result > 0)
1301 goto done;
1302 }
1303 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1304 return;
1305 }
1306#endif
1307#endif
1308
1309 if (*rel != '/')
1310 {
1311 if (!getcwd (res, PATH_MAX))
1312 return;
1313
1314 if (res [1]) /* only use if not / */
1315 res += strlen (res);
1316 }
1317
1318 while (*rel)
1319 {
1320 ssize_t len, linklen;
1321 char *beg = rel;
1322
1323 while (*rel && *rel != '/')
1324 ++rel;
1325
1326 len = rel - beg;
1327
1328 if (!len) /* skip slashes */
1329 {
1330 ++rel;
1331 continue;
1332 }
1333
1334 if (beg [0] == '.')
1335 {
1336 if (len == 1)
1337 continue; /* . - nop */
1338
1339 if (beg [1] == '.' && len == 2)
1340 {
1341 /* .. - back up one component, if possible */
1342
1343 while (res != req->ptr2)
1344 if (*--res == '/')
1345 break;
1346
1347 continue;
1348 }
1349 }
1350
1351 errno = ENAMETOOLONG;
1352 if (res + 1 + len + 1 >= tmp1)
1353 return;
1354
1355 /* copy one component */
1356 *res = '/';
1357 memcpy (res + 1, beg, len);
1358
1359 /* zero-terminate, for readlink */
1360 res [len + 1] = 0;
1361
1362 /* now check if it's a symlink */
1363 linklen = readlink (req->ptr2, tmp1, PATH_MAX);
1364
1365 if (linklen < 0)
1366 {
1367 if (errno != EINVAL)
1368 return;
1369
1370 /* it's a normal directory. hopefully */
1371 res += len + 1;
1372 }
1373 else
1374 {
1375 /* yay, it was a symlink - build new path in tmp2 */
1376 int rellen = strlen (rel);
1377
1378 errno = ENAMETOOLONG;
1379 if (linklen + 1 + rellen >= PATH_MAX)
1380 return;
1381
1382 errno = ELOOP;
1383 if (!--symlinks)
1384 return;
1385
1386 if (*tmp1 == '/')
1387 res = req->ptr2; /* symlink resolves to an absolute path */
1388
1389 /* we need to be careful, as rel might point into tmp2 already */
1390 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1391 tmp2 [linklen] = '/';
1392 memcpy (tmp2, tmp1, linklen);
1393
1394 rel = tmp2;
1395 }
1396 }
1397
1398 /* special case for the lone root path */
1399 if (res == req->ptr2)
1400 *res++ = '/';
1401
1402 req->result = res - (char *)req->ptr2;
1403
1404done:
1405 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1406}
1407
1043static signed char 1408static signed char
1044eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1409eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1045{ 1410{
1046 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1411 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; 1412 : a->inode < b->inode ? -1
1413 : a->inode > b->inode ? 1
1414 : 0;
1048} 1415}
1049 1416
1050#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1417#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1051 1418
1052#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1419#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
… …
1058 unsigned char bits [9 + sizeof (ino_t) * 8]; 1425 unsigned char bits [9 + sizeof (ino_t) * 8];
1059 unsigned char *bit = bits; 1426 unsigned char *bit = bits;
1060 1427
1061 assert (CHAR_BIT == 8); 1428 assert (CHAR_BIT == 8);
1062 assert (sizeof (eio_dirent) * 8 < 256); 1429 assert (sizeof (eio_dirent) * 8 < 256);
1063 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1430 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1064 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1431 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1065 1432
1066 if (size <= EIO_SORT_FAST) 1433 if (size <= EIO_SORT_FAST)
1067 return; 1434 return;
1068 1435
1069 /* first prepare an array of bits to test in our radix sort */ 1436 /* first prepare an array of bits to test in our radix sort */
… …
1224 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1591 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1225 1592
1226 X_LOCK (wrklock); 1593 X_LOCK (wrklock);
1227 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1594 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1228 self->dirp = dirp = opendir (req->ptr1); 1595 self->dirp = dirp = opendir (req->ptr1);
1596
1597 if (req->flags & EIO_FLAG_PTR1_FREE)
1598 free (req->ptr1);
1599
1229 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1600 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1230 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1601 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1231 req->ptr2 = names = malloc (namesalloc); 1602 req->ptr2 = names = malloc (namesalloc);
1232 X_UNLOCK (wrklock); 1603 X_UNLOCK (wrklock);
1233 1604
… …
1245 /* sort etc. */ 1616 /* sort etc. */
1246 req->int1 = flags; 1617 req->int1 = flags;
1247 req->result = dentoffs; 1618 req->result = dentoffs;
1248 1619
1249 if (flags & EIO_READDIR_STAT_ORDER) 1620 if (flags & EIO_READDIR_STAT_ORDER)
1250 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1621 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1251 else if (flags & EIO_READDIR_DIRS_FIRST) 1622 else if (flags & EIO_READDIR_DIRS_FIRST)
1252 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1623 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1253 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1624 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1254 else 1625 else
1255 { 1626 {
… …
1257 eio_dirent *oth = dents + dentoffs; 1628 eio_dirent *oth = dents + dentoffs;
1258 eio_dirent *dir = dents; 1629 eio_dirent *dir = dents;
1259 1630
1260 /* now partition dirs to the front, and non-dirs to the back */ 1631 /* now partition dirs to the front, and non-dirs to the back */
1261 /* by walking from both sides and swapping if necessary */ 1632 /* by walking from both sides and swapping if necessary */
1262 /* also clear score, so it doesn't influence sorting */
1263 while (oth > dir) 1633 while (oth > dir)
1264 { 1634 {
1265 if (dir->type == EIO_DT_DIR) 1635 if (dir->type == EIO_DT_DIR)
1266 ++dir; 1636 ++dir;
1267 else if ((--oth)->type == EIO_DT_DIR) 1637 else if ((--oth)->type == EIO_DT_DIR)
… …
1270 1640
1271 ++dir; 1641 ++dir;
1272 } 1642 }
1273 } 1643 }
1274 1644
1275 /* now sort the dirs only */ 1645 /* now sort the dirs only (dirs all have the same score) */
1276 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1646 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1277 } 1647 }
1278 1648
1279 break; 1649 break;
1280 } 1650 }
… …
1285 /* skip . and .. entries */ 1655 /* skip . and .. entries */
1286 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1656 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1287 { 1657 {
1288 int len = D_NAMLEN (entp) + 1; 1658 int len = D_NAMLEN (entp) + 1;
1289 1659
1290 while (expect_false (namesoffs + len > namesalloc)) 1660 while (ecb_expect_false (namesoffs + len > namesalloc))
1291 { 1661 {
1292 namesalloc *= 2; 1662 namesalloc *= 2;
1293 X_LOCK (wrklock); 1663 X_LOCK (wrklock);
1294 req->ptr2 = names = realloc (names, namesalloc); 1664 req->ptr2 = names = realloc (names, namesalloc);
1295 X_UNLOCK (wrklock); 1665 X_UNLOCK (wrklock);
… …
1302 1672
1303 if (dents) 1673 if (dents)
1304 { 1674 {
1305 struct eio_dirent *ent; 1675 struct eio_dirent *ent;
1306 1676
1307 if (expect_false (dentoffs == dentalloc)) 1677 if (ecb_expect_false (dentoffs == dentalloc))
1308 { 1678 {
1309 dentalloc *= 2; 1679 dentalloc *= 2;
1310 X_LOCK (wrklock); 1680 X_LOCK (wrklock);
1311 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1681 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1312 X_UNLOCK (wrklock); 1682 X_UNLOCK (wrklock);
… …
1400 break; 1770 break;
1401 } 1771 }
1402 } 1772 }
1403} 1773}
1404 1774
1405#ifdef PAGESIZE
1406# define eio_pagesize() PAGESIZE
1407#else
1408static intptr_t
1409eio_pagesize (void)
1410{
1411 static intptr_t page;
1412
1413 if (!page)
1414 page = sysconf (_SC_PAGESIZE);
1415
1416 return page;
1417}
1418#endif
1419
1420static void
1421eio_page_align (void **addr, size_t *length)
1422{
1423 intptr_t mask = eio_pagesize () - 1;
1424
1425 /* round down addr */
1426 intptr_t adj = mask & (intptr_t)*addr;
1427
1428 *addr = (void *)((intptr_t)*addr - adj);
1429 *length += adj;
1430
1431 /* round up length */
1432 *length = (*length + mask) & ~mask;
1433}
1434
1435#if !_POSIX_MEMLOCK
1436# define eio__mlockall(a) ((errno = ENOSYS), -1)
1437#else
1438
1439static int
1440eio__mlockall (int flags)
1441{
1442 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1443 extern int mallopt (int, int);
1444 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1445 #endif
1446
1447 if (EIO_MCL_CURRENT != MCL_CURRENT
1448 || EIO_MCL_FUTURE != MCL_FUTURE)
1449 {
1450 flags = 0
1451 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1452 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1453 }
1454
1455 return mlockall (flags);
1456}
1457#endif
1458
1459#if !_POSIX_MEMLOCK_RANGE
1460# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1461#else
1462
1463static int
1464eio__mlock (void *addr, size_t length)
1465{
1466 eio_page_align (&addr, &length);
1467
1468 return mlock (addr, length);
1469}
1470
1471#endif
1472
1473#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1474# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1475#else
1476
1477int
1478eio__msync (void *mem, size_t len, int flags)
1479{
1480 eio_page_align (&mem, &len);
1481
1482 if (EIO_MS_ASYNC != MS_SYNC
1483 || EIO_MS_INVALIDATE != MS_INVALIDATE
1484 || EIO_MS_SYNC != MS_SYNC)
1485 {
1486 flags = 0
1487 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1488 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1489 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1490 }
1491
1492 return msync (mem, len, flags);
1493}
1494
1495#endif
1496
1497int
1498eio__mtouch (void *mem, size_t len, int flags)
1499{
1500 eio_page_align (&mem, &len);
1501
1502 {
1503 intptr_t addr = (intptr_t)mem;
1504 intptr_t end = addr + len;
1505 intptr_t page = eio_pagesize ();
1506
1507 if (addr < end)
1508 if (flags & EIO_MT_MODIFY) /* modify */
1509 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1510 else
1511 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1512 }
1513
1514 return 0;
1515}
1516
1517/*****************************************************************************/ 1775/*****************************************************************************/
1518 1776
1519#define ALLOC(len) \ 1777#define ALLOC(len) \
1520 if (!req->ptr2) \ 1778 if (!req->ptr2) \
1521 { \ 1779 { \
… …
1551 if (req) 1809 if (req)
1552 break; 1810 break;
1553 1811
1554 ++idle; 1812 ++idle;
1555 1813
1556 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1814 ts.tv_sec = time (0) + idle_timeout;
1557 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1815 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1558 { 1816 {
1559 if (idle > max_idle) 1817 if (idle > max_idle)
1560 { 1818 {
1561 --idle; 1819 --idle;
… …
1578 X_UNLOCK (reqlock); 1836 X_UNLOCK (reqlock);
1579 1837
1580 if (req->type < 0) 1838 if (req->type < 0)
1581 goto quit; 1839 goto quit;
1582 1840
1583 if (!EIO_CANCELLED (req))
1584 ETP_EXECUTE (self, req); 1841 ETP_EXECUTE (self, req);
1585 1842
1586 X_LOCK (reslock); 1843 X_LOCK (reslock);
1587 1844
1588 ++npending; 1845 ++npending;
1589 1846
… …
1604 return 0; 1861 return 0;
1605} 1862}
1606 1863
1607/*****************************************************************************/ 1864/*****************************************************************************/
1608 1865
1866int ecb_cold
1609int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1867eio_init (void (*want_poll)(void), void (*done_poll)(void))
1610{ 1868{
1611 return etp_init (want_poll, done_poll); 1869 return etp_init (want_poll, done_poll);
1612} 1870}
1613 1871
1872ecb_inline void
1614static void eio_api_destroy (eio_req *req) 1873eio_api_destroy (eio_req *req)
1615{ 1874{
1616 free (req); 1875 free (req);
1617} 1876}
1618 1877
1619#define REQ(rtype) \ 1878#define REQ(rtype) \
… …
1638 { \ 1897 { \
1639 eio_api_destroy (req); \ 1898 eio_api_destroy (req); \
1640 return 0; \ 1899 return 0; \
1641 } 1900 }
1642 1901
1902static void
1643static void eio_execute (etp_worker *self, eio_req *req) 1903eio_execute (etp_worker *self, eio_req *req)
1644{ 1904{
1905 if (ecb_expect_false (EIO_CANCELLED (req)))
1906 {
1907 req->result = -1;
1908 req->errorno = ECANCELED;
1909 return;
1910 }
1911
1645 switch (req->type) 1912 switch (req->type)
1646 { 1913 {
1647 case EIO_READ: ALLOC (req->size); 1914 case EIO_READ: ALLOC (req->size);
1648 req->result = req->offs >= 0 1915 req->result = req->offs >= 0
1649 ? pread (req->int1, req->ptr2, req->size, req->offs) 1916 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1683 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1950 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1684 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1951 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1685 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1952 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; 1953 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1687 1954
1955 case EIO_REALPATH: eio__realpath (req, self); break;
1956
1688 case EIO_READLINK: ALLOC (PATH_MAX); 1957 case EIO_READLINK: ALLOC (PATH_MAX);
1689 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1958 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1690 1959
1691 case EIO_SYNC: req->result = 0; sync (); break; 1960 case EIO_SYNC: req->result = 0; sync (); break;
1692 case EIO_FSYNC: req->result = fsync (req->int1); break; 1961 case EIO_FSYNC: req->result = fsync (req->int1); break;
1693 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1962 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1694 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1963 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; 1964 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1696 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 1965 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1697 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1966 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; 1967 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1699 1968
1700 case EIO_READDIR: eio__scandir (req, self); break; 1969 case EIO_READDIR: eio__scandir (req, self); break;
… …
1744 case EIO_NOP: 2013 case EIO_NOP:
1745 req->result = 0; 2014 req->result = 0;
1746 break; 2015 break;
1747 2016
1748 case EIO_CUSTOM: 2017 case EIO_CUSTOM:
1749 ((void (*)(eio_req *))req->feed) (req); 2018 req->feed (req);
1750 break; 2019 break;
1751 2020
1752 default: 2021 default:
1753 errno = ENOSYS; 2022 errno = ENOSYS;
1754 req->result = -1; 2023 req->result = -1;
… …
1907} 2176}
1908 2177
1909eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2178eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1910{ 2179{
1911 return eio__1path (EIO_READLINK, path, pri, cb, data); 2180 return eio__1path (EIO_READLINK, path, pri, cb, data);
2181}
2182
2183eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2184{
2185 return eio__1path (EIO_REALPATH, path, pri, cb, data);
1912} 2186}
1913 2187
1914eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2188eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1915{ 2189{
1916 return eio__1path (EIO_STAT, path, pri, cb, data); 2190 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) 2249eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1976{ 2250{
1977 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2251 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1978} 2252}
1979 2253
1980eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2254eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1981{ 2255{
1982 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2256 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1983} 2257}
1984 2258
1985#endif 2259#endif
1986 2260
1987eio_req *eio_grp (eio_cb cb, void *data) 2261eio_req *eio_grp (eio_cb cb, void *data)
… …
1996#undef SEND 2270#undef SEND
1997 2271
1998/*****************************************************************************/ 2272/*****************************************************************************/
1999/* grp functions */ 2273/* grp functions */
2000 2274
2275void
2001void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2276eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
2002{ 2277{
2003 grp->int2 = limit; 2278 grp->int2 = limit;
2004 grp->feed = feed; 2279 grp->feed = feed;
2005 2280
2006 grp_try_feed (grp); 2281 grp_try_feed (grp);
2007} 2282}
2008 2283
2284void
2009void eio_grp_limit (eio_req *grp, int limit) 2285eio_grp_limit (eio_req *grp, int limit)
2010{ 2286{
2011 grp->int2 = limit; 2287 grp->int2 = limit;
2012 2288
2013 grp_try_feed (grp); 2289 grp_try_feed (grp);
2014} 2290}
2015 2291
2292void
2016void eio_grp_add (eio_req *grp, eio_req *req) 2293eio_grp_add (eio_req *grp, eio_req *req)
2017{ 2294{
2018 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2295 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2019 2296
2020 grp->flags |= EIO_FLAG_GROUPADD; 2297 grp->flags |= EIO_FLAG_GROUPADD;
2021 2298
… …
2032} 2309}
2033 2310
2034/*****************************************************************************/ 2311/*****************************************************************************/
2035/* misc garbage */ 2312/* misc garbage */
2036 2313
2314ssize_t
2037ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2315eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2038{ 2316{
2039 etp_worker wrk; 2317 etp_worker wrk;
2040 ssize_t ret; 2318 ssize_t ret;
2041 2319
2042 wrk.dbuf = 0; 2320 wrk.dbuf = 0;

Diff Legend

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