--- IO-AIO/AIO.xs 2006/06/24 16:27:02 1.40 +++ IO-AIO/AIO.xs 2006/10/24 21:26:30 1.73 @@ -1,4 +1,12 @@ +/* solaris */ +#define _POSIX_PTHREAD_SEMANTICS 1 + +#if __linux +# define _GNU_SOURCE +#endif + #define _REENTRANT 1 + #include #include "EXTERN.h" @@ -10,6 +18,9 @@ #include #include +#include +#include +#include #include #include #include @@ -40,10 +51,23 @@ #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 +/* 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; + enum { REQ_QUIT, REQ_OPEN, REQ_CLOSE, @@ -54,199 +78,478 @@ REQ_UNLINK, REQ_RMDIR, REQ_RENAME, REQ_READDIR, REQ_LINK, REQ_SYMLINK, + REQ_GROUP, REQ_NOP, + REQ_BUSY, }; -typedef struct aio_cb { - struct aio_cb *volatile next; +#define AIO_REQ_KLASS "IO::AIO::REQ" +#define AIO_GRP_KLASS "IO::AIO::GRP" - int type; +typedef struct aio_cb +{ + struct aio_cb *volatile next; - /* should receive a cleanup, with unions */ - int fd, fd2; - off_t offset; - size_t length; - ssize_t result; - mode_t mode; /* open */ - int errorno; SV *data, *callback; SV *fh, *fh2; void *dataptr, *data2ptr; + Stat_t *statdata; + off_t offset; + size_t length; + ssize_t result; + STRLEN dataoffset; + int type; + int fd, fd2; + int errorno; + mode_t mode; /* open */ - Stat_t *statdata; + unsigned char flags; + unsigned char pri; + + SV *self; /* the perl counterpart of this request, if any */ + struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; } aio_cb; +enum { + FLAG_CANCELLED = 0x01, +}; + typedef aio_cb *aio_req; +typedef aio_cb *aio_req_ornot; + +enum { + PRI_MIN = -4, + PRI_MAX = 4, + + DEFAULT_PRI = 0, + PRI_BIAS = -PRI_MIN, + NUM_PRI = PRI_MAX + PRI_BIAS + 1, +}; + +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 pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; +#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) +# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP +#else +# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER +#endif -static volatile aio_req reqs, reqe; /* queue start, queue end */ -static volatile aio_req ress, rese; /* queue start, queue end */ +#define LOCK(mutex) pthread_mutex_lock (&(mutex)) +#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) -static void free_req (aio_req req) -{ - if (req->data) - SvREFCNT_dec (req->data); +/* worker threasd management */ +static pthread_mutex_t wrklock = AIO_MUTEX_INIT; - if (req->fh) - SvREFCNT_dec (req->fh); +typedef struct worker { + /* locked by wrklock */ + struct worker *prev, *next; - if (req->fh2) - SvREFCNT_dec (req->fh2); + pthread_t tid; - if (req->statdata) - Safefree (req->statdata); + /* locked by reslock, reqlock or wrklock */ + aio_req req; /* currently processed request */ + void *dbuf; + DIR *dirp; +} worker; - if (req->callback) - SvREFCNT_dec (req->callback); +static worker wrk_first = { &wrk_first, &wrk_first, 0 }; - if (req->type == REQ_READDIR && req->result >= 0) - free (req->data2ptr); +static void worker_clear (worker *wrk) +{ + if (wrk->dirp) + { + closedir (wrk->dirp); + wrk->dirp = 0; + } - Safefree (req); + if (wrk->dbuf) + { + free (wrk->dbuf); + wrk->dbuf = 0; + } } -static void -poll_wait () +static void worker_free (worker *wrk) { - if (nreqs && !ress) - { - fd_set rfd; - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); + wrk->next->prev = wrk->prev; + wrk->prev->next = wrk->next; - select (respipe [0] + 1, &rfd, 0, 0, 0); + free (wrk); +} + +static pthread_mutex_t reslock = AIO_MUTEX_INIT; +static pthread_mutex_t reqlock = AIO_MUTEX_INIT; +static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; + +/* + * 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++; } -static int -poll_cb () +aio_req reqq_shift (reqq *q) { - dSP; - int count = 0; - int do_croak = 0; - aio_req req; + int pri; - for (;;) + if (!q->size) + return 0; + + --q->size; + + for (pri = NUM_PRI; pri--; ) { - pthread_mutex_lock (&reslock); - req = ress; + aio_req req = q->qs[pri]; if (req) { - ress = req->next; + if (!(q->qs[pri] = req->next)) + q->qe[pri] = 0; - if (!ress) - { - /* read any signals sent by the worker threads */ - char buf [32]; - while (read (respipe [0], buf, 32) == 32) - ; - - rese = 0; - } + return req; } + } - pthread_mutex_unlock (&reslock); + abort (); +} - if (!req) - break; +static void req_invoke (aio_req req); +static void req_free (aio_req req); +static void req_cancel (aio_req req); - nreqs--; +/* must be called at most once */ +static SV *req_sv (aio_req req, const char *klass) +{ + if (!req->self) + { + req->self = (SV *)newHV (); + sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); + } - if (req->type == REQ_QUIT) - started--; - else - { - int errorno = errno; - errno = req->errorno; + return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); +} - if (req->type == REQ_READ) - SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); +static aio_req SvAIO_REQ (SV *sv) +{ + MAGIC *mg; - if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) - SvREADONLY_off (req->data); + if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) + croak ("object of class " AIO_REQ_KLASS " expected"); - if (req->statdata) - { - PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; - PL_laststatval = req->result; - PL_statcache = *(req->statdata); - } + mg = mg_find (SvRV (sv), PERL_MAGIC_ext); + + return mg ? (aio_req)mg->mg_ptr : 0; +} + +static void aio_grp_feed (aio_req grp) +{ + while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) + { + int old_len = grp->length; + + if (grp->fh2 && SvOK (grp->fh2)) + { + dSP; ENTER; + SAVETMPS; PUSHMARK (SP); + XPUSHs (req_sv (grp, AIO_GRP_KLASS)); + PUTBACK; + call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); + SPAGAIN; + FREETMPS; + LEAVE; + } + + /* stop if no progress has been made */ + if (old_len == grp->length) + { + SvREFCNT_dec (grp->fh2); + grp->fh2 = 0; + break; + } + } +} + +static void aio_grp_dec (aio_req grp) +{ + --grp->length; + + /* call feeder, if applicable */ + aio_grp_feed (grp); - if (req->type == REQ_READDIR) + /* finish, if done */ + if (!grp->length && grp->fd) + { + req_invoke (grp); + req_free (grp); + } +} + +static void poll_wait () +{ + fd_set rfd; + + while (nreqs) + { + int size; +#if !(__i386 || __x86_64) /* safe without sempahore on these archs */ + LOCK (reslock); +#endif + size = res_queue.size; +#if !(__i386 || __x86_64) /* safe without sempahore on these archs */ + UNLOCK (reslock); +#endif + + if (size) + 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; + + if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) + { + errno = req->errorno; + + ENTER; + SAVETMPS; + PUSHMARK (SP); + EXTEND (SP, 1); + + switch (req->type) + { + case REQ_READDIR: { SV *rv = &PL_sv_undef; if (req->result >= 0) { + int i; char *buf = req->data2ptr; AV *av = newAV (); - while (req->result) + av_extend (av, req->result - 1); + + for (i = 0; i < req->result; ++i) { SV *sv = newSVpv (buf, 0); - av_push (av, sv); + av_store (av, i, sv); buf += SvCUR (sv) + 1; - req->result--; } rv = sv_2mortal (newRV_noinc ((SV *)av)); } - XPUSHs (rv); + PUSHs (rv); } - else - { - XPUSHs (sv_2mortal (newSViv (req->result))); + break; - if (req->type == REQ_OPEN) - { - /* convert fd to fh */ - SV *fh; + case REQ_OPEN: + { + /* convert fd to fh */ + SV *fh; - 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)); - } + PUSHMARK (SP); + XPUSHs (sv_2mortal (fh)); } + break; + + case REQ_GROUP: + req->fd = 2; /* mark group as finished */ + + 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; + + case REQ_NOP: + case REQ_BUSY: + break; + + default: + PUSHs (sv_2mortal (newSViv (req->result))); + break; + } + + + PUTBACK; + call_sv (req->callback, G_VOID | G_EVAL); + SPAGAIN; + + FREETMPS; + LEAVE; + } + + if (req->grp) + { + aio_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 (SvOK (req->callback)) + if (grp->grp_first == req) + grp->grp_first = req->grp_next; + + 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->callback); + Safefree (req->statdata); + + if (req->type == REQ_READDIR) + free (req->data2ptr); + + Safefree (req); +} + +static void req_cancel_subs (aio_req grp) +{ + aio_req sub; + + if (grp->type != REQ_GROUP) + return; + + SvREFCNT_dec (grp->fh2); + grp->fh2 = 0; + + for (sub = grp->grp_first; sub; sub = sub->grp_next) + req_cancel (sub); +} + +static void req_cancel (aio_req req) +{ + req->flags |= FLAG_CANCELLED; + + req_cancel_subs (req); +} + +static int poll_cb () +{ + dSP; + int count = 0; + int do_croak = 0; + aio_req req; + + for (;;) + { + LOCK (reslock); + req = reqq_shift (&res_queue); + + if (req) + { + if (!res_queue.size) { - PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); - SPAGAIN; + /* read any signals sent by the worker threads */ + char buf [32]; + while (read (respipe [0], buf, 32) == 32) + ; + } + } - if (SvTRUE (ERRSV)) - { - free_req (req); - croak (0); - } + 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); } - LEAVE; + req_invoke (req); - errno = errorno; count++; } - free_req (req); + req_free (req); } return count; @@ -254,48 +557,51 @@ static void *aio_proc(void *arg); -static void -start_thread (void) +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); 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 -send_req (aio_req req) +static void req_send (aio_req req) { while (started < wanted && nreqs >= started) start_thread (); - nreqs++; - - pthread_mutex_lock (&reqlock); - - req->next = 0; - - if (reqe) - { - reqe->next = req; - reqe = req; - } - else - reqe = reqs = req; + ++nreqs; + LOCK (reqlock); + reqq_push (&req_queue, req); pthread_cond_signal (&reqwait); - pthread_mutex_unlock (&reqlock); + UNLOCK (reqlock); if (nreqs > max_outstanding) for (;;) @@ -309,14 +615,16 @@ } } -static void -end_thread (void) +static void end_thread (void) { aio_req req; + Newz (0, req, 1, aio_cb); + req->type = REQ_QUIT; + req->pri = PRI_MAX + PRI_BIAS; - send_req (req); + req_send (req); } static void min_parallel (int nthreads) @@ -371,34 +679,32 @@ */ static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; -static ssize_t -pread (int fd, void *buf, size_t count, off_t offset) +static ssize_t pread (int fd, void *buf, size_t count, off_t offset) { 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; } -static ssize_t -pwrite (int fd, void *buf, size_t count, off_t offset) +static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) { 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; } @@ -411,16 +717,15 @@ #if !HAVE_READAHEAD # define readahead aio_readahead -static ssize_t -readahead (int fd, off_t offset, size_t count) +static ssize_t readahead (int fd, off_t offset, size_t count) { - 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; } @@ -434,13 +739,12 @@ static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; -static int -readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) +static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) { struct dirent *e; int errorno; - pthread_mutex_lock (&readdirlock); + LOCK (readdirlock); e = readdir (dirp); errorno = errno; @@ -453,7 +757,7 @@ else *res = 0; - pthread_mutex_unlock (&readdirlock); + UNLOCK (readdirlock); errno = errorno; return e ? 0 : -1; @@ -461,8 +765,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; @@ -521,14 +824,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) { @@ -536,7 +840,7 @@ break; } - cnt = write (ofd, buf, cnt); + cnt = write (ofd, aio_buf, cnt); if (cnt <= 0) { @@ -554,15 +858,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; @@ -570,74 +873,67 @@ 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->dataptr); + self->dbuf = u = malloc (sizeof (*u)); + UNLOCK (wrklock); - if (!entp) - break; + req->data2ptr = names = malloc (memlen); - name = entp->d_name; + if (dirp && u && names) + for (;;) + { + errno = 0; + readdir_r (dirp, &u->d, &entp); - if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) - { - int len = strlen (name) + 1; + if (!entp) + break; - res++; + name = entp->d_name; - while (memofs + len > memlen) - { - memlen *= 2; - names = realloc (names, memlen); - if (!names) - break; - } + if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) + { + int len = strlen (name) + 1; - memcpy (names + memofs, name, len); - memofs += len; - } - } + res++; - errorno = errno; - closedir (dirp); + while (memofs + len > memlen) + { + memlen *= 2; + LOCK (wrklock); + req->data2ptr = names = realloc (names, memlen); + UNLOCK (wrklock); + + 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; } /*****************************************************************************/ -static void * -aio_proc (void *thr_arg) +static void *aio_proc (void *thr_arg) { aio_req req; int type; + worker *self = (worker *)thr_arg; do { - pthread_mutex_lock (&reqlock); + LOCK (reqlock); for (;;) { - req = reqs; - - if (reqs) - { - reqs = reqs->next; - if (!reqs) reqe = 0; - } + self->req = req = reqq_shift (&req_queue); if (req) break; @@ -645,67 +941,75 @@ pthread_cond_wait (&reqwait, &reqlock); } - pthread_mutex_unlock (&reqlock); + UNLOCK (reqlock); errno = 0; /* strictly unnecessary */ + type = req->type; /* remember type for QUIT check */ - type = req->type; - - switch (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_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; + if (!(req->flags & FLAG_CANCELLED)) + switch (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_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_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, self); break; - case REQ_QUIT: - 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: scandir_ (req, self); break; + + case REQ_BUSY: + { + struct timeval tv; + + tv.tv_sec = req->fd; + tv.tv_usec = req->fd2; + + req->result = select (0, 0, 0, 0, &tv); + } + + case REQ_GROUP: + case REQ_NOP: + case REQ_QUIT: + break; - default: - req->result = ENOSYS; - break; - } + default: + req->result = ENOSYS; + break; + } req->errorno = errno; - pthread_mutex_lock (&reslock); + LOCK (reslock); - req->next = 0; + if (!reqq_push (&res_queue, req)) + /* write a dummy byte to the pipe so fh becomes ready */ + write (respipe [1], &respipe, 1); - if (rese) - { - rese->next = req; - rese = req; - } - else - { - rese = ress = req; + self->req = 0; + worker_clear (self); - /* write a dummy byte to the pipe so fh becomes ready */ - write (respipe [1], &respipe, 1); - } - - pthread_mutex_unlock (&reslock); + UNLOCK (reslock); } while (type != REQ_QUIT); + LOCK (wrklock); + worker_free (self); + UNLOCK (wrklock); + return 0; } @@ -713,51 +1017,53 @@ 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; - free_req (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; - free_req (prv); + worker *wrk = wrk_first.next; + + if (wrk->req) + req_free (wrk->req); + + worker_clear (wrk); + worker_free (wrk); } - - ress = rese = 0; + + started = 0; + nreqs = 0; close (respipe [0]); close (respipe [1]); @@ -768,15 +1074,24 @@ #define dREQ \ aio_req req; \ + int req_pri = next_pri; \ + next_pri = DEFAULT_PRI + PRI_BIAS; \ \ if (SvOK (callback) && !SvROK (callback)) \ - croak ("clalback must be undef or of reference type"); \ + croak ("callback must be undef or of reference type"); \ \ Newz (0, req, 1, aio_cb); \ if (!req) \ croak ("out of memory during aio_req allocation"); \ \ - req->callback = newSVsv (callback); + req->callback = newSVsv (callback); \ + req->pri = req_pri + +#define REQ_SEND \ + req_send (req); \ + \ + if (GIMME_V != G_VOID) \ + XPUSHs (req_sv (req, AIO_REQ_KLASS)); MODULE = IO::AIO PACKAGE = IO::AIO @@ -784,6 +1099,11 @@ 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)); + create_pipe (); pthread_atfork (atfork_prepare, atfork_parent, atfork_child); } @@ -813,7 +1133,7 @@ int mode SV * callback PROTOTYPE: $$$;$ - CODE: + PPCODE: { dREQ; @@ -823,7 +1143,7 @@ req->fd = flags; req->mode = mode; - send_req (req); + REQ_SEND; } void @@ -835,7 +1155,7 @@ aio_close = REQ_CLOSE aio_fsync = REQ_FSYNC aio_fdatasync = REQ_FDATASYNC - CODE: + PPCODE: { dREQ; @@ -843,7 +1163,7 @@ req->fh = newSVsv (fh); req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - send_req (req); + REQ_SEND (req); } void @@ -858,7 +1178,7 @@ aio_read = REQ_READ aio_write = REQ_WRITE PROTOTYPE: $$$$$;$ - CODE: + PPCODE: { aio_req req; STRLEN svlen; @@ -906,7 +1226,7 @@ req->data2ptr = (void *)data; } - send_req (req); + REQ_SEND; } } @@ -918,7 +1238,7 @@ UV length SV * callback PROTOTYPE: $$$$;$ - CODE: + PPCODE: { dREQ; @@ -930,7 +1250,7 @@ req->offset = in_offset; req->length = length; - send_req (req); + REQ_SEND; } void @@ -940,7 +1260,7 @@ IV length SV * callback PROTOTYPE: $$$;$ - CODE: + PPCODE: { dREQ; @@ -950,7 +1270,7 @@ req->offset = offset; req->length = length; - send_req (req); + REQ_SEND; } void @@ -960,14 +1280,14 @@ ALIAS: aio_stat = REQ_STAT aio_lstat = REQ_LSTAT - CODE: + PPCODE: { dREQ; New (0, req->statdata, 1, Stat_t); if (!req->statdata) { - free_req (req); + req_free (req); croak ("out of memory during aio_req->statdata allocation"); } @@ -984,7 +1304,7 @@ req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } - send_req (req); + REQ_SEND; } void @@ -995,7 +1315,7 @@ aio_unlink = REQ_UNLINK aio_rmdir = REQ_RMDIR aio_readdir = REQ_READDIR - CODE: + PPCODE: { dREQ; @@ -1003,7 +1323,7 @@ req->data = newSVsv (pathname); req->dataptr = SvPVbyte_nolen (req->data); - send_req (req); + REQ_SEND; } void @@ -1015,7 +1335,7 @@ aio_link = REQ_LINK aio_symlink = REQ_SYMLINK aio_rename = REQ_RENAME - CODE: + PPCODE: { dREQ; @@ -1025,10 +1345,66 @@ req->data = newSVsv (newpath); req->dataptr = SvPVbyte_nolen (req->data); - send_req (req); + REQ_SEND; +} + +void +aio_busy (delay,callback=&PL_sv_undef) + double delay + SV * callback + PPCODE: +{ + dREQ; + + req->type = REQ_BUSY; + req->fd = delay < 0. ? 0 : delay; + req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); + + REQ_SEND; +} + +void +aio_group (callback=&PL_sv_undef) + SV * callback + PROTOTYPE: ;$ + PPCODE: +{ + dREQ; + + req->type = REQ_GROUP; + req_send (req); + + XPUSHs (req_sv (req, AIO_GRP_KLASS)); +} + +void +aio_nop (callback=&PL_sv_undef) + SV * callback + PPCODE: +{ + dREQ; + + req->type = REQ_NOP; + + REQ_SEND; } void +aioreq_pri (int pri = DEFAULT_PRI) + CODE: + if (pri < PRI_MIN) pri = PRI_MIN; + if (pri > PRI_MAX) pri = PRI_MAX; + next_pri = pri + PRI_BIAS; + +void +aioreq_nice (int nice = 0) + CODE: + 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 () PROTOTYPE: CODE: @@ -1079,3 +1455,91 @@ OUTPUT: RETVAL +PROTOTYPES: DISABLE + +MODULE = IO::AIO PACKAGE = IO::AIO::REQ + +void +cancel (aio_req_ornot req) + CODE: + req_cancel (req); + +void +cb (aio_req_ornot req, SV *callback=&PL_sv_undef) + CODE: + SvREFCNT_dec (req->callback); + req->callback = newSVsv (callback); + +MODULE = IO::AIO PACKAGE = IO::AIO::GRP + +void +add (aio_req grp, ...) + PPCODE: +{ + int i; + aio_req req; + + if (grp->fd == 2) + croak ("cannot add requests to IO::AIO::GRP after the group finished"); + + for (i = 1; i < items; ++i ) + { + if (GIMME_V != G_VOID) + XPUSHs (sv_2mortal (newSVsv (ST (i)))); + + req = SvAIO_REQ (ST (i)); + + if (req) + { + ++grp->length; + req->grp = grp; + + req->grp_prev = 0; + req->grp_next = grp->grp_first; + + if (grp->grp_first) + grp->grp_first->grp_prev = req; + + grp->grp_first = req; + } + } +} + +void +cancel_subs (aio_req_ornot req) + CODE: + req_cancel_subs (req); + +void +result (aio_req grp, ...) + CODE: +{ + int i; + AV *av = newAV (); + + for (i = 1; i < items; ++i ) + av_push (av, newSVsv (ST (i))); + + SvREFCNT_dec (grp->data); + grp->data = (SV *)av; +} + +void +limit (aio_req grp, int limit) + CODE: + grp->fd2 = limit; + aio_grp_feed (grp); + +void +feed (aio_req grp, SV *callback=&PL_sv_undef) + CODE: +{ + SvREFCNT_dec (grp->fh2); + grp->fh2 = newSVsv (callback); + + if (grp->fd2 <= 0) + grp->fd2 = 2; + + aio_grp_feed (grp); +} +