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.70 by root, Fri Jun 10 06:55:10 2011 UTC vs.
Revision 1.87 by root, Thu Jul 14 19:19:22 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"
… …
53#include <stdlib.h> 54#include <stdlib.h>
54#include <string.h> 55#include <string.h>
55#include <errno.h> 56#include <errno.h>
56#include <sys/types.h> 57#include <sys/types.h>
57#include <sys/stat.h> 58#include <sys/stat.h>
58#include <sys/statvfs.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63#include <sys/statvfs.h>
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes form stdint.h, says idiot openbsd coder */ 65/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H 66#if HAVE_STDINT_H
66# include <stdint.h> 67# include <stdint.h>
67#endif 68#endif
68 69
70#ifndef ECANCELED
71# define ECANCELED EDOM
72#endif
73
74static void eio_destroy (eio_req *req);
75
69#ifndef EIO_FINISH 76#ifndef EIO_FINISH
70# 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
71#endif 78#endif
72 79
73#ifndef EIO_DESTROY 80#ifndef EIO_DESTROY
… …
76 83
77#ifndef EIO_FEED 84#ifndef EIO_FEED
78# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 85# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
79#endif 86#endif
80 87
88#ifndef EIO_FD_TO_WIN32_HANDLE
89# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
90#endif
91#ifndef EIO_WIN32_HANDLE_TO_FD
92# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
93#endif
94
95#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
96
97#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
98
81#ifdef _WIN32 99#ifdef _WIN32
82 100
83 /*doh*/ 101 #define PAGESIZE 4096 /* GetSystemInfo? */
102
103 #ifdef EIO_STRUCT_STATI64
104 #define stat(path,buf) _stati64 (path,buf)
105 #define fstat(fd,buf) _fstati64 (path,buf)
106 #endif
107 #define lstat(path,buf) stat (path,buf)
108 #define fsync(fd) (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
109 #define mkdir(path,mode) _mkdir (path)
110 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
111
112 #define chown(path,uid,gid) EIO_ENOSYS ()
113 #define fchown(fd,uid,gid) EIO_ENOSYS ()
114 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
115 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
116 #define mknod(path,mode,dev) EIO_ENOSYS ()
117 #define sync() EIO_ENOSYS ()
118
119 /* we could even stat and see if it exists */
120 static int
121 symlink (const char *old, const char *neu)
122 {
123 if (CreateSymbolicLink (neu, old, 1))
124 return 0;
125
126 if (CreateSymbolicLink (neu, old, 0))
127 return 0;
128
129 return EIO_ERRNO (ENOENT, -1);
130 }
131
84#else 132#else
85 133
86# include <sys/time.h> 134 #include <sys/time.h>
87# include <sys/select.h> 135 #include <sys/select.h>
136 #include <sys/statvfs.h>
88# include <unistd.h> 137 #include <unistd.h>
89# include <utime.h> 138 #include <utime.h>
90# include <signal.h> 139 #include <signal.h>
91# include <dirent.h> 140 #include <dirent.h>
92 141
93#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 142 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
94# include <sys/mman.h> 143 #include <sys/mman.h>
95#endif 144 #endif
96 145
97/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 146 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
98# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 147 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
99# define _DIRENT_HAVE_D_TYPE /* sigh */ 148 #define _DIRENT_HAVE_D_TYPE /* sigh */
100# define D_INO(de) (de)->d_fileno 149 #define D_INO(de) (de)->d_fileno
101# define D_NAMLEN(de) (de)->d_namlen 150 #define D_NAMLEN(de) (de)->d_namlen
102# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 151 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
103# define D_INO(de) (de)->d_ino 152 #define D_INO(de) (de)->d_ino
104# endif 153 #endif
105 154
106#ifdef _D_EXACT_NAMLEN 155 #ifdef _D_EXACT_NAMLEN
107# undef D_NAMLEN 156 #undef D_NAMLEN
108# define D_NAMLEN(de) _D_EXACT_NAMLEN (de) 157 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
109#endif 158 #endif
110 159
111# ifdef _DIRENT_HAVE_D_TYPE 160 #ifdef _DIRENT_HAVE_D_TYPE
112# define D_TYPE(de) (de)->d_type 161 #define D_TYPE(de) (de)->d_type
113# endif 162 #endif
114 163
115# ifndef EIO_STRUCT_DIRENT 164 #ifndef EIO_STRUCT_DIRENT
116# define EIO_STRUCT_DIRENT struct dirent 165 #define EIO_STRUCT_DIRENT struct dirent
117# endif 166 #endif
118 167
119#endif 168#endif
120 169
121#if HAVE_SENDFILE 170#if HAVE_SENDFILE
122# if __linux 171# if __linux
… …
165 if (!eio_buf) \ 214 if (!eio_buf) \
166 return -1; 215 return -1;
167 216
168#define EIO_TICKS ((1000000 + 1023) >> 10) 217#define EIO_TICKS ((1000000 + 1023) >> 10)
169 218
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 219#define ETP_PRI_MIN EIO_PRI_MIN
184#define ETP_PRI_MAX EIO_PRI_MAX 220#define ETP_PRI_MAX EIO_PRI_MAX
185 221
186struct etp_worker; 222struct etp_worker;
187 223
… …
212/*****************************************************************************/ 248/*****************************************************************************/
213 249
214#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 250#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
215 251
216/* calculate time difference in ~1/EIO_TICKS of a second */ 252/* calculate time difference in ~1/EIO_TICKS of a second */
253ecb_inline int
217static int tvdiff (struct timeval *tv1, struct timeval *tv2) 254tvdiff (struct timeval *tv1, struct timeval *tv2)
218{ 255{
219 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 256 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
220 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 257 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
221} 258}
222 259
… …
266#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 303#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
267#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 304#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
268 305
269/* worker threads management */ 306/* worker threads management */
270 307
308static void ecb_cold
271static void etp_worker_clear (etp_worker *wrk) 309etp_worker_clear (etp_worker *wrk)
272{ 310{
273 ETP_WORKER_CLEAR (wrk); 311 ETP_WORKER_CLEAR (wrk);
274} 312}
275 313
314static void ecb_cold
276static void etp_worker_free (etp_worker *wrk) 315etp_worker_free (etp_worker *wrk)
277{ 316{
278 wrk->next->prev = wrk->prev; 317 wrk->next->prev = wrk->prev;
279 wrk->prev->next = wrk->next; 318 wrk->prev->next = wrk->next;
280 319
281 free (wrk); 320 free (wrk);
282} 321}
283 322
284static unsigned int etp_nreqs (void) 323static unsigned int
324etp_nreqs (void)
285{ 325{
286 int retval; 326 int retval;
287 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 327 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
288 retval = nreqs; 328 retval = nreqs;
289 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 329 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
290 return retval; 330 return retval;
291} 331}
292 332
293static unsigned int etp_nready (void) 333static unsigned int
334etp_nready (void)
294{ 335{
295 unsigned int retval; 336 unsigned int retval;
296 337
297 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 338 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
298 retval = nready; 339 retval = nready;
299 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 340 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
300 341
301 return retval; 342 return retval;
302} 343}
303 344
304static unsigned int etp_npending (void) 345static unsigned int
346etp_npending (void)
305{ 347{
306 unsigned int retval; 348 unsigned int retval;
307 349
308 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 350 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
309 retval = npending; 351 retval = npending;
310 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 352 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
311 353
312 return retval; 354 return retval;
313} 355}
314 356
315static unsigned int etp_nthreads (void) 357static unsigned int
358etp_nthreads (void)
316{ 359{
317 unsigned int retval; 360 unsigned int retval;
318 361
319 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 362 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
320 retval = started; 363 retval = started;
… …
334} etp_reqq; 377} etp_reqq;
335 378
336static etp_reqq req_queue; 379static etp_reqq req_queue;
337static etp_reqq res_queue; 380static etp_reqq res_queue;
338 381
382static int ecb_noinline
339static int reqq_push (etp_reqq *q, ETP_REQ *req) 383reqq_push (etp_reqq *q, ETP_REQ *req)
340{ 384{
341 int pri = req->pri; 385 int pri = req->pri;
342 req->next = 0; 386 req->next = 0;
343 387
344 if (q->qe[pri]) 388 if (q->qe[pri])
… …
350 q->qe[pri] = q->qs[pri] = req; 394 q->qe[pri] = q->qs[pri] = req;
351 395
352 return q->size++; 396 return q->size++;
353} 397}
354 398
399static ETP_REQ * ecb_noinline
355static ETP_REQ *reqq_shift (etp_reqq *q) 400reqq_shift (etp_reqq *q)
356{ 401{
357 int pri; 402 int pri;
358 403
359 if (!q->size) 404 if (!q->size)
360 return 0; 405 return 0;
… …
375 } 420 }
376 421
377 abort (); 422 abort ();
378} 423}
379 424
425static void ecb_cold
380static void etp_thread_init (void) 426etp_thread_init (void)
381{ 427{
428#if !HAVE_PREADWRITE
429 X_MUTEX_CREATE (preadwritelock);
430#endif
382 X_MUTEX_CREATE (wrklock); 431 X_MUTEX_CREATE (wrklock);
383 X_MUTEX_CREATE (reslock); 432 X_MUTEX_CREATE (reslock);
384 X_MUTEX_CREATE (reqlock); 433 X_MUTEX_CREATE (reqlock);
385 X_COND_CREATE (reqwait); 434 X_COND_CREATE (reqwait);
386} 435}
387 436
437static void ecb_cold
388static void etp_atfork_prepare (void) 438etp_atfork_prepare (void)
389{ 439{
390 X_LOCK (wrklock);
391 X_LOCK (reqlock);
392 X_LOCK (reslock);
393#if !HAVE_PREADWRITE
394 X_LOCK (preadwritelock);
395#endif
396} 440}
397 441
442static void ecb_cold
398static void etp_atfork_parent (void) 443etp_atfork_parent (void)
399{ 444{
400#if !HAVE_PREADWRITE
401 X_UNLOCK (preadwritelock);
402#endif
403 X_UNLOCK (reslock);
404 X_UNLOCK (reqlock);
405 X_UNLOCK (wrklock);
406} 445}
407 446
447static void ecb_cold
408static void etp_atfork_child (void) 448etp_atfork_child (void)
409{ 449{
410 ETP_REQ *prv; 450 ETP_REQ *prv;
411 451
412 while ((prv = reqq_shift (&req_queue))) 452 while ((prv = reqq_shift (&req_queue)))
413 ETP_DESTROY (prv); 453 ETP_DESTROY (prv);
… …
433 npending = 0; 473 npending = 0;
434 474
435 etp_thread_init (); 475 etp_thread_init ();
436} 476}
437 477
438static void 478static void ecb_cold
439etp_once_init (void) 479etp_once_init (void)
440{ 480{
441 etp_thread_init (); 481 etp_thread_init ();
442 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 482 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
443} 483}
444 484
445static int 485static int ecb_cold
446etp_init (void (*want_poll)(void), void (*done_poll)(void)) 486etp_init (void (*want_poll)(void), void (*done_poll)(void))
447{ 487{
448 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 488 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
449 489
450 pthread_once (&doinit, etp_once_init); 490 pthread_once (&doinit, etp_once_init);
… …
455 return 0; 495 return 0;
456} 496}
457 497
458X_THREAD_PROC (etp_proc); 498X_THREAD_PROC (etp_proc);
459 499
500static void ecb_cold
460static void etp_start_thread (void) 501etp_start_thread (void)
461{ 502{
462 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 503 etp_worker *wrk = calloc (1, sizeof (etp_worker));
463 504
464 /*TODO*/ 505 /*TODO*/
465 assert (("unable to allocate worker thread data", wrk)); 506 assert (("unable to allocate worker thread data", wrk));
… …
478 free (wrk); 519 free (wrk);
479 520
480 X_UNLOCK (wrklock); 521 X_UNLOCK (wrklock);
481} 522}
482 523
524static void
483static void etp_maybe_start_thread (void) 525etp_maybe_start_thread (void)
484{ 526{
485 if (expect_true (etp_nthreads () >= wanted)) 527 if (ecb_expect_true (etp_nthreads () >= wanted))
486 return; 528 return;
487 529
488 /* todo: maybe use idle here, but might be less exact */ 530 /* todo: maybe use idle here, but might be less exact */
489 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) 531 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
490 return; 532 return;
491 533
492 etp_start_thread (); 534 etp_start_thread ();
493} 535}
494 536
537static void ecb_cold
495static void etp_end_thread (void) 538etp_end_thread (void)
496{ 539{
497 eio_req *req = calloc (1, sizeof (eio_req)); 540 eio_req *req = calloc (1, sizeof (eio_req));
498 541
499 req->type = -1; 542 req->type = -1;
500 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 543 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
… …
507 X_LOCK (wrklock); 550 X_LOCK (wrklock);
508 --started; 551 --started;
509 X_UNLOCK (wrklock); 552 X_UNLOCK (wrklock);
510} 553}
511 554
512static int etp_poll (void) 555static int
556etp_poll (void)
513{ 557{
514 unsigned int maxreqs; 558 unsigned int maxreqs;
515 unsigned int maxtime; 559 unsigned int maxtime;
516 struct timeval tv_start, tv_now; 560 struct timeval tv_start, tv_now;
517 561
… …
547 591
548 X_LOCK (reqlock); 592 X_LOCK (reqlock);
549 --nreqs; 593 --nreqs;
550 X_UNLOCK (reqlock); 594 X_UNLOCK (reqlock);
551 595
552 if (expect_false (req->type == EIO_GROUP && req->size)) 596 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
553 { 597 {
554 req->int1 = 1; /* mark request as delayed */ 598 req->int1 = 1; /* mark request as delayed */
555 continue; 599 continue;
556 } 600 }
557 else 601 else
558 { 602 {
559 int res = ETP_FINISH (req); 603 int res = ETP_FINISH (req);
560 if (expect_false (res)) 604 if (ecb_expect_false (res))
561 return res; 605 return res;
562 } 606 }
563 607
564 if (expect_false (maxreqs && !--maxreqs)) 608 if (ecb_expect_false (maxreqs && !--maxreqs))
565 break; 609 break;
566 610
567 if (maxtime) 611 if (maxtime)
568 { 612 {
569 gettimeofday (&tv_now, 0); 613 gettimeofday (&tv_now, 0);
… …
575 619
576 errno = EAGAIN; 620 errno = EAGAIN;
577 return -1; 621 return -1;
578} 622}
579 623
624static void
580static void etp_cancel (ETP_REQ *req) 625etp_cancel (ETP_REQ *req)
581{ 626{
582 X_LOCK (wrklock); 627 req->cancelled = 1;
583 req->flags |= EIO_FLAG_CANCELLED;
584 X_UNLOCK (wrklock);
585 628
586 eio_grp_cancel (req); 629 eio_grp_cancel (req);
587} 630}
588 631
632static void
589static void etp_submit (ETP_REQ *req) 633etp_submit (ETP_REQ *req)
590{ 634{
591 req->pri -= ETP_PRI_MIN; 635 req->pri -= ETP_PRI_MIN;
592 636
593 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 637 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; 638 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
595 639
596 if (expect_false (req->type == EIO_GROUP)) 640 if (ecb_expect_false (req->type == EIO_GROUP))
597 { 641 {
598 /* I hope this is worth it :/ */ 642 /* I hope this is worth it :/ */
599 X_LOCK (reqlock); 643 X_LOCK (reqlock);
600 ++nreqs; 644 ++nreqs;
601 X_UNLOCK (reqlock); 645 X_UNLOCK (reqlock);
… …
620 664
621 etp_maybe_start_thread (); 665 etp_maybe_start_thread ();
622 } 666 }
623} 667}
624 668
669static void ecb_cold
625static void etp_set_max_poll_time (double nseconds) 670etp_set_max_poll_time (double nseconds)
626{ 671{
627 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 672 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
628 max_poll_time = nseconds * EIO_TICKS; 673 max_poll_time = nseconds * EIO_TICKS;
629 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 674 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
630} 675}
631 676
677static void ecb_cold
632static void etp_set_max_poll_reqs (unsigned int maxreqs) 678etp_set_max_poll_reqs (unsigned int maxreqs)
633{ 679{
634 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 680 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
635 max_poll_reqs = maxreqs; 681 max_poll_reqs = maxreqs;
636 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 682 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
637} 683}
638 684
685static void ecb_cold
639static void etp_set_max_idle (unsigned int nthreads) 686etp_set_max_idle (unsigned int nthreads)
640{ 687{
641 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 688 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
642 max_idle = nthreads; 689 max_idle = nthreads;
643 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 690 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
644} 691}
645 692
693static void ecb_cold
646static void etp_set_idle_timeout (unsigned int seconds) 694etp_set_idle_timeout (unsigned int seconds)
647{ 695{
648 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 696 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
649 idle_timeout = seconds; 697 idle_timeout = seconds;
650 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 698 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
651} 699}
652 700
701static void ecb_cold
653static void etp_set_min_parallel (unsigned int nthreads) 702etp_set_min_parallel (unsigned int nthreads)
654{ 703{
655 if (wanted < nthreads) 704 if (wanted < nthreads)
656 wanted = nthreads; 705 wanted = nthreads;
657} 706}
658 707
708static void ecb_cold
659static void etp_set_max_parallel (unsigned int nthreads) 709etp_set_max_parallel (unsigned int nthreads)
660{ 710{
661 if (wanted > nthreads) 711 if (wanted > nthreads)
662 wanted = nthreads; 712 wanted = nthreads;
663 713
664 while (started > wanted) 714 while (started > wanted)
665 etp_end_thread (); 715 etp_end_thread ();
666} 716}
667 717
668/*****************************************************************************/ 718/*****************************************************************************/
669 719
720static void
670static void grp_try_feed (eio_req *grp) 721grp_try_feed (eio_req *grp)
671{ 722{
672 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 723 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
673 { 724 {
674 grp->flags &= ~EIO_FLAG_GROUPADD; 725 grp->flags &= ~EIO_FLAG_GROUPADD;
675 726
… …
682 break; 733 break;
683 } 734 }
684 } 735 }
685} 736}
686 737
738static int
687static int grp_dec (eio_req *grp) 739grp_dec (eio_req *grp)
688{ 740{
689 --grp->size; 741 --grp->size;
690 742
691 /* call feeder, if applicable */ 743 /* call feeder, if applicable */
692 grp_try_feed (grp); 744 grp_try_feed (grp);
… …
696 return eio_finish (grp); 748 return eio_finish (grp);
697 else 749 else
698 return 0; 750 return 0;
699} 751}
700 752
753static void
701void eio_destroy (eio_req *req) 754eio_destroy (eio_req *req)
702{ 755{
703 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 756 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
704 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 757 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
705 758
706 EIO_DESTROY (req); 759 EIO_DESTROY (req);
707} 760}
708 761
762static int
709static int eio_finish (eio_req *req) 763eio_finish (eio_req *req)
710{ 764{
711 int res = EIO_FINISH (req); 765 int res = EIO_FINISH (req);
712 766
713 if (req->grp) 767 if (req->grp)
714 { 768 {
… …
722 if (grp->grp_first == req) 776 if (grp->grp_first == req)
723 grp->grp_first = req->grp_next; 777 grp->grp_first = req->grp_next;
724 778
725 res2 = grp_dec (grp); 779 res2 = grp_dec (grp);
726 780
727 if (!res && res2) 781 if (!res)
728 res = res2; 782 res = res2;
729 } 783 }
730 784
731 eio_destroy (req); 785 eio_destroy (req);
732 786
733 return res; 787 return res;
734} 788}
735 789
790void
736void eio_grp_cancel (eio_req *grp) 791eio_grp_cancel (eio_req *grp)
737{ 792{
738 for (grp = grp->grp_first; grp; grp = grp->grp_next) 793 for (grp = grp->grp_first; grp; grp = grp->grp_next)
739 eio_cancel (grp); 794 eio_cancel (grp);
740} 795}
741 796
797void
742void eio_cancel (eio_req *req) 798eio_cancel (eio_req *req)
743{ 799{
744 etp_cancel (req); 800 etp_cancel (req);
745} 801}
746 802
803void
747void eio_submit (eio_req *req) 804eio_submit (eio_req *req)
748{ 805{
749 etp_submit (req); 806 etp_submit (req);
750} 807}
751 808
752unsigned int eio_nreqs (void) 809unsigned int
810eio_nreqs (void)
753{ 811{
754 return etp_nreqs (); 812 return etp_nreqs ();
755} 813}
756 814
757unsigned int eio_nready (void) 815unsigned int
816eio_nready (void)
758{ 817{
759 return etp_nready (); 818 return etp_nready ();
760} 819}
761 820
762unsigned int eio_npending (void) 821unsigned int
822eio_npending (void)
763{ 823{
764 return etp_npending (); 824 return etp_npending ();
765} 825}
766 826
767unsigned int eio_nthreads (void) 827unsigned int ecb_cold
828eio_nthreads (void)
768{ 829{
769 return etp_nthreads (); 830 return etp_nthreads ();
770} 831}
771 832
833void ecb_cold
772void eio_set_max_poll_time (double nseconds) 834eio_set_max_poll_time (double nseconds)
773{ 835{
774 etp_set_max_poll_time (nseconds); 836 etp_set_max_poll_time (nseconds);
775} 837}
776 838
839void ecb_cold
777void eio_set_max_poll_reqs (unsigned int maxreqs) 840eio_set_max_poll_reqs (unsigned int maxreqs)
778{ 841{
779 etp_set_max_poll_reqs (maxreqs); 842 etp_set_max_poll_reqs (maxreqs);
780} 843}
781 844
845void ecb_cold
782void eio_set_max_idle (unsigned int nthreads) 846eio_set_max_idle (unsigned int nthreads)
783{ 847{
784 etp_set_max_idle (nthreads); 848 etp_set_max_idle (nthreads);
785} 849}
786 850
851void ecb_cold
787void eio_set_idle_timeout (unsigned int seconds) 852eio_set_idle_timeout (unsigned int seconds)
788{ 853{
789 etp_set_idle_timeout (seconds); 854 etp_set_idle_timeout (seconds);
790} 855}
791 856
857void ecb_cold
792void eio_set_min_parallel (unsigned int nthreads) 858eio_set_min_parallel (unsigned int nthreads)
793{ 859{
794 etp_set_min_parallel (nthreads); 860 etp_set_min_parallel (nthreads);
795} 861}
796 862
863void ecb_cold
797void eio_set_max_parallel (unsigned int nthreads) 864eio_set_max_parallel (unsigned int nthreads)
798{ 865{
799 etp_set_max_parallel (nthreads); 866 etp_set_max_parallel (nthreads);
800} 867}
801 868
802int eio_poll (void) 869int eio_poll (void)
… …
872#ifndef HAVE_FUTIMES 939#ifndef HAVE_FUTIMES
873 940
874# undef futimes 941# undef futimes
875# define futimes(fd,times) eio__futimes (fd, times) 942# define futimes(fd,times) eio__futimes (fd, times)
876 943
944static int
877static int eio__futimes (int fd, const struct timeval tv[2]) 945eio__futimes (int fd, const struct timeval tv[2])
878{ 946{
879 errno = ENOSYS; 947 errno = ENOSYS;
880 return -1; 948 return -1;
881} 949}
882 950
… …
886# undef fdatasync 954# undef fdatasync
887# define fdatasync(fd) fsync (fd) 955# define fdatasync(fd) fsync (fd)
888#endif 956#endif
889 957
890/* sync_file_range always needs emulation */ 958/* sync_file_range always needs emulation */
891int 959static int
892eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 960eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
893{ 961{
894#if HAVE_SYNC_FILE_RANGE 962#if HAVE_SYNC_FILE_RANGE
895 int res; 963 int res;
896 964
… …
913 /* even though we could play tricks with the flags, it's better to always 981 /* even though we could play tricks with the flags, it's better to always
914 * call fdatasync, as that matches the expectation of its users best */ 982 * call fdatasync, as that matches the expectation of its users best */
915 return fdatasync (fd); 983 return fdatasync (fd);
916} 984}
917 985
986static int
987eio__fallocate (int fd, int mode, off_t offset, size_t len)
988{
989#if HAVE_FALLOCATE
990 return fallocate (fd, mode, offset, len);
991#else
992 errno = ENOSYS;
993 return -1;
994#endif
995}
996
918#if !HAVE_READAHEAD 997#if !HAVE_READAHEAD
919# undef readahead 998# undef readahead
920# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 999# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
921 1000
922static ssize_t 1001static ssize_t
… …
950 if (!count) 1029 if (!count)
951 return 0; 1030 return 0;
952 1031
953 for (;;) 1032 for (;;)
954 { 1033 {
1034#ifdef __APPLE__
1035# undef HAVE_SENDFILE /* broken, as everything on os x */
1036#endif
955#if HAVE_SENDFILE 1037#if HAVE_SENDFILE
956# if __linux 1038# if __linux
957 off_t soffset = offset; 1039 off_t soffset = offset;
958 res = sendfile (ofd, ifd, &soffset, count); 1040 res = sendfile (ofd, ifd, &soffset, count);
959 1041
… …
1002 if (res < 0 && sbytes) 1084 if (res < 0 && sbytes)
1003 res = sbytes; 1085 res = sbytes;
1004 1086
1005# endif 1087# endif
1006 1088
1007#elif defined (_WIN32) 1089#elif defined (_WIN32) && 0
1008 /* does not work, just for documentation of what would need to be done */ 1090 /* does not work, just for documentation of what would need to be done */
1009 /* actually, cannot be done like this, as TransmitFile changes the file offset, */ 1091 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1010 /* libeio guarantees that the file offset does not change, and windows */ 1092 /* libeio guarantees that the file offset does not change, and windows */
1011 /* has no way to get an independent handle to the same file description */ 1093 /* has no way to get an independent handle to the same file description */
1012 HANDLE h = TO_SOCKET (ifd); 1094 HANDLE h = TO_SOCKET (ifd);
… …
1084 count -= cnt; 1166 count -= cnt;
1085 } 1167 }
1086 } 1168 }
1087 1169
1088 return res; 1170 return res;
1171}
1172
1173#ifdef PAGESIZE
1174# define eio_pagesize() PAGESIZE
1175#else
1176static intptr_t
1177eio_pagesize (void)
1178{
1179 static intptr_t page;
1180
1181 if (!page)
1182 page = sysconf (_SC_PAGESIZE);
1183
1184 return page;
1185}
1186#endif
1187
1188static void
1189eio_page_align (void **addr, size_t *length)
1190{
1191 intptr_t mask = eio_pagesize () - 1;
1192
1193 /* round down addr */
1194 intptr_t adj = mask & (intptr_t)*addr;
1195
1196 *addr = (void *)((intptr_t)*addr - adj);
1197 *length += adj;
1198
1199 /* round up length */
1200 *length = (*length + mask) & ~mask;
1201}
1202
1203#if !_POSIX_MEMLOCK
1204# define eio__mlockall(a) eio_nosyscall()
1205#else
1206
1207static int
1208eio__mlockall (int flags)
1209{
1210 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1211 extern int mallopt (int, int);
1212 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1213 #endif
1214
1215 if (EIO_MCL_CURRENT != MCL_CURRENT
1216 || EIO_MCL_FUTURE != MCL_FUTURE)
1217 {
1218 flags = 0
1219 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1220 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1221 }
1222
1223 return mlockall (flags);
1224}
1225#endif
1226
1227#if !_POSIX_MEMLOCK_RANGE
1228# define eio__mlock(a,b) EIO_ENOSYS ()
1229#else
1230
1231static int
1232eio__mlock (void *addr, size_t length)
1233{
1234 eio_page_align (&addr, &length);
1235
1236 return mlock (addr, length);
1237}
1238
1239#endif
1240
1241#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1242# define eio__msync(a,b,c) EIO_ENOSYS ()
1243#else
1244
1245static int
1246eio__msync (void *mem, size_t len, int flags)
1247{
1248 eio_page_align (&mem, &len);
1249
1250 if (EIO_MS_ASYNC != MS_SYNC
1251 || EIO_MS_INVALIDATE != MS_INVALIDATE
1252 || EIO_MS_SYNC != MS_SYNC)
1253 {
1254 flags = 0
1255 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1256 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1257 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1258 }
1259
1260 return msync (mem, len, flags);
1261}
1262
1263#endif
1264
1265static int
1266eio__mtouch (eio_req *req)
1267{
1268 void *mem = req->ptr2;
1269 size_t len = req->size;
1270 int flags = req->int1;
1271
1272 eio_page_align (&mem, &len);
1273
1274 {
1275 intptr_t addr = (intptr_t)mem;
1276 intptr_t end = addr + len;
1277 intptr_t page = eio_pagesize ();
1278
1279 if (addr < end)
1280 if (flags & EIO_MT_MODIFY) /* modify */
1281 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1282 else
1283 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1284 }
1285
1286 return 0;
1287}
1288
1289/*****************************************************************************/
1290/* requests implemented outside eio_execute, because they are so large */
1291
1292static void
1293eio__realpath (eio_req *req, etp_worker *self)
1294{
1295 char *rel = req->ptr1;
1296 char *res;
1297 char *tmp1, *tmp2;
1298#if SYMLOOP_MAX > 32
1299 int symlinks = SYMLOOP_MAX;
1300#else
1301 int symlinks = 32;
1302#endif
1303
1304 req->result = -1;
1305
1306 errno = EINVAL;
1307 if (!rel)
1308 return;
1309
1310 errno = ENOENT;
1311 if (!*rel)
1312 return;
1313
1314 if (!req->ptr2)
1315 {
1316 X_LOCK (wrklock);
1317 req->flags |= EIO_FLAG_PTR2_FREE;
1318 X_UNLOCK (wrklock);
1319 req->ptr2 = malloc (PATH_MAX * 3);
1320
1321 errno = ENOMEM;
1322 if (!req->ptr2)
1323 return;
1324 }
1325
1326 res = req->ptr2;
1327 tmp1 = res + PATH_MAX;
1328 tmp2 = tmp1 + PATH_MAX;
1329
1330#if 0 /* disabled, the musl way to do things is just too racy */
1331#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1332 /* on linux we may be able to ask the kernel */
1333 {
1334 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1335
1336 if (fd >= 0)
1337 {
1338 sprintf (tmp1, "/proc/self/fd/%d", fd);
1339 req->result = readlink (tmp1, res, PATH_MAX);
1340 close (fd);
1341
1342 /* here we should probably stat the open file and the disk file, to make sure they still match */
1343
1344 if (req->result > 0)
1345 goto done;
1346 }
1347 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1348 return;
1349 }
1350#endif
1351#endif
1352
1353 if (*rel != '/')
1354 {
1355 if (!getcwd (res, PATH_MAX))
1356 return;
1357
1358 if (res [1]) /* only use if not / */
1359 res += strlen (res);
1360 }
1361
1362 while (*rel)
1363 {
1364 ssize_t len, linklen;
1365 char *beg = rel;
1366
1367 while (*rel && *rel != '/')
1368 ++rel;
1369
1370 len = rel - beg;
1371
1372 if (!len) /* skip slashes */
1373 {
1374 ++rel;
1375 continue;
1376 }
1377
1378 if (beg [0] == '.')
1379 {
1380 if (len == 1)
1381 continue; /* . - nop */
1382
1383 if (beg [1] == '.' && len == 2)
1384 {
1385 /* .. - back up one component, if possible */
1386
1387 while (res != req->ptr2)
1388 if (*--res == '/')
1389 break;
1390
1391 continue;
1392 }
1393 }
1394
1395 errno = ENAMETOOLONG;
1396 if (res + 1 + len + 1 >= tmp1)
1397 return;
1398
1399 /* copy one component */
1400 *res = '/';
1401 memcpy (res + 1, beg, len);
1402
1403 /* zero-terminate, for readlink */
1404 res [len + 1] = 0;
1405
1406 /* now check if it's a symlink */
1407 linklen = readlink (req->ptr2, tmp1, PATH_MAX);
1408
1409 if (linklen < 0)
1410 {
1411 if (errno != EINVAL)
1412 return;
1413
1414 /* it's a normal directory. hopefully */
1415 res += len + 1;
1416 }
1417 else
1418 {
1419 /* yay, it was a symlink - build new path in tmp2 */
1420 int rellen = strlen (rel);
1421
1422 errno = ENAMETOOLONG;
1423 if (linklen + 1 + rellen >= PATH_MAX)
1424 return;
1425
1426 errno = ELOOP;
1427 if (!--symlinks)
1428 return;
1429
1430 if (*tmp1 == '/')
1431 res = req->ptr2; /* symlink resolves to an absolute path */
1432
1433 /* we need to be careful, as rel might point into tmp2 already */
1434 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1435 tmp2 [linklen] = '/';
1436 memcpy (tmp2, tmp1, linklen);
1437
1438 rel = tmp2;
1439 }
1440 }
1441
1442 /* special case for the lone root path */
1443 if (res == req->ptr2)
1444 *res++ = '/';
1445
1446 req->result = res - (char *)req->ptr2;
1447
1448done:
1449 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1089} 1450}
1090 1451
1091static signed char 1452static signed char
1092eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1453eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1093{ 1454{
… …
1275 1636
1276 X_LOCK (wrklock); 1637 X_LOCK (wrklock);
1277 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1638 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1278 self->dirp = dirp = opendir (req->ptr1); 1639 self->dirp = dirp = opendir (req->ptr1);
1279 1640
1641 if (req->flags & EIO_FLAG_PTR1_FREE)
1642 free (req->ptr1);
1643
1280 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1644 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1281 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1645 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1282 req->ptr2 = names = malloc (namesalloc); 1646 req->ptr2 = names = malloc (namesalloc);
1283 X_UNLOCK (wrklock); 1647 X_UNLOCK (wrklock);
1284 1648
… …
1335 /* skip . and .. entries */ 1699 /* skip . and .. entries */
1336 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1700 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1337 { 1701 {
1338 int len = D_NAMLEN (entp) + 1; 1702 int len = D_NAMLEN (entp) + 1;
1339 1703
1340 while (expect_false (namesoffs + len > namesalloc)) 1704 while (ecb_expect_false (namesoffs + len > namesalloc))
1341 { 1705 {
1342 namesalloc *= 2; 1706 namesalloc *= 2;
1343 X_LOCK (wrklock); 1707 X_LOCK (wrklock);
1344 req->ptr2 = names = realloc (names, namesalloc); 1708 req->ptr2 = names = realloc (names, namesalloc);
1345 X_UNLOCK (wrklock); 1709 X_UNLOCK (wrklock);
… …
1352 1716
1353 if (dents) 1717 if (dents)
1354 { 1718 {
1355 struct eio_dirent *ent; 1719 struct eio_dirent *ent;
1356 1720
1357 if (expect_false (dentoffs == dentalloc)) 1721 if (ecb_expect_false (dentoffs == dentalloc))
1358 { 1722 {
1359 dentalloc *= 2; 1723 dentalloc *= 2;
1360 X_LOCK (wrklock); 1724 X_LOCK (wrklock);
1361 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1725 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1362 X_UNLOCK (wrklock); 1726 X_UNLOCK (wrklock);
… …
1450 break; 1814 break;
1451 } 1815 }
1452 } 1816 }
1453} 1817}
1454 1818
1455#ifdef PAGESIZE
1456# define eio_pagesize() PAGESIZE
1457#else
1458static intptr_t
1459eio_pagesize (void)
1460{
1461 static intptr_t page;
1462
1463 if (!page)
1464 page = sysconf (_SC_PAGESIZE);
1465
1466 return page;
1467}
1468#endif
1469
1470static void
1471eio_page_align (void **addr, size_t *length)
1472{
1473 intptr_t mask = eio_pagesize () - 1;
1474
1475 /* round down addr */
1476 intptr_t adj = mask & (intptr_t)*addr;
1477
1478 *addr = (void *)((intptr_t)*addr - adj);
1479 *length += adj;
1480
1481 /* round up length */
1482 *length = (*length + mask) & ~mask;
1483}
1484
1485#if !_POSIX_MEMLOCK
1486# define eio__mlockall(a) ((errno = ENOSYS), -1)
1487#else
1488
1489static int
1490eio__mlockall (int flags)
1491{
1492 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1493 extern int mallopt (int, int);
1494 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1495 #endif
1496
1497 if (EIO_MCL_CURRENT != MCL_CURRENT
1498 || EIO_MCL_FUTURE != MCL_FUTURE)
1499 {
1500 flags = 0
1501 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1502 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1503 }
1504
1505 return mlockall (flags);
1506}
1507#endif
1508
1509#if !_POSIX_MEMLOCK_RANGE
1510# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1511#else
1512
1513static int
1514eio__mlock (void *addr, size_t length)
1515{
1516 eio_page_align (&addr, &length);
1517
1518 return mlock (addr, length);
1519}
1520
1521#endif
1522
1523#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1524# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1525#else
1526
1527int
1528eio__msync (void *mem, size_t len, int flags)
1529{
1530 eio_page_align (&mem, &len);
1531
1532 if (EIO_MS_ASYNC != MS_SYNC
1533 || EIO_MS_INVALIDATE != MS_INVALIDATE
1534 || EIO_MS_SYNC != MS_SYNC)
1535 {
1536 flags = 0
1537 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1538 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1539 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1540 }
1541
1542 return msync (mem, len, flags);
1543}
1544
1545#endif
1546
1547int
1548eio__mtouch (eio_req *req)
1549{
1550 void *mem = req->ptr2;
1551 size_t len = req->size;
1552 int flags = req->int1;
1553
1554 eio_page_align (&mem, &len);
1555
1556 {
1557 intptr_t addr = (intptr_t)mem;
1558 intptr_t end = addr + len;
1559 intptr_t page = eio_pagesize ();
1560
1561 if (addr < end)
1562 if (flags & EIO_MT_MODIFY) /* modify */
1563 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1564 else
1565 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1566 }
1567
1568 return 0;
1569}
1570
1571/*****************************************************************************/ 1819/*****************************************************************************/
1572 1820
1573#define ALLOC(len) \ 1821#define ALLOC(len) \
1574 if (!req->ptr2) \ 1822 if (!req->ptr2) \
1575 { \ 1823 { \
… …
1588X_THREAD_PROC (etp_proc) 1836X_THREAD_PROC (etp_proc)
1589{ 1837{
1590 ETP_REQ *req; 1838 ETP_REQ *req;
1591 struct timespec ts; 1839 struct timespec ts;
1592 etp_worker *self = (etp_worker *)thr_arg; 1840 etp_worker *self = (etp_worker *)thr_arg;
1841 int timeout;
1593 1842
1594 /* try to distribute timeouts somewhat randomly */ 1843 /* try to distribute timeouts somewhat evenly */
1595 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1844 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1596 1845
1597 for (;;) 1846 for (;;)
1598 { 1847 {
1848 ts.tv_sec = 0;
1849
1599 X_LOCK (reqlock); 1850 X_LOCK (reqlock);
1600 1851
1601 for (;;) 1852 for (;;)
1602 { 1853 {
1603 self->req = req = reqq_shift (&req_queue); 1854 self->req = req = reqq_shift (&req_queue);
1604 1855
1605 if (req) 1856 if (req)
1606 break; 1857 break;
1607 1858
1859 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1860 {
1861 X_UNLOCK (reqlock);
1862 X_LOCK (wrklock);
1863 --started;
1864 X_UNLOCK (wrklock);
1865 goto quit;
1866 }
1867
1608 ++idle; 1868 ++idle;
1609 1869
1610 ts.tv_sec = time (0) + idle_timeout; 1870 if (idle <= max_idle)
1611 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1871 /* we are allowed to idle, so do so without any timeout */
1872 X_COND_WAIT (reqwait, reqlock);
1873 else
1612 { 1874 {
1613 if (idle > max_idle) 1875 /* initialise timeout once */
1614 { 1876 if (!ts.tv_sec)
1615 --idle; 1877 ts.tv_sec = time (0) + idle_timeout;
1616 X_UNLOCK (reqlock);
1617 X_LOCK (wrklock);
1618 --started;
1619 X_UNLOCK (wrklock);
1620 goto quit;
1621 }
1622 1878
1623 /* we are allowed to idle, so do so without any timeout */
1624 X_COND_WAIT (reqwait, reqlock); 1879 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1880 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1625 } 1881 }
1626 1882
1627 --idle; 1883 --idle;
1628 } 1884 }
1629 1885
… …
1632 X_UNLOCK (reqlock); 1888 X_UNLOCK (reqlock);
1633 1889
1634 if (req->type < 0) 1890 if (req->type < 0)
1635 goto quit; 1891 goto quit;
1636 1892
1637 if (!EIO_CANCELLED (req))
1638 ETP_EXECUTE (self, req); 1893 ETP_EXECUTE (self, req);
1639 1894
1640 X_LOCK (reslock); 1895 X_LOCK (reslock);
1641 1896
1642 ++npending; 1897 ++npending;
1643 1898
… …
1658 return 0; 1913 return 0;
1659} 1914}
1660 1915
1661/*****************************************************************************/ 1916/*****************************************************************************/
1662 1917
1918int ecb_cold
1663int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1919eio_init (void (*want_poll)(void), void (*done_poll)(void))
1664{ 1920{
1665 return etp_init (want_poll, done_poll); 1921 return etp_init (want_poll, done_poll);
1666} 1922}
1667 1923
1924ecb_inline void
1668static void eio_api_destroy (eio_req *req) 1925eio_api_destroy (eio_req *req)
1669{ 1926{
1670 free (req); 1927 free (req);
1671} 1928}
1672 1929
1673#define REQ(rtype) \ 1930#define REQ(rtype) \
… …
1692 { \ 1949 { \
1693 eio_api_destroy (req); \ 1950 eio_api_destroy (req); \
1694 return 0; \ 1951 return 0; \
1695 } 1952 }
1696 1953
1954static void
1697static void eio_execute (etp_worker *self, eio_req *req) 1955eio_execute (etp_worker *self, eio_req *req)
1698{ 1956{
1957 if (ecb_expect_false (EIO_CANCELLED (req)))
1958 {
1959 req->result = -1;
1960 req->errorno = ECANCELED;
1961 return;
1962 }
1963
1699 switch (req->type) 1964 switch (req->type)
1700 { 1965 {
1701 case EIO_READ: ALLOC (req->size); 1966 case EIO_READ: ALLOC (req->size);
1702 req->result = req->offs >= 0 1967 req->result = req->offs >= 0
1703 ? pread (req->int1, req->ptr2, req->size, req->offs) 1968 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1737 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 2002 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1738 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 2003 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1739 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 2004 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1740 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 2005 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1741 2006
2007 case EIO_REALPATH: eio__realpath (req, self); break;
2008
1742 case EIO_READLINK: ALLOC (PATH_MAX); 2009 case EIO_READLINK: ALLOC (PATH_MAX);
1743 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2010 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1744 2011
1745 case EIO_SYNC: req->result = 0; sync (); break; 2012 case EIO_SYNC: req->result = 0; sync (); break;
1746 case EIO_FSYNC: req->result = fsync (req->int1); break; 2013 case EIO_FSYNC: req->result = fsync (req->int1); break;
… …
1748 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2015 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1749 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2016 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1750 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2017 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1751 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2018 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1752 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2019 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2020 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1753 2021
1754 case EIO_READDIR: eio__scandir (req, self); break; 2022 case EIO_READDIR: eio__scandir (req, self); break;
1755 2023
1756 case EIO_BUSY: 2024 case EIO_BUSY:
1757#ifdef _WIN32 2025#ifdef _WIN32
… …
1857eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2125eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1858{ 2126{
1859 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2127 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1860} 2128}
1861 2129
2130eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2131{
2132 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2133}
2134
1862eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2135eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1863{ 2136{
1864 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2137 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1865} 2138}
1866 2139
… …
1961} 2234}
1962 2235
1963eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2236eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1964{ 2237{
1965 return eio__1path (EIO_READLINK, path, pri, cb, data); 2238 return eio__1path (EIO_READLINK, path, pri, cb, data);
2239}
2240
2241eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2242{
2243 return eio__1path (EIO_REALPATH, path, pri, cb, data);
1966} 2244}
1967 2245
1968eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2246eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1969{ 2247{
1970 return eio__1path (EIO_STAT, path, pri, cb, data); 2248 return eio__1path (EIO_STAT, path, pri, cb, data);
… …
2029eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2307eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2030{ 2308{
2031 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2309 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2032} 2310}
2033 2311
2034eio_req *eio_custom (void (*)(eio_req *) execute, int pri, eio_cb cb, void *data); 2312eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2035{ 2313{
2036 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2314 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2037} 2315}
2038 2316
2039#endif 2317#endif
… …
2050#undef SEND 2328#undef SEND
2051 2329
2052/*****************************************************************************/ 2330/*****************************************************************************/
2053/* grp functions */ 2331/* grp functions */
2054 2332
2333void
2055void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2334eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
2056{ 2335{
2057 grp->int2 = limit; 2336 grp->int2 = limit;
2058 grp->feed = feed; 2337 grp->feed = feed;
2059 2338
2060 grp_try_feed (grp); 2339 grp_try_feed (grp);
2061} 2340}
2062 2341
2342void
2063void eio_grp_limit (eio_req *grp, int limit) 2343eio_grp_limit (eio_req *grp, int limit)
2064{ 2344{
2065 grp->int2 = limit; 2345 grp->int2 = limit;
2066 2346
2067 grp_try_feed (grp); 2347 grp_try_feed (grp);
2068} 2348}
2069 2349
2350void
2070void eio_grp_add (eio_req *grp, eio_req *req) 2351eio_grp_add (eio_req *grp, eio_req *req)
2071{ 2352{
2072 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2353 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2073 2354
2074 grp->flags |= EIO_FLAG_GROUPADD; 2355 grp->flags |= EIO_FLAG_GROUPADD;
2075 2356
… …
2086} 2367}
2087 2368
2088/*****************************************************************************/ 2369/*****************************************************************************/
2089/* misc garbage */ 2370/* misc garbage */
2090 2371
2372ssize_t
2091ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2373eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2092{ 2374{
2093 etp_worker wrk; 2375 etp_worker wrk;
2094 ssize_t ret; 2376 ssize_t ret;
2095 2377
2096 wrk.dbuf = 0; 2378 wrk.dbuf = 0;

Diff Legend

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