--- IO-AIO/AIO.xs 2006/10/21 23:06:04 1.43 +++ IO-AIO/AIO.xs 2008/05/13 18:50:27 1.121 @@ -1,854 +1,467 @@ -#define _REENTRANT 1 +#include "libeio/xthread.h" + #include #include "EXTERN.h" #include "perl.h" #include "XSUB.h" -#include "autoconf/config.h" - -#include - #include +#include #include #include #include #include -#include #include -#include #include -#if HAVE_SENDFILE -# if __linux -# include -# elif __freebsd -# include -# include -# elif __hpux -# include -# elif __solaris /* not yet */ -# include -# else -# error sendfile support requested but not available -# endif -#endif +/* perl namespace pollution */ +#undef VERSION -/* used for struct dirent, AIX doesn't provide it */ -#ifndef NAME_MAX -# define NAME_MAX 4096 -#endif +#ifdef _WIN32 + +# define EIO_STRUCT_DIRENT Direntry_t +# undef malloc +# undef free + +// perl overrides all those nice win32 functions +# undef open +# undef read +# undef write +# undef send +# undef recv +# undef stat +# undef fstat +# define lstat stat +# undef truncate +# undef ftruncate +# undef open +# undef close +# undef unlink +# undef rmdir +# undef rename +# undef lseek + +# define chown(a,b,c) (errno = ENOSYS, -1) +# define fchown(a,b,c) (errno = ENOSYS, -1) +# define fchmod(a,b) (errno = ENOSYS, -1) +# define symlink(a,b) (errno = ENOSYS, -1) +# define readlink(a,b,c) (errno = ENOSYS, -1) +# define mknod(a,b,c) (errno = ENOSYS, -1) +# define truncate(a,b) (errno = ENOSYS, -1) +# define ftruncate(fd,o) chsize ((fd), (o)) +# define fsync(fd) _commit (fd) +# define opendir(fd) (errno = ENOSYS, 0) +# define readdir(fd) (errno = ENOSYS, -1) +# define closedir(fd) (errno = ENOSYS, -1) +# define mkdir(a,b) mkdir (a) -#if __ia64 -# define STACKSIZE 65536 #else -# define STACKSIZE 8192 -#endif -enum { - REQ_QUIT, - REQ_OPEN, REQ_CLOSE, - REQ_READ, REQ_WRITE, REQ_READAHEAD, - REQ_SENDFILE, - REQ_STAT, REQ_LSTAT, REQ_FSTAT, - REQ_FSYNC, REQ_FDATASYNC, - REQ_UNLINK, REQ_RMDIR, REQ_RENAME, - REQ_READDIR, - REQ_LINK, REQ_SYMLINK, -}; +# include +# include +# include +# include +# include +# define EIO_STRUCT_DIRENT struct dirent -#define AIO_CB_KLASS "IO::AIO::CB" +#endif -typedef struct aio_cb -{ - struct aio_cb *grp_prev, *grp_next; - struct aio_grp *grp; +#define EIO_STRUCT_STAT Stat_t - struct aio_cb *volatile next; +/* use NV for 32 bit perls as it allows larger offsets */ +#if IVSIZE >= 8 +# define SvVAL64 SvIV +#else +# define SvVAL64 SvNV +#endif - SV *self; /* the perl counterpart of this request, if any */ +static HV *stash; +typedef SV SV8; /* byte-sv, used for argument-checking */ - SV *data, *callback; - SV *fh, *fh2; - void *dataptr, *data2ptr; - Stat_t *statdata; - off_t offset; - size_t length; - ssize_t result; +#define AIO_REQ_KLASS "IO::AIO::REQ" +#define AIO_GRP_KLASS "IO::AIO::GRP" - int type; - int fd, fd2; - int errorno; - STRLEN dataoffset; - mode_t mode; /* open */ - unsigned char cancelled; -} aio_cb; +#define EIO_REQ_MEMBERS \ + SV *callback; \ + SV *sv1, *sv2; \ + STRLEN stroffset; \ + SV *self; + +#include "libeio/eio.h" + +static int req_invoke (eio_req *req); +#define EIO_FINISH(req) req_invoke (req) +static void aio_grp_feed (eio_req *grp); +#define EIO_FEED(req) aio_grp_feed (req) +static void req_destroy (eio_req *grp); +#define EIO_DESTROY(req) req_destroy (req) -typedef aio_cb *aio_req; -typedef aio_cb *aio_req_ornot; +enum { + FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ +}; -static int started, wanted; -static volatile int nreqs; -static int max_outstanding = 1<<30; -static int respipe [2]; +#include "libeio/eio.c" -static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; +typedef eio_req *aio_req; +typedef eio_req *aio_req_ornot; -static volatile aio_req reqs, reqe; /* queue start, queue end */ -static volatile aio_req ress, rese; /* queue start, queue end */ +static SV *on_next_submit; +static int next_pri = EIO_PRI_DEFAULT; +static int max_outstanding; -typedef struct aio_grp -{ - struct aio_cb *first, *last; - SV *callback; - int busycount; -} aio_grp; +static int respipe_osf [2], respipe [2] = { -1, -1 }; -static void aio_grp_begin (aio_grp *grp) -{ - ++grp->busycount; -} +static void req_destroy (aio_req req); +static void req_cancel (aio_req req); -static void aio_grp_end (aio_grp *grp) +static void want_poll (void) { - --grp->busycount; - - if (grp->busycount) - return; - - SvREFCNT_dec (grp->callback); - grp->callback = 0; + /* write a dummy byte to the pipe so fh becomes ready */ + respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); } -static aio_grp *aio_grp_new () +static void done_poll (void) { - aio_grp *grp; - - Newz (0, grp, 1, aio_grp); - aio_grp_begin (grp); - - return grp; + /* read any signals sent by the worker threads */ + char buf [4]; + while (respipe_read (respipe [0], buf, 4) == 4) + ; } /* must be called at most once */ -static SV *req_sv (aio_req req) +static SV *req_sv (aio_req req, const char *klass) { - req->self = (SV *)newHV (); - sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); + if (!req->self) + { + req->self = (SV *)newHV (); + sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); + } - return sv_bless (newRV_noinc (req->self), gv_stashpv (AIO_CB_KLASS, 1)); + return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); } static aio_req SvAIO_REQ (SV *sv) { - if (!sv_derived_from (sv, AIO_CB_KLASS) || !SvROK (sv)) - croak ("object of class " AIO_CB_KLASS " expected"); + MAGIC *mg; - MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); + if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) + croak ("object of class " AIO_REQ_KLASS " expected"); + + mg = mg_find (SvRV (sv), PERL_MAGIC_ext); return mg ? (aio_req)mg->mg_ptr : 0; } -static void req_free (aio_req req) +static void aio_grp_feed (aio_req grp) { - if (req->self) + if (grp->sv2 && SvOK (grp->sv2)) { - sv_unmagic (req->self, PERL_MAGIC_ext); - SvREFCNT_dec (req->self); - } - - if (req->data) - SvREFCNT_dec (req->data); - - if (req->fh) - SvREFCNT_dec (req->fh); - - if (req->fh2) - SvREFCNT_dec (req->fh2); - - if (req->statdata) - Safefree (req->statdata); - - if (req->callback) - SvREFCNT_dec (req->callback); + dSP; - if (req->type == REQ_READDIR && req->result >= 0) - free (req->data2ptr); - - Safefree (req); + ENTER; + SAVETMPS; + PUSHMARK (SP); + XPUSHs (req_sv (grp, AIO_GRP_KLASS)); + PUTBACK; + call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); + SPAGAIN; + FREETMPS; + LEAVE; + } } -static void -poll_wait () +static void req_submit (eio_req *req) { - if (nreqs && !ress) + eio_submit (req); + + if (on_next_submit) { - fd_set rfd; - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); + dSP; + SV *cb = sv_2mortal (on_next_submit); + + on_next_submit = 0; - select (respipe [0] + 1, &rfd, 0, 0, 0); + PUSHMARK (SP); + PUTBACK; + call_sv (cb, G_DISCARD | G_EVAL); } } -static int -poll_cb () +static int req_invoke (eio_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; + if (req->flags & FLAG_SV2_RO_OFF) + SvREADONLY_off (req->sv2); - nreqs--; + if (!EIO_CANCELLED (req) && SvOK (req->callback)) + { + ENTER; + SAVETMPS; + PUSHMARK (SP); + EXTEND (SP, 1); - if (req->type == REQ_QUIT) - started--; - else + switch (req->type) { - int errorno = errno; - errno = req->errorno; - - 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); - } - - ENTER; - PUSHMARK (SP); - - if (req->type == REQ_READDIR) + case EIO_READDIR: { SV *rv = &PL_sv_undef; if (req->result >= 0) { - char *buf = req->data2ptr; + int i; + char *buf = req->ptr2; 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 + break; + + case EIO_OPEN: { - XPUSHs (sv_2mortal (newSViv (req->result))); + /* convert fd to fh */ + SV *fh = &PL_sv_undef; - if (req->type == REQ_OPEN) + if (req->result >= 0) { - /* convert fd to fh */ - SV *fh; + GV *gv = (GV *)sv_newmortal (); + int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); + char sym [64]; + int symlen; + + symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); + gv_init (gv, stash, sym, symlen, 0); + + symlen = snprintf ( + sym, + sizeof (sym), + "%s&=%d", + flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", + req->result + ); - PUTBACK; - call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); - SPAGAIN; - - fh = SvREFCNT_inc (POPs); - - PUSHMARK (SP); - XPUSHs (sv_2mortal (fh)); + if (do_open (gv, sym, symlen, 0, 0, 0, 0)) + fh = (SV *)gv; } - } - if (SvOK (req->callback) && !req->cancelled) - { - PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); - SPAGAIN; - - if (SvTRUE (ERRSV)) - { - req_free (req); - croak (0); - } + PUSHs (fh); } + break; - LEAVE; - - errno = errorno; - count++; - } + case EIO_GROUP: + req->int1 = 2; /* mark group as finished */ - req_free (req); - } - - return count; -} + if (req->sv1) + { + int i; + AV *av = (AV *)req->sv1; + + EXTEND (SP, AvFILL (av) + 1); + for (i = 0; i <= AvFILL (av); ++i) + PUSHs (*av_fetch (av, i, 0)); + } + break; -static void *aio_proc(void *arg); + case EIO_NOP: + case EIO_BUSY: + break; -static void -start_thread (void) -{ - sigset_t fullsigset, oldsigset; - pthread_t tid; - pthread_attr_t attr; + case EIO_READLINK: + if (req->result > 0) + PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); + break; - pthread_attr_init (&attr); - pthread_attr_setstacksize (&attr, STACKSIZE); - pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); + case EIO_STAT: + case EIO_LSTAT: + case EIO_FSTAT: + PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; + PL_laststatval = req->result; + PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); + PUSHs (sv_2mortal (newSViv (req->result))); + break; - sigfillset (&fullsigset); - sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); + case EIO_READ: + SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); + *SvEND (req->sv2) = 0; + PUSHs (sv_2mortal (newSViv (req->result))); + break; - if (pthread_create (&tid, &attr, aio_proc, 0) == 0) - started++; + case EIO_DUP2: + if (req->result > 0) + req->result = 0; + /* FALLTHROUGH */ - sigprocmask (SIG_SETMASK, &oldsigset, 0); -} - -static void -req_send (aio_req req) -{ - while (started < wanted && nreqs >= started) - start_thread (); + default: + PUSHs (sv_2mortal (newSViv (req->result))); + break; + } - nreqs++; + errno = req->errorno; - pthread_mutex_lock (&reqlock); + PUTBACK; + call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); + SPAGAIN; - req->next = 0; + FREETMPS; + LEAVE; - if (reqe) - { - reqe->next = req; - reqe = req; + PUTBACK; } - else - reqe = reqs = req; - - pthread_cond_signal (&reqwait); - pthread_mutex_unlock (&reqlock); - if (nreqs > max_outstanding) - for (;;) - { - poll_cb (); - - if (nreqs <= max_outstanding) - break; - - poll_wait (); - } + return !!SvTRUE (ERRSV); } -static void -end_thread (void) +static void req_destroy (aio_req req) { - aio_req req; - Newz (0, req, 1, aio_cb); - req->type = REQ_QUIT; - - req_send (req); -} - -static void min_parallel (int nthreads) -{ - if (wanted < nthreads) - wanted = nthreads; -} - -static void max_parallel (int nthreads) -{ - int cur = started; - - if (wanted > nthreads) - wanted = nthreads; - - while (cur > wanted) - { - end_thread (); - cur--; - } - - while (started > wanted) + if (req->self) { - poll_wait (); - poll_cb (); + sv_unmagic (req->self, PERL_MAGIC_ext); + SvREFCNT_dec (req->self); } -} -static void create_pipe () -{ - if (pipe (respipe)) - croak ("unable to initialize result pipe"); - - if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) - croak ("cannot set result pipe to nonblocking mode"); - - if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) - croak ("cannot set result pipe to nonblocking mode"); -} - -/*****************************************************************************/ -/* work around various missing functions */ - -#if !HAVE_PREADWRITE -# define pread aio_pread -# define pwrite aio_pwrite - -/* - * make our pread/pwrite safe against themselves, but not against - * normal read/write by using a mutex. slows down execution a lot, - * but that's your problem, not mine. - */ -static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; - -static ssize_t -pread (int fd, void *buf, size_t count, off_t offset) -{ - ssize_t res; - off_t ooffset; - - pthread_mutex_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); + SvREFCNT_dec (req->sv1); + SvREFCNT_dec (req->sv2); + SvREFCNT_dec (req->callback); - return res; + Safefree (req); } -static ssize_t -pwrite (int fd, void *buf, size_t count, off_t offset) +static void req_cancel_subs (aio_req grp) { - ssize_t res; - off_t ooffset; + aio_req sub; - pthread_mutex_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); + if (grp->type != EIO_GROUP) + return; - return res; + SvREFCNT_dec (grp->sv2); + grp->sv2 = 0; + + eio_grp_cancel (grp); } -#endif -#if !HAVE_FDATASYNC -# define fdatasync fsync +#ifdef USE_SOCKETS_AS_HANDLES +# define TO_SOCKET(x) (win32_get_osfhandle (x)) +#else +# define TO_SOCKET(x) (x) #endif -#if !HAVE_READAHEAD -# define readahead aio_readahead - -static ssize_t -readahead (int fd, off_t offset, size_t count) +static void +create_respipe (void) { - char readahead_buf[4096]; + int old_readfd = respipe [0]; - while (count > 0) - { - size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); + if (respipe [1] >= 0) + respipe_close (TO_SOCKET (respipe [1])); - pread (fd, readahead_buf, len, offset); - offset += len; - count -= len; - } - - errno = 0; -} +#ifdef _WIN32 + if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe)) +#else + if (pipe (respipe)) #endif + croak ("unable to initialize result pipe"); -#if !HAVE_READDIR_R -# define readdir_r aio_readdir_r - -static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; - -static int -readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) -{ - struct dirent *e; - int errorno; - - pthread_mutex_lock (&readdirlock); - - e = readdir (dirp); - errorno = errno; - - if (e) + if (old_readfd >= 0) { - *res = ent; - strcpy (ent->d_name, e->d_name); - } - else - *res = 0; - - pthread_mutex_unlock (&readdirlock); + if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0) + croak ("unable to initialize result pipe(2)"); - errno = errorno; - return e ? 0 : -1; -} -#endif - -/* sendfile always needs emulation */ -static ssize_t -sendfile_ (int ofd, int ifd, off_t offset, size_t count) -{ - ssize_t res; - - if (!count) - return 0; - -#if HAVE_SENDFILE -# if __linux - res = sendfile (ofd, ifd, &offset, count); - -# elif __freebsd - /* - * Of course, the freebsd sendfile is a dire hack with no thoughts - * wasted on making it similar to other I/O functions. - */ - { - off_t sbytes; - 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 */ - res = sbytes; - } - -# elif __hpux - res = sendfile (ofd, ifd, offset, count, 0, 0); - -# elif __solaris - { - struct sendfilevec vec; - size_t sbytes; - - vec.sfv_fd = ifd; - vec.sfv_flag = 0; - vec.sfv_off = offset; - vec.sfv_len = count; - - res = sendfilev (ofd, &vec, 1, &sbytes); - - if (res < 0 && sbytes) - res = sbytes; - } + respipe_close (respipe [0]); + respipe [0] = old_readfd; + } -# endif +#ifdef _WIN32 + int arg = 1; + if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg) + || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg)) #else - res = -1; - errno = ENOSYS; -#endif - - if (res < 0 - && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK -#if __solaris - || errno == EAFNOSUPPORT || errno == EPROTOTYPE + if (fcntl (respipe [0], F_SETFL, O_NONBLOCK) + || fcntl (respipe [1], F_SETFL, O_NONBLOCK)) #endif - ) - ) - { - /* emulate sendfile. this is a major pain in the ass */ - char buf[4096]; - res = 0; - - while (count) - { - ssize_t cnt; - - cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); - - if (cnt <= 0) - { - if (cnt && !res) res = -1; - break; - } + croak ("unable to initialize result pipe(3)"); - cnt = write (ofd, buf, cnt); - - if (cnt <= 0) - { - if (cnt && !res) res = -1; - break; - } - - offset += cnt; - res += cnt; - count -= cnt; - } - } - - return res; + respipe_osf [0] = TO_SOCKET (respipe [0]); + respipe_osf [1] = TO_SOCKET (respipe [1]); } -/* read a full directory */ -static int -scandir_ (const char *path, void **namesp) -{ - DIR *dirp = opendir (path); - union - { - struct dirent d; - char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; - } u; - struct dirent *entp; - char *name, *names; - int memlen = 4096; - int memofs = 0; - int res = 0; - int errorno; - - if (!dirp) - return -1; - - names = malloc (memlen); +static void poll_wait (void) +{ + fd_set rfd; - for (;;) + while (eio_nreqs ()) { - errno = 0, readdir_r (dirp, &u.d, &entp); + int size; - if (!entp) - break; + X_LOCK (reslock); + size = res_queue.size; + X_UNLOCK (reslock); - name = entp->d_name; + if (size) + return; - if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) - { - int len = strlen (name) + 1; + maybe_start_thread (); - res++; + FD_ZERO (&rfd); + FD_SET (respipe [0], &rfd); - while (memofs + len > memlen) - { - memlen *= 2; - names = realloc (names, memlen); - if (!names) - break; - } - - memcpy (names + memofs, name, len); - memofs += len; - } + PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); } - - errorno = errno; - closedir (dirp); - - if (errorno) - { - free (names); - errno = errorno; - res = -1; - } - - *namesp = (void *)names; - return res; } -/*****************************************************************************/ - -static void * -aio_proc (void *thr_arg) +static int poll_cb (void) { - aio_req req; - int type; + int res; - do + do { - pthread_mutex_lock (&reqlock); - - for (;;) - { - req = reqs; - - if (reqs) - { - reqs = reqs->next; - if (!reqs) reqe = 0; - } + res = eio_poll (); - if (req) - break; - - pthread_cond_wait (&reqwait, &reqlock); - } - - pthread_mutex_unlock (&reqlock); - - errno = 0; /* strictly unnecessary */ - - if (!req->cancelled) - 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_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_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_QUIT: - break; - - default: - req->result = ENOSYS; - break; - } - - req->errorno = errno; - - pthread_mutex_lock (&reslock); - - req->next = 0; - - if (rese) - { - rese->next = req; - rese = req; - } - else - { - rese = ress = req; - - /* write a dummy byte to the pipe so fh becomes ready */ - write (respipe [1], &respipe, 1); - } - - pthread_mutex_unlock (&reslock); + if (res > 0) + croak (0); } - while (type != REQ_QUIT); - - return 0; -} + while (max_outstanding && max_outstanding <= eio_nreqs ()); -/*****************************************************************************/ - -static void atfork_prepare (void) -{ - pthread_mutex_lock (&reqlock); - pthread_mutex_lock (&reslock); -#if !HAVE_PREADWRITE - pthread_mutex_lock (&preadwritelock); -#endif -#if !HAVE_READDIR_R - pthread_mutex_lock (&readdirlock); -#endif -} - -static void atfork_parent (void) -{ -#if !HAVE_READDIR_R - pthread_mutex_unlock (&readdirlock); -#endif -#if !HAVE_PREADWRITE - pthread_mutex_unlock (&preadwritelock); -#endif - pthread_mutex_unlock (&reslock); - pthread_mutex_unlock (&reqlock); + return res; } static void atfork_child (void) { - aio_req prv; - - started = 0; - - while (reqs) - { - prv = reqs; - reqs = prv->next; - req_free (prv); - } - - reqs = reqe = 0; - - while (ress) - { - prv = ress; - ress = prv->next; - req_free (prv); - } - - ress = rese = 0; - - close (respipe [0]); - close (respipe [1]); - create_pipe (); - - atfork_parent (); + create_respipe (); } #define dREQ \ aio_req req; \ + int req_pri = next_pri; \ + next_pri = EIO_PRI_DEFAULT; \ \ if (SvOK (callback) && !SvROK (callback)) \ croak ("callback must be undef or of reference type"); \ \ - Newz (0, req, 1, aio_cb); \ + Newz (0, req, 1, eio_req); \ if (!req) \ - croak ("out of memory during aio_req allocation"); \ + croak ("out of memory during eio_req allocation"); \ \ - req->callback = newSVsv (callback) + req->callback = newSVsv (callback); \ + req->pri = req_pri #define REQ_SEND \ - req_send (req); \ + req_submit (req); \ \ if (GIMME_V != G_VOID) \ - XPUSHs (req_sv (req)); + XPUSHs (req_sv (req, AIO_REQ_KLASS)); MODULE = IO::AIO PACKAGE = IO::AIO @@ -856,90 +469,143 @@ BOOT: { - HV *stash = gv_stashpv ("IO::AIO", 1); + 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)); +#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); - create_pipe (); - pthread_atfork (atfork_prepare, atfork_parent, atfork_child); + X_COND_CHECK (reqwait); +#else + newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); +#endif + + create_respipe (); + + if (eio_init (want_poll, done_poll) < 0) + croak ("IO::AIO: unable to initialise eio library"); + + /* atfork child called in fifo order, so before eio's handler */ + X_THREAD_ATFORK (0, 0, atfork_child); } void -min_parallel (nthreads) - int nthreads +max_poll_reqs (int nreqs) + PROTOTYPE: $ + CODE: + eio_set_max_poll_reqs (nreqs); + +void +max_poll_time (double nseconds) PROTOTYPE: $ + CODE: + eio_set_max_poll_time (nseconds); void -max_parallel (nthreads) - int nthreads +min_parallel (int nthreads) PROTOTYPE: $ + CODE: + eio_set_min_parallel (nthreads); -int -max_outstanding (nreqs) - int nreqs - PROTOTYPE: $ +void +max_parallel (int nthreads) + PROTOTYPE: $ CODE: - RETVAL = max_outstanding; - max_outstanding = nreqs; + eio_set_max_parallel (nthreads); void -aio_open (pathname,flags,mode,callback=&PL_sv_undef) - SV * pathname - int flags - int mode - SV * callback +max_idle (int nthreads) + PROTOTYPE: $ + CODE: + eio_set_max_idle (nthreads); + +void +max_outstanding (int maxreqs) + PROTOTYPE: $ + CODE: + max_outstanding = maxreqs; + +void +aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) PROTOTYPE: $$$;$ PPCODE: { dREQ; - req->type = REQ_OPEN; - req->data = newSVsv (pathname); - req->dataptr = SvPVbyte_nolen (req->data); - req->fd = flags; - req->mode = mode; + req->type = EIO_OPEN; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->int1 = flags; + req->int2 = mode; REQ_SEND; } void -aio_close (fh,callback=&PL_sv_undef) - SV * fh - SV * callback +aio_fsync (SV *fh, SV *callback=&PL_sv_undef) PROTOTYPE: $;$ ALIAS: - aio_close = REQ_CLOSE - aio_fsync = REQ_FSYNC - aio_fdatasync = REQ_FDATASYNC + aio_fsync = EIO_FSYNC + aio_fdatasync = EIO_FDATASYNC PPCODE: { dREQ; req->type = ix; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->sv1 = newSVsv (fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + + REQ_SEND (req); +} + +void +aio_close (SV *fh, SV *callback=&PL_sv_undef) + PROTOTYPE: $;$ + PPCODE: +{ + static int close_pipe = -1; /* dummy fd to close fds via dup2 */ + dREQ; + + if (close_pipe < 0) + { + int pipefd [2]; + + if (pipe (pipefd) < 0 + || close (pipefd [1]) < 0 + || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) + abort (); /*D*/ + + close_pipe = pipefd [0]; + } + + req->type = EIO_DUP2; + req->int1 = close_pipe; + req->sv2 = newSVsv (fh); + req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); REQ_SEND (req); } void -aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) - SV * fh - UV offset - UV length - SV * data - UV dataoffset - SV * callback +aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) ALIAS: - aio_read = REQ_READ - aio_write = REQ_WRITE + aio_read = EIO_READ + aio_write = EIO_WRITE PROTOTYPE: $$$$$;$ PPCODE: { - aio_req req; STRLEN svlen; char *svptr = SvPVbyte (data, svlen); + UV len = SvUV (length); SvUPGRADE (data, SVt_PV); SvPOK_on (data); @@ -948,39 +614,40 @@ dataoffset += svlen; if (dataoffset < 0 || dataoffset > svlen) - croak ("data offset outside of string"); + croak ("dataoffset outside of data scalar"); - if (ix == REQ_WRITE) + if (ix == EIO_WRITE) { /* write: check length and adjust. */ - if (length < 0 || length + dataoffset > svlen) - length = svlen - dataoffset; + if (!SvOK (length) || len + dataoffset > svlen) + len = svlen - dataoffset; } else { /* read: grow scalar as necessary */ - svptr = SvGROW (data, length + dataoffset); + svptr = SvGROW (data, len + dataoffset + 1); } - if (length < 0) + if (len < 0) croak ("length must not be negative"); { 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->sv1 = newSVsv (fh); + req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) + : IoOFP (sv_2io (fh))); + req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; + req->size = len; + req->sv2 = SvREFCNT_inc (data); + req->ptr2 = (char *)svptr + dataoffset; + req->stroffset = dataoffset; if (!SvREADONLY (data)) { SvREADONLY_on (data); - req->data2ptr = (void *)data; + req->flags |= FLAG_SV2_RO_OFF; } REQ_SEND; @@ -988,165 +655,306 @@ } void -aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) - SV * out_fh - SV * in_fh - UV in_offset - UV length - SV * callback +aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) + PROTOTYPE: $$;$ + PPCODE: +{ + SV *data; + dREQ; + + req->type = EIO_READLINK; + req->sv1 = newSVsv (path); + req->ptr1 = SvPVbyte_nolen (req->sv1); + + REQ_SEND; +} + +void +aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) PROTOTYPE: $$$$;$ PPCODE: { 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->type = EIO_SENDFILE; + req->sv1 = 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 = SvVAL64 (in_offset); + req->size = length; REQ_SEND; } void -aio_readahead (fh,offset,length,callback=&PL_sv_undef) - SV * fh - UV offset - IV length - SV * callback +aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) PROTOTYPE: $$$;$ PPCODE: { dREQ; - req->type = REQ_READAHEAD; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - req->offset = offset; - req->length = length; + req->type = EIO_READAHEAD; + req->sv1 = newSVsv (fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->offs = SvVAL64 (offset); + req->size = length; REQ_SEND; } void -aio_stat (fh_or_path,callback=&PL_sv_undef) - SV * fh_or_path - SV * callback +aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) ALIAS: - aio_stat = REQ_STAT - aio_lstat = REQ_LSTAT + aio_stat = EIO_STAT + aio_lstat = EIO_LSTAT PPCODE: { dREQ; - New (0, req->statdata, 1, Stat_t); - if (!req->statdata) + req->sv1 = newSVsv (fh_or_path); + + if (SvPOK (req->sv1)) + { + req->type = ix; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else { - req_free (req); - croak ("out of memory during aio_req->statdata allocation"); + req->type = EIO_FSTAT; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } - if (SvPOK (fh_or_path)) + REQ_SEND; +} + +void +aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; + req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; + req->sv1 = newSVsv (fh_or_path); + + if (SvPOK (req->sv1)) + { + req->type = EIO_UTIME; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else + { + req->type = EIO_FUTIME; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + REQ_SEND; +} + +void +aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->sv1 = newSVsv (fh_or_path); + req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; + + if (SvPOK (req->sv1)) + { + req->type = EIO_TRUNCATE; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else + { + req->type = EIO_FTRUNCATE; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + REQ_SEND; +} + +void +aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) + ALIAS: + aio_chmod = EIO_CHMOD + aio_mkdir = EIO_MKDIR + PPCODE: +{ + dREQ; + + req->int2 = mode; + req->sv1 = newSVsv (fh_or_path); + + if (SvPOK (req->sv1)) { req->type = ix; - req->data = newSVsv (fh_or_path); - req->dataptr = SvPVbyte_nolen (req->data); + 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->type = EIO_FCHMOD; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } REQ_SEND; } void -aio_unlink (pathname,callback=&PL_sv_undef) - SV * pathname - SV * callback +aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->int2 = SvOK (uid) ? SvIV (uid) : -1; + req->int3 = SvOK (gid) ? SvIV (gid) : -1; + req->sv1 = newSVsv (fh_or_path); + + if (SvPOK (req->sv1)) + { + req->type = EIO_CHOWN; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else + { + req->type = EIO_FCHOWN; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + REQ_SEND; +} + +void +aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) ALIAS: - aio_unlink = REQ_UNLINK - aio_rmdir = REQ_RMDIR - aio_readdir = REQ_READDIR + aio_unlink = EIO_UNLINK + aio_rmdir = EIO_RMDIR + aio_readdir = EIO_READDIR PPCODE: { 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 +aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef) ALIAS: - aio_link = REQ_LINK - aio_symlink = REQ_SYMLINK - aio_rename = REQ_RENAME + aio_link = EIO_LINK + aio_symlink = EIO_SYMLINK + aio_rename = EIO_RENAME PPCODE: { 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->sv1 = newSVsv (oldpath); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->sv2 = newSVsv (newpath); + req->ptr2 = SvPVbyte_nolen (req->sv2); REQ_SEND; } -#if 0 +void +aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_MKNOD; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->int2 = (mode_t)mode; + req->offs = dev; + + REQ_SEND; +} -# undocumented, because it does not cancel active requests void -cancel_most_requests () - PROTOTYPE: - CODE: +aio_busy (double delay, SV *callback=&PL_sv_undef) + PPCODE: { - aio_req *req; + dREQ; + + req->type = EIO_BUSY; + req->nv1 = delay < 0. ? 0. : delay; - pthread_mutex_lock (&reqlock); - for (req = reqs; req; req = req->next) - req->flags |= 1; - pthread_mutex_unlock (&reqlock); - - pthread_mutex_lock (&reslock); - for (req = ress; req; req = req->next) - req->flags |= 1; - pthread_mutex_unlock (&reslock); + REQ_SEND; } -#endif +void +aio_group (SV *callback=&PL_sv_undef) + PROTOTYPE: ;$ + PPCODE: +{ + dREQ; + + req->type = EIO_GROUP; + + eio_submit (req); + XPUSHs (req_sv (req, AIO_GRP_KLASS)); +} + +void +aio_nop (SV *callback=&PL_sv_undef) + ALIAS: + aio_nop = EIO_NOP + aio_sync = EIO_SYNC + PPCODE: +{ + dREQ; + + req->type = ix; + + REQ_SEND; +} + +int +aioreq_pri (int pri = 0) + PROTOTYPE: ;$ + CODE: + RETVAL = next_pri; + if (items > 0) + { + if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; + if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; + next_pri = pri; + } + OUTPUT: + RETVAL + +void +aioreq_nice (int nice = 0) + CODE: + nice = next_pri - nice; + if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; + if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; + next_pri = nice; void flush () PROTOTYPE: CODE: - while (nreqs) + while (eio_nreqs ()) { poll_wait (); poll_cb (); } -void +int poll() PROTOTYPE: CODE: - if (nreqs) - { - poll_wait (); - poll_cb (); - } + poll_wait (); + RETVAL = poll_cb (); + OUTPUT: + RETVAL int poll_fileno() @@ -1168,22 +976,130 @@ poll_wait() PROTOTYPE: CODE: - if (nreqs) - poll_wait (); + poll_wait (); int nreqs() PROTOTYPE: CODE: - RETVAL = nreqs; + RETVAL = eio_nreqs (); + OUTPUT: + RETVAL + +int +nready() + PROTOTYPE: + CODE: + RETVAL = eio_nready (); + OUTPUT: + RETVAL + +int +npending() + PROTOTYPE: + CODE: + RETVAL = eio_npending (); + OUTPUT: + RETVAL + +int +nthreads() + PROTOTYPE: + CODE: + if (WORDACCESS_UNSAFE) X_LOCK (wrklock); + RETVAL = started; + if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); OUTPUT: RETVAL -MODULE = IO::AIO PACKAGE = IO::AIO::CB +void _on_next_submit (SV *cb) + CODE: + SvREFCNT_dec (on_next_submit); + on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; + +PROTOTYPES: DISABLE + +MODULE = IO::AIO PACKAGE = IO::AIO::REQ void cancel (aio_req_ornot req) - PROTOTYPE: CODE: - req->cancelled = 1; + eio_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; + + if (grp->int1 == 2) + croak ("cannot add requests to IO::AIO::GRP after the group finished"); + + for (i = 1; i < items; ++i ) + { + aio_req req; + + if (GIMME_V != G_VOID) + XPUSHs (sv_2mortal (newSVsv (ST (i)))); + + req = SvAIO_REQ (ST (i)); + + if (req) + eio_grp_add (grp, req); + } +} + +void +cancel_subs (aio_req_ornot req) + CODE: + req_cancel_subs (req); + +void +result (aio_req grp, ...) + CODE: +{ + int i; + AV *av; + + grp->errorno = errno; + + av = newAV (); + + for (i = 1; i < items; ++i ) + av_push (av, newSVsv (ST (i))); + + SvREFCNT_dec (grp->sv1); + grp->sv1 = (SV *)av; +} + +void +errno (aio_req grp, int errorno = errno) + CODE: + grp->errorno = errorno; + +void +limit (aio_req grp, int limit) + CODE: + eio_grp_limit (grp, limit); + +void +feed (aio_req grp, SV *callback=&PL_sv_undef) + CODE: +{ + SvREFCNT_dec (grp->sv2); + grp->sv2 = newSVsv (callback); + + if (grp->int2 <= 0) + grp->int2 = 2; + + eio_grp_limit (grp, grp->int2); +}