--- IO-AIO/AIO.xs 2005/07/31 18:45:48 1.17 +++ IO-AIO/AIO.xs 2008/05/10 18:06:41 1.115 @@ -1,513 +1,581 @@ +#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 +#ifdef _WIN32 -typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ -typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ -typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ +# 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 4096 + +# include +# include +# include +# include +# include +# define EIO_STRUCT_DIRENT struct dirent + #endif +#define EIO_STRUCT_STAT Stat_t + +/* use NV for 32 bit perls as it allows larger offsets */ +#if IVSIZE >= 8 +# define SvVAL64 SvIV +#else +# define SvVAL64 SvNV +#endif + +static HV *stash; +typedef SV SV8; /* byte-sv, used for argument-checking */ + +#define AIO_REQ_KLASS "IO::AIO::REQ" +#define AIO_GRP_KLASS "IO::AIO::GRP" + +#define EIO_COMMON \ + 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) + enum { - REQ_QUIT, - REQ_OPEN, REQ_CLOSE, - REQ_READ, REQ_WRITE, REQ_READAHEAD, - REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, - REQ_FSYNC, REQ_FDATASYNC, + FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ }; -typedef struct aio_cb { - struct aio_cb *volatile next; +#include "libeio/eio.c" - int type; +typedef eio_req *aio_req; +typedef eio_req *aio_req_ornot; - int fd; - off_t offset; - size_t length; - ssize_t result; - mode_t mode; /* open */ - int errorno; - SV *data, *callback, *fh; - void *dataptr; - STRLEN dataoffset; - - Stat_t *statdata; -} aio_cb; - -typedef aio_cb *aio_req; - -static int started; -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; +static unsigned int max_outstanding = 0x7fffffff; -static volatile aio_req reqs, reqe; /* queue start, queue end */ -static volatile aio_req ress, rese; /* queue start, queue end */ +static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; -static void -poll_wait () +static int respipe_osf [2], respipe [2] = { -1, -1 }; + +static void req_destroy (aio_req req); +static void req_cancel (aio_req req); + +static void want_poll (void) { - if (nreqs && !ress) - { - fd_set rfd; - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); + /* write a dummy byte to the pipe so fh becomes ready */ + respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); +} - select (respipe [0] + 1, &rfd, 0, 0, 0); - } +static void done_poll (void) +{ + /* read any signals sent by the worker threads */ + char buf [4]; + while (respipe_read (respipe [0], buf, 4) == 4) + ; } -static int -poll_cb () +/* must be called at most once */ +static SV *req_sv (aio_req req, const char *klass) { - dSP; - int count = 0; - aio_req req, prv; + if (!req->self) + { + req->self = (SV *)newHV (); + sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); + } + + return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); +} - pthread_mutex_lock (&reslock); +static aio_req SvAIO_REQ (SV *sv) +{ + MAGIC *mg; - { - /* read any signals sent by the worker threads */ - char buf [32]; - while (read (respipe [0], buf, 32) > 0) - ; - } + if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) + croak ("object of class " AIO_REQ_KLASS " expected"); - req = ress; - ress = rese = 0; + mg = mg_find (SvRV (sv), PERL_MAGIC_ext); - pthread_mutex_unlock (&reslock); + return mg ? (aio_req)mg->mg_ptr : 0; +} - while (req) +static void aio_grp_feed (aio_req grp) +{ + if (grp->sv2 && SvOK (grp->sv2)) { - nreqs--; + dSP; - if (req->type == REQ_QUIT) - started--; - else - { - int errorno = errno; - errno = req->errorno; + 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; + } +} - if (req->type == REQ_READ) - SvCUR_set (req->data, req->dataoffset - + req->result > 0 ? req->result : 0); +static int req_invoke (eio_req *req) +{ + dSP; - if (req->data) - SvREFCNT_dec (req->data); + if (req->flags & FLAG_SV2_RO_OFF) + SvREADONLY_off (req->sv2); - if (req->fh) - SvREFCNT_dec (req->fh); + if (!EIO_CANCELLED (req) && SvOK (req->callback)) + { + ENTER; + SAVETMPS; + PUSHMARK (SP); + EXTEND (SP, 1); - if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) + switch (req->type) + { + case EIO_READDIR: { - PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; - PL_laststatval = req->result; - PL_statcache = *(req->statdata); + SV *rv = &PL_sv_undef; - Safefree (req->statdata); - } + if (req->result >= 0) + { + int i; + char *buf = req->ptr2; + AV *av = newAV (); - ENTER; - PUSHMARK (SP); - XPUSHs (sv_2mortal (newSViv (req->result))); + av_extend (av, req->result - 1); - if (req->type == REQ_OPEN) - { - /* convert fd to fh */ - SV *fh; + for (i = 0; i < req->result; ++i) + { + SV *sv = newSVpv (buf, 0); - PUTBACK; - call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); - SPAGAIN; + av_store (av, i, sv); + buf += SvCUR (sv) + 1; + } - fh = SvREFCNT_inc (POPs); + rv = sv_2mortal (newRV_noinc ((SV *)av)); + } - PUSHMARK (SP); - XPUSHs (sv_2mortal (fh)); + PUSHs (rv); } + break; - if (SvOK (req->callback)) + case EIO_OPEN: { - PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); - SPAGAIN; - } - - LEAVE; - - if (req->callback) - SvREFCNT_dec (req->callback); + /* convert fd to fh */ + SV *fh = &PL_sv_undef; - errno = errorno; - count++; - } + if (req->result >= 0) + { + 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 + ); + + if (do_open (gv, sym, symlen, 0, 0, 0, 0)) + fh = (SV *)gv; + } - prv = req; - req = req->next; - Safefree (prv); + PUSHs (fh); + } + break; - /* TODO: croak on errors? */ - } + case EIO_GROUP: + req->int1 = 2; /* mark group as finished */ - 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) + { + SvCUR_set (req->sv2, req->result); + *SvEND (req->sv2) = 0; + PUSHs (req->sv2); + } + 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); -} + default: + PUSHs (sv_2mortal (newSViv (req->result))); + break; + } -static void -send_req (aio_req req) -{ - 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); + return !!SvTRUE (ERRSV); +} - while (nreqs > max_outstanding) +static void req_destroy (aio_req req) +{ + if (req->self) { - poll_wait (); - poll_cb (); + sv_unmagic (req->self, PERL_MAGIC_ext); + SvREFCNT_dec (req->self); } -} -static void -end_thread (void) -{ - aio_req req; - New (0, req, 1, aio_cb); - req->type = REQ_QUIT; + SvREFCNT_dec (req->sv1); + SvREFCNT_dec (req->sv2); + SvREFCNT_dec (req->callback); - send_req (req); + Safefree (req); } -/* 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 iolock = PTHREAD_MUTEX_INITIALIZER; - -static ssize_t -pread (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 (&iolock); - ooffset = lseek (fd, 0, SEEK_CUR); - lseek (fd, offset, SEEK_SET); - res = read (fd, buf, count); - lseek (fd, ooffset, SEEK_SET); - pthread_mutex_unlock (&iolock); + if (grp->type != EIO_GROUP) + return; - return res; -} + SvREFCNT_dec (grp->sv2); + grp->sv2 = 0; -static ssize_t -pwrite (int fd, void *buf, size_t count, off_t offset) -{ - ssize_t res; - off_t ooffset; - - pthread_mutex_lock (&iolock); - ooffset = lseek (fd, 0, SEEK_CUR); - lseek (fd, offset, SEEK_SET); - res = write (fd, buf, count); - lseek (fd, offset, SEEK_SET); - pthread_mutex_unlock (&iolock); - - return res; + 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 char readahead_buf[4096]; - -static ssize_t -readahead (int fd, off_t offset, size_t count) +static void +create_respipe (void) { - while (count > 0) - { - size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); + int old_readfd = respipe [0]; - pread (fd, readahead_buf, len, offset); - offset += len; - count -= len; - } + if (respipe [1] >= 0) + respipe_close (TO_SOCKET (respipe [1])); - errno = 0; -} +#ifdef _WIN32 + if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe)) +#else + if (pipe (respipe)) #endif + croak ("unable to initialize result pipe"); -static void * -aio_proc (void *thr_arg) -{ - aio_req req; - int type; - - do + if (old_readfd >= 0) { - pthread_mutex_lock (&reqlock); + if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0) + croak ("unable to initialize result pipe(2)"); - for (;;) - { - req = reqs; - - if (reqs) - { - reqs = reqs->next; - if (!reqs) reqe = 0; - } - - if (req) - break; - - pthread_cond_wait (&reqwait, &reqlock); - } - - pthread_mutex_unlock (&reqlock); - - errno = 0; /* strictly unnecessary */ - - 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; + respipe_close (respipe [0]); + respipe [0] = old_readfd; + } - case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; +#ifdef _WIN32 + int arg = 1; + if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg) + || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg)) +#else + if (fcntl (respipe [0], F_SETFL, O_NONBLOCK) + || fcntl (respipe [1], F_SETFL, O_NONBLOCK)) +#endif + croak ("unable to initialize result pipe(3)"); - 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; + respipe_osf [0] = TO_SOCKET (respipe [0]); + respipe_osf [1] = TO_SOCKET (respipe [1]); +} - 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; +static void poll_wait (void) +{ + fd_set rfd; - case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; - case REQ_FSYNC: req->result = fsync (req->fd); break; + while (eio_nreqs ()) + { + int size; - case REQ_QUIT: - break; + X_LOCK (reslock); + size = res_queue.size; + X_UNLOCK (reslock); - default: - req->result = ENOSYS; - break; - } + if (size) + return; - req->errorno = errno; + maybe_start_thread (); - pthread_mutex_lock (&reslock); + FD_ZERO (&rfd); + FD_SET (respipe [0], &rfd); - req->next = 0; - - if (rese) - { - rese->next = req; - rese = req; - } - else - { - rese = ress = req; + PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); + } +} - /* write a dummy byte to the pipe so fh becomes ready */ - write (respipe [1], &respipe, 1); - } +static int poll_cb (void) +{ + int res = eio_poll (); - pthread_mutex_unlock (&reslock); - } - while (type != REQ_QUIT); + if (res > 0) + croak (0); - return 0; + return res; } +#define dREQ \ + aio_req req; \ + int req_pri = next_pri; \ + next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ + \ + if (SvOK (callback) && !SvROK (callback)) \ + croak ("callback must be undef or of reference type"); \ + \ + Newz (0, req, 1, eio_req); \ + if (!req) \ + croak ("out of memory during eio_req allocation"); \ + \ + req->callback = newSVsv (callback); \ + req->pri = req_pri + +#define REQ_SEND \ + eio_submit (req); \ + \ + if (GIMME_V != G_VOID) \ + XPUSHs (req_sv (req, AIO_REQ_KLASS)); + MODULE = IO::AIO PACKAGE = IO::AIO PROTOTYPES: ENABLE BOOT: { - if (pipe (respipe)) - croak ("unable to initialize result pipe"); + stash = gv_stashpv ("IO::AIO", 1); - if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) - croak ("cannot set result pipe to nonblocking mode"); + 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); - if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) - croak ("cannot set result pipe to nonblocking mode"); + 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"); } void -min_parallel(nthreads) - int nthreads +max_poll_reqs (int nreqs) PROTOTYPE: $ CODE: - while (nthreads > started) - start_thread (); + eio_set_max_poll_reqs (nreqs); void -max_parallel(nthreads) - int nthreads +max_poll_time (double nseconds) PROTOTYPE: $ CODE: -{ - int cur = started; - while (cur > nthreads) - { - end_thread (); - cur--; - } + eio_set_max_poll_time (nseconds); - while (started > nthreads) - { - poll_wait (); - poll_cb (); - } -} +void +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: + eio_set_max_parallel (nthreads); + +void +max_idle (int nthreads) + PROTOTYPE: $ CODE: - RETVAL = max_outstanding; - max_outstanding = nreqs; + eio_set_max_idle (nthreads); void -aio_open(pathname,flags,mode,callback=&PL_sv_undef) - SV * pathname - int flags - int mode - SV * callback +max_outstanding (int maxreqs) + PROTOTYPE: $ + CODE: + max_outstanding = maxreqs; + +void +aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) PROTOTYPE: $$$;$ - CODE: + PPCODE: { - aio_req req; + dREQ; - Newz (0, req, 1, aio_cb); + req->type = EIO_OPEN; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->int1 = flags; + req->int2 = mode; - if (!req) - croak ("out of memory during aio_req allocation"); + REQ_SEND; +} - req->type = REQ_OPEN; - req->data = newSVsv (pathname); - req->dataptr = SvPV_nolen (req->data); - req->fd = flags; - req->mode = mode; - req->callback = SvREFCNT_inc (callback); +void +aio_fsync (SV *fh, SV *callback=&PL_sv_undef) + PROTOTYPE: $;$ + ALIAS: + aio_fsync = EIO_FSYNC + aio_fdatasync = EIO_FDATASYNC + PPCODE: +{ + dREQ; - send_req (req); + req->type = ix; + req->sv1 = newSVsv (fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + + REQ_SEND (req); } void -aio_close(fh,callback=&PL_sv_undef) - SV * fh - SV * callback +aio_close (SV *fh, SV *callback=&PL_sv_undef) PROTOTYPE: $;$ - ALIAS: - aio_close = REQ_CLOSE - aio_fsync = REQ_FSYNC - aio_fdatasync = REQ_FDATASYNC - CODE: + PPCODE: { - aio_req req; + static int close_pipe = -1; /* dummy fd to close fds via dup2 */ + dREQ; - Newz (0, req, 1, aio_cb); + if (close_pipe < 0) + { + int pipefd [2]; - if (!req) - croak ("out of memory during aio_req allocation"); + if (pipe (pipefd) < 0 + || close (pipefd [1]) < 0 + || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) + abort (); /*D*/ - req->type = ix; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - req->callback = SvREFCNT_inc (callback); + close_pipe = pipefd [0]; + } - send_req (req); + 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 - IV length - SV * data - IV 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: $$$$$;$ - CODE: + PPCODE: { - aio_req req; STRLEN svlen; - char *svptr = SvPV (data, svlen); + char *svptr = SvPVbyte (data, svlen); + UV len = SvUV (length); SvUPGRADE (data, SVt_PV); SvPOK_on (data); @@ -516,132 +584,340 @@ 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"); - Newz (0, req, 1, aio_cb); + { + dREQ; - if (!req) - croak ("out of memory during aio_req allocation"); + req->type = ix; + 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; - 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->callback = SvREFCNT_inc (callback); - - send_req (req); + if (!SvREADONLY (data)) + { + SvREADONLY_on (data); + req->flags |= FLAG_SV2_RO_OFF; + } + + REQ_SEND; + } } void -aio_readahead(fh,offset,length,callback=&PL_sv_undef) - SV * fh - UV offset - IV length - SV * callback - PROTOTYPE: $$$;$ - CODE: +aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) + PROTOTYPE: $$;$ + PPCODE: { - aio_req req; + SV *data; + dREQ; - if (length < 0) - croak ("length must not be negative"); + data = newSV (NAME_MAX); + SvPOK_on (data); + + req->type = EIO_READLINK; + req->sv1 = newSVsv (path); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->sv2 = data; + req->ptr2 = SvPVbyte_nolen (data); + + REQ_SEND; +} - Newz (0, req, 1, aio_cb); +void +aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) + PROTOTYPE: $$$$;$ + PPCODE: +{ + dREQ; - if (!req) - croak ("out of memory during aio_req allocation"); + 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->type = REQ_READAHEAD; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - req->offset = offset; - req->length = length; - req->callback = SvREFCNT_inc (callback); + REQ_SEND; +} - send_req (req); +void +aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) + PROTOTYPE: $$$;$ + PPCODE: +{ + dREQ; + + 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 - CODE: + aio_stat = EIO_STAT + aio_lstat = EIO_LSTAT + PPCODE: { - aio_req req; + dREQ; + + req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT)); + if (!req->ptr2) + { + req_destroy (req); + croak ("out of memory during aio_stat statdata allocation"); + } - Newz (0, req, 1, aio_cb); + req->flags |= EIO_FLAG_PTR2_FREE; + req->sv1 = newSVsv (fh_or_path); - if (!req) - croak ("out of memory during aio_req allocation"); + if (SvPOK (fh_or_path)) + { + req->type = ix; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else + { + req->type = EIO_FSTAT; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } - New (0, req->statdata, 1, Stat_t); + REQ_SEND; +} - if (!req->statdata) - croak ("out of memory during aio_req->statdata allocation"); +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 (fh_or_path)) { - req->type = ix; - req->data = newSVsv (fh_or_path); - req->dataptr = SvPV_nolen (req->data); + req->type = EIO_UTIME; + 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_FUTIME; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } - req->callback = SvREFCNT_inc (callback); + REQ_SEND; +} + +void +aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; - send_req (req); + req->sv1 = newSVsv (fh_or_path); + req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; + + if (SvPOK (fh_or_path)) + { + 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_unlink(pathname,callback=&PL_sv_undef) - SV * pathname - SV * callback - CODE: +aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) + ALIAS: + aio_chmod = EIO_CHMOD + aio_fchmod = EIO_FCHMOD + aio_mkdir = EIO_MKDIR + PPCODE: +{ + dREQ; + + req->type = ix; + req->int2 = mode; + req->sv1 = newSVsv (fh_or_path); + + if (ix == EIO_FCHMOD) + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + else + req->ptr1 = SvPVbyte_nolen (req->sv1); + + REQ_SEND; +} + +void +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 (fh_or_path)) + { + 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 = EIO_UNLINK + aio_rmdir = EIO_RMDIR + aio_readdir = EIO_READDIR + PPCODE: { - aio_req req; + dREQ; - Newz (0, req, 1, aio_cb); + req->type = ix; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + + REQ_SEND; +} + +void +aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef) + ALIAS: + aio_link = EIO_LINK + aio_symlink = EIO_SYMLINK + aio_rename = EIO_RENAME + PPCODE: +{ + dREQ; - if (!req) - croak ("out of memory during aio_req allocation"); + req->type = ix; + req->sv1 = newSVsv (oldpath); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->sv2 = newSVsv (newpath); + req->ptr2 = SvPVbyte_nolen (req->sv2); - req->type = REQ_UNLINK; - req->data = newSVsv (pathname); - req->dataptr = SvPV_nolen (req->data); - req->callback = SvREFCNT_inc (callback); + REQ_SEND; +} + +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; - send_req (req); + REQ_SEND; +} + +void +aio_busy (double delay, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_BUSY; + req->nv1 = delay < 0. ? 0. : delay; + + REQ_SEND; +} + +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 - EIO_PRI_BIAS; + if (items > 0) + { + if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; + if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; + next_pri = pri + EIO_PRI_BIAS; + } + OUTPUT: + RETVAL + void -flush() +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 + EIO_PRI_BIAS; + +void +flush () PROTOTYPE: CODE: while (nreqs) @@ -650,15 +926,14 @@ poll_cb (); } -void +int poll() PROTOTYPE: CODE: - if (nreqs) - { - poll_wait (); - poll_cb (); - } + poll_wait (); + RETVAL = poll_cb (); + OUTPUT: + RETVAL int poll_fileno() @@ -680,14 +955,125 @@ 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 + +PROTOTYPES: DISABLE + +MODULE = IO::AIO PACKAGE = IO::AIO::REQ + +void +cancel (aio_req_ornot req) + CODE: + 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); +} +