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

Comparing libeio/eio.c (file contents):
Revision 1.58 by root, Sat Oct 30 14:36:53 2010 UTC vs.
Revision 1.72 by root, Fri Jun 10 12:45:20 2011 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifndef _WIN32
41# include "config.h"
42#endif
43
40#include "eio.h" 44#include "eio.h"
45#include "ecb.h"
41 46
42#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define XTHREAD_STACKSIZE EIO_STACKSIZE
44#endif 49#endif
45#include "xthread.h" 50#include "xthread.h"
… …
54#include <sys/statvfs.h> 59#include <sys/statvfs.h>
55#include <limits.h> 60#include <limits.h>
56#include <fcntl.h> 61#include <fcntl.h>
57#include <assert.h> 62#include <assert.h>
58 63
64/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
65/* intptr_t only comes form stdint.h, says idiot openbsd coder */
66#if HAVE_STDINT_H
67# include <stdint.h>
68#endif
69
59#ifndef EIO_FINISH 70#ifndef EIO_FINISH
60# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 71# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
61#endif 72#endif
62 73
63#ifndef EIO_DESTROY 74#ifndef EIO_DESTROY
… …
71#ifdef _WIN32 82#ifdef _WIN32
72 83
73 /*doh*/ 84 /*doh*/
74#else 85#else
75 86
76# include "config.h"
77# include <sys/time.h> 87# include <sys/time.h>
78# include <sys/select.h> 88# include <sys/select.h>
79# include <unistd.h> 89# include <unistd.h>
80# include <utime.h> 90# include <utime.h>
81# include <signal.h> 91# include <signal.h>
82# include <dirent.h> 92# include <dirent.h>
83 93
84#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES 94#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h> 95# include <sys/mman.h>
86#endif 96#endif
87 97
88/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 98/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 99# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
… …
132#endif 142#endif
133#ifndef D_NAMLEN 143#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name) 144# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif 145#endif
136 146
137/* number of seconds after which an idle threads exit */
138#define IDLE_TIMEOUT 10
139
140/* used for struct dirent, AIX doesn't provide it */ 147/* used for struct dirent, AIX doesn't provide it */
141#ifndef NAME_MAX 148#ifndef NAME_MAX
142# define NAME_MAX 4096 149# define NAME_MAX 4096
143#endif 150#endif
144 151
… …
158 errno = ENOMEM; \ 165 errno = ENOMEM; \
159 if (!eio_buf) \ 166 if (!eio_buf) \
160 return -1; 167 return -1;
161 168
162#define EIO_TICKS ((1000000 + 1023) >> 10) 169#define EIO_TICKS ((1000000 + 1023) >> 10)
163
164/*****************************************************************************/
165
166#if __GNUC__ >= 3
167# define expect(expr,value) __builtin_expect ((expr),(value))
168#else
169# define expect(expr,value) (expr)
170#endif
171
172#define expect_false(expr) expect ((expr) != 0, 0)
173#define expect_true(expr) expect ((expr) != 0, 1)
174
175/*****************************************************************************/
176 170
177#define ETP_PRI_MIN EIO_PRI_MIN 171#define ETP_PRI_MIN EIO_PRI_MIN
178#define ETP_PRI_MAX EIO_PRI_MAX 172#define ETP_PRI_MAX EIO_PRI_MAX
179 173
180struct etp_worker; 174struct etp_worker;
… …
206/*****************************************************************************/ 200/*****************************************************************************/
207 201
208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 202#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
209 203
210/* calculate time difference in ~1/EIO_TICKS of a second */ 204/* calculate time difference in ~1/EIO_TICKS of a second */
205ECB_INLINE int
211static int tvdiff (struct timeval *tv1, struct timeval *tv2) 206tvdiff (struct timeval *tv1, struct timeval *tv2)
212{ 207{
213 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 208 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
214 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 209 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
215} 210}
216 211
… …
223static unsigned int max_poll_reqs; /* reslock */ 218static unsigned int max_poll_reqs; /* reslock */
224 219
225static volatile unsigned int nreqs; /* reqlock */ 220static volatile unsigned int nreqs; /* reqlock */
226static volatile unsigned int nready; /* reqlock */ 221static volatile unsigned int nready; /* reqlock */
227static volatile unsigned int npending; /* reqlock */ 222static volatile unsigned int npending; /* reqlock */
228static volatile unsigned int max_idle = 4; 223static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
224static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
229 225
230static xmutex_t wrklock = X_MUTEX_INIT; 226static xmutex_t wrklock;
231static xmutex_t reslock = X_MUTEX_INIT; 227static xmutex_t reslock;
232static xmutex_t reqlock = X_MUTEX_INIT; 228static xmutex_t reqlock;
233static xcond_t reqwait = X_COND_INIT; 229static xcond_t reqwait;
234 230
235#if !HAVE_PREADWRITE 231#if !HAVE_PREADWRITE
236/* 232/*
237 * make our pread/pwrite emulation safe against themselves, but not against 233 * make our pread/pwrite emulation safe against themselves, but not against
238 * normal read/write by using a mutex. slows down execution a lot, 234 * normal read/write by using a mutex. slows down execution a lot,
… …
259#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 255#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
260#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 256#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
261 257
262/* worker threads management */ 258/* worker threads management */
263 259
260static void ecb_cold
264static void etp_worker_clear (etp_worker *wrk) 261etp_worker_clear (etp_worker *wrk)
265{ 262{
266 ETP_WORKER_CLEAR (wrk); 263 ETP_WORKER_CLEAR (wrk);
267} 264}
268 265
266static void ecb_cold
269static void etp_worker_free (etp_worker *wrk) 267etp_worker_free (etp_worker *wrk)
270{ 268{
271 wrk->next->prev = wrk->prev; 269 wrk->next->prev = wrk->prev;
272 wrk->prev->next = wrk->next; 270 wrk->prev->next = wrk->next;
273 271
274 free (wrk); 272 free (wrk);
275} 273}
276 274
277static unsigned int etp_nreqs (void) 275static unsigned int
276etp_nreqs (void)
278{ 277{
279 int retval; 278 int retval;
280 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 279 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
281 retval = nreqs; 280 retval = nreqs;
282 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 281 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
283 return retval; 282 return retval;
284} 283}
285 284
286static unsigned int etp_nready (void) 285static unsigned int
286etp_nready (void)
287{ 287{
288 unsigned int retval; 288 unsigned int retval;
289 289
290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 290 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
291 retval = nready; 291 retval = nready;
292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 292 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
293 293
294 return retval; 294 return retval;
295} 295}
296 296
297static unsigned int etp_npending (void) 297static unsigned int
298etp_npending (void)
298{ 299{
299 unsigned int retval; 300 unsigned int retval;
300 301
301 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 302 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
302 retval = npending; 303 retval = npending;
303 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 304 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
304 305
305 return retval; 306 return retval;
306} 307}
307 308
308static unsigned int etp_nthreads (void) 309static unsigned int
310etp_nthreads (void)
309{ 311{
310 unsigned int retval; 312 unsigned int retval;
311 313
312 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 314 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
313 retval = started; 315 retval = started;
… …
327} etp_reqq; 329} etp_reqq;
328 330
329static etp_reqq req_queue; 331static etp_reqq req_queue;
330static etp_reqq res_queue; 332static etp_reqq res_queue;
331 333
334static int ecb_noinline
332static int reqq_push (etp_reqq *q, ETP_REQ *req) 335reqq_push (etp_reqq *q, ETP_REQ *req)
333{ 336{
334 int pri = req->pri; 337 int pri = req->pri;
335 req->next = 0; 338 req->next = 0;
336 339
337 if (q->qe[pri]) 340 if (q->qe[pri])
… …
343 q->qe[pri] = q->qs[pri] = req; 346 q->qe[pri] = q->qs[pri] = req;
344 347
345 return q->size++; 348 return q->size++;
346} 349}
347 350
351static ETP_REQ * ecb_noinline
348static ETP_REQ *reqq_shift (etp_reqq *q) 352reqq_shift (etp_reqq *q)
349{ 353{
350 int pri; 354 int pri;
351 355
352 if (!q->size) 356 if (!q->size)
353 return 0; 357 return 0;
… …
368 } 372 }
369 373
370 abort (); 374 abort ();
371} 375}
372 376
377static void ecb_cold
378etp_thread_init (void)
379{
380 X_MUTEX_CREATE (wrklock);
381 X_MUTEX_CREATE (reslock);
382 X_MUTEX_CREATE (reqlock);
383 X_COND_CREATE (reqwait);
384}
385
386static void ecb_cold
373static void etp_atfork_prepare (void) 387etp_atfork_prepare (void)
374{ 388{
375 X_LOCK (wrklock); 389 X_LOCK (wrklock);
376 X_LOCK (reqlock); 390 X_LOCK (reqlock);
377 X_LOCK (reslock); 391 X_LOCK (reslock);
378#if !HAVE_PREADWRITE 392#if !HAVE_PREADWRITE
379 X_LOCK (preadwritelock); 393 X_LOCK (preadwritelock);
380#endif 394#endif
381} 395}
382 396
397static void ecb_cold
383static void etp_atfork_parent (void) 398etp_atfork_parent (void)
384{ 399{
385#if !HAVE_PREADWRITE 400#if !HAVE_PREADWRITE
386 X_UNLOCK (preadwritelock); 401 X_UNLOCK (preadwritelock);
387#endif 402#endif
388 X_UNLOCK (reslock); 403 X_UNLOCK (reslock);
389 X_UNLOCK (reqlock); 404 X_UNLOCK (reqlock);
390 X_UNLOCK (wrklock); 405 X_UNLOCK (wrklock);
391} 406}
392 407
408static void ecb_cold
393static void etp_atfork_child (void) 409etp_atfork_child (void)
394{ 410{
395 ETP_REQ *prv; 411 ETP_REQ *prv;
396 412
397 while ((prv = reqq_shift (&req_queue))) 413 while ((prv = reqq_shift (&req_queue)))
398 ETP_DESTROY (prv); 414 ETP_DESTROY (prv);
… …
415 idle = 0; 431 idle = 0;
416 nreqs = 0; 432 nreqs = 0;
417 nready = 0; 433 nready = 0;
418 npending = 0; 434 npending = 0;
419 435
420 etp_atfork_parent (); 436 etp_thread_init ();
421} 437}
422 438
423static void 439static void ecb_cold
424etp_once_init (void) 440etp_once_init (void)
425{ 441{
442 etp_thread_init ();
426 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 443 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
427} 444}
428 445
429static int 446static int ecb_cold
430etp_init (void (*want_poll)(void), void (*done_poll)(void)) 447etp_init (void (*want_poll)(void), void (*done_poll)(void))
431{ 448{
432 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 449 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
433 450
434 pthread_once (&doinit, etp_once_init); 451 pthread_once (&doinit, etp_once_init);
… …
439 return 0; 456 return 0;
440} 457}
441 458
442X_THREAD_PROC (etp_proc); 459X_THREAD_PROC (etp_proc);
443 460
461static void ecb_cold
444static void etp_start_thread (void) 462etp_start_thread (void)
445{ 463{
446 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 464 etp_worker *wrk = calloc (1, sizeof (etp_worker));
447 465
448 /*TODO*/ 466 /*TODO*/
449 assert (("unable to allocate worker thread data", wrk)); 467 assert (("unable to allocate worker thread data", wrk));
… …
462 free (wrk); 480 free (wrk);
463 481
464 X_UNLOCK (wrklock); 482 X_UNLOCK (wrklock);
465} 483}
466 484
485static void
467static void etp_maybe_start_thread (void) 486etp_maybe_start_thread (void)
468{ 487{
469 if (expect_true (etp_nthreads () >= wanted)) 488 if (ecb_expect_true (etp_nthreads () >= wanted))
470 return; 489 return;
471 490
472 /* todo: maybe use idle here, but might be less exact */ 491 /* todo: maybe use idle here, but might be less exact */
473 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) 492 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
474 return; 493 return;
475 494
476 etp_start_thread (); 495 etp_start_thread ();
477} 496}
478 497
498static void ecb_cold
479static void etp_end_thread (void) 499etp_end_thread (void)
480{ 500{
481 eio_req *req = calloc (1, sizeof (eio_req)); 501 eio_req *req = calloc (1, sizeof (eio_req));
482 502
483 req->type = -1; 503 req->type = -1;
484 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 504 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
… …
491 X_LOCK (wrklock); 511 X_LOCK (wrklock);
492 --started; 512 --started;
493 X_UNLOCK (wrklock); 513 X_UNLOCK (wrklock);
494} 514}
495 515
496static int etp_poll (void) 516static int
517etp_poll (void)
497{ 518{
498 unsigned int maxreqs; 519 unsigned int maxreqs;
499 unsigned int maxtime; 520 unsigned int maxtime;
500 struct timeval tv_start, tv_now; 521 struct timeval tv_start, tv_now;
501 522
… …
531 552
532 X_LOCK (reqlock); 553 X_LOCK (reqlock);
533 --nreqs; 554 --nreqs;
534 X_UNLOCK (reqlock); 555 X_UNLOCK (reqlock);
535 556
536 if (expect_false (req->type == EIO_GROUP && req->size)) 557 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
537 { 558 {
538 req->int1 = 1; /* mark request as delayed */ 559 req->int1 = 1; /* mark request as delayed */
539 continue; 560 continue;
540 } 561 }
541 else 562 else
542 { 563 {
543 int res = ETP_FINISH (req); 564 int res = ETP_FINISH (req);
544 if (expect_false (res)) 565 if (ecb_expect_false (res))
545 return res; 566 return res;
546 } 567 }
547 568
548 if (expect_false (maxreqs && !--maxreqs)) 569 if (ecb_expect_false (maxreqs && !--maxreqs))
549 break; 570 break;
550 571
551 if (maxtime) 572 if (maxtime)
552 { 573 {
553 gettimeofday (&tv_now, 0); 574 gettimeofday (&tv_now, 0);
… …
559 580
560 errno = EAGAIN; 581 errno = EAGAIN;
561 return -1; 582 return -1;
562} 583}
563 584
585static void
564static void etp_cancel (ETP_REQ *req) 586etp_cancel (ETP_REQ *req)
565{ 587{
566 X_LOCK (wrklock); 588 X_LOCK (wrklock);
567 req->flags |= EIO_FLAG_CANCELLED; 589 req->flags |= EIO_FLAG_CANCELLED;
568 X_UNLOCK (wrklock); 590 X_UNLOCK (wrklock);
569 591
570 eio_grp_cancel (req); 592 eio_grp_cancel (req);
571} 593}
572 594
595static void
573static void etp_submit (ETP_REQ *req) 596etp_submit (ETP_REQ *req)
574{ 597{
575 req->pri -= ETP_PRI_MIN; 598 req->pri -= ETP_PRI_MIN;
576 599
577 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 600 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
578 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 601 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
579 602
580 if (expect_false (req->type == EIO_GROUP)) 603 if (ecb_expect_false (req->type == EIO_GROUP))
581 { 604 {
582 /* I hope this is worth it :/ */ 605 /* I hope this is worth it :/ */
583 X_LOCK (reqlock); 606 X_LOCK (reqlock);
584 ++nreqs; 607 ++nreqs;
585 X_UNLOCK (reqlock); 608 X_UNLOCK (reqlock);
… …
604 627
605 etp_maybe_start_thread (); 628 etp_maybe_start_thread ();
606 } 629 }
607} 630}
608 631
632static void ecb_cold
609static void etp_set_max_poll_time (double nseconds) 633etp_set_max_poll_time (double nseconds)
610{ 634{
611 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 635 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
612 max_poll_time = nseconds * EIO_TICKS; 636 max_poll_time = nseconds * EIO_TICKS;
613 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 637 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
614} 638}
615 639
640static void ecb_cold
616static void etp_set_max_poll_reqs (unsigned int maxreqs) 641etp_set_max_poll_reqs (unsigned int maxreqs)
617{ 642{
618 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 643 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
619 max_poll_reqs = maxreqs; 644 max_poll_reqs = maxreqs;
620 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 645 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
621} 646}
622 647
648static void ecb_cold
623static void etp_set_max_idle (unsigned int nthreads) 649etp_set_max_idle (unsigned int nthreads)
624{ 650{
625 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 651 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
626 max_idle = nthreads <= 0 ? 1 : nthreads; 652 max_idle = nthreads;
627 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 653 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
628} 654}
629 655
656static void ecb_cold
657etp_set_idle_timeout (unsigned int seconds)
658{
659 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
660 idle_timeout = seconds;
661 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
662}
663
664static void ecb_cold
630static void etp_set_min_parallel (unsigned int nthreads) 665etp_set_min_parallel (unsigned int nthreads)
631{ 666{
632 if (wanted < nthreads) 667 if (wanted < nthreads)
633 wanted = nthreads; 668 wanted = nthreads;
634} 669}
635 670
671static void ecb_cold
636static void etp_set_max_parallel (unsigned int nthreads) 672etp_set_max_parallel (unsigned int nthreads)
637{ 673{
638 if (wanted > nthreads) 674 if (wanted > nthreads)
639 wanted = nthreads; 675 wanted = nthreads;
640 676
641 while (started > wanted) 677 while (started > wanted)
642 etp_end_thread (); 678 etp_end_thread ();
643} 679}
644 680
645/*****************************************************************************/ 681/*****************************************************************************/
646 682
683static void
647static void grp_try_feed (eio_req *grp) 684grp_try_feed (eio_req *grp)
648{ 685{
649 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 686 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
650 { 687 {
651 grp->flags &= ~EIO_FLAG_GROUPADD; 688 grp->flags &= ~EIO_FLAG_GROUPADD;
652 689
… …
659 break; 696 break;
660 } 697 }
661 } 698 }
662} 699}
663 700
701static int
664static int grp_dec (eio_req *grp) 702grp_dec (eio_req *grp)
665{ 703{
666 --grp->size; 704 --grp->size;
667 705
668 /* call feeder, if applicable */ 706 /* call feeder, if applicable */
669 grp_try_feed (grp); 707 grp_try_feed (grp);
… …
673 return eio_finish (grp); 711 return eio_finish (grp);
674 else 712 else
675 return 0; 713 return 0;
676} 714}
677 715
716void
678void eio_destroy (eio_req *req) 717eio_destroy (eio_req *req)
679{ 718{
680 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 719 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
681 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 720 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
682 721
683 EIO_DESTROY (req); 722 EIO_DESTROY (req);
684} 723}
685 724
725static int
686static int eio_finish (eio_req *req) 726eio_finish (eio_req *req)
687{ 727{
688 int res = EIO_FINISH (req); 728 int res = EIO_FINISH (req);
689 729
690 if (req->grp) 730 if (req->grp)
691 { 731 {
… …
708 eio_destroy (req); 748 eio_destroy (req);
709 749
710 return res; 750 return res;
711} 751}
712 752
753void
713void eio_grp_cancel (eio_req *grp) 754eio_grp_cancel (eio_req *grp)
714{ 755{
715 for (grp = grp->grp_first; grp; grp = grp->grp_next) 756 for (grp = grp->grp_first; grp; grp = grp->grp_next)
716 eio_cancel (grp); 757 eio_cancel (grp);
717} 758}
718 759
760void
719void eio_cancel (eio_req *req) 761eio_cancel (eio_req *req)
720{ 762{
721 etp_cancel (req); 763 etp_cancel (req);
722} 764}
723 765
766void
724void eio_submit (eio_req *req) 767eio_submit (eio_req *req)
725{ 768{
726 etp_submit (req); 769 etp_submit (req);
727} 770}
728 771
729unsigned int eio_nreqs (void) 772unsigned int
773eio_nreqs (void)
730{ 774{
731 return etp_nreqs (); 775 return etp_nreqs ();
732} 776}
733 777
734unsigned int eio_nready (void) 778unsigned int
779eio_nready (void)
735{ 780{
736 return etp_nready (); 781 return etp_nready ();
737} 782}
738 783
739unsigned int eio_npending (void) 784unsigned int
785eio_npending (void)
740{ 786{
741 return etp_npending (); 787 return etp_npending ();
742} 788}
743 789
744unsigned int eio_nthreads (void) 790unsigned int ecb_cold
791eio_nthreads (void)
745{ 792{
746 return etp_nthreads (); 793 return etp_nthreads ();
747} 794}
748 795
796void ecb_cold
749void eio_set_max_poll_time (double nseconds) 797eio_set_max_poll_time (double nseconds)
750{ 798{
751 etp_set_max_poll_time (nseconds); 799 etp_set_max_poll_time (nseconds);
752} 800}
753 801
802void ecb_cold
754void eio_set_max_poll_reqs (unsigned int maxreqs) 803eio_set_max_poll_reqs (unsigned int maxreqs)
755{ 804{
756 etp_set_max_poll_reqs (maxreqs); 805 etp_set_max_poll_reqs (maxreqs);
757} 806}
758 807
808void ecb_cold
759void eio_set_max_idle (unsigned int nthreads) 809eio_set_max_idle (unsigned int nthreads)
760{ 810{
761 etp_set_max_idle (nthreads); 811 etp_set_max_idle (nthreads);
762} 812}
763 813
814void ecb_cold
815eio_set_idle_timeout (unsigned int seconds)
816{
817 etp_set_idle_timeout (seconds);
818}
819
820void ecb_cold
764void eio_set_min_parallel (unsigned int nthreads) 821eio_set_min_parallel (unsigned int nthreads)
765{ 822{
766 etp_set_min_parallel (nthreads); 823 etp_set_min_parallel (nthreads);
767} 824}
768 825
826void ecb_cold
769void eio_set_max_parallel (unsigned int nthreads) 827eio_set_max_parallel (unsigned int nthreads)
770{ 828{
771 etp_set_max_parallel (nthreads); 829 etp_set_max_parallel (nthreads);
772} 830}
773 831
774int eio_poll (void) 832int eio_poll (void)
… …
816 874
817 return res; 875 return res;
818} 876}
819#endif 877#endif
820 878
821#ifndef HAVE_FUTIMES 879#ifndef HAVE_UTIMES
822 880
823# undef utimes 881# undef utimes
824# undef futimes
825# define utimes(path,times) eio__utimes (path, times) 882# define utimes(path,times) eio__utimes (path, times)
826# define futimes(fd,times) eio__futimes (fd, times)
827 883
828static int 884static int
829eio__utimes (const char *filename, const struct timeval times[2]) 885eio__utimes (const char *filename, const struct timeval times[2])
830{ 886{
831 if (times) 887 if (times)
… …
839 } 895 }
840 else 896 else
841 return utime (filename, 0); 897 return utime (filename, 0);
842} 898}
843 899
900#endif
901
902#ifndef HAVE_FUTIMES
903
904# undef futimes
905# define futimes(fd,times) eio__futimes (fd, times)
906
907static int
844static int eio__futimes (int fd, const struct timeval tv[2]) 908eio__futimes (int fd, const struct timeval tv[2])
845{ 909{
846 errno = ENOSYS; 910 errno = ENOSYS;
847 return -1; 911 return -1;
848} 912}
849 913
… …
853# undef fdatasync 917# undef fdatasync
854# define fdatasync(fd) fsync (fd) 918# define fdatasync(fd) fsync (fd)
855#endif 919#endif
856 920
857/* sync_file_range always needs emulation */ 921/* sync_file_range always needs emulation */
858int 922static int
859eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 923eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
860{ 924{
861#if HAVE_SYNC_FILE_RANGE 925#if HAVE_SYNC_FILE_RANGE
862 int res; 926 int res;
863 927
… …
909 973
910/* sendfile always needs emulation */ 974/* sendfile always needs emulation */
911static ssize_t 975static ssize_t
912eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 976eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
913{ 977{
978 ssize_t written = 0;
914 ssize_t res; 979 ssize_t res;
915 980
916 if (!count) 981 if (!count)
917 return 0; 982 return 0;
918 983
984 for (;;)
985 {
919#if HAVE_SENDFILE 986#if HAVE_SENDFILE
920# if __linux 987# if __linux
988 off_t soffset = offset;
921 res = sendfile (ofd, ifd, &offset, count); 989 res = sendfile (ofd, ifd, &soffset, count);
922 990
923# elif __FreeBSD__ 991# elif __FreeBSD__
924 /* 992 /*
925 * Of course, the freebsd sendfile is a dire hack with no thoughts 993 * Of course, the freebsd sendfile is a dire hack with no thoughts
926 * wasted on making it similar to other I/O functions. 994 * wasted on making it similar to other I/O functions.
927 */ 995 */
928 {
929 off_t sbytes; 996 off_t sbytes;
930 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 997 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
931 998
932 #if 0 /* according to the manpage, this is correct, but broken behaviour */ 999 #if 0 /* according to the manpage, this is correct, but broken behaviour */
933 /* freebsd' sendfile will return 0 on success */ 1000 /* freebsd' sendfile will return 0 on success */
934 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ 1001 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
935 /* not on e.g. EIO or EPIPE - sounds broken */ 1002 /* not on e.g. EIO or EPIPE - sounds broken */
936 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 1003 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
937 res = sbytes; 1004 res = sbytes;
938 #endif 1005 #endif
939 1006
940 /* according to source inspection, this is correct, and useful behaviour */ 1007 /* according to source inspection, this is correct, and useful behaviour */
941 if (sbytes) 1008 if (sbytes)
942 res = sbytes; 1009 res = sbytes;
943 }
944 1010
945# elif defined (__APPLE__) 1011# elif defined (__APPLE__)
946
947 {
948 off_t sbytes = count; 1012 off_t sbytes = count;
949 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 1013 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
950 1014
951 /* according to the manpage, sbytes is always valid */ 1015 /* according to the manpage, sbytes is always valid */
952 if (sbytes) 1016 if (sbytes)
953 res = sbytes; 1017 res = sbytes;
954 }
955 1018
956# elif __hpux 1019# elif __hpux
957 res = sendfile (ofd, ifd, offset, count, 0, 0); 1020 res = sendfile (ofd, ifd, offset, count, 0, 0);
958 1021
959# elif __solaris 1022# elif __solaris
960 {
961 struct sendfilevec vec; 1023 struct sendfilevec vec;
962 size_t sbytes; 1024 size_t sbytes;
963 1025
964 vec.sfv_fd = ifd; 1026 vec.sfv_fd = ifd;
965 vec.sfv_flag = 0; 1027 vec.sfv_flag = 0;
966 vec.sfv_off = offset; 1028 vec.sfv_off = offset;
967 vec.sfv_len = count; 1029 vec.sfv_len = count;
968 1030
969 res = sendfilev (ofd, &vec, 1, &sbytes); 1031 res = sendfilev (ofd, &vec, 1, &sbytes);
970 1032
971 if (res < 0 && sbytes) 1033 if (res < 0 && sbytes)
972 res = sbytes; 1034 res = sbytes;
973 }
974 1035
975# endif 1036# endif
976 1037
977#elif defined (_WIN32) 1038#elif defined (_WIN32)
978
979 /* does not work, just for documentation of what would need to be done */ 1039 /* does not work, just for documentation of what would need to be done */
980 { 1040 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1041 /* libeio guarantees that the file offset does not change, and windows */
1042 /* has no way to get an independent handle to the same file description */
981 HANDLE h = TO_SOCKET (ifd); 1043 HANDLE h = TO_SOCKET (ifd);
982 SetFilePointer (h, offset, 0, FILE_BEGIN); 1044 SetFilePointer (h, offset, 0, FILE_BEGIN);
983 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1045 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
984 }
985 1046
986#else 1047#else
987 res = -1; 1048 res = -1;
988 errno = ENOSYS; 1049 errno = ENOSYS;
989#endif 1050#endif
990 1051
1052 /* we assume sendfile can copy at least 128mb in one go */
1053 if (res <= 128 * 1024 * 1024)
1054 {
1055 if (res > 0)
1056 written += res;
1057
1058 if (written)
1059 return written;
1060
1061 break;
1062 }
1063 else
1064 {
1065 /* if we requested more, then probably the kernel was lazy */
1066 written += res;
1067 offset += res;
1068 count -= res;
1069
1070 if (!count)
1071 return written;
1072 }
1073 }
1074
991 if (res < 0 1075 if (res < 0
992 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1076 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
993 /* BSDs */ 1077 /* BSDs */
994#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1078#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
995 || errno == ENOTSUP 1079 || errno == ENOTSUP
996#endif 1080#endif
… …
1036} 1120}
1037 1121
1038static signed char 1122static signed char
1039eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1123eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1040{ 1124{
1041 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1125 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1042 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; 1126 : a->inode < b->inode ? -1
1127 : a->inode > b->inode ? 1
1128 : 0;
1043} 1129}
1044 1130
1045#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1131#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1046 1132
1047#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1133#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
… …
1053 unsigned char bits [9 + sizeof (ino_t) * 8]; 1139 unsigned char bits [9 + sizeof (ino_t) * 8];
1054 unsigned char *bit = bits; 1140 unsigned char *bit = bits;
1055 1141
1056 assert (CHAR_BIT == 8); 1142 assert (CHAR_BIT == 8);
1057 assert (sizeof (eio_dirent) * 8 < 256); 1143 assert (sizeof (eio_dirent) * 8 < 256);
1058 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1144 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1059 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1145 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1060 1146
1061 if (size <= EIO_SORT_FAST) 1147 if (size <= EIO_SORT_FAST)
1062 return; 1148 return;
1063 1149
1064 /* first prepare an array of bits to test in our radix sort */ 1150 /* first prepare an array of bits to test in our radix sort */
… …
1219 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1305 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1220 1306
1221 X_LOCK (wrklock); 1307 X_LOCK (wrklock);
1222 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1308 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1223 self->dirp = dirp = opendir (req->ptr1); 1309 self->dirp = dirp = opendir (req->ptr1);
1310
1224 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1311 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1225 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1312 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1226 req->ptr2 = names = malloc (namesalloc); 1313 req->ptr2 = names = malloc (namesalloc);
1227 X_UNLOCK (wrklock); 1314 X_UNLOCK (wrklock);
1228 1315
… …
1240 /* sort etc. */ 1327 /* sort etc. */
1241 req->int1 = flags; 1328 req->int1 = flags;
1242 req->result = dentoffs; 1329 req->result = dentoffs;
1243 1330
1244 if (flags & EIO_READDIR_STAT_ORDER) 1331 if (flags & EIO_READDIR_STAT_ORDER)
1245 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1332 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1246 else if (flags & EIO_READDIR_DIRS_FIRST) 1333 else if (flags & EIO_READDIR_DIRS_FIRST)
1247 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1334 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1248 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1335 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1249 else 1336 else
1250 { 1337 {
… …
1252 eio_dirent *oth = dents + dentoffs; 1339 eio_dirent *oth = dents + dentoffs;
1253 eio_dirent *dir = dents; 1340 eio_dirent *dir = dents;
1254 1341
1255 /* now partition dirs to the front, and non-dirs to the back */ 1342 /* now partition dirs to the front, and non-dirs to the back */
1256 /* by walking from both sides and swapping if necessary */ 1343 /* by walking from both sides and swapping if necessary */
1257 /* also clear score, so it doesn't influence sorting */
1258 while (oth > dir) 1344 while (oth > dir)
1259 { 1345 {
1260 if (dir->type == EIO_DT_DIR) 1346 if (dir->type == EIO_DT_DIR)
1261 ++dir; 1347 ++dir;
1262 else if ((--oth)->type == EIO_DT_DIR) 1348 else if ((--oth)->type == EIO_DT_DIR)
… …
1265 1351
1266 ++dir; 1352 ++dir;
1267 } 1353 }
1268 } 1354 }
1269 1355
1270 /* now sort the dirs only */ 1356 /* now sort the dirs only (dirs all have the same score) */
1271 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1357 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1272 } 1358 }
1273 1359
1274 break; 1360 break;
1275 } 1361 }
… …
1280 /* skip . and .. entries */ 1366 /* skip . and .. entries */
1281 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1367 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1282 { 1368 {
1283 int len = D_NAMLEN (entp) + 1; 1369 int len = D_NAMLEN (entp) + 1;
1284 1370
1285 while (expect_false (namesoffs + len > namesalloc)) 1371 while (ecb_expect_false (namesoffs + len > namesalloc))
1286 { 1372 {
1287 namesalloc *= 2; 1373 namesalloc *= 2;
1288 X_LOCK (wrklock); 1374 X_LOCK (wrklock);
1289 req->ptr2 = names = realloc (names, namesalloc); 1375 req->ptr2 = names = realloc (names, namesalloc);
1290 X_UNLOCK (wrklock); 1376 X_UNLOCK (wrklock);
… …
1297 1383
1298 if (dents) 1384 if (dents)
1299 { 1385 {
1300 struct eio_dirent *ent; 1386 struct eio_dirent *ent;
1301 1387
1302 if (expect_false (dentoffs == dentalloc)) 1388 if (ecb_expect_false (dentoffs == dentalloc))
1303 { 1389 {
1304 dentalloc *= 2; 1390 dentalloc *= 2;
1305 X_LOCK (wrklock); 1391 X_LOCK (wrklock);
1306 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1392 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1307 X_UNLOCK (wrklock); 1393 X_UNLOCK (wrklock);
… …
1426 /* round up length */ 1512 /* round up length */
1427 *length = (*length + mask) & ~mask; 1513 *length = (*length + mask) & ~mask;
1428} 1514}
1429 1515
1430#if !_POSIX_MEMLOCK 1516#if !_POSIX_MEMLOCK
1431# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1432# define eio__mlockall(a) ((errno = ENOSYS), -1) 1517# define eio__mlockall(a) ((errno = ENOSYS), -1)
1433#else 1518#else
1434
1435static int
1436eio__mlock (void *addr, size_t length)
1437{
1438 eio_page_align (&addr, &length);
1439
1440 return mlock (addr, length);
1441}
1442 1519
1443static int 1520static int
1444eio__mlockall (int flags) 1521eio__mlockall (int flags)
1445{ 1522{
1446 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 1523 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
… …
1458 1535
1459 return mlockall (flags); 1536 return mlockall (flags);
1460} 1537}
1461#endif 1538#endif
1462 1539
1540#if !_POSIX_MEMLOCK_RANGE
1541# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1542#else
1543
1544static int
1545eio__mlock (void *addr, size_t length)
1546{
1547 eio_page_align (&addr, &length);
1548
1549 return mlock (addr, length);
1550}
1551
1552#endif
1553
1463#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1554#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1464# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1555# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1465#else 1556#else
1466 1557
1467int 1558static int
1468eio__msync (void *mem, size_t len, int flags) 1559eio__msync (void *mem, size_t len, int flags)
1469{ 1560{
1470 eio_page_align (&mem, &len); 1561 eio_page_align (&mem, &len);
1471 1562
1472 if (EIO_MS_ASYNC != MS_SYNC 1563 if (EIO_MS_ASYNC != MS_SYNC
… …
1482 return msync (mem, len, flags); 1573 return msync (mem, len, flags);
1483} 1574}
1484 1575
1485#endif 1576#endif
1486 1577
1487int 1578static int
1488eio__mtouch (void *mem, size_t len, int flags) 1579eio__mtouch (eio_req *req)
1489{ 1580{
1581 void *mem = req->ptr2;
1582 size_t len = req->size;
1583 int flags = req->int1;
1584
1490 eio_page_align (&mem, &len); 1585 eio_page_align (&mem, &len);
1491 1586
1492 { 1587 {
1493 intptr_t addr = (intptr_t)mem; 1588 intptr_t addr = (intptr_t)mem;
1494 intptr_t end = addr + len; 1589 intptr_t end = addr + len;
1495 intptr_t page = eio_pagesize (); 1590 intptr_t page = eio_pagesize ();
1496 1591
1497 if (addr < end) 1592 if (addr < end)
1498 if (flags & EIO_MT_MODIFY) /* modify */ 1593 if (flags & EIO_MT_MODIFY) /* modify */
1499 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1594 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1500 else 1595 else
1501 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1596 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1502 } 1597 }
1503 1598
1504 return 0; 1599 return 0;
1505} 1600}
1506 1601
… …
1541 if (req) 1636 if (req)
1542 break; 1637 break;
1543 1638
1544 ++idle; 1639 ++idle;
1545 1640
1546 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1641 ts.tv_sec = time (0) + idle_timeout;
1547 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1642 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1548 { 1643 {
1549 if (idle > max_idle) 1644 if (idle > max_idle)
1550 { 1645 {
1551 --idle; 1646 --idle;
… …
1594 return 0; 1689 return 0;
1595} 1690}
1596 1691
1597/*****************************************************************************/ 1692/*****************************************************************************/
1598 1693
1694int ecb_cold
1599int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1695eio_init (void (*want_poll)(void), void (*done_poll)(void))
1600{ 1696{
1601 return etp_init (want_poll, done_poll); 1697 return etp_init (want_poll, done_poll);
1602} 1698}
1603 1699
1700ECB_INLINE void
1604static void eio_api_destroy (eio_req *req) 1701eio_api_destroy (eio_req *req)
1605{ 1702{
1606 free (req); 1703 free (req);
1607} 1704}
1608 1705
1609#define REQ(rtype) \ 1706#define REQ(rtype) \
… …
1628 { \ 1725 { \
1629 eio_api_destroy (req); \ 1726 eio_api_destroy (req); \
1630 return 0; \ 1727 return 0; \
1631 } 1728 }
1632 1729
1730static void
1633static void eio_execute (etp_worker *self, eio_req *req) 1731eio_execute (etp_worker *self, eio_req *req)
1634{ 1732{
1635 switch (req->type) 1733 switch (req->type)
1636 { 1734 {
1637 case EIO_READ: ALLOC (req->size); 1735 case EIO_READ: ALLOC (req->size);
1638 req->result = req->offs >= 0 1736 req->result = req->offs >= 0
… …
1671 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1769 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1672 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1770 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1673 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1771 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1674 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1772 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1675 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1773 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1676 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1774 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1677 1775
1678 case EIO_READLINK: ALLOC (PATH_MAX); 1776 case EIO_READLINK: ALLOC (PATH_MAX);
1679 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1777 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1680 1778
1681 case EIO_SYNC: req->result = 0; sync (); break; 1779 case EIO_SYNC: req->result = 0; sync (); break;
1682 case EIO_FSYNC: req->result = fsync (req->int1); break; 1780 case EIO_FSYNC: req->result = fsync (req->int1); break;
1683 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1781 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1684 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1782 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1685 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1783 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1686 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 1784 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1687 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1785 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1688 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1786 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1689 1787
1690 case EIO_READDIR: eio__scandir (req, self); break; 1788 case EIO_READDIR: eio__scandir (req, self); break;
… …
1734 case EIO_NOP: 1832 case EIO_NOP:
1735 req->result = 0; 1833 req->result = 0;
1736 break; 1834 break;
1737 1835
1738 case EIO_CUSTOM: 1836 case EIO_CUSTOM:
1739 ((void (*)(eio_req *))req->feed) (req); 1837 req->feed (req);
1740 break; 1838 break;
1741 1839
1742 default: 1840 default:
1743 errno = ENOSYS; 1841 errno = ENOSYS;
1744 req->result = -1; 1842 req->result = -1;
… …
1931 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 2029 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1932} 2030}
1933 2031
1934eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 2032eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1935{ 2033{
1936 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 2034 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1937} 2035}
1938 2036
1939static eio_req * 2037static eio_req *
1940eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2038eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1941{ 2039{
… …
1965eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2063eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1966{ 2064{
1967 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2065 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1968} 2066}
1969 2067
1970eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2068eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
1971{ 2069{
1972 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2070 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1973} 2071}
1974 2072
1975#endif 2073#endif
1976 2074
1977eio_req *eio_grp (eio_cb cb, void *data) 2075eio_req *eio_grp (eio_cb cb, void *data)
… …
1986#undef SEND 2084#undef SEND
1987 2085
1988/*****************************************************************************/ 2086/*****************************************************************************/
1989/* grp functions */ 2087/* grp functions */
1990 2088
2089void
1991void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2090eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
1992{ 2091{
1993 grp->int2 = limit; 2092 grp->int2 = limit;
1994 grp->feed = feed; 2093 grp->feed = feed;
1995 2094
1996 grp_try_feed (grp); 2095 grp_try_feed (grp);
1997} 2096}
1998 2097
2098void
1999void eio_grp_limit (eio_req *grp, int limit) 2099eio_grp_limit (eio_req *grp, int limit)
2000{ 2100{
2001 grp->int2 = limit; 2101 grp->int2 = limit;
2002 2102
2003 grp_try_feed (grp); 2103 grp_try_feed (grp);
2004} 2104}
2005 2105
2106void
2006void eio_grp_add (eio_req *grp, eio_req *req) 2107eio_grp_add (eio_req *grp, eio_req *req)
2007{ 2108{
2008 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2109 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2009 2110
2010 grp->flags |= EIO_FLAG_GROUPADD; 2111 grp->flags |= EIO_FLAG_GROUPADD;
2011 2112
… …
2022} 2123}
2023 2124
2024/*****************************************************************************/ 2125/*****************************************************************************/
2025/* misc garbage */ 2126/* misc garbage */
2026 2127
2128ssize_t
2027ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2129eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2028{ 2130{
2029 etp_worker wrk; 2131 etp_worker wrk;
2030 ssize_t ret; 2132 ssize_t ret;
2031 2133
2032 wrk.dbuf = 0; 2134 wrk.dbuf = 0;

Diff Legend

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