--- IO-AIO/AIO.xs 2006/10/23 23:54:41 1.64 +++ IO-AIO/AIO.xs 2006/11/08 01:59:59 1.92 @@ -1,7 +1,11 @@ -#if __linux +/* solaris */ +#define _POSIX_PTHREAD_SEMANTICS 1 + +#if __linux && !defined(_GNU_SOURCE) # define _GNU_SOURCE #endif +/* just in case */ #define _REENTRANT 1 #include @@ -41,17 +45,52 @@ # endif #endif +/* number of seconds after which idle threads exit */ +#define IDLE_TIMEOUT 10 + /* used for struct dirent, AIX doesn't provide it */ #ifndef NAME_MAX # define NAME_MAX 4096 #endif +#ifndef PTHREAD_STACK_MIN +/* care for broken platforms, e.g. windows */ +# define PTHREAD_STACK_MIN 16384 +#endif + #if __ia64 # define STACKSIZE 65536 +#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ +# define STACKSIZE PTHREAD_STACK_MIN #else -# define STACKSIZE 8192 +# define STACKSIZE 16384 +#endif + +/* wether word reads are potentially non-atomic. + * this is conservatice, likely most arches this runs + * on have atomic word read/writes. + */ +#ifndef WORDACCESS_UNSAFE +# if __i386 || __x86_64 +# define WORDACCESS_UNSAFE 0 +# else +# define WORDACCESS_UNSAFE 1 +# endif #endif +/* buffer size for various temporary buffers */ +#define AIO_BUFSIZE 65536 + +#define dBUF \ + char *aio_buf; \ + LOCK (wrklock); \ + self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ + UNLOCK (wrklock); \ + if (!aio_buf) \ + return -1; + +typedef SV SV8; /* byte-sv, used for argument-checking */ + enum { REQ_QUIT, REQ_OPEN, REQ_CLOSE, @@ -60,10 +99,10 @@ REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_FSYNC, REQ_FDATASYNC, REQ_UNLINK, REQ_RMDIR, REQ_RENAME, - REQ_READDIR, - REQ_LINK, REQ_SYMLINK, + REQ_MKNOD, REQ_READDIR, + REQ_LINK, REQ_SYMLINK, REQ_READLINK, REQ_GROUP, REQ_NOP, - REQ_SLEEP, + REQ_BUSY, }; #define AIO_REQ_KLASS "IO::AIO::REQ" @@ -73,17 +112,16 @@ { struct aio_cb *volatile next; - SV *data, *callback; - SV *fh, *fh2; - void *dataptr, *data2ptr; - Stat_t *statdata; - off_t offset; - size_t length; + SV *callback, *fh; + SV *sv1, *sv2; + void *ptr1, *ptr2; + off_t offs; + size_t size; ssize_t result; - STRLEN dataoffset; + STRLEN stroffset; int type; - int fd, fd2; + int int1, int2; int errorno; mode_t mode; /* open */ @@ -95,7 +133,9 @@ } aio_cb; enum { - FLAG_CANCELLED = 0x01, + FLAG_CANCELLED = 0x01, /* request was cancelled */ + FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ + FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */ }; typedef aio_cb *aio_req; @@ -107,14 +147,24 @@ DEFAULT_PRI = 0, PRI_BIAS = -PRI_MIN, + NUM_PRI = PRI_MAX + PRI_BIAS + 1, }; +#define AIO_TICKS ((1000000 + 1023) >> 10) + +static unsigned int max_poll_time = 0; +static unsigned int max_poll_reqs = 0; + +/* calculcate time difference in ~1/AIO_TICKS of a second */ +static int tvdiff (struct timeval *tv1, struct timeval *tv2) +{ + return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS + + ((tv2->tv_usec - tv1->tv_usec) >> 10); +} + static int next_pri = DEFAULT_PRI + PRI_BIAS; -static int started, wanted; -static volatile int nreqs; -static int max_outstanding = 1<<30; -static int respipe [2]; +static unsigned int started, idle, wanted; #if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) # define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP @@ -122,15 +172,159 @@ # define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER #endif +#define LOCK(mutex) pthread_mutex_lock (&(mutex)) +#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) + +/* worker threads management */ +static pthread_mutex_t wrklock = AIO_MUTEX_INIT; + +typedef struct worker { + /* locked by wrklock */ + struct worker *prev, *next; + + pthread_t tid; + + /* locked by reslock, reqlock or wrklock */ + aio_req req; /* currently processed request */ + void *dbuf; + DIR *dirp; +} worker; + +static worker wrk_first = { &wrk_first, &wrk_first, 0 }; + +static void worker_clear (worker *wrk) +{ + if (wrk->dirp) + { + closedir (wrk->dirp); + wrk->dirp = 0; + } + + if (wrk->dbuf) + { + free (wrk->dbuf); + wrk->dbuf = 0; + } +} + +static void worker_free (worker *wrk) +{ + wrk->next->prev = wrk->prev; + wrk->prev->next = wrk->next; + + free (wrk); +} + +static volatile unsigned int nreqs, nready, npending; +static volatile unsigned int max_idle = 4; +static volatile unsigned int max_outstanding = 0xffffffff; +static int respipe [2]; + static pthread_mutex_t reslock = AIO_MUTEX_INIT; static pthread_mutex_t reqlock = AIO_MUTEX_INIT; static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; -static volatile aio_req reqs, reqe; /* queue start, queue end */ -static volatile aio_req ress, rese; /* queue start, queue end */ +#if WORDACCESS_UNSAFE + +static unsigned int get_nready () +{ + unsigned int retval; + + LOCK (reqlock); + retval = nready; + UNLOCK (reqlock); + + return retval; +} + +static unsigned int get_npending () +{ + unsigned int retval; + + LOCK (reslock); + retval = npending; + UNLOCK (reslock); + + return retval; +} + +static unsigned int get_nthreads () +{ + unsigned int retval; + + LOCK (wrklock); + retval = started; + UNLOCK (wrklock); + + return retval; +} + +#else + +# define get_nready() nready +# define get_npending() npending +# define get_nthreads() started + +#endif + +/* + * a somewhat faster data structure might be nice, but + * with 8 priorities this actually needs <20 insns + * per shift, the most expensive operation. + */ +typedef struct { + aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ + int size; +} reqq; + +static reqq req_queue; +static reqq res_queue; + +int reqq_push (reqq *q, aio_req req) +{ + int pri = req->pri; + req->next = 0; + + if (q->qe[pri]) + { + q->qe[pri]->next = req; + q->qe[pri] = req; + } + else + q->qe[pri] = q->qs[pri] = req; + + return q->size++; +} + +aio_req reqq_shift (reqq *q) +{ + int pri; + + if (!q->size) + return 0; + + --q->size; + + for (pri = NUM_PRI; pri--; ) + { + aio_req req = q->qs[pri]; + + if (req) + { + if (!(q->qs[pri] = req->next)) + q->qe[pri] = 0; + + return req; + } + } + + abort (); +} +static int poll_cb (); static void req_invoke (aio_req req); static void req_free (aio_req req); +static void req_cancel (aio_req req); /* must be called at most once */ static SV *req_sv (aio_req req, const char *klass) @@ -158,11 +352,11 @@ static void aio_grp_feed (aio_req grp) { - while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) + while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED)) { - int old_len = grp->length; + int old_len = grp->size; - if (grp->fh2 && SvOK (grp->fh2)) + if (grp->sv2 && SvOK (grp->sv2)) { dSP; @@ -171,17 +365,17 @@ PUSHMARK (SP); XPUSHs (req_sv (grp, AIO_GRP_KLASS)); PUTBACK; - call_sv (grp->fh2, G_VOID | G_EVAL); + call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); SPAGAIN; FREETMPS; LEAVE; } /* stop if no progress has been made */ - if (old_len == grp->length) + if (old_len == grp->size) { - SvREFCNT_dec (grp->fh2); - grp->fh2 = 0; + SvREFCNT_dec (grp->sv2); + grp->sv2 = 0; break; } } @@ -189,145 +383,136 @@ static void aio_grp_dec (aio_req grp) { - --grp->length; + --grp->size; /* call feeder, if applicable */ aio_grp_feed (grp); /* finish, if done */ - if (!grp->length && grp->fd) + if (!grp->size && grp->int1) { req_invoke (grp); req_free (grp); } } -static void poll_wait () -{ - fd_set rfd; - - while (nreqs) - { - aio_req req; -#if !(__x86 || __x86_64) /* safe without sempahore on this archs */ - pthread_mutex_lock (&reslock); -#endif - req = ress; -#if !(__x86 || __x86_64) /* safe without sempahore on this archs */ - pthread_mutex_unlock (&reslock); -#endif - - if (req) - return; - - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); - - select (respipe [0] + 1, &rfd, 0, 0, 0); - } -} - static void req_invoke (aio_req req) { dSP; - int errorno = errno; - - if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) - return; - errno = req->errorno; + if (req->flags & FLAG_SV1_RO_OFF) + SvREADONLY_off (req->sv1); - ENTER; - SAVETMPS; - PUSHMARK (SP); - EXTEND (SP, 1); - - switch (req->type) + if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) { - case REQ_READDIR: - { - SV *rv = &PL_sv_undef; + ENTER; + SAVETMPS; + PUSHMARK (SP); + EXTEND (SP, 1); - if (req->result >= 0) + switch (req->type) + { + case REQ_READDIR: { - char *buf = req->data2ptr; - AV *av = newAV (); + SV *rv = &PL_sv_undef; - while (req->result) + if (req->result >= 0) { - SV *sv = newSVpv (buf, 0); + int i; + char *buf = req->ptr2; + AV *av = newAV (); - av_push (av, sv); - buf += SvCUR (sv) + 1; - req->result--; + av_extend (av, req->result - 1); + + for (i = 0; i < req->result; ++i) + { + SV *sv = newSVpv (buf, 0); + + av_store (av, i, sv); + buf += SvCUR (sv) + 1; + } + + rv = sv_2mortal (newRV_noinc ((SV *)av)); } - rv = sv_2mortal (newRV_noinc ((SV *)av)); + PUSHs (rv); } + break; - PUSHs (rv); - } - break; + case REQ_OPEN: + { + /* convert fd to fh */ + SV *fh; - case REQ_OPEN: - { - /* convert fd to fh */ - SV *fh; + PUSHs (sv_2mortal (newSViv (req->result))); + PUTBACK; + call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); + SPAGAIN; - PUSHs (sv_2mortal (newSViv (req->result))); - PUTBACK; - call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); - SPAGAIN; + fh = SvREFCNT_inc (POPs); - fh = SvREFCNT_inc (POPs); + PUSHMARK (SP); + XPUSHs (sv_2mortal (fh)); + } + break; - PUSHMARK (SP); - XPUSHs (sv_2mortal (fh)); - } - break; + case REQ_GROUP: + req->int1 = 2; /* mark group as finished */ - case REQ_GROUP: - req->fd = 2; /* mark group as finished */ + if (req->sv1) + { + int i; + AV *av = (AV *)req->sv1; - if (req->data) - { - int i; - AV *av = (AV *)req->data; + EXTEND (SP, AvFILL (av) + 1); + for (i = 0; i <= AvFILL (av); ++i) + PUSHs (*av_fetch (av, i, 0)); + } + break; - EXTEND (SP, AvFILL (av) + 1); - for (i = 0; i <= AvFILL (av); ++i) - PUSHs (*av_fetch (av, i, 0)); - } - break; + case REQ_NOP: + case REQ_BUSY: + break; - case REQ_NOP: - case REQ_SLEEP: - break; + case REQ_READLINK: + if (req->result > 0) + { + SvCUR_set (req->sv1, req->result); + *SvEND (req->sv1) = 0; + PUSHs (req->sv1); + } + break; - default: - PUSHs (sv_2mortal (newSViv (req->result))); - break; - } + case REQ_STAT: + case REQ_LSTAT: + case REQ_FSTAT: + PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; + PL_laststatval = req->result; + PL_statcache = *(Stat_t *)(req->ptr2); + PUSHs (sv_2mortal (newSViv (req->result))); + break; + case REQ_READ: + SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); + *SvEND (req->sv1) = 0; + PUSHs (sv_2mortal (newSViv (req->result))); + break; - PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); - SPAGAIN; + default: + PUSHs (sv_2mortal (newSViv (req->result))); + break; + } - FREETMPS; - LEAVE; + errno = req->errorno; - errno = errorno; + PUTBACK; + call_sv (req->callback, G_VOID | G_EVAL); + SPAGAIN; - if (SvTRUE (ERRSV)) - { - req_free (req); - croak (0); + FREETMPS; + LEAVE; } -} -static void req_free (aio_req req) -{ if (req->grp) { aio_req grp = req->grp; @@ -342,102 +527,51 @@ aio_grp_dec (grp); } + if (SvTRUE (ERRSV)) + { + req_free (req); + croak (0); + } +} + +static void req_free (aio_req req) +{ if (req->self) { sv_unmagic (req->self, PERL_MAGIC_ext); SvREFCNT_dec (req->self); } - SvREFCNT_dec (req->data); SvREFCNT_dec (req->fh); - SvREFCNT_dec (req->fh2); + SvREFCNT_dec (req->sv1); + SvREFCNT_dec (req->sv2); SvREFCNT_dec (req->callback); - Safefree (req->statdata); - if (req->type == REQ_READDIR && req->result >= 0) - free (req->data2ptr); + if (req->flags & FLAG_PTR2_FREE) + free (req->ptr2); Safefree (req); } -static void req_cancel (aio_req req) +static void req_cancel_subs (aio_req grp) { - req->flags |= FLAG_CANCELLED; + aio_req sub; - if (req->type == REQ_GROUP) - { - aio_req sub; + if (grp->type != REQ_GROUP) + return; - for (sub = req->grp_first; sub; sub = sub->grp_next) - req_cancel (sub); - } + SvREFCNT_dec (grp->sv2); + grp->sv2 = 0; + + for (sub = grp->grp_first; sub; sub = sub->grp_next) + req_cancel (sub); } -static int poll_cb () +static void req_cancel (aio_req req) { - dSP; - int count = 0; - int do_croak = 0; - aio_req req; - - for (;;) - { - pthread_mutex_lock (&reslock); - req = ress; - - if (req) - { - ress = req->next; - - if (!ress) - { - /* read any signals sent by the worker threads */ - char buf [32]; - while (read (respipe [0], buf, 32) == 32) - ; - - rese = 0; - } - } - - pthread_mutex_unlock (&reslock); - - if (!req) - break; - - --nreqs; - - if (req->type == REQ_QUIT) - started--; - else if (req->type == REQ_GROUP && req->length) - { - req->fd = 1; /* mark request as delayed */ - continue; - } - else - { - if (req->type == REQ_READ) - SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); - - if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) - SvREADONLY_off (req->data); - - if (req->statdata) - { - PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; - PL_laststatval = req->result; - PL_statcache = *(req->statdata); - } - - req_invoke (req); - - count++; - } - - req_free (req); - } + req->flags |= FLAG_CANCELLED; - return count; + req_cancel_subs (req); } static void *aio_proc(void *arg); @@ -445,63 +579,89 @@ static void start_thread (void) { sigset_t fullsigset, oldsigset; - pthread_t tid; pthread_attr_t attr; + worker *wrk = calloc (1, sizeof (worker)); + + if (!wrk) + croak ("unable to allocate worker thread data"); + pthread_attr_init (&attr); pthread_attr_setstacksize (&attr, STACKSIZE); pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); +#ifdef PTHREAD_SCOPE_PROCESS + pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS); +#endif sigfillset (&fullsigset); + + LOCK (wrklock); sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); - if (pthread_create (&tid, &attr, aio_proc, 0) == 0) - started++; + if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) + { + wrk->prev = &wrk_first; + wrk->next = wrk_first.next; + wrk_first.next->prev = wrk; + wrk_first.next = wrk; + ++started; + } + else + free (wrk); sigprocmask (SIG_SETMASK, &oldsigset, 0); + UNLOCK (wrklock); } -static void req_send (aio_req req) +static void maybe_start_thread () { - while (started < wanted && nreqs >= started) - start_thread (); - - ++nreqs; - - pthread_mutex_lock (&reqlock); + if (get_nthreads () >= wanted) + return; + + /* todo: maybe use idle here, but might be less exact */ + if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs) + return; - req->next = 0; + start_thread (); +} - if (reqe) - { - reqe->next = req; - reqe = req; - } - else - reqe = reqs = req; +static void req_send (aio_req req) +{ + ++nreqs; + LOCK (reqlock); + ++nready; + reqq_push (&req_queue, req); pthread_cond_signal (&reqwait); - pthread_mutex_unlock (&reqlock); - - if (nreqs > max_outstanding) - for (;;) - { - poll_cb (); + UNLOCK (reqlock); - if (nreqs <= max_outstanding) - break; - - poll_wait (); - } + maybe_start_thread (); } static void end_thread (void) { aio_req req; + Newz (0, req, 1, aio_cb); + req->type = REQ_QUIT; + req->pri = PRI_MAX + PRI_BIAS; + + LOCK (reqlock); + reqq_push (&req_queue, req); + pthread_cond_signal (&reqwait); + UNLOCK (reqlock); + + LOCK (wrklock); + --started; + UNLOCK (wrklock); +} - req_send (req); +static void set_max_idle (int nthreads) +{ + if (WORDACCESS_UNSAFE) LOCK (reqlock); + max_idle = nthreads <= 0 ? 1 : nthreads; + if (WORDACCESS_UNSAFE) UNLOCK (reqlock); } static void min_parallel (int nthreads) @@ -512,22 +672,112 @@ static void max_parallel (int nthreads) { - int cur = started; - if (wanted > nthreads) wanted = nthreads; - while (cur > wanted) + while (started > wanted) + end_thread (); +} + +static void poll_wait () +{ + fd_set rfd; + + while (nreqs) { - end_thread (); - cur--; + int size; + if (WORDACCESS_UNSAFE) LOCK (reslock); + size = res_queue.size; + if (WORDACCESS_UNSAFE) UNLOCK (reslock); + + if (size) + return; + + maybe_start_thread (); + + FD_ZERO(&rfd); + FD_SET(respipe [0], &rfd); + + select (respipe [0] + 1, &rfd, 0, 0, 0); } +} - while (started > wanted) +static int poll_cb () +{ + dSP; + int count = 0; + int maxreqs = max_poll_reqs; + int do_croak = 0; + struct timeval tv_start, tv_now; + aio_req req; + + if (max_poll_time) + gettimeofday (&tv_start, 0); + + for (;;) { + for (;;) + { + maybe_start_thread (); + + LOCK (reslock); + req = reqq_shift (&res_queue); + + if (req) + { + --npending; + + if (!res_queue.size) + { + /* read any signals sent by the worker threads */ + char buf [32]; + while (read (respipe [0], buf, 32) == 32) + ; + } + } + + UNLOCK (reslock); + + if (!req) + break; + + --nreqs; + + if (req->type == REQ_GROUP && req->size) + { + req->int1 = 1; /* mark request as delayed */ + continue; + } + else + { + req_invoke (req); + + count++; + } + + req_free (req); + + if (maxreqs && !--maxreqs) + break; + + if (max_poll_time) + { + gettimeofday (&tv_now, 0); + + if (tvdiff (&tv_start, &tv_now) >= max_poll_time) + break; + } + } + + if (nreqs <= max_outstanding) + break; + poll_wait (); - poll_cb (); + + ++maxreqs; } + + return count; } static void create_pipe () @@ -561,12 +811,12 @@ ssize_t res; off_t ooffset; - pthread_mutex_lock (&preadwritelock); + LOCK (preadwritelock); ooffset = lseek (fd, 0, SEEK_CUR); lseek (fd, offset, SEEK_SET); res = read (fd, buf, count); lseek (fd, ooffset, SEEK_SET); - pthread_mutex_unlock (&preadwritelock); + UNLOCK (preadwritelock); return res; } @@ -576,12 +826,12 @@ ssize_t res; off_t ooffset; - pthread_mutex_lock (&preadwritelock); + LOCK (preadwritelock); ooffset = lseek (fd, 0, SEEK_CUR); lseek (fd, offset, SEEK_SET); res = write (fd, buf, count); lseek (fd, offset, SEEK_SET); - pthread_mutex_unlock (&preadwritelock); + UNLOCK (preadwritelock); return res; } @@ -592,23 +842,24 @@ #endif #if !HAVE_READAHEAD -# define readahead aio_readahead +# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) -static ssize_t readahead (int fd, off_t offset, size_t count) +static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self) { - char readahead_buf[4096]; + dBUF; while (count > 0) { - size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); + size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; - pread (fd, readahead_buf, len, offset); + pread (fd, aio_buf, len, offset); offset += len; count -= len; } errno = 0; } + #endif #if !HAVE_READDIR_R @@ -621,7 +872,7 @@ struct dirent *e; int errorno; - pthread_mutex_lock (&readdirlock); + LOCK (readdirlock); e = readdir (dirp); errorno = errno; @@ -634,7 +885,7 @@ else *res = 0; - pthread_mutex_unlock (&readdirlock); + UNLOCK (readdirlock); errno = errorno; return e ? 0 : -1; @@ -642,7 +893,7 @@ #endif /* sendfile always needs emulation */ -static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) +static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self) { ssize_t res; @@ -663,7 +914,7 @@ res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); if (res < 0 && sbytes) - /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ + /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ res = sbytes; } @@ -701,14 +952,15 @@ ) { /* emulate sendfile. this is a major pain in the ass */ - char buf[4096]; + dBUF; + res = 0; while (count) { ssize_t cnt; - cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); + cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset); if (cnt <= 0) { @@ -716,7 +968,7 @@ break; } - cnt = write (ofd, buf, cnt); + cnt = write (ofd, aio_buf, cnt); if (cnt <= 0) { @@ -734,14 +986,14 @@ } /* read a full directory */ -static int scandir_ (const char *path, void **namesp) +static void scandir_ (aio_req req, worker *self) { - DIR *dirp = opendir (path); + DIR *dirp; union { struct dirent d; char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; - } u; + } *u; struct dirent *entp; char *name, *names; int memlen = 4096; @@ -749,51 +1001,50 @@ int res = 0; int errorno; - if (!dirp) - return -1; - - names = malloc (memlen); - - for (;;) - { - errno = 0, readdir_r (dirp, &u.d, &entp); + LOCK (wrklock); + self->dirp = dirp = opendir (req->ptr1); + self->dbuf = u = malloc (sizeof (*u)); + req->flags |= FLAG_PTR2_FREE; + req->ptr2 = names = malloc (memlen); + UNLOCK (wrklock); - if (!entp) - break; + if (dirp && u && names) + for (;;) + { + errno = 0; + readdir_r (dirp, &u->d, &entp); - name = entp->d_name; + if (!entp) + break; - if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) - { - int len = strlen (name) + 1; + name = entp->d_name; - res++; + if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) + { + int len = strlen (name) + 1; - while (memofs + len > memlen) - { - memlen *= 2; - names = realloc (names, memlen); - if (!names) - break; - } + res++; - memcpy (names + memofs, name, len); - memofs += len; - } - } + while (memofs + len > memlen) + { + memlen *= 2; + LOCK (wrklock); + req->ptr2 = names = realloc (names, memlen); + UNLOCK (wrklock); - errorno = errno; - closedir (dirp); + if (!names) + break; + } - if (errorno) - { - free (names); - errno = errorno; - res = -1; - } + memcpy (names + memofs, name, len); + memofs += len; + } + } - *namesp = (void *)names; - return res; + if (errno) + res = -1; + + req->result = res; } /*****************************************************************************/ @@ -801,73 +1052,99 @@ static void *aio_proc (void *thr_arg) { aio_req req; - int type; + struct timespec ts; + worker *self = (worker *)thr_arg; - do + /* try to distribute timeouts somewhat evenly */ + ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) + * (1000000000UL / 1024UL); + + for (;;) { - pthread_mutex_lock (&reqlock); + ts.tv_sec = time (0) + IDLE_TIMEOUT; + + LOCK (reqlock); for (;;) { - req = reqs; - - if (reqs) - { - reqs = reqs->next; - if (!reqs) reqe = 0; - } + self->req = req = reqq_shift (&req_queue); if (req) break; - pthread_cond_wait (&reqwait, &reqlock); + ++idle; + + if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) + == ETIMEDOUT) + { + if (idle > max_idle) + { + --idle; + UNLOCK (reqlock); + LOCK (wrklock); + --started; + UNLOCK (wrklock); + goto quit; + } + + /* we are allowed to idle, so do so without any timeout */ + pthread_cond_wait (&reqwait, &reqlock); + ts.tv_sec = time (0) + IDLE_TIMEOUT; + } + + --idle; } - pthread_mutex_unlock (&reqlock); + --nready; + + UNLOCK (reqlock); errno = 0; /* strictly unnecessary */ - type = req->type; /* remember type for QUIT check */ if (!(req->flags & FLAG_CANCELLED)) - switch (type) + switch (req->type) { - case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; - case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; + case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; + case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break; - case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; - case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; + case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; + case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break; - case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; - case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; - case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; - - case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; - case REQ_CLOSE: req->result = close (req->fd); break; - case REQ_UNLINK: req->result = unlink (req->dataptr); break; - case REQ_RMDIR: req->result = rmdir (req->dataptr); break; - case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; - case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; - case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; - - case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; - case REQ_FSYNC: req->result = fsync (req->fd); break; - case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; + case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break; + case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break; + case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break; + + case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; + case REQ_CLOSE: req->result = close (req->int1); break; + case REQ_UNLINK: req->result = unlink (req->ptr1); break; + case REQ_RMDIR: req->result = rmdir (req->ptr1); break; + case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; + case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; + case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; + case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; + case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; + + case REQ_FDATASYNC: req->result = fdatasync (req->int1); break; + case REQ_FSYNC: req->result = fsync (req->int1); break; + case REQ_READDIR: scandir_ (req, self); break; - case REQ_SLEEP: + case REQ_BUSY: { struct timeval tv; - tv.tv_sec = req->fd; - tv.tv_usec = req->fd2; + tv.tv_sec = req->int1; + tv.tv_usec = req->int2; req->result = select (0, 0, 0, 0, &tv); } case REQ_GROUP: case REQ_NOP: - case REQ_QUIT: break; + case REQ_QUIT: + goto quit; + default: req->result = ENOSYS; break; @@ -875,26 +1152,24 @@ req->errorno = errno; - pthread_mutex_lock (&reslock); + LOCK (reslock); - req->next = 0; + ++npending; - if (rese) - { - rese->next = req; - rese = req; - } - else - { - rese = ress = req; + if (!reqq_push (&res_queue, req)) + /* write a dummy byte to the pipe so fh becomes ready */ + write (respipe [1], &respipe, 1); - /* write a dummy byte to the pipe so fh becomes ready */ - write (respipe [1], &respipe, 1); - } + self->req = 0; + worker_clear (self); - pthread_mutex_unlock (&reslock); + UNLOCK (reslock); } - while (type != REQ_QUIT); + +quit: + LOCK (wrklock); + worker_free (self); + UNLOCK (wrklock); return 0; } @@ -903,51 +1178,56 @@ static void atfork_prepare (void) { - pthread_mutex_lock (&reqlock); - pthread_mutex_lock (&reslock); + LOCK (wrklock); + LOCK (reqlock); + LOCK (reslock); #if !HAVE_PREADWRITE - pthread_mutex_lock (&preadwritelock); + LOCK (preadwritelock); #endif #if !HAVE_READDIR_R - pthread_mutex_lock (&readdirlock); + LOCK (readdirlock); #endif } static void atfork_parent (void) { #if !HAVE_READDIR_R - pthread_mutex_unlock (&readdirlock); + UNLOCK (readdirlock); #endif #if !HAVE_PREADWRITE - pthread_mutex_unlock (&preadwritelock); + UNLOCK (preadwritelock); #endif - pthread_mutex_unlock (&reslock); - pthread_mutex_unlock (&reqlock); + UNLOCK (reslock); + UNLOCK (reqlock); + UNLOCK (wrklock); } static void atfork_child (void) { aio_req prv; - started = 0; + while (prv = reqq_shift (&req_queue)) + req_free (prv); - while (reqs) - { - prv = reqs; - reqs = prv->next; - req_free (prv); - } + while (prv = reqq_shift (&res_queue)) + req_free (prv); - reqs = reqe = 0; - - while (ress) + while (wrk_first.next != &wrk_first) { - prv = ress; - ress = prv->next; - req_free (prv); + worker *wrk = wrk_first.next; + + if (wrk->req) + req_free (wrk->req); + + worker_clear (wrk); + worker_free (wrk); } - - ress = rese = 0; + + started = 0; + idle = 0; + nreqs = 0; + nready = 0; + npending = 0; close (respipe [0]); close (respipe [1]); @@ -984,35 +1264,56 @@ BOOT: { HV *stash = gv_stashpv ("IO::AIO", 1); + newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); + newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); + newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); + newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); create_pipe (); pthread_atfork (atfork_prepare, atfork_parent, atfork_child); } void -min_parallel (nthreads) - int nthreads +max_poll_reqs (int nreqs) + PROTOTYPE: $ + CODE: + max_poll_reqs = nreqs; + +void +max_poll_time (double nseconds) + PROTOTYPE: $ + CODE: + max_poll_time = nseconds * AIO_TICKS; + +void +min_parallel (int nthreads) + PROTOTYPE: $ + +void +max_parallel (int nthreads) PROTOTYPE: $ void -max_parallel (nthreads) - int nthreads +max_idle (int nthreads) PROTOTYPE: $ + CODE: + set_max_idle (nthreads); int -max_outstanding (nreqs) - int nreqs - PROTOTYPE: $ +max_outstanding (int maxreqs) + PROTOTYPE: $ CODE: RETVAL = max_outstanding; - max_outstanding = nreqs; + max_outstanding = maxreqs; + OUTPUT: + RETVAL void aio_open (pathname,flags,mode,callback=&PL_sv_undef) - SV * pathname + SV8 * pathname int flags int mode SV * callback @@ -1022,9 +1323,9 @@ dREQ; req->type = REQ_OPEN; - req->data = newSVsv (pathname); - req->dataptr = SvPVbyte_nolen (req->data); - req->fd = flags; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->int1 = flags; req->mode = mode; REQ_SEND; @@ -1044,8 +1345,8 @@ dREQ; req->type = ix; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->fh = newSVsv (fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); REQ_SEND (req); } @@ -1055,7 +1356,7 @@ SV * fh UV offset UV length - SV * data + SV8 * data UV dataoffset SV * callback ALIAS: @@ -1064,7 +1365,6 @@ PROTOTYPE: $$$$$;$ PPCODE: { - aio_req req; STRLEN svlen; char *svptr = SvPVbyte (data, svlen); @@ -1096,18 +1396,19 @@ dREQ; req->type = ix; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) - : IoOFP (sv_2io (fh))); - req->offset = offset; - req->length = length; - req->data = SvREFCNT_inc (data); - req->dataptr = (char *)svptr + dataoffset; + req->fh = newSVsv (fh); + req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) + : IoOFP (sv_2io (fh))); + req->offs = offset; + req->size = length; + req->sv1 = SvREFCNT_inc (data); + req->ptr1 = (char *)svptr + dataoffset; + req->stroffset = dataoffset; if (!SvREADONLY (data)) { SvREADONLY_on (data); - req->data2ptr = (void *)data; + req->flags |= FLAG_SV1_RO_OFF; } REQ_SEND; @@ -1115,6 +1416,28 @@ } void +aio_readlink (path,callback=&PL_sv_undef) + SV8 * path + SV * callback + PROTOTYPE: $$;$ + PPCODE: +{ + SV *data; + dREQ; + + data = newSV (NAME_MAX); + SvPOK_on (data); + + req->type = REQ_READLINK; + req->fh = newSVsv (path); + req->ptr2 = SvPVbyte_nolen (req->fh); + req->sv1 = data; + req->ptr1 = SvPVbyte_nolen (data); + + REQ_SEND; +} + +void aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) SV * out_fh SV * in_fh @@ -1127,12 +1450,12 @@ dREQ; req->type = REQ_SENDFILE; - req->fh = newSVsv (out_fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); - req->fh2 = newSVsv (in_fh); - req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); - req->offset = in_offset; - req->length = length; + req->fh = newSVsv (out_fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); + req->sv2 = newSVsv (in_fh); + req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); + req->offs = in_offset; + req->size = length; REQ_SEND; } @@ -1149,17 +1472,17 @@ dREQ; req->type = REQ_READAHEAD; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - req->offset = offset; - req->length = length; + req->fh = newSVsv (fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->offs = offset; + req->size = length; REQ_SEND; } void aio_stat (fh_or_path,callback=&PL_sv_undef) - SV * fh_or_path + SV8 * fh_or_path SV * callback ALIAS: aio_stat = REQ_STAT @@ -1168,24 +1491,26 @@ { dREQ; - New (0, req->statdata, 1, Stat_t); - if (!req->statdata) + req->ptr2 = malloc (sizeof (Stat_t)); + if (!req->ptr2) { req_free (req); - croak ("out of memory during aio_req->statdata allocation"); + croak ("out of memory during aio_stat statdata allocation"); } + req->flags |= FLAG_PTR2_FREE; + if (SvPOK (fh_or_path)) { req->type = ix; - req->data = newSVsv (fh_or_path); - req->dataptr = SvPVbyte_nolen (req->data); + req->sv1 = newSVsv (fh_or_path); + req->ptr1 = SvPVbyte_nolen (req->sv1); } else { req->type = REQ_FSTAT; - req->fh = newSVsv (fh_or_path); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + req->fh = newSVsv (fh_or_path); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } REQ_SEND; @@ -1193,8 +1518,8 @@ void aio_unlink (pathname,callback=&PL_sv_undef) - SV * pathname - SV * callback + SV8 * pathname + SV * callback ALIAS: aio_unlink = REQ_UNLINK aio_rmdir = REQ_RMDIR @@ -1204,17 +1529,17 @@ dREQ; req->type = ix; - req->data = newSVsv (pathname); - req->dataptr = SvPVbyte_nolen (req->data); - + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + REQ_SEND; } void aio_link (oldpath,newpath,callback=&PL_sv_undef) - SV * oldpath - SV * newpath - SV * callback + SV8 * oldpath + SV8 * newpath + SV * callback ALIAS: aio_link = REQ_LINK aio_symlink = REQ_SYMLINK @@ -1224,25 +1549,44 @@ dREQ; req->type = ix; - req->fh = newSVsv (oldpath); - req->data2ptr = SvPVbyte_nolen (req->fh); - req->data = newSVsv (newpath); - req->dataptr = SvPVbyte_nolen (req->data); + req->fh = newSVsv (oldpath); + req->ptr2 = SvPVbyte_nolen (req->fh); + req->sv1 = newSVsv (newpath); + req->ptr1 = SvPVbyte_nolen (req->sv1); REQ_SEND; } void -aio_sleep (delay,callback=&PL_sv_undef) - double delay - SV * callback +aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) + SV8 * pathname + SV * callback + UV mode + UV dev + PPCODE: +{ + dREQ; + + req->type = REQ_MKNOD; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->mode = (mode_t)mode; + req->offs = dev; + + REQ_SEND; +} + +void +aio_busy (delay,callback=&PL_sv_undef) + double delay + SV * callback PPCODE: { dREQ; - req->type = REQ_SLEEP; - req->fd = delay < 0. ? 0 : delay; - req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); + req->type = REQ_BUSY; + req->int1 = delay < 0. ? 0 : delay; + req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1); REQ_SEND; } @@ -1256,14 +1600,14 @@ dREQ; req->type = REQ_GROUP; - req_send (req); + req_send (req); XPUSHs (req_sv (req, AIO_GRP_KLASS)); } void aio_nop (callback=&PL_sv_undef) - SV * callback + SV * callback PPCODE: { dREQ; @@ -1273,16 +1617,27 @@ REQ_SEND; } -#if 0 +int +aioreq_pri (int pri = 0) + PROTOTYPE: ;$ + CODE: + RETVAL = next_pri - PRI_BIAS; + if (items > 0) + { + if (pri < PRI_MIN) pri = PRI_MIN; + if (pri > PRI_MAX) pri = PRI_MAX; + next_pri = pri + PRI_BIAS; + } + OUTPUT: + RETVAL void -aio_pri (int pri = DEFAULT_PRI) +aioreq_nice (int nice = 0) CODE: - if (pri < PRI_MIN) pri = PRI_MIN; - if (pri > PRI_MAX) pri = PRI_MAX; - next_pri = pri + PRI_BIAS; - -#endif + nice = next_pri - nice; + if (nice < PRI_MIN) nice = PRI_MIN; + if (nice > PRI_MAX) nice = PRI_MAX; + next_pri = nice + PRI_BIAS; void flush () @@ -1294,15 +1649,14 @@ poll_cb (); } -void +int poll() PROTOTYPE: CODE: - if (nreqs) - { - poll_wait (); - poll_cb (); - } + poll_wait (); + RETVAL = poll_cb (); + OUTPUT: + RETVAL int poll_fileno() @@ -1324,8 +1678,7 @@ poll_wait() PROTOTYPE: CODE: - if (nreqs) - poll_wait (); + poll_wait (); int nreqs() @@ -1335,13 +1688,38 @@ OUTPUT: RETVAL +int +nready() + PROTOTYPE: + CODE: + RETVAL = get_nready (); + OUTPUT: + RETVAL + +int +npending() + PROTOTYPE: + CODE: + RETVAL = get_npending (); + OUTPUT: + RETVAL + +int +nthreads() + PROTOTYPE: + CODE: + if (WORDACCESS_UNSAFE) LOCK (wrklock); + RETVAL = started; + if (WORDACCESS_UNSAFE) UNLOCK (wrklock); + OUTPUT: + RETVAL + PROTOTYPES: DISABLE MODULE = IO::AIO PACKAGE = IO::AIO::REQ void cancel (aio_req_ornot req) - PROTOTYPE: CODE: req_cancel (req); @@ -1360,7 +1738,7 @@ int i; aio_req req; - if (grp->fd == 2) + if (grp->int1 == 2) croak ("cannot add requests to IO::AIO::GRP after the group finished"); for (i = 1; i < items; ++i ) @@ -1372,7 +1750,7 @@ if (req) { - ++grp->length; + ++grp->size; req->grp = grp; req->grp_prev = 0; @@ -1387,34 +1765,48 @@ } void +cancel_subs (aio_req_ornot req) + CODE: + req_cancel_subs (req); + +void result (aio_req grp, ...) CODE: { int i; - AV *av = newAV (); + AV *av; + + grp->errorno = errno; + + av = newAV (); for (i = 1; i < items; ++i ) av_push (av, newSVsv (ST (i))); - SvREFCNT_dec (grp->data); - grp->data = (SV *)av; + SvREFCNT_dec (grp->sv1); + grp->sv1 = (SV *)av; } void -feed_limit (aio_req grp, int limit) +errno (aio_req grp, int errorno = errno) + CODE: + grp->errorno = errorno; + +void +limit (aio_req grp, int limit) CODE: - grp->fd2 = limit; + grp->int2 = limit; aio_grp_feed (grp); void feed (aio_req grp, SV *callback=&PL_sv_undef) CODE: { - SvREFCNT_dec (grp->fh2); - grp->fh2 = newSVsv (callback); + SvREFCNT_dec (grp->sv2); + grp->sv2 = newSVsv (callback); - if (grp->fd2 <= 0) - grp->fd2 = 2; + if (grp->int2 <= 0) + grp->int2 = 2; aio_grp_feed (grp); }