--- IO-AIO/AIO.xs 2007/09/24 18:14:00 1.106 +++ IO-AIO/AIO.xs 2010/11/01 22:03:43 1.174 @@ -1,4 +1,4 @@ -#include "xthread.h" +#include "libeio/xthread.h" #include @@ -6,21 +6,30 @@ #include "perl.h" #include "XSUB.h" +#include "schmorp.h" + #include #include #include #include #include +#include #include #include #include +#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES +# include +#endif + +/* perl namespace pollution */ +#undef VERSION + #ifdef _WIN32 -# define SIGIO 0 - typedef Direntry_t X_DIRENT; -#undef malloc -#undef free +# define EIO_STRUCT_DIRENT Direntry_t +# undef malloc +# undef free // perl overrides all those nice win32 functions # undef open @@ -56,326 +65,216 @@ #else -# include "autoconf/config.h" # include # include # include # include # include - typedef struct dirent X_DIRENT; +# define EIO_STRUCT_DIRENT struct dirent #endif -#if HAVE_SENDFILE -# if __linux -# include -# elif __freebsd -# include -# include -# elif __hpux -# include -# elif __solaris /* not yet */ -# include -# else -# error sendfile support requested but not available -# endif -#endif - -/* number of seconds after which idle threads exit */ -#define IDLE_TIMEOUT 10 +/* perl stupidly overrides readdir and maybe others */ +/* with thread-unsafe versions, imagine that :( */ +#undef readdir +#undef opendir +#undef closedir -/* used for struct dirent, AIX doesn't provide it */ -#ifndef NAME_MAX -# define NAME_MAX 4096 -#endif - -/* buffer size for various temporary buffers */ -#define AIO_BUFSIZE 65536 +#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 VAL64 NV # define SvVAL64 SvNV +# define newSVval64 newSVnv #endif -#define dBUF \ - char *aio_buf; \ - X_LOCK (wrklock); \ - self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ - X_UNLOCK (wrklock); \ - if (!aio_buf) \ - return -1; - -typedef SV SV8; /* byte-sv, used for argument-checking */ - -enum { - REQ_QUIT, - REQ_OPEN, REQ_CLOSE, - REQ_READ, REQ_WRITE, - REQ_READAHEAD, REQ_SENDFILE, - REQ_STAT, REQ_LSTAT, REQ_FSTAT, - REQ_TRUNCATE, REQ_FTRUNCATE, - REQ_UTIME, REQ_FUTIME, - REQ_CHMOD, REQ_FCHMOD, - REQ_CHOWN, REQ_FCHOWN, - REQ_FSYNC, REQ_FDATASYNC, - REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME, - REQ_MKNOD, REQ_READDIR, - REQ_LINK, REQ_SYMLINK, REQ_READLINK, - REQ_GROUP, REQ_NOP, - REQ_BUSY, -}; - -#define AIO_REQ_KLASS "IO::AIO::REQ" -#define AIO_GRP_KLASS "IO::AIO::GRP" - -typedef struct aio_cb -{ - struct aio_cb *volatile next; - - SV *callback; - SV *sv1, *sv2; - void *ptr1, *ptr2; - off_t offs; - size_t size; - ssize_t result; - double nv1, nv2; - - STRLEN stroffset; - int type; - int int1, int2, int3; - 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; - -enum { - FLAG_CANCELLED = 0x01, /* request was cancelled */ - FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ - FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */ -}; - -typedef aio_cb *aio_req; -typedef aio_cb *aio_req_ornot; - -enum { - PRI_MIN = -4, - PRI_MAX = 4, - - DEFAULT_PRI = 0, - PRI_BIAS = -PRI_MIN, - NUM_PRI = PRI_MAX + PRI_BIAS + 1, -}; - -#define AIO_TICKS ((1000000 + 1023) >> 10) - -static unsigned int max_poll_time = 0; -static unsigned int max_poll_reqs = 0; - -/* 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 thread_t main_tid; -static int main_sig; -static int block_sig_level; - -void block_sig () -{ - sigset_t ss; - - if (block_sig_level++) - return; - - if (!main_sig) - return; - - sigemptyset (&ss); - sigaddset (&ss, main_sig); - pthread_sigmask (SIG_BLOCK, &ss, 0); -} - -void unblock_sig () -{ - sigset_t ss; - - if (--block_sig_level) - return; - - if (!main_sig) - return; - - sigemptyset (&ss); - sigaddset (&ss, main_sig); - pthread_sigmask (SIG_UNBLOCK, &ss, 0); -} - -static int next_pri = DEFAULT_PRI + PRI_BIAS; - -static unsigned int started, idle, wanted; - -/* worker threads management */ -static mutex_t wrklock = X_MUTEX_INIT; - -typedef struct worker { - /* locked by wrklock */ - struct worker *prev, *next; - - thread_t tid; +/*****************************************************************************/ - /* locked by reslock, reqlock or wrklock */ - aio_req req; /* currently processed request */ - void *dbuf; - DIR *dirp; -} worker; +#if __GNUC__ >= 3 +# define expect(expr,value) __builtin_expect ((expr),(value)) +#else +# define expect(expr,value) (expr) +#endif -static worker wrk_first = { &wrk_first, &wrk_first, 0 }; +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) -static void worker_clear (worker *wrk) -{ - if (wrk->dirp) - { - closedir (wrk->dirp); - wrk->dirp = 0; - } +/*****************************************************************************/ - if (wrk->dbuf) - { - free (wrk->dbuf); - wrk->dbuf = 0; - } -} +typedef SV SV8; /* byte-sv, used for argument-checking */ +typedef int aio_rfd; /* read file desriptor */ +typedef int aio_wfd; /* write file descriptor */ -static void worker_free (worker *wrk) -{ - wrk->next->prev = wrk->prev; - wrk->prev->next = wrk->next; +static HV *aio_stash, *aio_req_stash, *aio_grp_stash; - free (wrk); -} +#define EIO_REQ_MEMBERS \ + SV *callback; \ + SV *sv1, *sv2; \ + STRLEN stroffset; \ + SV *self; -static volatile unsigned int nreqs, nready, npending; -static volatile unsigned int max_idle = 4; -static volatile unsigned int max_outstanding = 0xffffffff; -static int respipe_osf [2], respipe [2] = { -1, -1 }; +#define EIO_NO_WRAPPERS 1 -static mutex_t reslock = X_MUTEX_INIT; -static mutex_t reqlock = X_MUTEX_INIT; -static cond_t reqwait = X_COND_INIT; +#include "libeio/eio.h" -#if WORDACCESS_UNSAFE +#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 -static unsigned int get_nready () -{ - unsigned int retval; +#if _XOPEN_SOURCE < 600 || NO_FADVISE +# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */ +#endif - X_LOCK (reqlock); - retval = nready; - X_UNLOCK (reqlock); +#ifndef POSIX_MADV_NORMAL +# define POSIX_MADV_NORMAL 0 +# define NO_MADVISE 1 +#endif +#ifndef POSIX_MADV_SEQUENTIAL +# define POSIX_MADV_SEQUENTIAL 0 +#endif +#ifndef POSIX_MADV_RANDOM +# define POSIX_MADV_RANDOM 0 +#endif +#ifndef POSIX_MADV_WILLNEED +# define POSIX_MADV_WILLNEED 0 +#endif +#ifndef POSIX_MADV_DONTNEED +# define POSIX_MADV_DONTNEED 0 +#endif - return retval; -} +#if _XOPEN_SOURCE < 600 || NO_MADVISE +# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */ +#endif -static unsigned int get_npending () -{ - unsigned int retval; +#ifndef PROT_NONE +# define PROT_NONE 0 +#endif +#ifndef PROT_READ +# define PROT_READ 0 +#endif +#ifndef PROT_WRITE +# define PROT_READ 0 +#endif +#ifndef PROT_EXEC +# define PROT_EXEC 0 +#endif - X_LOCK (reslock); - retval = npending; - X_UNLOCK (reslock); +#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 - return retval; -} +#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 -static unsigned int get_nthreads () -{ - unsigned int retval; +#ifndef PAGESIZE +# define PAGESIZE sysconf (_SC_PAGESIZE) +#endif - X_LOCK (wrklock); - retval = started; - X_UNLOCK (wrklock); +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) - return retval; -} +enum { + FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ +}; -#else +#include "libeio/eio.c" -# define get_nready() nready -# define get_npending() npending -# define get_nthreads() started +typedef eio_req *aio_req; +typedef eio_req *aio_req_ornot; -#endif +static SV *on_next_submit; +static int next_pri = EIO_PRI_DEFAULT; +static int max_outstanding; -/* - * a somewhat faster data structure might be nice, but - * with 8 priorities this actually needs <20 insns - * per shift, the most expensive operation. - */ -typedef struct { - aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */ - int size; -} reqq; +static s_epipe respipe; -static reqq req_queue; -static reqq res_queue; +static void req_destroy (aio_req req); +static void req_cancel (aio_req req); -int reqq_push (reqq *q, aio_req req) +static void want_poll (void) { - int pri = req->pri; - req->next = 0; - - if (q->qe[pri]) - { - q->qe[pri]->next = req; - q->qe[pri] = req; - } - else - q->qe[pri] = q->qs[pri] = req; - - return q->size++; + /* write a dummy byte to the pipe so fh becomes ready */ + s_epipe_signal (&respipe); } -aio_req reqq_shift (reqq *q) +static void done_poll (void) { - int pri; - - if (!q->size) - return 0; - - --q->size; - - for (pri = NUM_PRI; pri--; ) - { - aio_req req = q->qs[pri]; - - if (req) - { - if (!(q->qs[pri] = req->next)) - q->qe[pri] = 0; - - return req; - } - } - - abort (); + /* read any signals sent by the worker threads */ + s_epipe_drain (&respipe); } -static int poll_cb (); -static int req_invoke (aio_req req); -static void req_destroy (aio_req req); -static void req_cancel (aio_req req); - /* 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) { @@ -383,15 +282,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); @@ -400,123 +302,192 @@ static void aio_grp_feed (aio_req grp) { - block_sig (); - - while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED)) + if (grp->sv2 && SvOK (grp->sv2)) { - int old_len = grp->size; - - if (grp->sv2 && SvOK (grp->sv2)) - { - dSP; + dSP; - 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; - } - - /* stop if no progress has been made */ - if (old_len == grp->size) - { - SvREFCNT_dec (grp->sv2); - grp->sv2 = 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; } - - unblock_sig (); } -static void aio_grp_dec (aio_req grp) +static void req_submit (eio_req *req) { - --grp->size; - - /* call feeder, if applicable */ - aio_grp_feed (grp); + eio_submit (req); - /* finish, if done */ - if (!grp->size && grp->int1) + if (expect_false (on_next_submit)) { - block_sig (); + dSP; + SV *cb = sv_2mortal (on_next_submit); - if (!req_invoke (grp)) - { - req_destroy (grp); - unblock_sig (); - croak (0); - } + on_next_submit = 0; - req_destroy (grp); - unblock_sig (); + PUSHMARK (SP); + PUTBACK; + call_sv (cb, G_DISCARD | G_EVAL); } } -static int req_invoke (aio_req req) +static int req_invoke (eio_req *req) { - dSP; - 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); + } + else + { + sv_result = newSViv (req->result); + SvREADONLY_on (sv_result); + } + switch (req->type) { - case REQ_READDIR: + 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: + case EIO_OPEN: { /* convert fd to fh */ - SV *fh; + SV *fh = &PL_sv_undef; + + 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 + ); + + if (do_open (gv, sym, symlen, 0, 0, 0, 0)) + fh = (SV *)gv; + } - PUSHs (sv_2mortal (newSViv (req->result))); - PUTBACK; - call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); - SPAGAIN; - - fh = POPs; - PUSHMARK (SP); - XPUSHs (fh); + PUSHs (fh); } break; - case REQ_GROUP: + 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 (); + + 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 (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); + } + + PUSHs (rv); + } + + break; + + case EIO_GROUP: req->int1 = 2; /* mark group as finished */ if (req->sv1) @@ -530,64 +501,62 @@ } break; - case REQ_NOP: - case REQ_BUSY: + case EIO_NOP: + case EIO_BUSY: break; - case REQ_READLINK: + case EIO_READLINK: if (req->result > 0) - { - SvCUR_set (req->sv2, req->result); - *SvEND (req->sv2) = 0; - PUSHs (req->sv2); - } + PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); break; - case REQ_STAT: - case REQ_LSTAT: - case REQ_FSTAT: - PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; + 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 = *(Stat_t *)(req->ptr2); - PUSHs (sv_2mortal (newSViv (req->result))); + PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); + PUSHs (sv_result); break; - case REQ_READ: - SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); - *SvEND (req->sv2) = 0; - PUSHs (sv_2mortal (newSViv (req->result))); + 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 EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su 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; } - return !SvTRUE (ERRSV); + return !!SvTRUE (ERRSV); } static void req_destroy (aio_req req) @@ -602,9 +571,6 @@ SvREFCNT_dec (req->sv2); SvREFCNT_dec (req->callback); - if (req->flags & FLAG_PTR2_FREE) - free (req->ptr2); - Safefree (req); } @@ -612,908 +578,358 @@ { 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); + eio_grp_cancel (grp); } -#ifdef USE_SOCKETS_AS_HANDLES -# define TO_SOCKET(x) (win32_get_osfhandle (x)) -#else -# define TO_SOCKET(x) (x) -#endif - static void -create_respipe () +create_respipe (void) { - int old_readfd = respipe [0]; - - if (respipe [1] >= 0) - respipe_close (TO_SOCKET (respipe [1])); - -#ifdef _WIN32 - if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe)) -#else - if (pipe (respipe)) -#endif - croak ("unable to initialize result pipe"); - - if (old_readfd >= 0) - { - if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0) - croak ("unable to initialize result pipe(2)"); - - respipe_close (respipe [0]); - respipe [0] = old_readfd; - } - -#ifdef _WIN32 - int arg = 1; - if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg) - || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg)) -#else - if (fcntl (respipe [0], F_SETFL, O_NONBLOCK) - || fcntl (respipe [1], F_SETFL, O_NONBLOCK)) -#endif - croak ("unable to initialize result pipe(3)"); - - respipe_osf [0] = TO_SOCKET (respipe [0]); - respipe_osf [1] = TO_SOCKET (respipe [1]); + if (s_epipe_renew (&respipe)) + croak ("IO::AIO: unable to initialize result pipe"); } -X_THREAD_PROC (aio_proc); - -static void start_thread (void) +static void poll_wait (void) { - worker *wrk = calloc (1, sizeof (worker)); - - if (!wrk) - croak ("unable to allocate worker thread data"); - - X_LOCK (wrklock); - - if (thread_create (&wrk->tid, aio_proc, (void *)wrk)) - { - wrk->prev = &wrk_first; - wrk->next = wrk_first.next; - wrk_first.next->prev = wrk; - wrk_first.next = wrk; - ++started; - } - else - free (wrk); - - X_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) -{ - block_sig (); - - ++nreqs; - - X_LOCK (reqlock); - ++nready; - reqq_push (&req_queue, req); - X_COND_SIGNAL (reqwait); - X_UNLOCK (reqlock); - - unblock_sig (); - - 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; - - X_LOCK (reqlock); - reqq_push (&req_queue, req); - X_COND_SIGNAL (reqwait); - X_UNLOCK (reqlock); - - X_LOCK (wrklock); - --started; - X_UNLOCK (wrklock); -} - -static void set_max_idle (int nthreads) -{ - if (WORDACCESS_UNSAFE) X_LOCK (reqlock); - max_idle = nthreads <= 0 ? 1 : nthreads; - if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); -} - -static void min_parallel (int nthreads) -{ - if (wanted < nthreads) - wanted = nthreads; -} - -static void max_parallel (int nthreads) -{ - if (wanted > nthreads) - wanted = nthreads; - - while (started > wanted) - end_thread (); -} - -static void poll_wait () -{ - fd_set rfd; - - while (nreqs) + while (eio_nreqs ()) { int size; - if (WORDACCESS_UNSAFE) X_LOCK (reslock); + + X_LOCK (reslock); size = res_queue.size; - if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); + X_UNLOCK (reslock); if (size) return; - maybe_start_thread (); + etp_maybe_start_thread (); - FD_ZERO (&rfd); - FD_SET (respipe [0], &rfd); - - PerlSock_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); - - block_sig (); - for (;;) { - for (;;) - { - maybe_start_thread (); - - X_LOCK (reslock); - req = reqq_shift (&res_queue); - - if (req) - { - --npending; + int res = eio_poll (); - if (!res_queue.size) - { - /* read any signals sent by the worker threads */ - char buf [4]; - while (respipe_read (respipe [0], buf, 4) == 4) - ; - } - } + if (res > 0) + croak (0); - X_UNLOCK (reslock); - - if (!req) - break; - - --nreqs; - - if (req->type == REQ_GROUP && req->size) - { - req->int1 = 1; /* mark request as delayed */ - continue; - } - else - { - if (!req_invoke (req)) - { - req_destroy (req); - unblock_sig (); - croak (0); - } - - count++; - } - - req_destroy (req); - - 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; } - - unblock_sig (); - return count; -} - -/*****************************************************************************/ -/* 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 mutex_t preadwritelock = X_MUTEX_INIT; - -static ssize_t pread (int fd, void *buf, size_t count, off_t offset) -{ - ssize_t res; - off_t ooffset; - - X_LOCK (preadwritelock); - ooffset = lseek (fd, 0, SEEK_CUR); - lseek (fd, offset, SEEK_SET); - res = read (fd, buf, count); - lseek (fd, ooffset, SEEK_SET); - X_UNLOCK (preadwritelock); - - return res; -} - -static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) -{ - ssize_t res; - off_t ooffset; - - X_LOCK (preadwritelock); - ooffset = lseek (fd, 0, SEEK_CUR); - lseek (fd, offset, SEEK_SET); - res = write (fd, buf, count); - lseek (fd, offset, SEEK_SET); - X_UNLOCK (preadwritelock); - - return res; -} -#endif - -#ifndef HAVE_FUTIMES - -# define utimes(path,times) aio_utimes (path, times) -# define futimes(fd,times) aio_futimes (fd, times) - -int aio_utimes (const char *filename, const struct timeval times[2]) -{ - if (times) - { - struct utimbuf buf; - - buf.actime = times[0].tv_sec; - buf.modtime = times[1].tv_sec; - - return utime (filename, &buf); - } - else - return utime (filename, 0); -} - -int aio_futimes (int fd, const struct timeval tv[2]) -{ - errno = ENOSYS; - return -1; -} - -#endif - -#if !HAVE_FDATASYNC -# define fdatasync fsync -#endif - -#if !HAVE_READAHEAD -# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) - -static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self) -{ - size_t todo = count; - dBUF; - - while (todo > 0) - { - size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE; - - pread (fd, aio_buf, len, offset); - offset += len; - todo -= len; - } - - errno = 0; - return count; } -#endif - -#if !HAVE_READDIR_R -# define readdir_r aio_readdir_r - -static mutex_t readdirlock = X_MUTEX_INIT; - -static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res) -{ - X_DIRENT *e; - int errorno; - - X_LOCK (readdirlock); - - e = readdir (dirp); - errorno = errno; - - if (e) - { - *res = ent; - strcpy (ent->d_name, e->d_name); - } - else - *res = 0; - - X_UNLOCK (readdirlock); - - errno = errorno; - return e ? 0 : -1; -} -#endif - -/* sendfile always needs emulation */ -static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self) -{ - 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 - ) - ) - { - /* emulate sendfile. this is a major pain in the ass */ - dBUF; - - res = 0; - - while (count) - { - ssize_t cnt; - - cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset); - - if (cnt <= 0) - { - if (cnt && !res) res = -1; - break; - } - - cnt = write (ofd, aio_buf, cnt); - - if (cnt <= 0) - { - if (cnt && !res) res = -1; - break; - } - - offset += cnt; - res += cnt; - count -= cnt; - } - } - - return res; -} - -/* read a full directory */ -static void scandir_ (aio_req req, worker *self) +static void atfork_child (void) { - DIR *dirp; - union - { - X_DIRENT d; - char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1]; - } *u; - X_DIRENT *entp; - char *name, *names; - int memlen = 4096; - int memofs = 0; - int res = 0; - - X_LOCK (wrklock); - self->dirp = dirp = opendir (req->ptr1); - self->dbuf = u = malloc (sizeof (*u)); - req->flags |= FLAG_PTR2_FREE; - req->ptr2 = names = malloc (memlen); - X_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; - X_LOCK (wrklock); - req->ptr2 = names = realloc (names, memlen); - X_UNLOCK (wrklock); - - if (!names) - break; - } - - memcpy (names + memofs, name, len); - memofs += len; - } - } - - if (errno) - res = -1; - - req->result = res; + create_respipe (); } /*****************************************************************************/ -X_THREAD_PROC (aio_proc) -{ - {//D - aio_req req; - struct timespec ts; - worker *self = (worker *)thr_arg; - - /* try to distribute timeouts somewhat randomly */ - ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); - - for (;;) - { - ts.tv_sec = time (0) + IDLE_TIMEOUT; - - X_LOCK (reqlock); - - for (;;) - { - self->req = req = reqq_shift (&req_queue); - - if (req) - break; - - ++idle; - - if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) - == ETIMEDOUT) - { - if (idle > max_idle) - { - --idle; - X_UNLOCK (reqlock); - X_LOCK (wrklock); - --started; - X_UNLOCK (wrklock); - goto quit; - } - - /* we are allowed to idle, so do so without any timeout */ - X_COND_WAIT (reqwait, reqlock); - ts.tv_sec = time (0) + IDLE_TIMEOUT; - } - - --idle; - } - - --nready; - - X_UNLOCK (reqlock); - - errno = 0; /* strictly unnecessary */ - - if (!(req->flags & FLAG_CANCELLED)) - switch (req->type) - { - case REQ_READ: req->result = req->offs >= 0 - ? pread (req->int1, req->ptr1, req->size, req->offs) - : read (req->int1, req->ptr1, req->size); break; - case REQ_WRITE: req->result = req->offs >= 0 - ? pwrite (req->int1, req->ptr1, req->size, req->offs) - : write (req->int1, req->ptr1, req->size); 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_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; - case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; - case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break; - case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break; - case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; - case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); 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_MKDIR: req->result = mkdir (req->ptr1, req->mode); 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: -#ifdef _WIN32 - Sleep (req->nv1 * 1000.); -#else - { - struct timeval tv; - - tv.tv_sec = req->nv1; - tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; - - req->result = select (0, 0, 0, 0, &tv); - } +#if !_POSIX_MAPPED_FILES +# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) +# define munmap(addr,length) (errno = ENOSYS, -1) +# define mprotect(addr,len,prot) (errno = ENOSYS, -1) +# define PROT_NONE 0 +# define PROT_WRITE 0 +# define MAP_PRIVATE 0 +# define MAP_SHARED 0 +# define MAP_FIXED 0 #endif - break; - case REQ_UTIME: - case REQ_FUTIME: - { - struct timeval tv[2]; - struct timeval *times; - - if (req->nv1 != -1. || req->nv2 != -1.) - { - tv[0].tv_sec = req->nv1; - tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.; - tv[1].tv_sec = req->nv2; - tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.; - - times = tv; - } - else - times = 0; - - - req->result = req->type == REQ_FUTIME - ? futimes (req->int1, times) - : utimes (req->ptr1, times); - } +#define MMAP_MAGIC PERL_MAGIC_ext - case REQ_GROUP: - case REQ_NOP: - break; - - case REQ_QUIT: - goto quit; - - default: - req->result = -1; - break; - } - - req->errorno = errno; - - X_LOCK (reslock); - - ++npending; - - if (!reqq_push (&res_queue, req)) - { - /* write a dummy byte to the pipe so fh becomes ready */ - respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); +static int +mmap_free (pTHX_ SV *sv, MAGIC *mg) +{ + int old_errno = errno; + munmap (mg->mg_ptr, (size_t)mg->mg_obj); + errno = old_errno; - /* optionally signal the main thread asynchronously */ - if (main_sig) - pthread_kill (main_tid, main_sig); - } + mg->mg_obj = 0; /* just in case */ - self->req = 0; - worker_clear (self); + SvREADONLY_off (sv); - X_UNLOCK (reslock); - } + if (SvPVX (sv) != mg->mg_ptr) + croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected"); -quit: - X_LOCK (wrklock); - worker_free (self); - X_UNLOCK (wrklock); + SvCUR_set (sv, 0); + SvPVX (sv) = 0; + SvOK_off (sv); return 0; - }//D } -/*****************************************************************************/ - -static void atfork_prepare (void) -{ - X_LOCK (wrklock); - X_LOCK (reqlock); - X_LOCK (reslock); -#if !HAVE_PREADWRITE - X_LOCK (preadwritelock); -#endif -#if !HAVE_READDIR_R - X_LOCK (readdirlock); -#endif -} +static MGVTBL mmap_vtbl = { + 0, 0, 0, 0, mmap_free +}; -static void atfork_parent (void) -{ -#if !HAVE_READDIR_R - X_UNLOCK (readdirlock); -#endif -#if !HAVE_PREADWRITE - X_UNLOCK (preadwritelock); -#endif - X_UNLOCK (reslock); - X_UNLOCK (reqlock); - X_UNLOCK (wrklock); -} +/*****************************************************************************/ -static void atfork_child (void) +static SV * +get_cb (SV *cb_sv) { - aio_req prv; - - while (prv = reqq_shift (&req_queue)) - req_destroy (prv); - - while (prv = reqq_shift (&res_queue)) - req_destroy (prv); - - while (wrk_first.next != &wrk_first) - { - worker *wrk = wrk_first.next; - - if (wrk->req) - req_destroy (wrk->req); - - worker_clear (wrk); - worker_free (wrk); - } - - started = 0; - idle = 0; - nreqs = 0; - nready = 0; - npending = 0; - - create_respipe (); - - atfork_parent (); + 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 = DEFAULT_PRI + PRI_BIAS; \ + 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); + 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_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) + + 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_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_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 (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); - newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); - newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); - newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); - newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); - newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); -#ifdef _WIN32 - X_MUTEX_CHECK (wrklock); - X_MUTEX_CHECK (reslock); - X_MUTEX_CHECK (reqlock); - X_MUTEX_CHECK (reqwait); - X_MUTEX_CHECK (preadwritelock); - X_MUTEX_CHECK (readdirlock); + for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) + newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); - X_COND_CHECK (reqwait); -#else - newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); - newCONSTSUB (stash, "SIGIO", newSViv (SIGIO)); -#endif + newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); + + create_respipe (); - create_respipe (); + if (eio_init (want_poll, done_poll) < 0) + croak ("IO::AIO: unable to initialise eio library"); - X_THREAD_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 max_poll_reqs (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) PROTOTYPE: $ + CODE: + eio_set_min_parallel (nthreads); void max_parallel (int nthreads) PROTOTYPE: $ + CODE: + eio_set_max_parallel (nthreads); void max_idle (int nthreads) PROTOTYPE: $ CODE: - set_max_idle (nthreads); + eio_set_max_idle (nthreads); -int +void max_outstanding (int maxreqs) PROTOTYPE: $ CODE: - RETVAL = max_outstanding; max_outstanding = maxreqs; - OUTPUT: - RETVAL void aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) - PROTOTYPE: $$$;$ PPCODE: { dREQ; - req->type = REQ_OPEN; + req->type = EIO_OPEN; req->sv1 = newSVsv (pathname); req->ptr1 = SvPVbyte_nolen (req->sv1); req->int1 = flags; - req->mode = mode; + req->int2 = mode; REQ_SEND; } void -aio_close (SV *fh, SV *callback=&PL_sv_undef) - 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 PPCODE: { + int fd = s_fileno_croak (fh, 0); dREQ; req->type = ix; req->sv1 = newSVsv (fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (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) + 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_close (SV *fh, SV *callback=&PL_sv_undef) + 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); } @@ -1521,25 +937,22 @@ 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 - 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); UV len = SvUV (length); - SvUPGRADE (data, SVt_PV); - SvPOK_on (data); - if (dataoffset < 0) dataoffset += svlen; if (dataoffset < 0 || dataoffset > svlen) croak ("dataoffset outside of data scalar"); - if (ix == REQ_WRITE) + if (ix == EIO_WRITE) { /* write: check length and adjust. */ if (!SvOK (length) || len + dataoffset > svlen) @@ -1547,24 +960,21 @@ } else { - /* read: grow scalar as necessary */ + /* read: check type and grow scalar as necessary */ + SvUPGRADE (data, SVt_PV); svptr = SvGROW (data, len + dataoffset + 1); } - if (len < 0) - croak ("length must not be negative"); - { dREQ; req->type = ix; req->sv1 = newSVsv (fh); - req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) - : IoOFP (sv_2io (fh))); + req->int1 = fd; req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; req->size = len; req->sv2 = SvREFCNT_inc (data); - req->ptr1 = (char *)svptr + dataoffset; + req->ptr2 = (char *)svptr + dataoffset; req->stroffset = dataoffset; if (!SvREADONLY (data)) @@ -1579,53 +989,48 @@ void aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) - PROTOTYPE: $$;$ PPCODE: { SV *data; dREQ; - data = newSV (NAME_MAX); - SvPOK_on (data); - - req->type = REQ_READLINK; + req->type = EIO_READLINK; req->sv1 = newSVsv (path); - req->ptr2 = SvPVbyte_nolen (req->sv1); - req->sv2 = data; - req->ptr1 = SvPVbyte_nolen (data); + req->ptr1 = SvPVbyte_nolen (req->sv1); REQ_SEND; } void -aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) - PROTOTYPE: $$$$;$ +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->type = EIO_SENDFILE; req->sv1 = newSVsv (out_fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); + req->int1 = ofd; req->sv2 = newSVsv (in_fh); - req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); - req->offs = SvVAL64 (in_offset); + req->int2 = ifd; + req->offs = in_offset; req->size = length; REQ_SEND; } void -aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) - 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->type = EIO_READAHEAD; req->sv1 = newSVsv (fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); - req->offs = SvVAL64 (offset); + req->int1 = fd; + req->offs = offset; req->size = length; REQ_SEND; @@ -1634,30 +1039,23 @@ void 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_destroy (req); - croak ("out of memory during aio_stat statdata allocation"); - } - - req->flags |= FLAG_PTR2_FREE; req->sv1 = newSVsv (fh_or_path); - if (SvPOK (fh_or_path)) + if (SvPOK (req->sv1)) { req->type = ix; req->ptr1 = SvPVbyte_nolen (req->sv1); } else { - req->type = REQ_FSTAT; + req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT; req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } @@ -1674,14 +1072,14 @@ req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; req->sv1 = newSVsv (fh_or_path); - if (SvPOK (fh_or_path)) + if (SvPOK (req->sv1)) { - req->type = REQ_UTIME; + req->type = EIO_UTIME; req->ptr1 = SvPVbyte_nolen (req->sv1); } else { - req->type = REQ_FUTIME; + req->type = EIO_FUTIME; req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } @@ -1697,14 +1095,14 @@ req->sv1 = newSVsv (fh_or_path); req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; - if (SvPOK (fh_or_path)) + if (SvPOK (req->sv1)) { - req->type = REQ_TRUNCATE; + req->type = EIO_TRUNCATE; req->ptr1 = SvPVbyte_nolen (req->sv1); } else { - req->type = REQ_FTRUNCATE; + req->type = EIO_FTRUNCATE; req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } @@ -1713,21 +1111,24 @@ 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->mode = mode; + req->int2 = mode; req->sv1 = newSVsv (fh_or_path); - if (SvPOK (fh_or_path)) + if (SvPOK (req->sv1)) { - req->type = REQ_CHMOD; + req->type = ix; req->ptr1 = SvPVbyte_nolen (req->sv1); } else { - req->type = REQ_FCHMOD; + req->type = EIO_FCHMOD; req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } @@ -1744,14 +1145,14 @@ req->int3 = SvOK (gid) ? SvIV (gid) : -1; req->sv1 = newSVsv (fh_or_path); - if (SvPOK (fh_or_path)) + if (SvPOK (req->sv1)) { - req->type = REQ_CHOWN; + req->type = EIO_CHOWN; req->ptr1 = SvPVbyte_nolen (req->sv1); } else { - req->type = REQ_FCHOWN; + req->type = EIO_FCHOWN; req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } @@ -1759,32 +1160,35 @@ } void -aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) - ALIAS: - aio_unlink = REQ_UNLINK - aio_rmdir = REQ_RMDIR - aio_readdir = REQ_READDIR +aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef) PPCODE: { dREQ; - req->type = ix; + 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_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef) +aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) + ALIAS: + aio_unlink = EIO_UNLINK + aio_rmdir = EIO_RMDIR + aio_readdir = EIO_READDIR PPCODE: { dREQ; - req->type = REQ_MKDIR; + req->type = ix; req->sv1 = newSVsv (pathname); req->ptr1 = SvPVbyte_nolen (req->sv1); - req->mode = mode; REQ_SEND; } @@ -1792,18 +1196,18 @@ void 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->sv2 = newSVsv (oldpath); - req->ptr2 = SvPVbyte_nolen (req->sv2); - req->sv1 = newSVsv (newpath); + req->sv1 = newSVsv (oldpath); req->ptr1 = SvPVbyte_nolen (req->sv1); + req->sv2 = newSVsv (newpath); + req->ptr2 = SvPVbyte_nolen (req->sv2); REQ_SEND; } @@ -1814,22 +1218,96 @@ { dREQ; - req->type = REQ_MKNOD; + req->type = EIO_MKNOD; req->sv1 = newSVsv (pathname); req->ptr1 = SvPVbyte_nolen (req->sv1); - req->mode = (mode_t)mode; + req->int2 = (mode_t)mode; req->offs = dev; REQ_SEND; } 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 + 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 = 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_busy (double delay, SV *callback=&PL_sv_undef) PPCODE: { dREQ; - req->type = REQ_BUSY; + req->type = EIO_BUSY; req->nv1 = delay < 0. ? 0. : delay; REQ_SEND; @@ -1837,38 +1315,39 @@ void aio_group (SV *callback=&PL_sv_undef) - PROTOTYPE: ;$ PPCODE: { dREQ; - req->type = REQ_GROUP; + req->type = EIO_GROUP; - req_send (req); - XPUSHs (req_sv (req, AIO_GRP_KLASS)); + req_submit (req); + XPUSHs (req_sv (req, aio_grp_stash)); } void 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 - 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 @@ -1877,23 +1356,21 @@ 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 (); } int -poll() - PROTOTYPE: +poll () CODE: poll_wait (); RETVAL = poll_cb (); @@ -1901,15 +1378,14 @@ 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 (); @@ -1917,82 +1393,165 @@ RETVAL void -poll_wait() - PROTOTYPE: +poll_wait () CODE: poll_wait (); -void -setsig (int signum = SIGIO) - PROTOTYPE: ;$ - CODE: -{ - if (block_sig_level) - croak ("cannot call IO::AIO::setsig from within aio_block/callback"); - - X_LOCK (reslock); - main_tid = pthread_self (); - main_sig = signum; - X_UNLOCK (reslock); - - if (main_sig && npending) - pthread_kill (main_tid, main_sig); -} - -void -aio_block (SV *cb) - PROTOTYPE: & - PPCODE: -{ - int count; - - block_sig (); - PUSHMARK (SP); - PUTBACK; - count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL); - SPAGAIN; - unblock_sig (); - - if (SvTRUE (ERRSV)) - croak (0); - - XSRETURN (count); -} - 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) X_LOCK (wrklock); - RETVAL = started; - if (WORDACCESS_UNSAFE) X_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 + +ssize_t +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, size_t length, int prot, int flags, SV *fh, off_t offset = 0) + 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; + + sv_force_normal (scalar); + + /* 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); + + if (SvLEN (scalar)) + Safefree (SvPVX (scalar)); + + SvPVX (scalar) = (char *)addr; + SvCUR_set (scalar, length); + SvLEN_set (scalar, 0); + SvPOK_only (scalar); + + XSRETURN_YES; +} + +void +munmap (SV *scalar) + CODE: + sv_unmagic (scalar, MMAP_MAGIC); + +int +madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot) + ALIAS: + mprotect = 1 + 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); + + 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, off_t 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 + RETVAL = munlock (addr, len); +#else + RETVAL = ((errno = ENOSYS), -1); +#endif +} + OUTPUT: + RETVAL + +int +munlockall () + 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 @@ -2000,13 +1559,23 @@ 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); + 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 @@ -2015,34 +1584,21 @@ PPCODE: { int i; - aio_req req; - - if (main_sig && !block_sig_level) - croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use"); 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); } } @@ -2061,6 +1617,7 @@ grp->errorno = errno; av = newAV (); + av_extend (av, items - 1); for (i = 1; i < items; ++i ) av_push (av, newSVsv (ST (i))); @@ -2077,19 +1634,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) 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); }