--- libeio/eio.c 2008/05/13 17:08:15 1.10 +++ libeio/eio.c 2008/05/17 12:26:57 1.15 @@ -1,3 +1,42 @@ +/* + * libeio implementation + * + * Copyright (c) 2007,2008 Marc Alexander Lehmann + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modifica- + * tion, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- + * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- + * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- + * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, the contents of this file may be used under the terms of + * the GNU General Public License ("GPL") version 2 or any later version, + * in which case the provisions of the GPL are applicable instead of + * the above. If you wish to allow the use of your version of this file + * only under the terms of the GPL and not to allow others to use your + * version of this file under the BSD license, indicate your decision + * by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL. If you do not delete the + * provisions above, a recipient may use your version of this file under + * either the BSD or the GPL. + */ + #include "eio.h" #include "xthread.h" @@ -72,20 +111,48 @@ #define dBUF \ char *eio_buf; \ - X_LOCK (wrklock); \ + ETP_WORKER_LOCK (self); \ self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \ - X_UNLOCK (wrklock); \ + ETP_WORKER_UNLOCK (self); \ errno = ENOMEM; \ if (!eio_buf) \ return -1; #define EIO_TICKS ((1000000 + 1023) >> 10) -static void (*want_poll_cb) (void); -static void (*done_poll_cb) (void); +/*****************************************************************************/ -static unsigned int max_poll_time = 0; -static unsigned int max_poll_reqs = 0; +#define ETP_PRI_MIN EIO_PRI_MIN +#define ETP_PRI_MAX EIO_PRI_MAX + +struct etp_worker; + +#define ETP_REQ eio_req +#define ETP_DESTROY(req) eio_destroy (req) +static int eio_finish (eio_req *req); +#define ETP_FINISH(req) eio_finish (req) +static void eio_execute (struct etp_worker *self, eio_req *req); +#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) + +#define ETP_WORKER_CLEAR(req) \ + if (wrk->dbuf) \ + { \ + free (wrk->dbuf); \ + wrk->dbuf = 0; \ + } \ + \ + if (wrk->dirp) \ + { \ + closedir (wrk->dirp); \ + wrk->dirp = 0; \ + } +#define ETP_WORKER_COMMON \ + void *dbuf; \ + DIR *dirp; + +/*****************************************************************************/ + +#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) /* calculcate time difference in ~1/EIO_TICKS of a second */ static int tvdiff (struct timeval *tv1, struct timeval *tv2) @@ -96,40 +163,48 @@ static unsigned int started, idle, wanted = 4; -/* worker threads management */ +static void (*want_poll_cb) (void); +static void (*done_poll_cb) (void); + +static unsigned int max_poll_time; /* reslock */ +static unsigned int max_poll_reqs; /* reslock */ + +static volatile unsigned int nreqs; /* reqlock */ +static volatile unsigned int nready; /* reqlock */ +static volatile unsigned int npending; /* reqlock */ +static volatile unsigned int max_idle = 4; + static mutex_t wrklock = X_MUTEX_INIT; +static mutex_t reslock = X_MUTEX_INIT; +static mutex_t reqlock = X_MUTEX_INIT; +static cond_t reqwait = X_COND_INIT; -typedef struct worker +typedef struct etp_worker { /* locked by wrklock */ - struct worker *prev, *next; + struct etp_worker *prev, *next; thread_t tid; /* locked by reslock, reqlock or wrklock */ - eio_req *req; /* currently processed request */ - void *dbuf; - DIR *dirp; -} worker; + ETP_REQ *req; /* currently processed request */ -static worker wrk_first = { &wrk_first, &wrk_first, 0 }; + ETP_WORKER_COMMON +} etp_worker; -static void worker_clear (worker *wrk) -{ - if (wrk->dirp) - { - closedir (wrk->dirp); - wrk->dirp = 0; - } +static etp_worker wrk_first = { &wrk_first, &wrk_first, 0 }; /* NOT etp */ - if (wrk->dbuf) - { - free (wrk->dbuf); - wrk->dbuf = 0; - } +#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) +#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) + +/* worker threads management */ + +static void etp_worker_clear (etp_worker *wrk) +{ + ETP_WORKER_CLEAR (wrk); } -static void worker_free (worker *wrk) +static void etp_worker_free (etp_worker *wrk) { wrk->next->prev = wrk->prev; wrk->prev->next = wrk->next; @@ -137,19 +212,16 @@ free (wrk); } -static volatile unsigned int nreqs, nready, npending; -static volatile unsigned int max_idle = 4; - -static mutex_t reslock = X_MUTEX_INIT; -static mutex_t reqlock = X_MUTEX_INIT; -static cond_t reqwait = X_COND_INIT; - -unsigned int eio_nreqs (void) +static unsigned int etp_nreqs (void) { - return nreqs; + int retval; + if (WORDACCESS_UNSAFE) X_LOCK (reqlock); + retval = nreqs; + if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); + return retval; } -unsigned int eio_nready (void) +static unsigned int etp_nready (void) { unsigned int retval; @@ -160,7 +232,7 @@ return retval; } -unsigned int eio_npending (void) +static unsigned int etp_npending (void) { unsigned int retval; @@ -171,7 +243,7 @@ return retval; } -unsigned int eio_nthreads (void) +static unsigned int etp_nthreads (void) { unsigned int retval; @@ -188,14 +260,14 @@ * per shift, the most expensive operation. */ typedef struct { - eio_req *qs[EIO_NUM_PRI], *qe[EIO_NUM_PRI]; /* qstart, qend */ + ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */ int size; -} reqq; +} etp_reqq; -static reqq req_queue; -static reqq res_queue; +static etp_reqq req_queue; +static etp_reqq res_queue; -static int reqq_push (reqq *q, eio_req *req) +static int reqq_push (etp_reqq *q, ETP_REQ *req) { int pri = req->pri; req->next = 0; @@ -211,7 +283,7 @@ return q->size++; } -static eio_req *reqq_shift (reqq *q) +static ETP_REQ *reqq_shift (etp_reqq *q) { int pri; @@ -220,7 +292,7 @@ --q->size; - for (pri = EIO_NUM_PRI; pri--; ) + for (pri = ETP_NUM_PRI; pri--; ) { eio_req *req = q->qs[pri]; @@ -236,101 +308,91 @@ abort (); } -static void grp_try_feed (eio_req *grp) +static void etp_atfork_prepare (void) { - while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) - { - int old_len = grp->size; - - EIO_FEED (grp); - - /* stop if no progress has been made */ - if (old_len == grp->size) - { - grp->feed = 0; - break; - } - } + X_LOCK (wrklock); + X_LOCK (reqlock); + X_LOCK (reslock); +#if !HAVE_PREADWRITE + X_LOCK (preadwritelock); +#endif +#if !HAVE_READDIR_R + X_LOCK (readdirlock); +#endif } -static int eio_finish (eio_req *req); - -static int grp_dec (eio_req *grp) +static void etp_atfork_parent (void) { - --grp->size; - - /* call feeder, if applicable */ - grp_try_feed (grp); - - /* finish, if done */ - if (!grp->size && grp->int1) - return eio_finish (grp); - else - return 0; +#if !HAVE_READDIR_R + X_UNLOCK (readdirlock); +#endif +#if !HAVE_PREADWRITE + X_UNLOCK (preadwritelock); +#endif + X_UNLOCK (reslock); + X_UNLOCK (reqlock); + X_UNLOCK (wrklock); } -void eio_destroy (eio_req *req) +static void etp_atfork_child (void) { - if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); - if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); + ETP_REQ *prv; - EIO_DESTROY (req); -} + while (prv = reqq_shift (&req_queue)) + ETP_DESTROY (prv); -static int eio_finish (eio_req *req) -{ - int res = EIO_FINISH (req); + while (prv = reqq_shift (&res_queue)) + ETP_DESTROY (prv); - if (req->grp) + while (wrk_first.next != &wrk_first) { - int res2; - eio_req *grp = req->grp; + etp_worker *wrk = wrk_first.next; - /* unlink request */ - if (req->grp_next) req->grp_next->grp_prev = req->grp_prev; - if (req->grp_prev) req->grp_prev->grp_next = req->grp_next; - - if (grp->grp_first == req) - grp->grp_first = req->grp_next; - - res2 = grp_dec (grp); + if (wrk->req) + ETP_DESTROY (wrk->req); - if (!res && res2) - res = res2; + etp_worker_clear (wrk); + etp_worker_free (wrk); } - eio_destroy (req); + started = 0; + idle = 0; + nreqs = 0; + nready = 0; + npending = 0; - return res; + etp_atfork_parent (); } -void eio_grp_cancel (eio_req *grp) -{ - for (grp = grp->grp_first; grp; grp = grp->grp_next) - eio_cancel (grp); +static void +etp_once_init (void) +{ + X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); } -void eio_cancel (eio_req *req) +static int +etp_init (void (*want_poll)(void), void (*done_poll)(void)) { - X_LOCK (wrklock); - req->flags |= EIO_FLAG_CANCELLED; - X_UNLOCK (wrklock); + static pthread_once_t doinit = PTHREAD_ONCE_INIT; - eio_grp_cancel (req); + pthread_once (&doinit, etp_once_init); + + want_poll_cb = want_poll; + done_poll_cb = done_poll; } -X_THREAD_PROC (eio_proc); +X_THREAD_PROC (etp_proc); -static void start_thread (void) +static void etp_start_thread (void) { - worker *wrk = calloc (1, sizeof (worker)); + etp_worker *wrk = calloc (1, sizeof (etp_worker)); /*TODO*/ assert (("unable to allocate worker thread data", wrk)); X_LOCK (wrklock); - if (thread_create (&wrk->tid, eio_proc, (void *)wrk)) + if (thread_create (&wrk->tid, etp_proc, (void *)wrk)) { wrk->prev = &wrk_first; wrk->next = wrk_first.next; @@ -344,37 +406,24 @@ X_UNLOCK (wrklock); } -static void maybe_start_thread (void) +static void etp_maybe_start_thread (void) { - if (eio_nthreads () >= wanted) + if (etp_nthreads () >= wanted) return; /* todo: maybe use idle here, but might be less exact */ - if (0 <= (int)eio_nthreads () + (int)eio_npending () - (int)eio_nreqs ()) + if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()) return; - start_thread (); -} - -void eio_submit (eio_req *req) -{ - ++nreqs; - - X_LOCK (reqlock); - ++nready; - reqq_push (&req_queue, req); - X_COND_SIGNAL (reqwait); - X_UNLOCK (reqlock); - - maybe_start_thread (); + etp_start_thread (); } -static void end_thread (void) +static void etp_end_thread (void) { eio_req *req = calloc (1, sizeof (eio_req)); - req->type = EIO_QUIT; - req->pri = EIO_PRI_MAX + EIO_PRI_BIAS; + req->type = -1; + req->pri = ETP_PRI_MAX - ETP_PRI_MIN; X_LOCK (reqlock); reqq_push (&req_queue, req); @@ -386,54 +435,25 @@ X_UNLOCK (wrklock); } -void eio_set_max_poll_time (double nseconds) -{ - if (WORDACCESS_UNSAFE) X_LOCK (reqlock); - max_poll_time = nseconds; - if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); -} - -void eio_set_max_poll_reqs (unsigned int maxreqs) -{ - if (WORDACCESS_UNSAFE) X_LOCK (reqlock); - max_poll_reqs = maxreqs; - if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); -} - -void eio_set_max_idle (unsigned int nthreads) -{ - if (WORDACCESS_UNSAFE) X_LOCK (reqlock); - max_idle = nthreads <= 0 ? 1 : nthreads; - if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); -} - -void eio_set_min_parallel (unsigned int nthreads) -{ - if (wanted < nthreads) - wanted = nthreads; -} - -void eio_set_max_parallel (unsigned int nthreads) -{ - if (wanted > nthreads) - wanted = nthreads; - - while (started > wanted) - end_thread (); -} - -int eio_poll (void) +static int etp_poll (void) { - int maxreqs = max_poll_reqs; + unsigned int maxreqs; + unsigned int maxtime; struct timeval tv_start, tv_now; - eio_req *req; - if (max_poll_time) + X_LOCK (reslock); + maxreqs = max_poll_reqs; + maxtime = max_poll_time; + X_UNLOCK (reslock); + + if (maxtime) gettimeofday (&tv_start, 0); for (;;) { - maybe_start_thread (); + ETP_REQ *req; + + etp_maybe_start_thread (); X_LOCK (reslock); req = reqq_shift (&res_queue); @@ -451,7 +471,9 @@ if (!req) return 0; + X_LOCK (reqlock); --nreqs; + X_UNLOCK (reqlock); if (req->type == EIO_GROUP && req->size) { @@ -460,7 +482,7 @@ } else { - int res = eio_finish (req); + int res = ETP_FINISH (req); if (res) return res; } @@ -468,11 +490,11 @@ if (maxreqs && !--maxreqs) break; - if (max_poll_time) + if (maxtime) { gettimeofday (&tv_now, 0); - if (tvdiff (&tv_start, &tv_now) >= max_poll_time) + if (tvdiff (&tv_start, &tv_now) >= maxtime) break; } } @@ -481,6 +503,202 @@ return -1; } +static void etp_cancel (ETP_REQ *req) +{ + X_LOCK (wrklock); + req->flags |= EIO_FLAG_CANCELLED; + X_UNLOCK (wrklock); + + eio_grp_cancel (req); +} + +static void etp_submit (ETP_REQ *req) +{ + req->pri -= ETP_PRI_MIN; + + if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; + if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; + + X_LOCK (reqlock); + ++nreqs; + ++nready; + reqq_push (&req_queue, req); + X_COND_SIGNAL (reqwait); + X_UNLOCK (reqlock); + + etp_maybe_start_thread (); +} + +static void etp_set_max_poll_time (double nseconds) +{ + if (WORDACCESS_UNSAFE) X_LOCK (reslock); + max_poll_time = nseconds; + if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); +} + +static void etp_set_max_poll_reqs (unsigned int maxreqs) +{ + if (WORDACCESS_UNSAFE) X_LOCK (reslock); + max_poll_reqs = maxreqs; + if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); +} + +static void etp_set_max_idle (unsigned int nthreads) +{ + if (WORDACCESS_UNSAFE) X_LOCK (reqlock); + max_idle = nthreads <= 0 ? 1 : nthreads; + if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); +} + +static void etp_set_min_parallel (unsigned int nthreads) +{ + if (wanted < nthreads) + wanted = nthreads; +} + +static void etp_set_max_parallel (unsigned int nthreads) +{ + if (wanted > nthreads) + wanted = nthreads; + + while (started > wanted) + etp_end_thread (); +} + +/*****************************************************************************/ + +static void grp_try_feed (eio_req *grp) +{ + while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) + { + int old_len = grp->size; + + EIO_FEED (grp); + + /* stop if no progress has been made */ + if (old_len == grp->size) + { + grp->feed = 0; + break; + } + } +} + +static int grp_dec (eio_req *grp) +{ + --grp->size; + + /* call feeder, if applicable */ + grp_try_feed (grp); + + /* finish, if done */ + if (!grp->size && grp->int1) + return eio_finish (grp); + else + return 0; +} + +void eio_destroy (eio_req *req) +{ + if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); + if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); + + EIO_DESTROY (req); +} + +static int eio_finish (eio_req *req) +{ + int res = EIO_FINISH (req); + + if (req->grp) + { + int res2; + eio_req *grp = req->grp; + + /* unlink request */ + if (req->grp_next) req->grp_next->grp_prev = req->grp_prev; + if (req->grp_prev) req->grp_prev->grp_next = req->grp_next; + + if (grp->grp_first == req) + grp->grp_first = req->grp_next; + + res2 = grp_dec (grp); + + if (!res && res2) + res = res2; + } + + eio_destroy (req); + + return res; +} + +void eio_grp_cancel (eio_req *grp) +{ + for (grp = grp->grp_first; grp; grp = grp->grp_next) + eio_cancel (grp); +} + +void eio_cancel (eio_req *req) +{ + etp_cancel (req); +} + +void eio_submit (eio_req *req) +{ + etp_submit (req); +} + +unsigned int eio_nreqs (void) +{ + return etp_nreqs (); +} + +unsigned int eio_nready (void) +{ + return etp_nready (); +} + +unsigned int eio_npending (void) +{ + return etp_npending (); +} + +unsigned int eio_nthreads (void) +{ + return etp_nthreads (); +} + +void eio_set_max_poll_time (double nseconds) +{ + etp_set_max_poll_time (nseconds); +} + +void eio_set_max_poll_reqs (unsigned int maxreqs) +{ + etp_set_max_poll_reqs (maxreqs); +} + +void eio_set_max_idle (unsigned int nthreads) +{ + etp_set_max_idle (nthreads); +} + +void eio_set_min_parallel (unsigned int nthreads) +{ + etp_set_min_parallel (nthreads); +} + +void eio_set_max_parallel (unsigned int nthreads) +{ + etp_set_max_parallel (nthreads); +} + +int eio_poll (void) +{ + return etp_poll (); +} + /*****************************************************************************/ /* work around various missing functions */ @@ -618,7 +836,7 @@ /* sendfile always needs emulation */ static ssize_t -eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self) +eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) { ssize_t res; @@ -712,7 +930,7 @@ /* read a full directory */ static void -eio__scandir (eio_req *req, worker *self) +eio__scandir (eio_req *req, etp_worker *self) { DIR *dirp; union @@ -789,19 +1007,17 @@ } \ } -X_THREAD_PROC (eio_proc) +X_THREAD_PROC (etp_proc) { - eio_req *req; + ETP_REQ *req; struct timespec ts; - worker *self = (worker *)thr_arg; + etp_worker *self = (etp_worker *)thr_arg; /* try to distribute timeouts somewhat randomly */ ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); for (;;) { - ts.tv_sec = time (0) + IDLE_TIMEOUT; - X_LOCK (reqlock); for (;;) @@ -813,6 +1029,7 @@ ++idle; + ts.tv_sec = time (0) + IDLE_TIMEOUT; if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) { if (idle > max_idle) @@ -827,7 +1044,6 @@ /* we are allowed to idle, so do so without any timeout */ X_COND_WAIT (reqwait, reqlock); - ts.tv_sec = time (0) + IDLE_TIMEOUT; } --idle; @@ -837,109 +1053,11 @@ X_UNLOCK (reqlock); - errno = 0; /* strictly unnecessary */ + if (req->type < 0) + goto quit; if (!EIO_CANCELLED (req)) - switch (req->type) - { - case EIO_READ: ALLOC (req->size); - req->result = req->offs >= 0 - ? pread (req->int1, req->ptr2, req->size, req->offs) - : read (req->int1, req->ptr2, req->size); break; - case EIO_WRITE: req->result = req->offs >= 0 - ? pwrite (req->int1, req->ptr2, req->size, req->offs) - : write (req->int1, req->ptr2, req->size); break; - - case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; - case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; - - case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); - req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; - case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); - req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; - case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); - req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; - - case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; - case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; - case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; - case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; - case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; - case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; - - case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break; - case EIO_CLOSE: req->result = close (req->int1); break; - case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; - case EIO_UNLINK: req->result = unlink (req->ptr1); break; - case EIO_RMDIR: req->result = rmdir (req->ptr1); break; - case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; - case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; - case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; - case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; - case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; - - case EIO_READLINK: ALLOC (NAME_MAX); - req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; - - case EIO_SYNC: req->result = 0; sync (); break; - case EIO_FSYNC: req->result = fsync (req->int1); break; - case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; - - case EIO_READDIR: eio__scandir (req, self); break; - - case EIO_BUSY: -#ifdef _WIN32 - Sleep (req->nv1 * 1000.); -#else - { - struct timeval tv; - - tv.tv_sec = req->nv1; - tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; - - req->result = select (0, 0, 0, 0, &tv); - } -#endif - break; - - case EIO_UTIME: - case EIO_FUTIME: - { - struct timeval tv[2]; - struct timeval *times; - - if (req->nv1 != -1. || req->nv2 != -1.) - { - tv[0].tv_sec = req->nv1; - tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.; - tv[1].tv_sec = req->nv2; - tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.; - - times = tv; - } - else - times = 0; - - - req->result = req->type == EIO_FUTIME - ? futimes (req->int1, times) - : utimes (req->ptr1, times); - } - - case EIO_GROUP: - case EIO_NOP: - req->result = 0; - break; - - case EIO_QUIT: - goto quit; - - default: - req->result = -1; - break; - } - - req->errorno = errno; + ETP_EXECUTE (self, req); X_LOCK (reslock); @@ -949,14 +1067,14 @@ want_poll_cb (); self->req = 0; - worker_clear (self); + etp_worker_clear (self); X_UNLOCK (reslock); } quit: X_LOCK (wrklock); - worker_free (self); + etp_worker_free (self); X_UNLOCK (wrklock); return 0; @@ -964,79 +1082,9 @@ /*****************************************************************************/ -static void eio_atfork_prepare (void) -{ - X_LOCK (wrklock); - X_LOCK (reqlock); - X_LOCK (reslock); -#if !HAVE_PREADWRITE - X_LOCK (preadwritelock); -#endif -#if !HAVE_READDIR_R - X_LOCK (readdirlock); -#endif -} - -static void eio_atfork_parent (void) -{ -#if !HAVE_READDIR_R - X_UNLOCK (readdirlock); -#endif -#if !HAVE_PREADWRITE - X_UNLOCK (preadwritelock); -#endif - X_UNLOCK (reslock); - X_UNLOCK (reqlock); - X_UNLOCK (wrklock); -} - -static void eio_atfork_child (void) -{ - eio_req *prv; - - while (prv = reqq_shift (&req_queue)) - eio_destroy (prv); - - while (prv = reqq_shift (&res_queue)) - eio_destroy (prv); - - while (wrk_first.next != &wrk_first) - { - worker *wrk = wrk_first.next; - - if (wrk->req) - eio_destroy (wrk->req); - - worker_clear (wrk); - worker_free (wrk); - } - - started = 0; - idle = 0; - nreqs = 0; - nready = 0; - npending = 0; - - eio_atfork_parent (); -} - int eio_init (void (*want_poll)(void), void (*done_poll)(void)) { - want_poll_cb = want_poll; - done_poll_cb = done_poll; - -#ifdef _WIN32 - X_MUTEX_CHECK (wrklock); - X_MUTEX_CHECK (reslock); - X_MUTEX_CHECK (reqlock); - X_MUTEX_CHECK (reqwait); - X_MUTEX_CHECK (preadwritelock); - X_MUTEX_CHECK (readdirlock); - - X_COND_CHECK (reqwait); -#endif - - X_THREAD_ATFORK (eio_atfork_prepare, eio_atfork_parent, eio_atfork_child); + etp_init (want_poll, done_poll); } static void eio_api_destroy (eio_req *req) @@ -1051,9 +1099,10 @@ if (!req) \ return 0; \ \ - req->type = rtype; \ - req->pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ - req->finish = cb; \ + req->type = rtype; \ + req->pri = pri; \ + req->finish = cb; \ + req->data = data; \ req->destroy = eio_api_destroy; #define SEND eio_submit (req); return req @@ -1067,6 +1116,115 @@ return 0; \ } +static void eio_execute (etp_worker *self, eio_req *req) +{ + errno = 0; + + switch (req->type) + { + case EIO_READ: ALLOC (req->size); + req->result = req->offs >= 0 + ? pread (req->int1, req->ptr2, req->size, req->offs) + : read (req->int1, req->ptr2, req->size); break; + case EIO_WRITE: req->result = req->offs >= 0 + ? pwrite (req->int1, req->ptr2, req->size, req->offs) + : write (req->int1, req->ptr2, req->size); break; + + case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; + case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; + + case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); + req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; + case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); + req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; + case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); + req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; + + case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; + case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; + case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; + case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; + case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; + case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; + + case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break; + case EIO_CLOSE: req->result = close (req->int1); break; + case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; + case EIO_UNLINK: req->result = unlink (req->ptr1); break; + case EIO_RMDIR: req->result = rmdir (req->ptr1); break; + case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; + case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; + case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; + case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; + case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; + + case EIO_READLINK: ALLOC (NAME_MAX); + req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; + + case EIO_SYNC: req->result = 0; sync (); break; + case EIO_FSYNC: req->result = fsync (req->int1); break; + case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; + + case EIO_READDIR: eio__scandir (req, self); break; + + case EIO_BUSY: +#ifdef _WIN32 + Sleep (req->nv1 * 1000.); +#else + { + struct timeval tv; + + tv.tv_sec = req->nv1; + tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; + + req->result = select (0, 0, 0, 0, &tv); + } +#endif + break; + + case EIO_UTIME: + case EIO_FUTIME: + { + struct timeval tv[2]; + struct timeval *times; + + if (req->nv1 != -1. || req->nv2 != -1.) + { + tv[0].tv_sec = req->nv1; + tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.; + tv[1].tv_sec = req->nv2; + tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.; + + times = tv; + } + else + times = 0; + + + req->result = req->type == EIO_FUTIME + ? futimes (req->int1, times) + : utimes (req->ptr1, times); + } + + case EIO_GROUP: + case EIO_NOP: + req->result = 0; + break; + + case EIO_CUSTOM: + req->feed (req); + break; + + default: + req->result = -1; + break; + } + + req->errorno = errno; +} + +#ifndef EIO_NO_WRAPPERS + eio_req *eio_nop (int pri, eio_cb cb, void *data) { REQ (EIO_NOP); SEND; @@ -1249,6 +1407,13 @@ return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); } +eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) +{ + REQ (EIO_CUSTOM); req->feed = execute; SEND; +} + +#endif + eio_req *eio_grp (eio_cb cb, void *data) { const int pri = EIO_PRI_MAX; @@ -1299,7 +1464,7 @@ ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) { - worker wrk; + etp_worker wrk; wrk.dbuf = 0;