--- IO-AIO/AIO.xs 2005/07/23 18:15:36 1.14 +++ IO-AIO/AIO.xs 2006/10/21 23:20:29 1.44 @@ -1,58 +1,95 @@ +#define _REENTRANT 1 +#include + +#include "EXTERN.h" #include "perl.h" #include "XSUB.h" +#include "autoconf/config.h" + +#include + +#include +#include #include #include - +#include #include #include #include #include -#if __linux -#include -#endif -#include +#if HAVE_SENDFILE +# if __linux +# include +# elif __freebsd +# include +# include +# elif __hpux +# include +# elif __solaris /* not yet */ +# include +# else +# error sendfile support requested but not available +# endif +#endif -typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ -typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ -typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ +/* used for struct dirent, AIX doesn't provide it */ +#ifndef NAME_MAX +# define NAME_MAX 4096 +#endif #if __ia64 # define STACKSIZE 65536 #else -# define STACKSIZE 4096 +# define STACKSIZE 8192 #endif enum { REQ_QUIT, REQ_OPEN, REQ_CLOSE, REQ_READ, REQ_WRITE, REQ_READAHEAD, - REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, + REQ_SENDFILE, + REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_FSYNC, REQ_FDATASYNC, + REQ_UNLINK, REQ_RMDIR, REQ_RENAME, + REQ_READDIR, + REQ_LINK, REQ_SYMLINK, + REQ_GROUP, }; -typedef struct aio_cb { +#define AIO_REQ_KLASS "IO::AIO::REQ" +#define AIO_GRP_KLASS "IO::AIO::GRP" + +typedef struct aio_cb +{ + struct aio_cb *grp, *grp_prev, *grp_next; + struct aio_cb *volatile next; - int type; + SV *self; /* the perl counterpart of this request, if any */ - int fd; + SV *data, *callback; + SV *fh, *fh2; + void *dataptr, *data2ptr; + Stat_t *statdata; off_t offset; size_t length; ssize_t result; - mode_t mode; /* open */ + + int type; + int fd, fd2; int errorno; - SV *data, *callback, *fh; - void *dataptr; STRLEN dataoffset; - - Stat_t *statdata; + mode_t mode; /* open */ + unsigned char cancelled; } aio_cb; typedef aio_cb *aio_req; +typedef aio_cb *aio_req_ornot; +typedef aio_cb *aio_group; -static int started; +static int started, wanted; static volatile int nreqs; static int max_outstanding = 1<<30; static int respipe [2]; @@ -64,6 +101,54 @@ static volatile aio_req reqs, reqe; /* queue start, queue end */ static volatile aio_req ress, rese; /* queue start, queue end */ +/* must be called at most once */ +static SV *req_sv (aio_req req, const char *klass) +{ + req->self = (SV *)newHV (); + sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); + + return sv_2mortal (sv_bless (newRV_noinc (req->self), gv_stashpv (klass, 1))); +} + +static aio_req SvAIO_REQ (SV *sv, const char *klass) +{ + if (!sv_derived_from (sv, klass) || !SvROK (sv)) + croak ("object of class %s expected", klass); + + MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); + + return mg ? (aio_req)mg->mg_ptr : 0; +} + +static void req_free (aio_req req) +{ + if (req->self) + { + sv_unmagic (req->self, PERL_MAGIC_ext); + SvREFCNT_dec (req->self); + } + + if (req->data) + SvREFCNT_dec (req->data); + + if (req->fh) + SvREFCNT_dec (req->fh); + + if (req->fh2) + SvREFCNT_dec (req->fh2); + + if (req->statdata) + Safefree (req->statdata); + + if (req->callback) + SvREFCNT_dec (req->callback); + + if (req->type == REQ_READDIR && req->result >= 0) + free (req->data2ptr); + + Safefree (req); +} + static void poll_wait () { @@ -82,24 +167,34 @@ { dSP; int count = 0; - aio_req req, prv; + int do_croak = 0; + aio_req req; - pthread_mutex_lock (&reslock); + for (;;) + { + pthread_mutex_lock (&reslock); + req = ress; - { - /* read any signals sent by the worker threads */ - char buf [32]; - while (read (respipe [0], buf, 32) > 0) - ; - } + if (req) + { + ress = req->next; - req = ress; - ress = rese = 0; + if (!ress) + { + /* read any signals sent by the worker threads */ + char buf [32]; + while (read (respipe [0], buf, 32) == 32) + ; - pthread_mutex_unlock (&reslock); + rese = 0; + } + } + + pthread_mutex_unlock (&reslock); + + if (!req) + break; - while (req) - { nreqs--; if (req->type == REQ_QUIT) @@ -110,64 +205,84 @@ errno = req->errorno; if (req->type == REQ_READ) - SvCUR_set (req->data, req->dataoffset - + req->result > 0 ? req->result : 0); - - if (req->data) - SvREFCNT_dec (req->data); + SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); - if (req->fh) - SvREFCNT_dec (req->fh); + if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) + SvREADONLY_off (req->data); - if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) + if (req->statdata) { PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; PL_laststatval = req->result; PL_statcache = *(req->statdata); - - Safefree (req->statdata); } ENTER; PUSHMARK (SP); - XPUSHs (sv_2mortal (newSViv (req->result))); - if (req->type == REQ_OPEN) + if (req->type == REQ_READDIR) { - /* convert fd to fh */ - SV *fh; + SV *rv = &PL_sv_undef; - PUTBACK; - call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); - SPAGAIN; + if (req->result >= 0) + { + char *buf = req->data2ptr; + AV *av = newAV (); + + while (req->result) + { + SV *sv = newSVpv (buf, 0); + + av_push (av, sv); + buf += SvCUR (sv) + 1; + req->result--; + } - fh = SvREFCNT_inc (POPs); + rv = sv_2mortal (newRV_noinc ((SV *)av)); + } + + XPUSHs (rv); + } + else + { + XPUSHs (sv_2mortal (newSViv (req->result))); - PUSHMARK (SP); - XPUSHs (sv_2mortal (fh)); + if (req->type == REQ_OPEN) + { + /* convert fd to fh */ + SV *fh; + + PUTBACK; + call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); + SPAGAIN; + + fh = SvREFCNT_inc (POPs); + + PUSHMARK (SP); + XPUSHs (sv_2mortal (fh)); + } } - if (SvOK (req->callback)) + if (SvOK (req->callback) && !req->cancelled) { PUTBACK; call_sv (req->callback, G_VOID | G_EVAL); SPAGAIN; + + if (SvTRUE (ERRSV)) + { + req_free (req); + croak (0); + } } LEAVE; - - if (req->callback) - SvREFCNT_dec (req->callback); errno = errorno; count++; } - prv = req; - req = req->next; - Safefree (prv); - - /* TODO: croak on errors? */ + req_free (req); } return count; @@ -196,8 +311,11 @@ } static void -send_req (aio_req req) +req_send (aio_req req) { + while (started < wanted && nreqs >= started) + start_thread (); + nreqs++; pthread_mutex_lock (&reqlock); @@ -215,23 +333,328 @@ pthread_cond_signal (&reqwait); pthread_mutex_unlock (&reqlock); - while (nreqs > max_outstanding) - { - poll_wait (); - poll_cb (); - } + if (nreqs > max_outstanding) + for (;;) + { + poll_cb (); + + if (nreqs <= max_outstanding) + break; + + poll_wait (); + } } static void end_thread (void) { aio_req req; - New (0, req, 1, aio_cb); + Newz (0, req, 1, aio_cb); req->type = REQ_QUIT; - send_req (req); + req_send (req); +} + +static void min_parallel (int nthreads) +{ + if (wanted < nthreads) + wanted = nthreads; +} + +static void max_parallel (int nthreads) +{ + int cur = started; + + if (wanted > nthreads) + wanted = nthreads; + + while (cur > wanted) + { + end_thread (); + cur--; + } + + while (started > wanted) + { + poll_wait (); + poll_cb (); + } +} + +static void create_pipe () +{ + if (pipe (respipe)) + croak ("unable to initialize result pipe"); + + if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) + croak ("cannot set result pipe to nonblocking mode"); + + if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) + croak ("cannot set result pipe to nonblocking mode"); +} + +/*****************************************************************************/ +/* work around various missing functions */ + +#if !HAVE_PREADWRITE +# define pread aio_pread +# define pwrite aio_pwrite + +/* + * make our pread/pwrite safe against themselves, but not against + * normal read/write by using a mutex. slows down execution a lot, + * but that's your problem, not mine. + */ +static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; + +static ssize_t +pread (int fd, void *buf, size_t count, off_t offset) +{ + ssize_t res; + off_t ooffset; + + pthread_mutex_lock (&preadwritelock); + ooffset = lseek (fd, 0, SEEK_CUR); + lseek (fd, offset, SEEK_SET); + res = read (fd, buf, count); + lseek (fd, ooffset, SEEK_SET); + pthread_mutex_unlock (&preadwritelock); + + return res; +} + +static ssize_t +pwrite (int fd, void *buf, size_t count, off_t offset) +{ + ssize_t res; + off_t ooffset; + + pthread_mutex_lock (&preadwritelock); + ooffset = lseek (fd, 0, SEEK_CUR); + lseek (fd, offset, SEEK_SET); + res = write (fd, buf, count); + lseek (fd, offset, SEEK_SET); + pthread_mutex_unlock (&preadwritelock); + + return res; +} +#endif + +#if !HAVE_FDATASYNC +# define fdatasync fsync +#endif + +#if !HAVE_READAHEAD +# define readahead aio_readahead + +static ssize_t +readahead (int fd, off_t offset, size_t count) +{ + char readahead_buf[4096]; + + while (count > 0) + { + size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); + + pread (fd, readahead_buf, len, offset); + offset += len; + count -= len; + } + + errno = 0; +} +#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; + + pthread_mutex_lock (&readdirlock); + + e = readdir (dirp); + errorno = errno; + + if (e) + { + *res = ent; + strcpy (ent->d_name, e->d_name); + } + else + *res = 0; + + pthread_mutex_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) +{ + ssize_t res; + + if (!count) + return 0; + +#if HAVE_SENDFILE +# if __linux + res = sendfile (ofd, ifd, &offset, count); + +# elif __freebsd + /* + * Of course, the freebsd sendfile is a dire hack with no thoughts + * wasted on making it similar to other I/O functions. + */ + { + off_t sbytes; + res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); + + if (res < 0 && sbytes) + /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ + res = sbytes; + } + +# elif __hpux + res = sendfile (ofd, ifd, offset, count, 0, 0); + +# elif __solaris + { + struct sendfilevec vec; + size_t sbytes; + + vec.sfv_fd = ifd; + vec.sfv_flag = 0; + vec.sfv_off = offset; + vec.sfv_len = count; + + res = sendfilev (ofd, &vec, 1, &sbytes); + + if (res < 0 && sbytes) + res = sbytes; + } + +# endif +#else + res = -1; + errno = ENOSYS; +#endif + + if (res < 0 + && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK +#if __solaris + || errno == EAFNOSUPPORT || errno == EPROTOTYPE +#endif + ) + ) + { + /* emulate sendfile. this is a major pain in the ass */ + char buf[4096]; + res = 0; + + while (count) + { + ssize_t cnt; + + cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); + + if (cnt <= 0) + { + if (cnt && !res) res = -1; + break; + } + + cnt = write (ofd, buf, cnt); + + if (cnt <= 0) + { + if (cnt && !res) res = -1; + break; + } + + offset += cnt; + res += cnt; + count -= cnt; + } + } + + return res; } +/* read a full directory */ +static int +scandir_ (const char *path, void **namesp) +{ + DIR *dirp = opendir (path); + union + { + struct dirent d; + char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; + } u; + struct dirent *entp; + char *name, *names; + int memlen = 4096; + int memofs = 0; + int res = 0; + int errorno; + + if (!dirp) + return -1; + + names = malloc (memlen); + + 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; + names = realloc (names, memlen); + if (!names) + break; + } + + memcpy (names + memofs, name, len); + memofs += len; + } + } + + errorno = errno; + closedir (dirp); + + if (errorno) + { + free (names); + errno = errorno; + res = -1; + } + + *namesp = (void *)names; + return res; +} + +/*****************************************************************************/ + static void * aio_proc (void *thr_arg) { @@ -262,36 +685,38 @@ errno = 0; /* strictly unnecessary */ - type = req->type; - - switch (type) - { - case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; - case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; -#if SYS_readahead - case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; -#else - case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break; -#endif - - case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; - case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; - case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; - - case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; - case REQ_CLOSE: req->result = close (req->fd); break; - case REQ_UNLINK: req->result = unlink (req->dataptr); break; + if (!req->cancelled) + switch (req->type) + { + case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; + case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; - case REQ_FSYNC: req->result = fsync (req->fd); break; - case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; + case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; + case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; - case REQ_QUIT: - break; - - default: - req->result = ENOSYS; - break; - } + case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; + case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; + case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; + + case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; + case REQ_CLOSE: req->result = close (req->fd); break; + case REQ_UNLINK: req->result = unlink (req->dataptr); break; + case REQ_RMDIR: req->result = rmdir (req->dataptr); break; + case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; + case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; + case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; + + case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; + case REQ_FSYNC: req->result = fsync (req->fd); break; + case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; + + case REQ_QUIT: + break; + + default: + req->result = ENOSYS; + break; + } req->errorno = errno; @@ -319,52 +744,108 @@ return 0; } +/*****************************************************************************/ + +static void atfork_prepare (void) +{ + pthread_mutex_lock (&reqlock); + pthread_mutex_lock (&reslock); +#if !HAVE_PREADWRITE + pthread_mutex_lock (&preadwritelock); +#endif +#if !HAVE_READDIR_R + pthread_mutex_lock (&readdirlock); +#endif +} + +static void atfork_parent (void) +{ +#if !HAVE_READDIR_R + pthread_mutex_unlock (&readdirlock); +#endif +#if !HAVE_PREADWRITE + pthread_mutex_unlock (&preadwritelock); +#endif + pthread_mutex_unlock (&reslock); + pthread_mutex_unlock (&reqlock); +} + +static void atfork_child (void) +{ + aio_req prv; + + started = 0; + + while (reqs) + { + prv = reqs; + reqs = prv->next; + req_free (prv); + } + + reqs = reqe = 0; + + while (ress) + { + prv = ress; + ress = prv->next; + req_free (prv); + } + + ress = rese = 0; + + close (respipe [0]); + close (respipe [1]); + create_pipe (); + + atfork_parent (); +} + +#define dREQ \ + aio_req req; \ + \ + 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) + +#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: { - if (pipe (respipe)) - croak ("unable to initialize result pipe"); + HV *stash = gv_stashpv ("IO::AIO", 1); + newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); + newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); + newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); - if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) - croak ("cannot set result pipe to nonblocking mode"); - - if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) - croak ("cannot set result pipe to nonblocking mode"); + create_pipe (); + pthread_atfork (atfork_prepare, atfork_parent, atfork_child); } void -min_parallel(nthreads) +min_parallel (nthreads) int nthreads PROTOTYPE: $ - CODE: - while (nthreads > started) - start_thread (); void -max_parallel(nthreads) +max_parallel (nthreads) int nthreads PROTOTYPE: $ - CODE: -{ - int cur = started; - while (cur > nthreads) - { - end_thread (); - cur--; - } - - while (started > nthreads) - { - poll_wait (); - poll_cb (); - } -} int -max_outstanding(nreqs) +max_outstanding (nreqs) int nreqs PROTOTYPE: $ CODE: @@ -372,33 +853,27 @@ max_outstanding = nreqs; void -aio_open(pathname,flags,mode,callback=&PL_sv_undef) +aio_open (pathname,flags,mode,callback=&PL_sv_undef) SV * pathname int flags int mode SV * callback PROTOTYPE: $$$;$ - CODE: + PPCODE: { - aio_req req; - - Newz (0, req, 1, aio_cb); - - if (!req) - croak ("out of memory during aio_req allocation"); + dREQ; req->type = REQ_OPEN; req->data = newSVsv (pathname); - req->dataptr = SvPV_nolen (req->data); + req->dataptr = SvPVbyte_nolen (req->data); req->fd = flags; req->mode = mode; - req->callback = SvREFCNT_inc (callback); - send_req (req); + REQ_SEND; } void -aio_close(fh,callback=&PL_sv_undef) +aio_close (fh,callback=&PL_sv_undef) SV * fh SV * callback PROTOTYPE: $;$ @@ -406,40 +881,34 @@ aio_close = REQ_CLOSE aio_fsync = REQ_FSYNC aio_fdatasync = REQ_FDATASYNC - CODE: + PPCODE: { - aio_req req; - - Newz (0, req, 1, aio_cb); - - if (!req) - croak ("out of memory during aio_req allocation"); + dREQ; req->type = ix; req->fh = newSVsv (fh); req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - req->callback = SvREFCNT_inc (callback); - send_req (req); + REQ_SEND (req); } void -aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) +aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) SV * fh UV offset - IV length + UV length SV * data - IV dataoffset + UV dataoffset SV * callback ALIAS: aio_read = REQ_READ aio_write = REQ_WRITE PROTOTYPE: $$$$$;$ - CODE: + PPCODE: { aio_req req; STRLEN svlen; - char *svptr = SvPV (data, svlen); + char *svptr = SvPVbyte (data, svlen); SvUPGRADE (data, SVt_PV); SvPOK_on (data); @@ -465,79 +934,94 @@ if (length < 0) croak ("length must not be negative"); - Newz (0, req, 1, aio_cb); + { + dREQ; - if (!req) - croak ("out of memory during aio_req allocation"); + req->type = ix; + req->fh = newSVsv (fh); + req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) + : IoOFP (sv_2io (fh))); + req->offset = offset; + req->length = length; + req->data = SvREFCNT_inc (data); + req->dataptr = (char *)svptr + dataoffset; - req->type = ix; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) - : IoOFP (sv_2io (fh))); - req->offset = offset; + if (!SvREADONLY (data)) + { + SvREADONLY_on (data); + req->data2ptr = (void *)data; + } + + 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: $$$$;$ + PPCODE: +{ + dREQ; + + req->type = REQ_SENDFILE; + req->fh = newSVsv (out_fh); + req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); + req->fh2 = newSVsv (in_fh); + req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); + req->offset = in_offset; req->length = length; - req->data = SvREFCNT_inc (data); - req->dataptr = (char *)svptr + dataoffset; - req->callback = SvREFCNT_inc (callback); - send_req (req); + REQ_SEND; } void -aio_readahead(fh,offset,length,callback=&PL_sv_undef) +aio_readahead (fh,offset,length,callback=&PL_sv_undef) SV * fh UV offset IV length SV * callback PROTOTYPE: $$$;$ - CODE: + PPCODE: { - aio_req req; - - if (length < 0) - croak ("length must not be negative"); - - Newz (0, req, 1, aio_cb); - - if (!req) - croak ("out of memory during aio_req allocation"); + dREQ; req->type = REQ_READAHEAD; req->fh = newSVsv (fh); req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); req->offset = offset; req->length = length; - req->callback = SvREFCNT_inc (callback); - send_req (req); + REQ_SEND; } void -aio_stat(fh_or_path,callback=&PL_sv_undef) +aio_stat (fh_or_path,callback=&PL_sv_undef) SV * fh_or_path SV * callback ALIAS: aio_stat = REQ_STAT aio_lstat = REQ_LSTAT - CODE: + PPCODE: { - aio_req req; - - Newz (0, req, 1, aio_cb); - - if (!req) - croak ("out of memory during aio_req allocation"); + dREQ; New (0, req->statdata, 1, Stat_t); - if (!req->statdata) - croak ("out of memory during aio_req->statdata allocation"); + { + req_free (req); + croak ("out of memory during aio_req->statdata allocation"); + } if (SvPOK (fh_or_path)) { req->type = ix; req->data = newSVsv (fh_or_path); - req->dataptr = SvPV_nolen (req->data); + req->dataptr = SvPVbyte_nolen (req->data); } else { @@ -546,34 +1030,63 @@ req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } - req->callback = SvREFCNT_inc (callback); - - send_req (req); + REQ_SEND; } void -aio_unlink(pathname,callback=&PL_sv_undef) +aio_unlink (pathname,callback=&PL_sv_undef) SV * pathname SV * callback - CODE: + ALIAS: + aio_unlink = REQ_UNLINK + aio_rmdir = REQ_RMDIR + aio_readdir = REQ_READDIR + PPCODE: { - aio_req req; + dREQ; - Newz (0, req, 1, aio_cb); + req->type = ix; + req->data = newSVsv (pathname); + req->dataptr = SvPVbyte_nolen (req->data); - if (!req) - croak ("out of memory during aio_req allocation"); + REQ_SEND; +} + +void +aio_link (oldpath,newpath,callback=&PL_sv_undef) + SV * oldpath + SV * newpath + SV * callback + ALIAS: + aio_link = REQ_LINK + aio_symlink = REQ_SYMLINK + aio_rename = REQ_RENAME + PPCODE: +{ + dREQ; - req->type = REQ_UNLINK; - req->data = newSVsv (pathname); - req->dataptr = SvPV_nolen (req->data); - req->callback = SvREFCNT_inc (callback); + req->type = ix; + req->fh = newSVsv (oldpath); + req->data2ptr = SvPVbyte_nolen (req->fh); + req->data = newSVsv (newpath); + req->dataptr = SvPVbyte_nolen (req->data); - send_req (req); + REQ_SEND; } void -flush() +aio_group (callback=&PL_sv_undef) + SV * callback + PROTOTYPE: ;& + PPCODE: +{ + dREQ; + req->type = REQ_GROUP; + XPUSHs (req_sv (req, AIO_GRP_KLASS)); +} + +void +flush () PROTOTYPE: CODE: while (nreqs) @@ -623,3 +1136,11 @@ OUTPUT: RETVAL +MODULE = IO::AIO PACKAGE = IO::AIO::REQ + +void +cancel (aio_req_ornot req) + PROTOTYPE: + CODE: + req->cancelled = 1; +