--- IO-AIO/AIO.xs 2006/10/23 00:47:29 1.55 +++ IO-AIO/AIO.xs 2010/05/04 21:14:01 1.164 @@ -1,113 +1,249 @@ -#define _REENTRANT 1 +#include "libeio/xthread.h" + #include #include "EXTERN.h" #include "perl.h" #include "XSUB.h" -#include "autoconf/config.h" - -#include +#include "schmorp.h" #include +#include #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 +#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES +# include #endif -/* used for struct dirent, AIX doesn't provide it */ -#ifndef NAME_MAX -# define NAME_MAX 4096 +/* perl namespace pollution */ +#undef VERSION + +#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) + +#else + +# include +# include +# include +# include +# include +# define EIO_STRUCT_DIRENT struct dirent + #endif -#if __ia64 -# define STACKSIZE 65536 +/* perl stupidly overrides readdir and maybe others */ +/* with thread-unsafe versions, imagine that :( */ +#undef readdir +#undef opendir +#undef closedir + +#define EIO_STRUCT_STAT Stat_t + +/* use NV for 32 bit perls as it allows larger offsets */ +#if IVSIZE >= 8 +# define VAL64 IV +# define SvVAL64 SvIV +# define newSVval64 newSViv #else -# define STACKSIZE 8192 +# define VAL64 NV +# define SvVAL64 SvNV +# define newSVval64 newSVnv #endif +/*****************************************************************************/ + +#if __GNUC__ >= 3 +# define expect(expr,value) __builtin_expect ((expr),(value)) +#else +# define expect(expr,value) (expr) +#endif + +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) + +/*****************************************************************************/ + +typedef SV SV8; /* byte-sv, used for argument-checking */ +typedef int aio_rfd; /* read file desriptor */ +typedef int aio_wfd; /* write file descriptor */ + +static HV *aio_stash, *aio_req_stash, *aio_grp_stash; + +#define EIO_REQ_MEMBERS \ + SV *callback; \ + SV *sv1, *sv2; \ + STRLEN stroffset; \ + SV *self; + +#define EIO_NO_WRAPPERS 1 + +#include "libeio/eio.h" + +#ifndef POSIX_FADV_NORMAL +# define POSIX_FADV_NORMAL 0 +# define NO_FADVISE 1 +#endif +#ifndef POSIX_FADV_SEQUENTIAL +# define POSIX_FADV_SEQUENTIAL 0 +#endif +#ifndef POSIX_FADV_RANDOM +# define POSIX_FADV_RANDOM 0 +#endif +#ifndef POSIX_FADV_NOREUSE +# define POSIX_FADV_NOREUSE 0 +#endif +#ifndef POSIX_FADV_WILLNEED +# define POSIX_FADV_WILLNEED 0 +#endif +#ifndef POSIX_FADV_DONTNEED +# define POSIX_FADV_DONTNEED 0 +#endif + +#ifndef ST_NODEV +# define ST_NODEV 0 +#endif +#ifndef ST_NOEXEC +# define ST_NOEXEC 0 +#endif +#ifndef ST_SYNCHRONOUS +# define ST_SYNCHRONOUS 0 +#endif +#ifndef ST_MANDLOCK +# define ST_MANDLOCK 0 +#endif +#ifndef ST_WRITE +# define ST_WRITE 0 +#endif +#ifndef ST_APPEND +# define ST_APPEND 0 +#endif +#ifndef ST_IMMUTABLE +# define ST_IMMUTABLE 0 +#endif +#ifndef ST_NOATIME +# define ST_NOATIME 0 +#endif +#ifndef ST_NODIRATIME +# define ST_NODIRATIME 0 +#endif +#ifndef ST_RELATIME +# define ST_RELATIME 0 +#endif + +#ifndef MCL_CURRENT +# define MCL_CURRENT 0 +#endif +#ifndef MCL_FUTURE +# define MCL_FUTURE 0 +#endif + +#ifndef MAP_ANONYMOUS +# ifdef MAP_ANON +# define MAP_ANONYMOUS MAP_ANON +# else +# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */ +# endif +#endif +#ifndef MAP_HUGETLB +# define MAP_HUGETLB 0 +#endif +#ifndef MAP_LOCKED +# define MAP_LOCKED 0 +#endif +#ifndef MAP_NORESERVE +# define MAP_NORESERVE 0 +#endif +#ifndef MAP_POPULATE +# define MAP_POPULATE 0 +#endif +#ifndef MAP_NONBLOCK +# define MAP_NONBLOCK 0 +#endif + +#ifndef PAGESIZE +# define PAGESIZE sysconf (_SC_PAGESIZE) +#endif + +static int req_invoke (eio_req *req); +#define EIO_FINISH(req) req_invoke (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_SENDFILE, - REQ_STAT, REQ_LSTAT, REQ_FSTAT, - REQ_FSYNC, REQ_FDATASYNC, - REQ_UNLINK, REQ_RMDIR, REQ_RENAME, - REQ_READDIR, - REQ_LINK, REQ_SYMLINK, - REQ_GROUP, REQ_NOP, - REQ_SLEEP, + FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ }; -#define AIO_REQ_KLASS "IO::AIO::REQ" -#define AIO_GRP_KLASS "IO::AIO::GRP" +#include "libeio/eio.c" -typedef struct aio_cb -{ - struct aio_cb *volatile next; +typedef eio_req *aio_req; +typedef eio_req *aio_req_ornot; - struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; +static SV *on_next_submit; +static int next_pri = EIO_PRI_DEFAULT; +static int max_outstanding; - SV *self; /* the perl counterpart of this request, if any */ - - SV *data, *callback; - SV *fh, *fh2; - void *dataptr, *data2ptr; - Stat_t *statdata; - off_t offset; - size_t length; - ssize_t result; - - int type; - int fd, fd2; - int errorno; - STRLEN dataoffset; - mode_t mode; /* open */ - unsigned char cancelled; -} aio_cb; - -typedef aio_cb *aio_req; -typedef aio_cb *aio_req_ornot; - -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; +static s_epipe respipe; -static volatile aio_req reqs, reqe; /* queue start, queue end */ -static volatile aio_req ress, rese; /* queue start, queue end */ +static void req_destroy (aio_req req); +static void req_cancel (aio_req req); -static void req_invoke (aio_req req); -static void req_free (aio_req req); +static void want_poll (void) +{ + /* write a dummy byte to the pipe so fh becomes ready */ + s_epipe_signal (&respipe); +} + +static void done_poll (void) +{ + /* read any signals sent by the worker threads */ + s_epipe_drain (&respipe); +} /* must be called at most once */ -static SV *req_sv (aio_req req, const char *klass) +static SV *req_sv (aio_req req, HV *stash) { if (!req->self) { @@ -115,15 +251,18 @@ sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); } - return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); + return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); } static aio_req SvAIO_REQ (SV *sv) { MAGIC *mg; - if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) - croak ("object of class " AIO_REQ_KLASS " expected"); + if (!SvROK (sv) + || (SvSTASH (SvRV (sv)) != aio_grp_stash + && SvSTASH (SvRV (sv)) != aio_req_stash + && !sv_derived_from (sv, "IO::AIO::REQ"))) + croak ("object of class IO::AIO::REQ expected"); mg = mg_find (SvRV (sv), PERL_MAGIC_ext); @@ -132,939 +271,656 @@ static void aio_grp_feed (aio_req grp) { - while (grp->length < grp->fd2) + if (grp->sv2 && SvOK (grp->sv2)) { - int old_len = grp->length; - - if (grp->fh2 && SvOK (grp->fh2)) - { - dSP; + dSP; - ENTER; - SAVETMPS; - PUSHMARK (SP); - XPUSHs (req_sv (grp, AIO_GRP_KLASS)); - PUTBACK; - call_sv (grp->fh2, G_VOID | G_EVAL); - SPAGAIN; - FREETMPS; - LEAVE; - } - - /* stop if no progress has been made */ - if (old_len == grp->length) - { - SvREFCNT_dec (grp->fh2); - grp->fh2 = 0; - break; - } + ENTER; + SAVETMPS; + PUSHMARK (SP); + XPUSHs (req_sv (grp, aio_grp_stash)); + PUTBACK; + call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); + SPAGAIN; + FREETMPS; + LEAVE; } } -static void aio_grp_dec (aio_req grp) +static void req_submit (eio_req *req) { - --grp->length; - - /* call feeder, if applicable */ - aio_grp_feed (grp); + eio_submit (req); - /* finish, if done */ - if (!grp->length && grp->fd) + if (expect_false (on_next_submit)) { - req_invoke (grp); - req_free (grp); - } -} + dSP; + SV *cb = sv_2mortal (on_next_submit); -static void poll_wait () -{ - if (nreqs && !ress) - { - fd_set rfd; - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); + on_next_submit = 0; - select (respipe [0] + 1, &rfd, 0, 0, 0); + PUSHMARK (SP); + PUTBACK; + call_sv (cb, G_DISCARD | G_EVAL); } } -static void req_invoke (aio_req req) +static int req_invoke (eio_req *req) { dSP; - int errorno = errno; - if (req->cancelled || !SvOK (req->callback)) - return; - - errno = req->errorno; - - ENTER; - SAVETMPS; - PUSHMARK (SP); - EXTEND (SP, 1); + if (req->flags & FLAG_SV2_RO_OFF) + SvREADONLY_off (req->sv2); - switch (req->type) + if (!EIO_CANCELLED (req) && req->callback) { - case REQ_READDIR: - { - SV *rv = &PL_sv_undef; + ENTER; + SAVETMPS; + PUSHMARK (SP); + EXTEND (SP, 1); - if (req->result >= 0) + switch (req->type) + { + case EIO_READDIR: { - char *buf = req->data2ptr; - AV *av = newAV (); + SV *rv = &PL_sv_undef; - while (req->result) + if (req->result >= 0) { - SV *sv = newSVpv (buf, 0); + int i; + char *names = (char *)req->ptr2; + eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */ + AV *av = newAV (); + + av_extend (av, req->result - 1); + + for (i = 0; i < req->result; ++i) + { + if (req->int1 & EIO_READDIR_DENTS) + { + SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen); + + if (req->int1 & EIO_READDIR_CUSTOM2) + { + static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */ + AV *avent = newAV (); + + av_extend (avent, 2); + + if (!sv_type [ent->type]) + { + sv_type [ent->type] = newSViv (ent->type); + SvREADONLY_on (sv_type [ent->type]); + } + + av_store (avent, 0, namesv); + av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type])); + av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode)); + + av_store (av, i, newRV_noinc ((SV *)avent)); + } + else + av_store (av, i, namesv); + + ++ent; + } + else + { + SV *name = newSVpv (names, 0); + av_store (av, i, name); + names += SvCUR (name) + 1; + } + } - av_push (av, sv); - buf += SvCUR (sv) + 1; - req->result--; + rv = sv_2mortal (newRV_noinc ((SV *)av)); } - rv = sv_2mortal (newRV_noinc ((SV *)av)); - } - - PUSHs (rv); - } - break; - - case REQ_OPEN: - { - /* convert fd to fh */ - SV *fh; - - PUSHs (sv_2mortal (newSViv (req->result))); - PUTBACK; - call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); - SPAGAIN; - - fh = SvREFCNT_inc (POPs); - - 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; + PUSHs (rv); - case REQ_NOP: - case REQ_SLEEP: - break; - - default: - PUSHs (sv_2mortal (newSViv (req->result))); - break; - } - - - PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); - SPAGAIN; - - FREETMPS; - LEAVE; - - errno = errorno; - - if (SvTRUE (ERRSV)) - { - req_free (req); - croak (0); - } -} - -static void req_free (aio_req req) -{ - 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 (grp->grp_first == req) - grp->grp_first = req->grp_next; - - aio_grp_dec (grp); - } - - 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->int1 & EIO_READDIR_CUSTOM1) + XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2)))); + } + break; - if (req->type == REQ_READDIR && req->result >= 0) - free (req->data2ptr); + case EIO_OPEN: + { + /* convert fd to fh */ + SV *fh = &PL_sv_undef; - Safefree (req); -} + 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", (int)req->result); + gv_init (gv, aio_stash, sym, symlen, 0); + + symlen = snprintf ( + sym, + sizeof (sym), + "%s&=%d", + flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", + (int)req->result + ); -static void req_cancel (aio_req req) -{ - req->cancelled = 1; + if (do_open (gv, sym, symlen, 0, 0, 0, 0)) + fh = (SV *)gv; + } - if (req->type == REQ_GROUP) - { - aio_req sub; + PUSHs (fh); + } + break; - for (sub = req->grp_first; sub; sub = sub->grp_next) - req_cancel (sub); - } -} + case EIO_STATVFS: + case EIO_FSTATVFS: + { + SV *rv = &PL_sv_undef; + + if (req->result >= 0) + { + EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); + HV *hv = newHV (); -static int poll_cb () -{ - dSP; - int count = 0; - int do_croak = 0; - aio_req req; + rv = sv_2mortal (newRV_noinc ((SV *)hv)); - for (;;) - { - pthread_mutex_lock (&reslock); - req = ress; + hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0); + hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0); + hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0); + hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0); + hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0); + hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0); + hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0); + hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); + hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); + hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); + hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); + } - if (req) - { - ress = req->next; + PUSHs (rv); + } - if (!ress) - { - /* read any signals sent by the worker threads */ - char buf [32]; - while (read (respipe [0], buf, 32) == 32) - ; + break; - rese = 0; - } - } + case EIO_GROUP: + req->int1 = 2; /* mark group as finished */ - pthread_mutex_unlock (&reslock); + if (req->sv1) + { + int i; + AV *av = (AV *)req->sv1; - if (!req) - break; + EXTEND (SP, AvFILL (av) + 1); + for (i = 0; i <= AvFILL (av); ++i) + PUSHs (*av_fetch (av, i, 0)); + } + break; - --nreqs; + case EIO_NOP: + case EIO_BUSY: + break; - 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)); + case EIO_READLINK: + if (req->result > 0) + PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); + break; - if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) - SvREADONLY_off (req->data); + 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; - if (req->statdata) + case EIO_READ: { - PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; - PL_laststatval = req->result; - PL_statcache = *(req->statdata); + SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); + *SvEND (req->sv2) = 0; + SvPOK_only (req->sv2); + SvSETMAGIC (req->sv2); + PUSHs (sv_2mortal (newSViv (req->result))); } + break; - req_invoke (req); + case EIO_DUP2: + if (req->result > 0) + req->result = 0; + /* FALLTHROUGH */ - count++; + default: + PUSHs (sv_2mortal (newSViv (req->result))); + break; } - req_free (req); - } - - return count; -} + errno = req->errorno; -static void *aio_proc(void *arg); - -static void start_thread (void) -{ - sigset_t fullsigset, oldsigset; - pthread_t tid; - pthread_attr_t attr; - - pthread_attr_init (&attr); - pthread_attr_setstacksize (&attr, STACKSIZE); - pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); - - sigfillset (&fullsigset); - sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); - - if (pthread_create (&tid, &attr, aio_proc, 0) == 0) - started++; - - sigprocmask (SIG_SETMASK, &oldsigset, 0); -} - -static void req_send (aio_req req) -{ - while (started < wanted && nreqs >= started) - start_thread (); + PUTBACK; + call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); + SPAGAIN; - ++nreqs; + FREETMPS; + LEAVE; - pthread_mutex_lock (&reqlock); - - req->next = 0; - - 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 (); - } -} -static void end_thread (void) -{ - 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; + return !!SvTRUE (ERRSV); } -static void max_parallel (int nthreads) +static void req_destroy (aio_req req) { - 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"); + SvREFCNT_dec (req->sv1); + SvREFCNT_dec (req->sv2); + SvREFCNT_dec (req->callback); - if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) - croak ("cannot set result pipe to nonblocking mode"); + 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 preadwritelock = 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 (&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); - - return res; -} - -static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) -{ - ssize_t res; - off_t ooffset; + if (grp->type != EIO_GROUP) + return; - 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); + SvREFCNT_dec (grp->sv2); + grp->sv2 = 0; - return res; + eio_grp_cancel (grp); } -#endif - -#if !HAVE_FDATASYNC -# define fdatasync fsync -#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]; - - while (count > 0) - { - size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); - - pread (fd, readahead_buf, len, offset); - offset += len; - count -= len; - } - - errno = 0; + if (s_epipe_renew (&respipe)) + croak ("IO::AIO: unable to initialize result pipe"); } -#endif - -#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) +static void poll_wait (void) { - struct dirent *e; - int errorno; - - pthread_mutex_lock (&readdirlock); - - e = readdir (dirp); - errorno = errno; - - if (e) + while (eio_nreqs ()) { - *res = ent; - strcpy (ent->d_name, e->d_name); - } - else - *res = 0; + int size; - pthread_mutex_unlock (&readdirlock); + X_LOCK (reslock); + size = res_queue.size; + X_UNLOCK (reslock); - errno = errorno; - return e ? 0 : -1; -} -#endif + if (size) + return; -/* 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; - } - -# endif -#else - res = -1; - errno = ENOSYS; -#endif - - if (res < 0 - && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK -#if __solaris - || errno == EAFNOSUPPORT || errno == EPROTOTYPE -#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; - } - - cnt = write (ofd, buf, cnt); + etp_maybe_start_thread (); - if (cnt <= 0) - { - if (cnt && !res) res = -1; - break; - } - - offset += cnt; - res += cnt; - count -= cnt; - } + s_epipe_wait (&respipe); } - - return res; } -/* read a full directory */ -static int scandir_ (const char *path, void **namesp) +static int poll_cb (void) { - 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); - for (;;) { - errno = 0, readdir_r (dirp, &u.d, &entp); - - if (!entp) - break; - - name = entp->d_name; - - if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) - { - int len = strlen (name) + 1; - - res++; + int res = eio_poll (); - while (memofs + len > memlen) - { - memlen *= 2; - names = realloc (names, memlen); - if (!names) - break; - } - - memcpy (names + memofs, name, len); - memofs += len; - } - } + if (res > 0) + croak (0); - errorno = errno; - closedir (dirp); + if (!max_outstanding || max_outstanding > eio_nreqs ()) + return res; - if (errorno) - { - free (names); - errno = errorno; - res = -1; + poll_wait (); } - - *namesp = (void *)names; - return res; } -/*****************************************************************************/ - -static void *aio_proc (void *thr_arg) +static void atfork_child (void) { - aio_req req; - int type; - - do - { - pthread_mutex_lock (&reqlock); - - 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 */ - - if (!req->cancelled) - switch (type = req->type) /* remember type for QUIT check */ - { - 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_SLEEP: - { - 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; - } - - 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); - } - while (type != REQ_QUIT); - - return 0; + create_respipe (); } /*****************************************************************************/ -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); +#if !_POSIX_MAPPED_FILES +# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) +# define munmap(addr,length) (errno = ENOSYS, -1) #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); -} +#define MMAP_MAGIC PERL_MAGIC_ext -static void atfork_child (void) +static int +mmap_free (pTHX_ SV *sv, MAGIC *mg) { - aio_req prv; + int old_errno = errno; + munmap (mg->mg_ptr, (size_t)mg->mg_obj); + errno = old_errno; + + mg->mg_obj = 0; /* just in case */ + + SvREADONLY_off (sv); + SvCUR_set (sv, 0); + SvLEN_set (sv, 0); + SvPVX (sv) = 0; + SvOK_off (sv); - started = 0; - - while (reqs) - { - prv = reqs; - reqs = prv->next; - req_free (prv); - } + return 0; +} - reqs = reqe = 0; - - while (ress) - { - prv = ress; - ress = prv->next; - req_free (prv); - } - - ress = rese = 0; +static MGVTBL mmap_vtbl = { + 0, 0, 0, 0, mmap_free +}; - close (respipe [0]); - close (respipe [1]); - create_pipe (); +/*****************************************************************************/ - atfork_parent (); +static SV * +get_cb (SV *cb_sv) +{ + SvGETMAGIC (cb_sv); + return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; } #define dREQ \ + SV *cb_cv; \ 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"); \ + cb_cv = get_cb (callback); \ \ - 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 = SvREFCNT_inc (cb_cv); \ + req->pri = req_pri #define REQ_SEND \ - req_send (req); \ + PUTBACK; \ + req_submit (req); \ + SPAGAIN; \ \ if (GIMME_V != G_VOID) \ - XPUSHs (req_sv (req, AIO_REQ_KLASS)); - + XPUSHs (req_sv (req, aio_req_stash)); + MODULE = IO::AIO PACKAGE = IO::AIO PROTOTYPES: ENABLE 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)); + static const struct { + const char *name; + IV iv; + } *civ, const_iv[] = { +# define const_niv(name, value) { # name, (IV) value }, +# define const_iv(name) { # name, (IV) name }, +# define const_eio(name) { # name, (IV) EIO_ ## name }, + const_iv (EXDEV) + const_iv (ENOSYS) + const_iv (O_RDONLY) + const_iv (O_WRONLY) + const_iv (O_RDWR) + const_iv (O_CREAT) + const_iv (O_TRUNC) + const_iv (O_EXCL) + const_iv (O_APPEND) +#ifndef _WIN32 + const_iv (S_IFIFO) +#endif + const_niv (FADV_NORMAL , POSIX_FADV_NORMAL) + const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL) + const_niv (FADV_RANDOM , POSIX_FADV_RANDOM) + const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE) + const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED) + const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED) + + const_iv (ST_RDONLY) + const_iv (ST_NOSUID) + const_iv (ST_NODEV) + const_iv (ST_NOEXEC) + const_iv (ST_SYNCHRONOUS) + const_iv (ST_MANDLOCK) + const_iv (ST_WRITE) + const_iv (ST_APPEND) + const_iv (ST_IMMUTABLE) + const_iv (ST_NOATIME) + const_iv (ST_NODIRATIME) + const_iv (ST_RELATIME) + + const_iv (PROT_EXEC) + const_iv (PROT_NONE) + const_iv (PROT_READ) + const_iv (PROT_WRITE) + + /*const_iv (MAP_FIXED)*/ + const_iv (MAP_PRIVATE) + const_iv (MAP_SHARED) + const_iv (MAP_ANONYMOUS) + + /* linuxish */ + const_iv (MAP_HUGETLB) + const_iv (MAP_LOCKED) + const_iv (MAP_NORESERVE) + const_iv (MAP_POPULATE) + const_iv (MAP_NONBLOCK) + + const_iv (MCL_FUTURE) + const_iv (MCL_CURRENT) + + const_eio (MS_ASYNC) + const_eio (MS_INVALIDATE) + const_eio (MS_SYNC) + + const_eio (MT_MODIFY) + + const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) + const_eio (SYNC_FILE_RANGE_WRITE) + const_eio (SYNC_FILE_RANGE_WAIT_AFTER) + + const_eio (READDIR_DENTS) + const_eio (READDIR_DIRS_FIRST) + const_eio (READDIR_STAT_ORDER) + const_eio (READDIR_FOUND_UNKNOWN) + + const_eio (DT_UNKNOWN) + const_eio (DT_FIFO) + const_eio (DT_CHR) + const_eio (DT_DIR) + const_eio (DT_BLK) + const_eio (DT_REG) + const_eio (DT_LNK) + const_eio (DT_SOCK) + const_eio (DT_WHT) + }; + + aio_stash = gv_stashpv ("IO::AIO" , 1); + aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); + aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); + + for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) + newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); + + newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); + + create_respipe (); + + if (eio_init (want_poll, done_poll) < 0) + croak ("IO::AIO: unable to initialise eio library"); - create_pipe (); - pthread_atfork (atfork_prepare, atfork_parent, atfork_child); + /* 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_parallel (nthreads) - int nthreads +max_poll_time (double nseconds) PROTOTYPE: $ + CODE: + eio_set_max_poll_time (nseconds); -int -max_outstanding (nreqs) - int nreqs - PROTOTYPE: $ +void +min_parallel (int nthreads) + PROTOTYPE: $ CODE: - RETVAL = max_outstanding; - max_outstanding = nreqs; + eio_set_min_parallel (nthreads); void -aio_open (pathname,flags,mode,callback=&PL_sv_undef) - SV * pathname - int flags - int mode - SV * callback +max_parallel (int nthreads) + PROTOTYPE: $ + CODE: + eio_set_max_parallel (nthreads); + +void +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: { + int fd = s_fileno_croak (fh, 0); dREQ; req->type = ix; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->sv1 = newSVsv (fh); + req->int1 = fd; + + REQ_SEND (req); +} + +void +aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) + PROTOTYPE: $$$$;$ + PPCODE: +{ + int fd = s_fileno_croak (fh, 0); + dREQ; + + req->type = EIO_SYNC_FILE_RANGE; + req->sv1 = newSVsv (fh); + req->int1 = fd; + req->offs = offset; + req->size = nbytes; + req->int2 = flags; 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_close (SV *fh, SV *callback=&PL_sv_undef) + PROTOTYPE: $;$ + PPCODE: +{ + static int close_pipe = -1; /* dummy fd to close fds via dup2 */ + int fd = s_fileno_croak (fh, 0); + 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 = fd; + + REQ_SEND (req); +} + +void +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; + int fd = s_fileno_croak (fh, ix == EIO_WRITE); char *svptr = SvPVbyte (data, svlen); - - SvUPGRADE (data, SVt_PV); - SvPOK_on (data); + UV len = SvUV (length); if (dataoffset < 0) 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); + /* read: check type and grow scalar as necessary */ + SvUPGRADE (data, SVt_PV); + svptr = SvGROW (data, len + dataoffset + 1); } - if (length < 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 = fd; + 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; @@ -1072,187 +928,367 @@ } 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, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) PROTOTYPE: $$$$;$ PPCODE: { + int ifd = s_fileno_croak (in_fh , 0); + int ofd = s_fileno_croak (out_fh, 1); 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 = ofd; + req->sv2 = newSVsv (in_fh); + req->int2 = ifd; + req->offs = 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, off_t offset, size_t length, SV *callback=&PL_sv_undef) PROTOTYPE: $$$;$ PPCODE: { + int fd = s_fileno_croak (fh, 0); 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 = fd; + req->offs = 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 + aio_statvfs = EIO_STATVFS + PPCODE: +{ + dREQ; + + req->sv1 = newSVsv (fh_or_path); + + if (SvPOK (req->sv1)) + { + req->type = ix; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else + { + req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (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; - New (0, req->statdata, 1, Stat_t); - if (!req->statdata) + 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_free (req); - croak ("out of memory during aio_req->statdata allocation"); + req->type = EIO_FTRUNCATE; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } - if (SvPOK (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 = EIO_FCHMOD; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + 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 (req->sv1)) + { + req->type = EIO_CHOWN; + 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_FCHOWN; + 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_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_READDIR; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; + + if (flags & EIO_READDIR_DENTS) + req->int1 |= EIO_READDIR_CUSTOM2; + + 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; } void -aio_sleep (delay,callback=&PL_sv_undef) - double delay - SV * callback +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; +} - req->type = REQ_SLEEP; - req->fd = delay < 0. ? 0 : delay; - req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); +void +aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef) + ALIAS: + aio_mtouch = EIO_MTOUCH + aio_msync = EIO_MSYNC + PROTOTYPE: $$$$;$ + PPCODE: +{ + STRLEN svlen; + UV len = SvUV (length); + char *svptr = SvPVbyte (data, svlen); + + if (offset < 0) + offset += svlen; + + if (offset < 0 || offset > svlen) + croak ("offset outside of scalar"); + + if (!SvOK (length) || len + offset > svlen) + len = svlen - offset; + + { + dREQ; + + req->type = ix; + req->size = len; + req->sv2 = SvREFCNT_inc (data); + req->ptr2 = (char *)svptr + offset; + req->int1 = flags; + + 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 (callback=&PL_sv_undef) - SV * callback +aio_group (SV *callback=&PL_sv_undef) PROTOTYPE: ;$ PPCODE: { dREQ; - req->type = REQ_GROUP; - req_send (req); - XPUSHs (req_sv (req, AIO_GRP_KLASS)); + + req->type = EIO_GROUP; + + req_submit (req); + XPUSHs (req_sv (req, aio_grp_stash)); } void -aio_nop (callback=&PL_sv_undef) - SV * callback +aio_nop (SV *callback=&PL_sv_undef) + ALIAS: + aio_nop = EIO_NOP + aio_sync = EIO_SYNC PPCODE: { dREQ; - req->type = REQ_NOP; + 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() PROTOTYPE: CODE: - RETVAL = respipe [0]; + RETVAL = s_epipe_fd (&respipe); OUTPUT: RETVAL @@ -1268,26 +1304,152 @@ 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: + RETVAL = eio_nthreads (); + OUTPUT: + RETVAL + +int +fadvise (aio_rfd fh, off_t offset, off_t length, IV advice) + PROTOTYPE: $$$$ + CODE: +#if _XOPEN_SOURCE >= 600 && !NO_FADVISE + RETVAL = posix_fadvise (fh, offset, length, advice); +#else + RETVAL = errno = ENOSYS; /* yes, this is actually correct */ +#endif + OUTPUT: + RETVAL + +ssize_t +sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) + PROTOTYPE: $$$$ + CODE: + RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); + OUTPUT: + RETVAL + +void +mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) + PROTOTYPE: $$$$$;$ + PPCODE: + sv_unmagic (scalar, MMAP_MAGIC); +{ + int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; + void *addr = (void *)mmap (0, length, prot, flags, fd, offset); + if (addr == (void *)-1) + XSRETURN_NO; + + /* we store the length in mg_obj, as namlen is I32 :/ */ + sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0) + ->mg_obj = (SV *)length; + + SvUPGRADE (scalar, SVt_PV); /* nop... */ + if (!(prot & PROT_WRITE)) + SvREADONLY_on (scalar); + + SvPVX (scalar) = (char *)addr; + SvCUR_set (scalar, length); + SvLEN_set (scalar, 0); + SvPOK_only (scalar); + + XSRETURN_YES; +} + +void +munmap (SV *scalar) + PROTOTYPE: $ + CODE: + sv_unmagic (scalar, MMAP_MAGIC); + +int +mlockall (int flags) + PROTOTYPE: $ + CODE: +#if _POSIX_MEMLOCK +#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 + extern int mallopt (int, int); + mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */ +#endif + mlockall (flags); +#else + RETVAL = -1; + errno = ENOSYS; +#endif + OUTPUT: + RETVAL + +int +munlockall () + PROTOTYPE: + CODE: +#if _POSIX_MEMLOCK + munlockall (); +#else + RETVAL = -1; + errno = ENOSYS; +#endif + OUTPUT: + RETVAL + +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_cancel (req); + eio_cancel (req); + +void +cb (aio_req_ornot req, SV *callback=&PL_sv_undef) + PPCODE: +{ + if (GIMME_V != G_VOID) + XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); + + if (items > 1) + { + SV *cb_cv =get_cb (callback); + + SvREFCNT_dec (req->callback); + req->callback = SvREFCNT_inc (cb_cv); + } +} MODULE = IO::AIO PACKAGE = IO::AIO::GRP @@ -1296,74 +1458,69 @@ PPCODE: { int i; - aio_req req; - if (grp->fd == 2) + if (grp->int1 == 2) croak ("cannot add requests to IO::AIO::GRP after the group finished"); for (i = 1; i < items; ++i ) { + aio_req req; + 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; - } + 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 = newAV (); + AV *av; + + grp->errorno = errno; + + av = newAV (); + av_extend (av, items - 1); for (i = 1; i < items; ++i ) av_push (av, newSVsv (ST (i))); - SvREFCNT_dec (grp->data); - grp->data = (SV *)av; + SvREFCNT_dec (grp->sv1); + grp->sv1 = (SV *)av; } void -lock (aio_req grp) - CODE: - ++grp->length; - -void -unlock (aio_req grp) - CODE: - aio_grp_dec (grp); +errno (aio_req grp, int errorno = errno) + CODE: + grp->errorno = errorno; void -feeder_limit (aio_req grp, int limit) +limit (aio_req grp, int limit) CODE: - grp->fd2 = limit; - aio_grp_feed (grp); + eio_grp_limit (grp, limit); void -set_feeder (aio_req grp, SV *callback=&PL_sv_undef) +feed (aio_req grp, SV *callback=&PL_sv_undef) CODE: { - SvREFCNT_dec (grp->fh2); - grp->fh2 = newSVsv (callback); + SvREFCNT_dec (grp->sv2); + grp->sv2 = newSVsv (callback); + grp->feed = aio_grp_feed; - if (grp->fd2 <= 0) - grp->fd2 = 2; + if (grp->int2 <= 0) + grp->int2 = 2; - aio_grp_feed (grp); + eio_grp_limit (grp, grp->int2); }