--- IO-AIO/AIO.xs 2006/10/30 23:43:17 1.88 +++ IO-AIO/AIO.xs 2018/07/24 04:58:59 1.260 @@ -1,12 +1,4 @@ -/* solaris */ -#define _POSIX_PTHREAD_SEMANTICS 1 - -#if __linux && !defined(_GNU_SOURCE) -# define _GNU_SOURCE -#endif - -/* just in case */ -#define _REENTRANT 1 +#include "libeio/xthread.h" #include @@ -14,318 +6,414 @@ #include "perl.h" #include "XSUB.h" -#include "autoconf/config.h" - -#include +#if !defined mg_findext +# define mg_findext(sv,type,vtbl) mg_find (sv, type) +#endif #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 +#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES +# include +#endif + +/* the incompetent fool that created musl keeps __linux__, refuses + * to implement any linux standard apis, and also has no way to test + * for his broken iplementation. don't complain to me if this fails + * for you. + */ +#if __linux__ && (defined __GLIBC__ || defined __UCLIBC__) +# include +# ifdef FS_IOC_FIEMAP +# include +# include +# define HAVE_FIEMAP 1 # endif #endif -/* number of seconds after which idle threads exit */ -#define IDLE_TIMEOUT 10 +/* perl namespace pollution */ +#undef VERSION -/* used for struct dirent, AIX doesn't provide it */ -#ifndef NAME_MAX -# define NAME_MAX 4096 -#endif +/* perl stupidly overrides readdir and maybe others */ +/* with thread-unsafe versions, imagine that :( */ +#undef readdir +#undef opendir +#undef closedir + +#ifdef _WIN32 + + // perl overrides all those nice libc functions + + #undef malloc + #undef free + #undef open + #undef read + #undef write + #undef send + #undef recv + #undef stat + #undef lstat + #undef fstat + #undef truncate + #undef ftruncate + #undef open + #undef link + #undef close + #undef unlink + #undef mkdir + #undef rmdir + #undef rename + #undef lseek + #undef opendir + #undef readdir + #undef closedir + #undef chmod + #undef fchmod + #undef dup + #undef dup2 + #undef abort + #undef pipe -#ifndef PTHREAD_STACK_MIN -/* care for broken platforms, e.g. windows */ -# define PTHREAD_STACK_MIN 16384 -#endif + #define EIO_STRUCT_STAT struct _stati64 + #define EIO_STRUCT_STATI64 -#if __ia64 -# define STACKSIZE 65536 -#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ -# define STACKSIZE PTHREAD_STACK_MIN #else -# define STACKSIZE 16384 + + #include + #include + #include + #include + #include + + #define EIO_STRUCT_STAT Stat_t + #endif -/* wether word reads are potentially non-atomic. - * this is conservatice, likely most arches this runs - * on have atomic word read/writes. - */ -#ifndef WORDACCESS_UNSAFE -# if __i386 || __x86_64 -# define WORDACCESS_UNSAFE 0 -# else -# define WORDACCESS_UNSAFE 1 -# endif +/*****************************************************************************/ + +#if __GNUC__ >= 3 +# define expect(expr,value) __builtin_expect ((expr),(value)) +#else +# define expect(expr,value) (expr) #endif -/* buffer size for various temporary buffers */ -#define AIO_BUFSIZE 65536 +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) -#define dBUF \ - char *aio_buf; \ - LOCK (wrklock); \ - self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ - UNLOCK (wrklock); \ - if (!aio_buf) \ - return -1; +/*****************************************************************************/ -enum { - REQ_QUIT, - REQ_OPEN, REQ_CLOSE, - 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_MKNOD, REQ_READDIR, - REQ_LINK, REQ_SYMLINK, REQ_READLINK, - REQ_GROUP, REQ_NOP, - REQ_BUSY, -}; +#include "libeio/config.h" -#define AIO_REQ_KLASS "IO::AIO::REQ" -#define AIO_GRP_KLASS "IO::AIO::GRP" +#include "schmorp.h" -typedef struct aio_cb -{ - struct aio_cb *volatile next; +#if HAVE_EVENTFD +# include +#endif - SV *callback, *fh; - SV *sv1, *sv2; - void *ptr1, *ptr2; - off_t offs; - size_t size; - ssize_t result; - - STRLEN stroffset; - int type; - int int1, int2; - int errorno; - mode_t mode; /* open */ - - unsigned char flags; - unsigned char pri; - - SV *self; /* the perl counterpart of this request, if any */ - struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; -} aio_cb; +#if HAVE_TIMERFD +# include +#endif -enum { - FLAG_CANCELLED = 0x01, - FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ - FLAG_PTR2_FREE = 0x80, /* need free(ptr2) */ -}; +#if HAVE_RLIMITS + #include + #include +#endif -typedef aio_cb *aio_req; -typedef aio_cb *aio_req_ornot; +typedef SV SV8; /* byte-sv, used for argument-checking */ +typedef int aio_rfd; /* read file desriptor */ +typedef int aio_wfd; /* write file descriptor */ -enum { - PRI_MIN = -4, - PRI_MAX = 4, +static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash; - DEFAULT_PRI = 0, - PRI_BIAS = -PRI_MIN, - NUM_PRI = PRI_MAX + PRI_BIAS + 1, -}; +#define EIO_REQ_MEMBERS \ + SV *callback; \ + SV *sv1, *sv2; \ + SV *sv3, *sv4; \ + STRLEN stroffset; \ + SV *self; -#define AIO_TICKS ((1000000 + 1023) >> 10) +#define EIO_NO_WRAPPERS 1 -static unsigned int max_poll_time = 0; -static unsigned int max_poll_reqs = 0; +#include "libeio/eio.h" -/* calculcate time difference in ~1/AIO_TICKS of a second */ -static int tvdiff (struct timeval *tv1, struct timeval *tv2) -{ - return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS - + ((tv2->tv_usec - tv1->tv_usec) >> 10); -} +static int 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) -static int next_pri = DEFAULT_PRI + PRI_BIAS; +#include "libeio/eio.c" -static unsigned int started, idle, wanted; +#if !HAVE_POSIX_FADVISE +# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */ +#endif -#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) -# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP -#else -# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER +#if !HAVE_POSIX_MADVISE +# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */ #endif -#define LOCK(mutex) pthread_mutex_lock (&(mutex)) -#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) +#ifndef MAP_ANONYMOUS +# ifdef MAP_ANON +# define MAP_ANONYMOUS MAP_ANON +# else +# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */ +# endif +#endif -/* worker threads management */ -static pthread_mutex_t wrklock = AIO_MUTEX_INIT; +#ifndef makedev +# define makedev(maj,min) (((maj) << 8) | (min)) +#endif +#ifndef major +# define major(dev) ((dev) >> 8) +#endif +#ifndef minor +# define minor(dev) ((dev) & 0xff) +#endif -typedef struct worker { - /* locked by wrklock */ - struct worker *prev, *next; +#if PAGESIZE <= 0 +# define PAGESIZE sysconf (_SC_PAGESIZE) +#endif - pthread_t tid; +/*****************************************************************************/ - /* locked by reslock, reqlock or wrklock */ - aio_req req; /* currently processed request */ - void *dbuf; - DIR *dirp; -} worker; +#if !_POSIX_MAPPED_FILES +# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, (void *)-1) +# define munmap(addr,length) EIO_ENOSYS () +#endif -static worker wrk_first = { &wrk_first, &wrk_first, 0 }; +#if !_POSIX_MEMORY_PROTECTION +# define mprotect(addr,len,prot) EIO_ENOSYS () +#endif -static void worker_clear (worker *wrk) -{ - if (wrk->dirp) - { - closedir (wrk->dirp); - wrk->dirp = 0; - } +#if !MREMAP_MAYMOVE +# define mremap(old_address,old_size,new_size,flags,new_address) (errno = ENOSYS, (void *)-1) +#endif - if (wrk->dbuf) - { - free (wrk->dbuf); - wrk->dbuf = 0; - } -} +#define FOREIGN_MAGIC PERL_MAGIC_ext -static void worker_free (worker *wrk) +static int ecb_cold +mmap_free (pTHX_ SV *sv, MAGIC *mg) { - wrk->next->prev = wrk->prev; - wrk->prev->next = wrk->next; + int old_errno = errno; + munmap (mg->mg_ptr, (size_t)mg->mg_obj); + errno = old_errno; - free (wrk); -} + mg->mg_obj = 0; /* just in case */ -static volatile unsigned int nreqs, nready, npending; -static volatile unsigned int max_idle = 4; -static volatile unsigned int max_outstanding = 0xffffffff; -static int respipe [2]; + SvREADONLY_off (sv); -static pthread_mutex_t reslock = AIO_MUTEX_INIT; -static pthread_mutex_t reqlock = AIO_MUTEX_INIT; -static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; + if (SvPVX (sv) != mg->mg_ptr) + croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected"); -#if WORDACCESS_UNSAFE + SvCUR_set (sv, 0); + SvPVX (sv) = 0; + SvOK_off (sv); + + return 0; +} -static unsigned int get_nready () +static MGVTBL mmap_vtbl = { + 0, 0, 0, 0, mmap_free +}; + +static int ecb_cold +sysfree_free (pTHX_ SV *sv, MAGIC *mg) { - unsigned int retval; + free (mg->mg_ptr); + mg->mg_obj = 0; /* just in case */ + + SvREADONLY_off (sv); + + if (SvPVX (sv) != mg->mg_ptr) + croak ("ERROR: IO::AIO mapped scalar changed location, detected"); - LOCK (reqlock); - retval = nready; - UNLOCK (reqlock); + SvCUR_set (sv, 0); + SvPVX (sv) = 0; + SvOK_off (sv); - return retval; + return 0; } -static unsigned int get_npending () +static MGVTBL sysfree_vtbl = { + 0, 0, 0, 0, sysfree_free +}; + +/*****************************************************************************/ + +/* helper: set scalar to foreign ptr with custom free */ +static void +sv_set_foreign (SV *sv, const MGVTBL *const vtbl, void *addr, IV length) { - unsigned int retval; + sv_force_normal (sv); + + /* we store the length in mg_obj, as namlen is I32 :/ */ + sv_magicext (sv, 0, FOREIGN_MAGIC, vtbl, (char *)addr, 0) + ->mg_obj = (SV *)length; + + SvUPGRADE (sv, SVt_PV); /* nop... */ - LOCK (reslock); - retval = npending; - UNLOCK (reslock); + if (SvLEN (sv)) + Safefree (SvPVX (sv)); - return retval; + SvPVX (sv) = (char *)addr; + SvCUR_set (sv, length); + SvLEN_set (sv, 0); + SvPOK_only (sv); } -static unsigned int get_nthreads () +static void +sv_clear_foreign (SV *sv) { - unsigned int retval; + /* todo: iterate over magic and only free ours, but of course */ + /* the perl5porters will call that (correct) behaviour buggy */ + sv_unmagic (sv, FOREIGN_MAGIC); +} - LOCK (wrklock); - retval = started; - UNLOCK (wrklock); +/*****************************************************************************/ - return retval; -} +/* defines all sorts of constants to 0 unless they are already defined */ +/* also provides const_iv_ and const_niv_ macros for them */ +#include "def0.h" -#else +/*****************************************************************************/ -# define get_nready() nready -# define get_npending() npending -# define get_nthreads() started +static void +fiemap (eio_req *req) +{ + req->result = -1; -#endif +#if HAVE_FIEMAP + /* assume some c99 */ + struct fiemap *fiemap = 0; + size_t end_offset; + int count = req->int3; + + req->flags |= EIO_FLAG_PTR1_FREE; + + /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */ + /* increase in 3.5kb steps */ + if (count < 0) + count = 8; + + fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); + errno = ENOMEM; + if (!fiemap) + return; -/* - * a somewhat faster data structure might be nice, but - * with 8 priorities this actually needs <20 insns - * per shift, the most expensive operation. - */ -typedef struct { - aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ - int size; -} reqq; + req->ptr1 = fiemap; -static reqq req_queue; -static reqq res_queue; + fiemap->fm_start = req->offs; + fiemap->fm_length = req->size; + fiemap->fm_flags = req->int2; + fiemap->fm_extent_count = count; -int reqq_push (reqq *q, aio_req req) -{ - int pri = req->pri; - req->next = 0; + if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap) < 0) + return; - if (q->qe[pri]) - { - q->qe[pri]->next = req; - q->qe[pri] = req; - } - else - q->qe[pri] = q->qs[pri] = req; + if (req->int3 >= 0 /* not autosizing */ + || !fiemap->fm_mapped_extents /* no more extents */ + || fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST /* hit eof */) + goto done; + + /* else we have to loop - + * it would be tempting (actually I tried that first) to just query the + * number of extents needed, but linux often feels like not returning all + * extents, without telling us it left any out. this complicates + * this quite a bit. + */ - return q->size++; -} + end_offset = fiemap->fm_length + (fiemap->fm_length == FIEMAP_MAX_OFFSET ? 0 : fiemap->fm_start); -aio_req reqq_shift (reqq *q) -{ - int pri; + for (;;) + { + /* we go in 54 extent steps - 3kb, in the hope that this fits nicely on the eio stack (normally 16+ kb) */ + char scratch[3072]; + struct fiemap *incmap = (struct fiemap *)scratch; + + incmap->fm_start = fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_logical + + fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_length; + incmap->fm_length = fiemap->fm_length - (incmap->fm_start - fiemap->fm_start); + incmap->fm_flags = fiemap->fm_flags; + incmap->fm_extent_count = (sizeof (scratch) - sizeof (struct fiemap)) / sizeof (struct fiemap_extent); - if (!q->size) - return 0; + if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0) + return; - --q->size; + if (!incmap->fm_mapped_extents) + goto done; - for (pri = NUM_PRI; pri--; ) - { - aio_req req = q->qs[pri]; + count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents; + fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); + errno = ENOMEM; + if (!fiemap) + return; - if (req) + req->ptr1 = fiemap; + + for (count = 0; count < incmap->fm_mapped_extents; ++count) { - if (!(q->qs[pri] = req->next)) - q->qe[pri] = 0; + struct fiemap_extent *e = incmap->fm_extents + count; + + if (e->fe_logical + e->fe_length >= end_offset) + goto done; + + fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e; + + if (e->fe_flags & FIEMAP_EXTENT_LAST) + goto done; - return req; } } - abort (); +done: + req->result = 0; + +#else + errno = ENOSYS; +#endif } -static int poll_cb (); -static void req_invoke (aio_req req); -static void req_free (aio_req req); +/*****************************************************************************/ + +enum { + FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ +}; + +typedef eio_req *aio_req; +typedef eio_req *aio_req_ornot; +typedef eio_wd aio_wd; + +static SV *on_next_submit; +static int next_pri = EIO_PRI_DEFAULT; +static int max_outstanding; + +static s_epipe respipe; + +static void req_destroy (aio_req req); static void req_cancel (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) { @@ -333,128 +421,244 @@ 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) +static SV * +newSVaio_wd (aio_wd wd) +{ + return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_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) + /* for speed reasons, we do not verify that SvROK actually has a stash ptr */ + || (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); return mg ? (aio_req)mg->mg_ptr : 0; } -static void aio_grp_feed (aio_req grp) +static aio_wd +SvAIO_WD (SV *sv) { - while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED)) - { - int old_len = grp->size; + if (!SvROK (sv) + || SvTYPE (SvRV (sv)) != SVt_PVMG + || SvSTASH (SvRV (sv)) != aio_wd_stash) + croak ("IO::AIO: expected a working directory object as returned by aio_wd"); - if (grp->sv2 && SvOK (grp->sv2)) - { - dSP; + return (aio_wd)(long)SvIVX (SvRV (sv)); +} - 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 SV * +newmortalFH (int fd, int flags) +{ + if (fd < 0) + return &PL_sv_undef; - /* stop if no progress has been made */ - if (old_len == grp->size) - { - SvREFCNT_dec (grp->sv2); - grp->sv2 = 0; - break; - } - } + GV *gv = (GV *)sv_newmortal (); + char sym[64]; + int symlen; + + symlen = snprintf (sym, sizeof (sym), "fd#%d", fd); + gv_init (gv, aio_stash, sym, symlen, 0); + + symlen = snprintf ( + sym, + sizeof (sym), + "%s&=%d", + flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", + fd + ); + + return do_open (gv, sym, symlen, 0, 0, 0, 0) + ? (SV *)gv : &PL_sv_undef; } -static void aio_grp_dec (aio_req grp) +static void +aio_grp_feed (aio_req grp) { - --grp->size; + if (grp->sv2 && SvOK (grp->sv2)) + { + dSP; - /* call feeder, if applicable */ - aio_grp_feed (grp); + 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 +req_submit (eio_req *req) +{ + eio_submit (req); - /* finish, if done */ - if (!grp->size && grp->int1) + if (expect_false (on_next_submit)) { - req_invoke (grp); - req_free (grp); + dSP; + SV *cb = sv_2mortal (on_next_submit); + + on_next_submit = 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; - - if (req->flags & FLAG_SV1_RO_OFF) - SvREADONLY_off (req->sv1); + if (req->flags & FLAG_SV2_RO_OFF) + SvREADONLY_off (req->sv2); - if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) + if (!EIO_CANCELLED (req) && req->callback) { + dSP; + static SV *sv_result_cache; /* caches the result integer SV */ + SV *sv_result; + ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 1); + /* do not recreate the result IV from scratch each time */ + if (expect_true (sv_result_cache)) + { + sv_result = sv_result_cache; sv_result_cache = 0; + SvIV_set (sv_result, req->result); + SvIOK_only (sv_result); + } + else + { + sv_result = newSViv (req->result); + SvREADONLY_on (sv_result); + } + switch (req->type) { - case REQ_READDIR: + case EIO_WD_OPEN: + PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd))); + break; + + case EIO_READDIR: { SV *rv = &PL_sv_undef; if (req->result >= 0) { int i; - char *buf = req->ptr2; + 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) { - SV *sv = newSVpv (buf, 0); - - av_store (av, i, sv); - buf += SvCUR (sv) + 1; + 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; + } } rv = sv_2mortal (newRV_noinc ((SV *)av)); } PUSHs (rv); + + if (req->int1 & EIO_READDIR_CUSTOM1) + XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2)))); } 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; + case EIO_OPEN: + PUSHs (newmortalFH (req->result, req->int1 & (O_RDONLY | O_WRONLY | O_RDWR))); + break; - fh = SvREFCNT_inc (POPs); + case EIO_STATVFS: + case EIO_FSTATVFS: + { + SV *rv = &PL_sv_undef; + +#ifndef _WIN32 + if (req->result >= 0) + { + EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); + HV *hv = newHV (); + /* POSIX requires fsid to be unsigned long, but AIX in its infinite wisdom + * chooses to make it a struct. + */ + unsigned long fsid = 0; + memcpy (&fsid, &f->f_fsid, sizeof (unsigned long) < sizeof (f->f_fsid) ? sizeof (unsigned long) : sizeof (f->f_fsid)); + + rv = sv_2mortal (newRV_noinc ((SV *)hv)); + + 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 (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); + } +#endif - PUSHMARK (SP); - XPUSHs (sv_2mortal (fh)); + PUSHs (rv); } + break; - case REQ_GROUP: + case EIO_GROUP: req->int1 = 2; /* mark group as finished */ if (req->sv1) @@ -468,71 +672,138 @@ } break; - case REQ_NOP: - case REQ_BUSY: + case EIO_NOP: + case EIO_BUSY: break; - case REQ_READLINK: + case EIO_READLINK: + case EIO_REALPATH: if (req->result > 0) - { - SvCUR_set (req->sv1, req->result); - *SvEND (req->sv1) = 0; - PUSHs (req->sv1); - } + PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); + break; + + case EIO_STAT: + case EIO_LSTAT: + case EIO_FSTAT: + PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; + + if (!(PL_laststatval = req->result)) + /* if compilation fails here then perl's Stat_t is not struct _stati64 */ + PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); + + PUSHs (sv_result); + break; + + case EIO_SEEK: + PUSHs (req->result ? sv_result : sv_2mortal (newSVval64 (req->offs))); + break; + + case EIO_READ: + { + 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_result); + } break; - case REQ_STAT: - case REQ_LSTAT: - case REQ_FSTAT: - PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; - PL_laststatval = req->result; - PL_statcache = *(Stat_t *)(req->ptr2); - PUSHs (sv_2mortal (newSViv (req->result))); + case EIO_SLURP: + { + if (req->result >= 0) + { + /* if length was originally not known, we steal the malloc'ed memory */ + if (req->flags & EIO_FLAG_PTR2_FREE) + { + req->flags &= ~EIO_FLAG_PTR2_FREE; + sv_set_foreign (req->sv2, &sysfree_vtbl, req->ptr2, req->result); + } + else + { + SvCUR_set (req->sv2, req->result); + *SvEND (req->sv2) = 0; + SvPOK_only (req->sv2); + } + + SvSETMAGIC (req->sv2); + } + + PUSHs (sv_result); + } break; - case REQ_READ: - SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); - *SvEND (req->sv1) = 0; - PUSHs (sv_2mortal (newSViv (req->result))); + case EIO_CUSTOM: + if (req->feed == fiemap) + { +#if HAVE_FIEMAP + if (!req->result) + { + struct fiemap *fiemap = (struct fiemap *)req->ptr1; + + if (fiemap->fm_extent_count) + { + AV *av = newAV (); + int i; + + while (fiemap->fm_mapped_extents) + { + struct fiemap_extent *extent = &fiemap->fm_extents [--fiemap->fm_mapped_extents]; + AV *ext_av = newAV (); + + av_store (ext_av, 3, newSVuv (extent->fe_flags)); + av_store (ext_av, 2, newSVval64 (extent->fe_length)); + av_store (ext_av, 1, newSVval64 (extent->fe_physical)); + av_store (ext_av, 0, newSVval64 (extent->fe_logical)); + + av_store (av, fiemap->fm_mapped_extents, newRV_noinc ((SV *)ext_av)); + } + + PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); + } + else + { + SvIV_set (sv_result, fiemap->fm_mapped_extents); + PUSHs (sv_result); + } + } +#endif + } + else + PUSHs (sv_result); break; + case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */ + if (req->result > 0) + SvIV_set (sv_result, 0); + /* FALLTHROUGH */ + default: - PUSHs (sv_2mortal (newSViv (req->result))); + PUSHs (sv_result); break; } errno = req->errorno; PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); + call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); SPAGAIN; + if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache)) + SvREFCNT_dec (sv_result); + else + sv_result_cache = sv_result; + FREETMPS; LEAVE; - } - - if (req->grp) - { - aio_req grp = req->grp; - - /* unlink request */ - if (req->grp_next) req->grp_next->grp_prev = req->grp_prev; - if (req->grp_prev) req->grp_prev->grp_next = req->grp_next; - if (grp->grp_first == req) - grp->grp_first = req->grp_next; - - aio_grp_dec (grp); + PUTBACK; } - if (SvTRUE (ERRSV)) - { - req_free (req); - croak (0); - } + return !!SvTRUE (ERRSV); } -static void req_free (aio_req req) +static void +req_destroy (aio_req req) { if (req->self) { @@ -540,873 +811,695 @@ SvREFCNT_dec (req->self); } - SvREFCNT_dec (req->fh); SvREFCNT_dec (req->sv1); SvREFCNT_dec (req->sv2); + SvREFCNT_dec (req->sv3); + SvREFCNT_dec (req->sv4); SvREFCNT_dec (req->callback); - if (req->flags & FLAG_PTR2_FREE) - free (req->ptr2); - - Safefree (req); + free (req); } -static void req_cancel_subs (aio_req grp) +static void +req_cancel_subs (aio_req grp) { - aio_req sub; - - if (grp->type != REQ_GROUP) + if (grp->type != EIO_GROUP) return; SvREFCNT_dec (grp->sv2); grp->sv2 = 0; - for (sub = grp->grp_first; sub; sub = sub->grp_next) - req_cancel (sub); -} - -static void req_cancel (aio_req req) -{ - req->flags |= FLAG_CANCELLED; - - req_cancel_subs (req); -} - -static void *aio_proc(void *arg); - -static void start_thread (void) -{ - sigset_t fullsigset, oldsigset; - pthread_attr_t attr; - - worker *wrk = calloc (1, sizeof (worker)); - - if (!wrk) - croak ("unable to allocate worker thread data"); - - pthread_attr_init (&attr); - pthread_attr_setstacksize (&attr, STACKSIZE); - pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); -#ifdef PTHREAD_SCOPE_PROCESS - pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS); -#endif - - sigfillset (&fullsigset); - - LOCK (wrklock); - sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); - - if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) - { - wrk->prev = &wrk_first; - wrk->next = wrk_first.next; - wrk_first.next->prev = wrk; - wrk_first.next = wrk; - ++started; - } - else - free (wrk); - - sigprocmask (SIG_SETMASK, &oldsigset, 0); - UNLOCK (wrklock); -} - -static void maybe_start_thread () -{ - if (get_nthreads () >= wanted) - return; - - /* todo: maybe use idle here, but might be less exact */ - if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs) - return; - - start_thread (); -} - -static void req_send (aio_req req) -{ - ++nreqs; - - LOCK (reqlock); - ++nready; - reqq_push (&req_queue, req); - pthread_cond_signal (&reqwait); - UNLOCK (reqlock); - - maybe_start_thread (); -} - -static void end_thread (void) -{ - aio_req req; - - Newz (0, req, 1, aio_cb); - - req->type = REQ_QUIT; - req->pri = PRI_MAX + PRI_BIAS; - - LOCK (reqlock); - reqq_push (&req_queue, req); - pthread_cond_signal (&reqwait); - UNLOCK (reqlock); - - LOCK (wrklock); - --started; - UNLOCK (wrklock); -} - -static void set_max_idle (int nthreads) -{ - if (WORDACCESS_UNSAFE) LOCK (reqlock); - max_idle = nthreads <= 0 ? 1 : nthreads; - if (WORDACCESS_UNSAFE) UNLOCK (reqlock); -} - -static void min_parallel (int nthreads) -{ - if (wanted < nthreads) - wanted = nthreads; + eio_grp_cancel (grp); } -static void max_parallel (int nthreads) +static void ecb_cold +create_respipe (void) { - if (wanted > nthreads) - wanted = nthreads; - - while (started > wanted) - end_thread (); + if (s_epipe_renew (&respipe)) + croak ("IO::AIO: unable to initialize result pipe"); } -static void poll_wait () +static void +poll_wait (void) { - fd_set rfd; - - while (nreqs) + while (eio_nreqs ()) { int size; - if (WORDACCESS_UNSAFE) LOCK (reslock); - size = res_queue.size; - if (WORDACCESS_UNSAFE) UNLOCK (reslock); + + X_LOCK (EIO_POOL->reslock); + size = EIO_POOL->res_queue.size; + X_UNLOCK (EIO_POOL->reslock); if (size) return; - maybe_start_thread (); - - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); + etp_maybe_start_thread (EIO_POOL); - select (respipe [0] + 1, &rfd, 0, 0, 0); + s_epipe_wait (&respipe); } } -static int poll_cb () +static int +poll_cb (void) { - dSP; - int count = 0; - int maxreqs = max_poll_reqs; - int do_croak = 0; - struct timeval tv_start, tv_now; - aio_req req; - - if (max_poll_time) - gettimeofday (&tv_start, 0); - for (;;) { - for (;;) - { - maybe_start_thread (); - - LOCK (reslock); - req = reqq_shift (&res_queue); - - if (req) - { - --npending; - - if (!res_queue.size) - { - /* read any signals sent by the worker threads */ - char buf [32]; - while (read (respipe [0], buf, 32) == 32) - ; - } - } - - UNLOCK (reslock); - - if (!req) - break; - - --nreqs; + int res = eio_poll (); - if (req->type == REQ_GROUP && req->size) - { - req->int1 = 1; /* mark request as delayed */ - continue; - } - else - { - req_invoke (req); - - count++; - } - - req_free (req); + if (res > 0) + croak (0); - if (maxreqs && !--maxreqs) - break; - - if (max_poll_time) - { - gettimeofday (&tv_now, 0); - - if (tvdiff (&tv_start, &tv_now) >= max_poll_time) - break; - } - } - - if (nreqs <= max_outstanding) - break; + if (!max_outstanding || max_outstanding > eio_nreqs ()) + return res; poll_wait (); - - ++maxreqs; } - - return count; } -static void create_pipe () +static void ecb_cold +reinit (void) { - 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"); + create_respipe (); - if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) - croak ("cannot set result pipe to nonblocking mode"); + if (eio_init (want_poll, done_poll) < 0) + croak ("IO::AIO: unable to initialise eio library"); } /*****************************************************************************/ -/* 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 SV * +get_cb (SV *cb_sv) { - ssize_t res; - off_t ooffset; - - LOCK (preadwritelock); - ooffset = lseek (fd, 0, SEEK_CUR); - lseek (fd, offset, SEEK_SET); - res = read (fd, buf, count); - lseek (fd, ooffset, SEEK_SET); - UNLOCK (preadwritelock); - - return res; + SvGETMAGIC (cb_sv); + return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; } -static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) +static aio_req ecb_noinline +dreq (SV *callback) { - ssize_t res; - off_t ooffset; - - LOCK (preadwritelock); - ooffset = lseek (fd, 0, SEEK_CUR); - lseek (fd, offset, SEEK_SET); - res = write (fd, buf, count); - lseek (fd, offset, SEEK_SET); - UNLOCK (preadwritelock); - - return res; -} -#endif - -#if !HAVE_FDATASYNC -# define fdatasync fsync -#endif + SV *cb_cv; + aio_req req; + int req_pri = next_pri; + next_pri = EIO_PRI_DEFAULT; -#if !HAVE_READAHEAD -# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) + cb_cv = get_cb (callback); -static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self) -{ - dBUF; + req = calloc (sizeof (*req), 1); + if (!req) + croak ("out of memory during eio_req allocation"); - while (count > 0) - { - size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; + req->callback = SvREFCNT_inc (cb_cv); + req->pri = req_pri; - pread (fd, aio_buf, len, offset); - offset += len; - count -= len; - } - - errno = 0; + return req; } -#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) -{ - struct dirent *e; - int errorno; - - LOCK (readdirlock); - - e = readdir (dirp); - errorno = errno; - - if (e) - { - *res = ent; - strcpy (ent->d_name, e->d_name); - } - else - *res = 0; - - UNLOCK (readdirlock); +#define dREQ \ + aio_req req = dreq (callback); \ - errno = errorno; - return e ? 0 : -1; -} -#endif +#define REQ_SEND \ + PUTBACK; \ + req_submit (req); \ + SPAGAIN; \ + \ + if (GIMME_V != G_VOID) \ + XPUSHs (req_sv (req, aio_req_stash)); -/* sendfile always needs emulation */ -static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self) +ecb_inline void +req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr) { - 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: 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 - ) - ) + if (expect_false (SvROK (path))) { - /* emulate sendfile. this is a major pain in the ass */ - dBUF; - - res = 0; + SV *rv = SvRV (path); + SV *wdob; - while (count) + if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1) { - ssize_t cnt; - - cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset); + path = AvARRAY (rv)[1]; + wdob = AvARRAY (rv)[0]; - if (cnt <= 0) + if (SvOK (wdob)) { - if (cnt && !res) res = -1; - break; + *wd = SvAIO_WD (wdob); + *wdsv = SvREFCNT_inc_NN (SvRV (wdob)); } - - cnt = write (ofd, aio_buf, cnt); - - if (cnt <= 0) - { - if (cnt && !res) res = -1; - break; - } - - offset += cnt; - res += cnt; - count -= cnt; + else + *wd = EIO_INVALID_WD; } + else if (SvTYPE (rv) == SVt_PVMG && SvSTASH (rv) == aio_wd_stash) + { + *wd = (aio_wd)(long)SvIVX (rv); + *wdsv = SvREFCNT_inc_NN (rv); + *ptr = "."; + return; /* path set to "." */ + } + else + croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair"); } - return res; + *pathsv = newSVsv (path); + *ptr = SvPVbyte_nolen (*pathsv); } -/* read a full directory */ -static void scandir_ (aio_req req, worker *self) +static void ecb_noinline +req_set_path1 (aio_req req, SV *path) { - DIR *dirp; - 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; - - LOCK (wrklock); - self->dirp = dirp = opendir (req->ptr1); - self->dbuf = u = malloc (sizeof (*u)); - req->flags |= FLAG_PTR2_FREE; - req->ptr2 = names = malloc (memlen); - UNLOCK (wrklock); - - if (dirp && u && names) - 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++; - - while (memofs + len > memlen) - { - memlen *= 2; - LOCK (wrklock); - req->ptr2 = names = realloc (names, memlen); - UNLOCK (wrklock); - - if (!names) - break; - } - - memcpy (names + memofs, name, len); - memofs += len; - } - } - - if (errno) - res = -1; - - req->result = res; + req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1); } -/*****************************************************************************/ - -static void *aio_proc (void *thr_arg) +static void ecb_noinline +req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path) { - aio_req req; - struct timespec ts; - worker *self = (worker *)thr_arg; + SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path; - /* try to distribute timeouts somewhat evenly */ - ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) - * (1000000000UL / 1024UL); - - for (;;) + switch (SvTYPE (rv)) { - ts.tv_sec = time (0) + IDLE_TIMEOUT; - - LOCK (reqlock); - - for (;;) - { - self->req = req = reqq_shift (&req_queue); - - if (req) - break; - - ++idle; - - if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) - == ETIMEDOUT) - { - if (idle > max_idle) - { - --idle; - UNLOCK (reqlock); - LOCK (wrklock); - --started; - UNLOCK (wrklock); - goto quit; - } - - /* we are allowed to idle, so do so without any timeout */ - pthread_cond_wait (&reqwait, &reqlock); - ts.tv_sec = time (0) + IDLE_TIMEOUT; - } - - --idle; - } - - --nready; - - UNLOCK (reqlock); - - errno = 0; /* strictly unnecessary */ - - if (!(req->flags & FLAG_CANCELLED)) - switch (req->type) - { - case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; - case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break; - - case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; - case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break; - - case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break; - case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break; - case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break; - - case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; - case REQ_CLOSE: req->result = close (req->int1); break; - case REQ_UNLINK: req->result = unlink (req->ptr1); break; - case REQ_RMDIR: req->result = rmdir (req->ptr1); break; - case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; - case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; - case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; - case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; - case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; - - case REQ_FDATASYNC: req->result = fdatasync (req->int1); break; - case REQ_FSYNC: req->result = fsync (req->int1); break; - case REQ_READDIR: scandir_ (req, self); break; - - case REQ_BUSY: - { - struct timeval tv; - - tv.tv_sec = req->int1; - tv.tv_usec = req->int2; - - req->result = select (0, 0, 0, 0, &tv); - } - - case REQ_GROUP: - case REQ_NOP: - break; - - case REQ_QUIT: - goto quit; - - default: - req->result = ENOSYS; - break; - } - - req->errorno = errno; - - LOCK (reslock); - - ++npending; - - if (!reqq_push (&res_queue, req)) - /* write a dummy byte to the pipe so fh becomes ready */ - write (respipe [1], &respipe, 1); - - self->req = 0; - worker_clear (self); + case SVt_PVIO: + case SVt_PVLV: + case SVt_PVGV: + req->type = type_fh; + req->sv1 = newSVsv (fh_or_path); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + break; - UNLOCK (reslock); + default: + req->type = type_path; + req_set_path1 (req, fh_or_path); + break; } - -quit: - LOCK (wrklock); - worker_free (self); - UNLOCK (wrklock); - - return 0; } /*****************************************************************************/ -static void atfork_prepare (void) +static void +ts_set (struct timespec *ts, NV value) { - LOCK (wrklock); - LOCK (reqlock); - LOCK (reslock); -#if !HAVE_PREADWRITE - LOCK (preadwritelock); -#endif -#if !HAVE_READDIR_R - LOCK (readdirlock); -#endif + ts->tv_sec = value; + ts->tv_nsec = (value - ts->tv_sec) * 1e9; } -static void atfork_parent (void) +static NV +ts_get (const struct timespec *ts) { -#if !HAVE_READDIR_R - UNLOCK (readdirlock); -#endif -#if !HAVE_PREADWRITE - UNLOCK (preadwritelock); -#endif - UNLOCK (reslock); - UNLOCK (reqlock); - UNLOCK (wrklock); + return ts->tv_sec + ts->tv_nsec * 1e-9; } -static void atfork_child (void) -{ - aio_req prv; - - while (prv = reqq_shift (&req_queue)) - req_free (prv); - - while (prv = reqq_shift (&res_queue)) - req_free (prv); - - while (wrk_first.next != &wrk_first) - { - worker *wrk = wrk_first.next; - - if (wrk->req) - req_free (wrk->req); - - worker_clear (wrk); - worker_free (wrk); - } - - started = 0; - idle = 0; - nreqs = 0; - nready = 0; - npending = 0; - - close (respipe [0]); - close (respipe [1]); - create_pipe (); - - atfork_parent (); -} +/*****************************************************************************/ -#define dREQ \ - aio_req req; \ - int req_pri = next_pri; \ - next_pri = DEFAULT_PRI + PRI_BIAS; \ - \ - if (SvOK (callback) && !SvROK (callback)) \ - croak ("callback must be undef or of reference type"); \ - \ - Newz (0, req, 1, aio_cb); \ - if (!req) \ - croak ("out of memory during aio_req allocation"); \ - \ - req->callback = newSVsv (callback); \ - req->pri = req_pri +XS(boot_IO__AIO) ecb_cold; -#define REQ_SEND \ - req_send (req); \ - \ - if (GIMME_V != G_VOID) \ - XPUSHs (req_sv (req, AIO_REQ_KLASS)); - MODULE = IO::AIO PACKAGE = IO::AIO PROTOTYPES: ENABLE BOOT: { - HV *stash = gv_stashpv ("IO::AIO", 1); + 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 }, + + /* you have to re-run ./gendef0 after adding/removing any constants here */ + /* the first block can be undef if missing */ + const_iv (ENOSYS) + const_iv (EXDEV) + const_iv (EBADR) + + /* for lseek */ + const_iv (SEEK_DATA) + const_iv (SEEK_HOLE) + + 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_niv (MADV_NORMAL , POSIX_MADV_NORMAL) + const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL) + const_niv (MADV_RANDOM , POSIX_MADV_RANDOM) + const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED) + const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED) + + /* the second block will be 0 when missing */ + const_iv (O_ACCMODE) + + 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) + + const_iv (O_ASYNC) + const_iv (O_DIRECT) + const_iv (O_NOATIME) + + const_iv (O_CLOEXEC) + const_iv (O_NOCTTY) + const_iv (O_NOFOLLOW) + const_iv (O_NONBLOCK) + const_iv (O_EXEC) + const_iv (O_SEARCH) + const_iv (O_DIRECTORY) + const_iv (O_DSYNC) + const_iv (O_RSYNC) + const_iv (O_SYNC) + const_iv (O_PATH) + const_iv (O_TMPFILE) + const_iv (O_TTY_INIT) + + const_iv (S_IFIFO) + const_iv (S_IFCHR) + const_iv (S_IFBLK) + const_iv (S_IFLNK) + const_iv (S_IFREG) + const_iv (S_IFDIR) + const_iv (S_IFWHT) + const_iv (S_IFSOCK) + const_iv (S_IFMT) + + 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_NONE) + const_iv (PROT_EXEC) + const_iv (PROT_READ) + const_iv (PROT_WRITE) + + const_iv (MAP_PRIVATE) + const_iv (MAP_SHARED) + const_iv (MAP_FIXED) + const_iv (MAP_ANONYMOUS) + + /* linuxish */ + const_iv (MAP_LOCKED) + const_iv (MAP_NORESERVE) + const_iv (MAP_POPULATE) + const_iv (MAP_NONBLOCK) + const_iv (MAP_GROWSDOWN) + const_iv (MAP_32BIT) + const_iv (MAP_HUGETLB) + const_iv (MAP_STACK) + + const_iv (MREMAP_MAYMOVE) + const_iv (MREMAP_FIXED) + + const_iv (F_DUPFD_CLOEXEC) + + const_iv (F_OFD_GETLK) + const_iv (F_OFD_SETLK) + const_iv (F_OFD_GETLKW) + + const_iv (FIFREEZE) + const_iv (FITHAW) + const_iv (FITRIM) + const_iv (FICLONE) + const_iv (FICLONERANGE) + const_iv (FIDEDUPERANGE) + + const_iv (FS_IOC_GETFLAGS) + const_iv (FS_IOC_SETFLAGS) + const_iv (FS_IOC_GETVERSION) + const_iv (FS_IOC_SETVERSION) + const_iv (FS_IOC_FIEMAP) + const_iv (FS_IOC_FSGETXATTR) + const_iv (FS_IOC_FSSETXATTR) + const_iv (FS_IOC_SET_ENCRYPTION_POLICY) + const_iv (FS_IOC_GET_ENCRYPTION_PWSALT) + const_iv (FS_IOC_GET_ENCRYPTION_POLICY) + + const_iv (FS_KEY_DESCRIPTOR_SIZE) + + const_iv (FS_SECRM_FL) + const_iv (FS_UNRM_FL) + const_iv (FS_COMPR_FL) + const_iv (FS_SYNC_FL) + const_iv (FS_IMMUTABLE_FL) + const_iv (FS_APPEND_FL) + const_iv (FS_NODUMP_FL) + const_iv (FS_NOATIME_FL) + const_iv (FS_DIRTY_FL) + const_iv (FS_COMPRBLK_FL) + const_iv (FS_NOCOMP_FL) + const_iv (FS_ENCRYPT_FL) + const_iv (FS_BTREE_FL) + const_iv (FS_INDEX_FL) + const_iv (FS_JOURNAL_DATA_FL) + const_iv (FS_NOTAIL_FL) + const_iv (FS_DIRSYNC_FL) + const_iv (FS_TOPDIR_FL) + const_iv (FS_FL_USER_MODIFIABLE) + + const_iv (FS_XFLAG_REALTIME) + const_iv (FS_XFLAG_PREALLOC) + const_iv (FS_XFLAG_IMMUTABLE) + const_iv (FS_XFLAG_APPEND) + const_iv (FS_XFLAG_SYNC) + const_iv (FS_XFLAG_NOATIME) + const_iv (FS_XFLAG_NODUMP) + const_iv (FS_XFLAG_RTINHERIT) + const_iv (FS_XFLAG_PROJINHERIT) + const_iv (FS_XFLAG_NOSYMLINKS) + const_iv (FS_XFLAG_EXTSIZE) + const_iv (FS_XFLAG_EXTSZINHERIT) + const_iv (FS_XFLAG_NODEFRAG) + const_iv (FS_XFLAG_FILESTREAM) + const_iv (FS_XFLAG_DAX) + const_iv (FS_XFLAG_HASATTR) + + const_iv (FIEMAP_FLAG_SYNC) + const_iv (FIEMAP_FLAG_XATTR) + const_iv (FIEMAP_FLAGS_COMPAT) + const_iv (FIEMAP_EXTENT_LAST) + const_iv (FIEMAP_EXTENT_UNKNOWN) + const_iv (FIEMAP_EXTENT_DELALLOC) + const_iv (FIEMAP_EXTENT_ENCODED) + const_iv (FIEMAP_EXTENT_DATA_ENCRYPTED) + const_iv (FIEMAP_EXTENT_NOT_ALIGNED) + const_iv (FIEMAP_EXTENT_DATA_INLINE) + const_iv (FIEMAP_EXTENT_DATA_TAIL) + const_iv (FIEMAP_EXTENT_UNWRITTEN) + const_iv (FIEMAP_EXTENT_MERGED) + const_iv (FIEMAP_EXTENT_SHARED) + + const_iv (SPLICE_F_MOVE) + const_iv (SPLICE_F_NONBLOCK) + const_iv (SPLICE_F_MORE) + const_iv (SPLICE_F_GIFT) + + const_iv (EFD_CLOEXEC) + const_iv (EFD_NONBLOCK) + const_iv (EFD_SEMAPHORE) + + const_iv (CLOCK_REALTIME) + const_iv (CLOCK_MONOTONIC) + const_iv (CLOCK_BOOTTIME) + const_iv (CLOCK_REALTIME_ALARM) + const_iv (CLOCK_BOOTTIME_ALARM) + + const_iv (TFD_NONBLOCK) + const_iv (TFD_CLOEXEC) + + const_iv (TFD_TIMER_ABSTIME) + const_iv (TFD_TIMER_CANCEL_ON_SET) + + /* these are libeio constants, and are independent of gendef0 */ + const_eio (SEEK_SET) + const_eio (SEEK_CUR) + const_eio (SEEK_END) + + const_eio (MCL_FUTURE) + const_eio (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 (FALLOC_FL_KEEP_SIZE) + const_eio (FALLOC_FL_PUNCH_HOLE) + const_eio (FALLOC_FL_COLLAPSE_RANGE) + const_eio (FALLOC_FL_ZERO_RANGE) + const_eio (FALLOC_FL_INSERT_RANGE) + const_eio (FALLOC_FL_UNSHARE_RANGE) + + const_eio (RENAME_NOREPLACE) + const_eio (RENAME_EXCHANGE) + const_eio (RENAME_WHITEOUT) + + 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); + aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1); + + for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) + newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); - newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); - newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); - newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); - newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); - newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); - newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); + newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); - create_pipe (); - pthread_atfork (atfork_prepare, atfork_parent, atfork_child); + reinit (); } void -max_poll_reqs (int nreqs) +reinit () + PROTOTYPE: + +void +max_poll_reqs (unsigned int nreqs) PROTOTYPE: $ CODE: - max_poll_reqs = nreqs; + eio_set_max_poll_reqs (nreqs); void max_poll_time (double nseconds) PROTOTYPE: $ CODE: - max_poll_time = nseconds * AIO_TICKS; + eio_set_max_poll_time (nseconds); void -min_parallel (int nthreads) +min_parallel (unsigned int nthreads) PROTOTYPE: $ + CODE: + eio_set_min_parallel (nthreads); void -max_parallel (int nthreads) +max_parallel (unsigned int nthreads) PROTOTYPE: $ + CODE: + eio_set_max_parallel (nthreads); void -max_idle (int nthreads) +max_idle (unsigned int nthreads) PROTOTYPE: $ CODE: - set_max_idle (nthreads); + eio_set_max_idle (nthreads); -int -max_outstanding (int maxreqs) +void +idle_timeout (unsigned int seconds) + PROTOTYPE: $ + CODE: + eio_set_idle_timeout (seconds); + +void +max_outstanding (unsigned int maxreqs) PROTOTYPE: $ CODE: - RETVAL = max_outstanding; max_outstanding = maxreqs; - OUTPUT: - RETVAL void -aio_open (pathname,flags,mode,callback=&PL_sv_undef) - SV * pathname - int flags - int mode - SV * callback - PROTOTYPE: $$$;$ +aio_wd (SV8 *pathname, SV *callback = &PL_sv_undef) PPCODE: { dREQ; - req->type = REQ_OPEN; - req->sv1 = newSVsv (pathname); - req->ptr1 = SvPVbyte_nolen (pathname); + req->type = EIO_WD_OPEN; + req_set_path1 (req, pathname); + + REQ_SEND; +} + +void +aio_open (SV8 *pathname, int flags, int mode, SV *callback = &PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_OPEN; + req_set_path1 (req, pathname); req->int1 = flags; - req->mode = mode; + req->int2 = mode; REQ_SEND; } void -aio_close (fh,callback=&PL_sv_undef) - SV * fh - SV * callback - PROTOTYPE: $;$ +aio_fsync (SV *fh, SV *callback = &PL_sv_undef) ALIAS: - aio_close = REQ_CLOSE - aio_fsync = REQ_FSYNC - aio_fdatasync = REQ_FDATASYNC + aio_fsync = EIO_FSYNC + aio_fdatasync = EIO_FDATASYNC + aio_syncfs = EIO_SYNCFS PPCODE: { + int fd = s_fileno_croak (fh, 0); dREQ; req->type = ix; - req->fh = newSVsv (fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->sv1 = newSVsv (fh); + req->int1 = fd; + + REQ_SEND; +} + +void +aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback = &PL_sv_undef) + 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; +} + +void +aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback = &PL_sv_undef) + PPCODE: +{ + int fd = s_fileno_croak (fh, 0); + dREQ; + + req->type = EIO_FALLOCATE; + req->sv1 = newSVsv (fh); + req->int1 = fd; + req->int2 = mode; + req->offs = offset; + req->size = len; + + REQ_SEND; +} + +void +aio_close (SV *fh, SV *callback = &PL_sv_undef) + PPCODE: +{ + static int close_fd = -1; /* dummy fd to close fds via dup2 */ + int fd = s_fileno_croak (fh, 0); + dREQ; + + if (expect_false (close_fd < 0)) + { + int pipefd [2]; + + if ( +#ifdef _WIN32 + _pipe (pipefd, 1, _O_BINARY) < 0 +#else + pipe (pipefd) < 0 + || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0 +#endif + || close (pipefd [1]) < 0 + ) + abort (); /*D*/ + + close_fd = pipefd [0]; + } + + req->type = EIO_DUP2; + req->int1 = close_fd; + req->sv2 = newSVsv (fh); + req->int2 = fd; + + REQ_SEND; +} + +void +aio_seek (SV *fh, SV *offset, int whence, SV *callback = &PL_sv_undef) + PPCODE: +{ + int fd = s_fileno_croak (fh, 0); + dREQ; + + req->type = EIO_SEEK; + req->sv1 = newSVsv (fh); + req->int1 = fd; + req->offs = SvVAL64 (offset); + req->int2 = whence; - REQ_SEND (req); + REQ_SEND; } 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 - PROTOTYPE: $$$$$;$ + aio_read = EIO_READ + aio_write = EIO_WRITE PPCODE: { 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 */ + if (!SvPOK (data) || SvLEN (data) >= SvCUR (data)) + svptr = sv_grow (data, len + dataoffset + 1); + else if (SvCUR (data) < len + dataoffset) + croak ("length + dataoffset outside of scalar, and cannot grow"); } - if (length < 0) - croak ("length must not be negative"); - { dREQ; req->type = ix; - req->fh = newSVsv (fh); - req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) - : IoOFP (sv_2io (fh))); - req->offs = offset; - req->size = length; - req->sv1 = SvREFCNT_inc (data); - req->ptr1 = (char *)svptr + dataoffset; + req->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->flags |= FLAG_SV1_RO_OFF; + req->flags |= FLAG_SV2_RO_OFF; } REQ_SEND; @@ -1414,44 +1507,73 @@ } void -aio_readlink (path,callback=&PL_sv_undef) - SV * path - SV * callback - PROTOTYPE: $$;$ +aio_ioctl (SV *fh, unsigned long request, SV8 *arg, SV *callback = &PL_sv_undef) + ALIAS: + aio_ioctl = EIO_IOCTL + aio_fcntl = EIO_FCNTL PPCODE: { - SV *data; - dREQ; + int fd = s_fileno_croak (fh, 0); + char *svptr; + + if (SvPOK (arg) || !SvNIOK (arg)) + { + STRLEN svlen; + /* perl uses IOCPARM_LEN for fcntl, so we do, too */ +#ifdef IOCPARM_LEN + STRLEN need = IOCPARM_LEN (request); +#else + STRLEN need = 256; +#endif - data = newSV (NAME_MAX); - SvPOK_on (data); + if (svlen < need) + svptr = SvGROW (arg, need); + } + else + svptr = (char *)SvIV (arg); - req->type = REQ_READLINK; - req->fh = newSVsv (path); - req->ptr2 = SvPVbyte_nolen (path); - req->sv1 = data; - req->ptr1 = SvPVbyte_nolen (data); + { + dREQ; + + req->type = ix; + req->sv1 = newSVsv (fh); + req->int1 = fd; + req->int2 = (long)request; + req->sv2 = SvREFCNT_inc (arg); + req->ptr2 = svptr; + + REQ_SEND; + } +} + +void +aio_readlink (SV8 *pathname, SV *callback = &PL_sv_undef) + ALIAS: + aio_readlink = EIO_READLINK + aio_realpath = EIO_REALPATH + PPCODE: +{ + dREQ; + + req->type = ix; + req_set_path1 (req, pathname); REQ_SEND; } 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 - PROTOTYPE: $$$$;$ +aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback = &PL_sv_undef) 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->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); + req->type = EIO_SENDFILE; + req->sv1 = newSVsv (out_fh); + req->int1 = ofd; req->sv2 = newSVsv (in_fh); - req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); + req->int2 = ifd; req->offs = in_offset; req->size = length; @@ -1459,19 +1581,15 @@ } void -aio_readahead (fh,offset,length,callback=&PL_sv_undef) - SV * fh - UV offset - IV length - SV * callback - PROTOTYPE: $$$;$ +aio_readahead (SV *fh, off_t offset, size_t length, SV *callback = &PL_sv_undef) PPCODE: { + int fd = s_fileno_croak (fh, 0); dREQ; - req->type = REQ_READAHEAD; - req->fh = newSVsv (fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->type = EIO_READAHEAD; + req->sv1 = newSVsv (fh); + req->int1 = fd; req->offs = offset; req->size = length; @@ -1479,152 +1597,369 @@ } 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->ptr2 = malloc (sizeof (Stat_t)); - if (!req->ptr2) - { - req_free (req); - croak ("out of memory during aio_stat statdata allocation"); - } + req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path); - req->flags |= FLAG_PTR2_FREE; + REQ_SEND; +} - if (SvPOK (fh_or_path)) - { - req->type = ix; - req->sv1 = newSVsv (fh_or_path); - req->ptr1 = SvPVbyte_nolen (fh_or_path); - } - else - { - req->type = REQ_FSTAT; - req->fh = newSVsv (fh_or_path); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); - } +UV +major (UV dev) + ALIAS: + minor = 1 + CODE: + RETVAL = ix ? minor (dev) : major (dev); + OUTPUT: + RETVAL + +UV +makedev (UV maj, UV min) + CODE: + RETVAL = makedev (maj, min); + OUTPUT: + RETVAL + +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_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path); REQ_SEND; } void -aio_unlink (pathname,callback=&PL_sv_undef) - SV * pathname - SV * callback +aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback = &PL_sv_undef) + PPCODE: +{ + dREQ; + + req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; + req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path); + + REQ_SEND; +} + +void +aio_chmod (SV8 *fh_or_path, int mode, SV *callback = &PL_sv_undef) + PPCODE: +{ + dREQ; + + req->int2 = mode; + req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, 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_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path); + + REQ_SEND; +} + +void +aio_readdirx (SV8 *pathname, IV flags, SV *callback = &PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_READDIR; + req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; + + if (flags & EIO_READDIR_DENTS) + req->int1 |= EIO_READDIR_CUSTOM2; + + req_set_path1 (req, pathname); + + REQ_SEND; +} + +void +aio_mkdir (SV8 *pathname, int mode, SV *callback = &PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_MKDIR; + req->int2 = mode; + req_set_path1 (req, pathname); + + 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->sv1 = newSVsv (pathname); - req->ptr1 = SvPVbyte_nolen (pathname); + req_set_path1 (req, pathname); 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: { + eio_wd wd2 = 0; dREQ; req->type = ix; - req->fh = newSVsv (oldpath); - req->ptr2 = SvPVbyte_nolen (req->fh); - req->sv1 = newSVsv (newpath); - req->ptr1 = SvPVbyte_nolen (newpath); + req_set_path1 (req, oldpath); + req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); + req->int3 = (long)wd2; REQ_SEND; } void -aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) - SV * pathname - SV * callback - UV mode - UV dev +aio_rename2 (SV8 *oldpath, SV8 *newpath, int flags = 0, SV *callback = &PL_sv_undef) PPCODE: { + eio_wd wd2 = 0; dREQ; - req->type = REQ_MKNOD; - req->sv1 = newSVsv (pathname); - req->ptr1 = SvPVbyte_nolen (pathname); - req->mode = (mode_t)mode; + req->type = EIO_RENAME; + req_set_path1 (req, oldpath); + req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); + req->int2 = flags; + req->int3 = (long)wd2; + + REQ_SEND; +} + +void +aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback = &PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_MKNOD; + req->int2 = (mode_t)mode; req->offs = dev; + req_set_path1 (req, pathname); REQ_SEND; } void -aio_busy (delay,callback=&PL_sv_undef) - double delay - SV * callback +aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = -1, SV *callback = &PL_sv_undef) + ALIAS: + aio_mtouch = EIO_MTOUCH + aio_msync = EIO_MSYNC + PPCODE: +{ + STRLEN svlen; + char *svptr = SvPVbyte (data, svlen); + UV len = SvUV (length); + + if (flags < 0) + flags = ix == EIO_MSYNC ? EIO_MS_SYNC : 0; + + 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->sv2 = SvREFCNT_inc (data); + req->ptr2 = (char *)svptr + offset; + req->size = len; + req->int1 = flags; + + REQ_SEND; + } +} + +void +aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback = &PL_sv_undef) + PPCODE: +{ + STRLEN svlen; + char *svptr = SvPVbyte (data, svlen); + UV len = SvUV (length); + + 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 = EIO_MLOCK; + req->sv2 = SvREFCNT_inc (data); + req->ptr2 = (char *)svptr + offset; + req->size = len; + + REQ_SEND; + } +} + +void +aio_mlockall (IV flags, SV *callback = &PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_MLOCKALL; + req->int1 = flags; + + REQ_SEND; +} + +void +aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback = &PL_sv_undef) + PPCODE: +{ + int fd = s_fileno_croak (fh, 0); + dREQ; + + req->type = EIO_CUSTOM; + req->sv1 = newSVsv (fh); + req->int1 = fd; + + req->feed = fiemap; +#if HAVE_FIEMAP + /* keep our fingers crossed that the next two types are 64 bit */ + req->offs = start; + req->size = SvOK (length) ? SvVAL64 (length) : ~0ULL; + req->int2 = flags; + req->int3 = SvOK (count) ? SvIV (count) : -1; +#endif + + REQ_SEND; +} + +void +aio_slurp (SV *pathname, off_t offset, UV length, SV8 *data, SV *callback = &PL_sv_undef) + PPCODE: +{ + char *svptr = 0; + + sv_clear_foreign (data); + + if (length) /* known length, directly read into scalar */ + { + if (!SvPOK (data) || SvLEN (data) >= SvCUR (data)) + svptr = sv_grow (data, length + 1); + else if (SvCUR (data) < length) + croak ("length outside of scalar, and cannot grow"); + else + svptr = SvPVbyte_nolen (data); + } + + { + dREQ; + + req->type = EIO_SLURP; + req_set_path1 (req, pathname); + req->offs = offset; + req->size = length; + req->sv2 = SvREFCNT_inc (data); + req->ptr2 = svptr; + + if (!SvREADONLY (data)) + { + SvREADONLY_on (data); + req->flags |= FLAG_SV2_RO_OFF; + } + + REQ_SEND; + } +} + +void +aio_busy (double delay, SV *callback = &PL_sv_undef) PPCODE: { dREQ; - req->type = REQ_BUSY; - req->int1 = delay < 0. ? 0 : delay; - req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1); + req->type = EIO_BUSY; + req->nv1 = delay < 0. ? 0. : delay; REQ_SEND; } void -aio_group (callback=&PL_sv_undef) - SV * callback - PROTOTYPE: ;$ +aio_group (SV *callback = &PL_sv_undef) PPCODE: { dREQ; - req->type = REQ_GROUP; + req->type = EIO_GROUP; + + PUTBACK; + req_submit (req); + SPAGAIN; - req_send (req); - XPUSHs (req_sv (req, AIO_GRP_KLASS)); + 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: ;$ +aioreq_pri (int pri = NO_INIT) CODE: - RETVAL = next_pri - PRI_BIAS; + RETVAL = next_pri; if (items > 0) { - if (pri < PRI_MIN) pri = PRI_MIN; - if (pri > PRI_MAX) pri = PRI_MAX; - next_pri = pri + PRI_BIAS; + if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; + if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; + next_pri = pri; } OUTPUT: RETVAL @@ -1633,40 +1968,36 @@ aioreq_nice (int nice = 0) CODE: nice = next_pri - nice; - if (nice < PRI_MIN) nice = PRI_MIN; - if (nice > PRI_MAX) nice = PRI_MAX; - next_pri = nice + PRI_BIAS; + 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 (0); + poll_cb (); } -void -poll() - PROTOTYPE: +int +poll () CODE: - if (nreqs) - { - poll_wait (); - poll_cb (0); - } + poll_wait (); + RETVAL = poll_cb (); + OUTPUT: + RETVAL int -poll_fileno() - PROTOTYPE: +poll_fileno () CODE: - RETVAL = respipe [0]; + RETVAL = s_epipe_fd (&respipe); OUTPUT: RETVAL int -poll_cb(...) +poll_cb (...) PROTOTYPE: CODE: RETVAL = poll_cb (); @@ -1674,60 +2005,447 @@ RETVAL void -poll_wait() - PROTOTYPE: +poll_wait () CODE: - if (nreqs) - poll_wait (); + poll_wait (); int -nreqs() - PROTOTYPE: +nreqs () CODE: - RETVAL = nreqs; + RETVAL = eio_nreqs (); OUTPUT: RETVAL int -nready() - PROTOTYPE: +nready () CODE: - RETVAL = get_nready (); + RETVAL = eio_nready (); OUTPUT: RETVAL int -npending() - PROTOTYPE: +npending () CODE: - RETVAL = get_npending (); + RETVAL = eio_npending (); OUTPUT: RETVAL int -nthreads() - PROTOTYPE: +nthreads () CODE: - if (WORDACCESS_UNSAFE) LOCK (wrklock); - RETVAL = started; - if (WORDACCESS_UNSAFE) UNLOCK (wrklock); + RETVAL = eio_nthreads (); OUTPUT: RETVAL +int +fadvise (aio_rfd fh, off_t offset, off_t length, IV advice) + CODE: + RETVAL = posix_fadvise (fh, offset, length, advice); + OUTPUT: + RETVAL + +IV +sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) + CODE: + RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); + OUTPUT: + RETVAL + +void +mmap (SV *scalar, STRLEN length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0) + PPCODE: + sv_clear_foreign (scalar); +{ + 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; + + sv_set_foreign (scalar, &mmap_vtbl, addr, length); + + if (!(prot & PROT_WRITE)) + SvREADONLY_on (scalar); + + XSRETURN_YES; +} + +void +munmap (SV *scalar) + CODE: + sv_clear_foreign (scalar); + +SV * +mremap (SV *scalar, STRLEN new_length, int flags = MREMAP_MAYMOVE, IV new_address = 0) + CODE: +{ + MAGIC *mg = mg_findext (scalar, FOREIGN_MAGIC, &mmap_vtbl); + void *new; + + if (!mg || SvPVX (scalar) != mg->mg_ptr) + croak ("IO::AIO::mremap: scalar not mapped by IO::AIO::mmap or improperly modified"); + + new = mremap (mg->mg_ptr, (size_t)mg->mg_obj, new_length, flags, (void *)new_address); + + RETVAL = &PL_sv_no; + + if (new != (void *)-1) + { + RETVAL = new == (void *)mg->mg_ptr + ? newSVpvn ("0 but true", 10) + : &PL_sv_yes; + + mg->mg_ptr = (char *)new; + mg->mg_obj = (SV *)new_length; + + SvPVX (scalar) = mg->mg_ptr; + SvCUR_set (scalar, new_length); + } +} + OUTPUT: + RETVAL + +int +madvise (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot) + ALIAS: + mprotect = 1 + CODE: +{ + STRLEN svlen; + void *addr = SvPVbyte (scalar, svlen); + STRLEN len = SvUV (length); + + if (offset < 0) + offset += svlen; + + if (offset < 0 || offset > svlen) + croak ("offset outside of scalar"); + + if (!SvOK (length) || len + offset > svlen) + len = svlen - offset; + + addr = (void *)(((intptr_t)addr) + offset); + eio_page_align (&addr, &len); + + switch (ix) + { + case 0: RETVAL = posix_madvise (addr, len, advice_or_prot); break; + case 1: RETVAL = mprotect (addr, len, advice_or_prot); break; + } +} + OUTPUT: + RETVAL + +int +munlock (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef) + CODE: +{ + STRLEN svlen; + void *addr = SvPVbyte (scalar, svlen); + size_t len = SvUV (length); + + if (offset < 0) + offset += svlen; + + if (offset < 0 || offset > svlen) + croak ("offset outside of scalar"); + + if (!SvOK (length) || len + offset > svlen) + len = svlen - offset; + + addr = (void *)(((intptr_t)addr) + offset); + eio_page_align (&addr, &len); +#if _POSIX_MEMLOCK_RANGE + RETVAL = munlock (addr, len); +#else + RETVAL = EIO_ENOSYS (); +#endif +} + OUTPUT: + RETVAL + +int +munlockall () + CODE: +#if _POSIX_MEMLOCK + munlockall (); +#else + RETVAL = EIO_ENOSYS (); +#endif + OUTPUT: + RETVAL + +int +splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags) + CODE: +{ +#if HAVE_LINUX_SPLICE + loff_t off_in_, off_out_; + RETVAL = splice ( + rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0, + wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0, + length, flags + ); +#else + RETVAL = EIO_ENOSYS (); +#endif +} + OUTPUT: + RETVAL + +int +tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags) + CODE: +#if HAVE_LINUX_SPLICE + RETVAL = tee (rfh, wfh, length, flags); +#else + RETVAL = EIO_ENOSYS (); +#endif + OUTPUT: + RETVAL + +int +pipesize (aio_rfd rfh, int new_size = -1) + PROTOTYPE: $;$ + CODE: +#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ) + if (new_size >= 0) + RETVAL = fcntl (rfh, F_SETPIPE_SZ, new_size); + else + RETVAL = fcntl (rfh, F_GETPIPE_SZ); +#else + errno = ENOSYS; + RETVAL = -1; +#endif + OUTPUT: + RETVAL + +void +pipe2 (int flags = 0) + PROTOTYPE: ;$ + PPCODE: +{ + int fd[2]; + int res; + + if (flags) +#if HAVE_PIPE2 + res = pipe2 (fd, flags); +#else + res = (errno = ENOSYS, -1); +#endif + else + res = pipe (fd); + + if (!res) + { + EXTEND (SP, 2); + PUSHs (newmortalFH (fd[0], O_RDONLY)); + PUSHs (newmortalFH (fd[1], O_WRONLY)); + } +} + +void +eventfd (unsigned int initval = 0, int flags = 0) + PPCODE: +{ + int fd; +#if HAVE_EVENTFD + fd = eventfd (initval, flags); +#else + fd = (errno = ENOSYS, -1); +#endif + + XPUSHs (newmortalFH (fd, O_RDWR)); +} + +void +timerfd_create (int clockid, int flags = 0) + PPCODE: +{ + int fd; +#if HAVE_TIMERFD + fd = timerfd_create (clockid, flags); +#else + fd = (errno = ENOSYS, -1); +#endif + + XPUSHs (newmortalFH (fd, O_RDWR)); +} + +void +timerfd_settime (SV *fh, int flags, NV interval, NV value) + PPCODE: +{ + int fd = s_fileno_croak (fh, 0); +#if HAVE_TIMERFD + int res; + struct itimerspec its, ots; + + ts_set (&its.it_interval, interval); + ts_set (&its.it_value , value); + res = timerfd_settime (fd, flags, &its, &ots); + + if (!res) + { + EXTEND (SP, 2); + PUSHs (newSVnv (ts_get (&ots.it_interval))); + PUSHs (newSVnv (ts_get (&ots.it_value))); + } +#else + errno = ENOSYS; +#endif +} + +void +timerfd_gettime (SV *fh) + PPCODE: +{ + int fd = s_fileno_croak (fh, 0); +#if HAVE_TIMERFD + int res; + struct itimerspec ots; + res = timerfd_gettime (fd, &ots); + + if (!res) + { + EXTEND (SP, 2); + PUSHs (newSVnv (ts_get (&ots.it_interval))); + PUSHs (newSVnv (ts_get (&ots.it_value))); + } +#else + errno = ENOSYS; +#endif +} + +UV +get_fdlimit () + CODE: +#if HAVE_RLIMITS + struct rlimit rl; + if (0 == getrlimit (RLIMIT_NOFILE, &rl)) + XSRETURN_UV (rl.rlim_cur == RLIM_INFINITY ? (UV)-1 : rl.rlim_cur); +#endif + XSRETURN_UNDEF; + OUTPUT: + RETVAL + +void +min_fdlimit (UV limit = 0x7fffffffU) + CODE: +{ +#if HAVE_RLIMITS + struct rlimit rl; + rlim_t orig_rlim_max; + UV bit; + + if (0 != getrlimit (RLIMIT_NOFILE, &rl)) + goto fail; + + if (rl.rlim_cur == RLIM_INFINITY) + XSRETURN_YES; + + orig_rlim_max = rl.rlim_max == RLIM_INFINITY ? ((rlim_t)0)-1 : rl.rlim_max; + + if (rl.rlim_cur < limit) + { + rl.rlim_cur = limit; + + if (rl.rlim_max < rl.rlim_cur && rl.rlim_max != RLIM_INFINITY) + rl.rlim_max = rl.rlim_cur; + } + + if (0 == setrlimit (RLIMIT_NOFILE, &rl)) + XSRETURN_YES; + + if (errno == EPERM) + { + /* setlimit failed with EPERM - maybe we can't raise the hardlimit, or maybe */ + /* our limit overflows a system-wide limit */ + /* try an adaptive algorithm, but do not lower the hardlimit */ + rl.rlim_max = 0; + for (bit = 0x40000000U; bit; bit >>= 1) + { + rl.rlim_max |= bit; + rl.rlim_cur = rl.rlim_max; + + /* nevr decrease the hard limit */ + if (rl.rlim_max < orig_rlim_max) + break; + + if (0 != setrlimit (RLIMIT_NOFILE, &rl)) + rl.rlim_max &= ~bit; /* too high, remove bit again */ + } + + /* now, raise the soft limit to the max permitted */ + if (0 == getrlimit (RLIMIT_NOFILE, &rl)) + { + rl.rlim_cur = rl.rlim_max; + if (0 == setrlimit (RLIMIT_NOFILE, &rl)) + errno = EPERM; + } + } +#endif + fail: + XSRETURN_UNDEF; +} + +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::WD + +BOOT: +{ + newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD )); + newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD)); +} + +void +DESTROY (SV *self) + CODE: +{ + aio_wd wd = SvAIO_WD (self); +#if HAVE_AT + { + SV *callback = &PL_sv_undef; + dREQ; /* clobbers next_pri :/ */ + next_pri = req->pri; /* restore next_pri */ + req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */ + req->type = EIO_WD_CLOSE; + req->wd = wd; + REQ_SEND; + } +#else + eio_wd_close_sync (wd); +#endif +} + MODULE = IO::AIO PACKAGE = IO::AIO::REQ void cancel (aio_req_ornot req) CODE: - req_cancel (req); + eio_cancel (req); void -cb (aio_req_ornot req, SV *callback=&PL_sv_undef) - CODE: - SvREFCNT_dec (req->callback); - req->callback = newSVsv (callback); +cb (aio_req_ornot req, SV *callback = NO_INIT) + 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 @@ -1736,31 +2454,21 @@ PPCODE: { int i; - aio_req req; 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->size; - 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); } } @@ -1779,6 +2487,7 @@ grp->errorno = errno; av = newAV (); + av_extend (av, items - 1); for (i = 1; i < items; ++i ) av_push (av, newSVsv (ST (i))); @@ -1795,19 +2504,19 @@ void limit (aio_req grp, int limit) CODE: - grp->int2 = limit; - aio_grp_feed (grp); + eio_grp_limit (grp, limit); void -feed (aio_req grp, SV *callback=&PL_sv_undef) +feed (aio_req grp, SV *callback = &PL_sv_undef) CODE: { SvREFCNT_dec (grp->sv2); - grp->sv2 = newSVsv (callback); + grp->sv2 = newSVsv (callback); + grp->feed = aio_grp_feed; if (grp->int2 <= 0) grp->int2 = 2; - aio_grp_feed (grp); + eio_grp_limit (grp, grp->int2); }