--- IO-AIO/AIO.xs 2005/07/10 20:07:11 1.3 +++ IO-AIO/AIO.xs 2006/07/21 07:35:31 1.42 @@ -1,38 +1,60 @@ -#define PERL_NO_GET_CONTEXT +#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 -#include -#include -#include +#if HAVE_SENDFILE +# if __linux +# include +# elif __freebsd +# include +# include +# elif __hpux +# include +# elif __solaris /* not yet */ +# include +# else +# error sendfile support requested but not available +# endif +#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 ;) */ - -#if __i386 || __amd64 -# define STACKSIZE ( 256 * sizeof (long)) -#elif __ia64 -# define STACKSIZE (8192 * sizeof (long)) +/* 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 ( 512 * sizeof (long)) +# 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, }; typedef struct aio_cb { @@ -40,14 +62,16 @@ int type; - int fd; + /* should receive a cleanup, with unions */ + int fd, fd2; off_t offset; size_t length; ssize_t result; mode_t mode; /* open */ int errorno; SV *data, *callback; - void *dataptr; + SV *fh, *fh2; + void *dataptr, *data2ptr; STRLEN dataoffset; Stat_t *statdata; @@ -55,8 +79,9 @@ typedef aio_cb *aio_req; -static int started; -static int nreqs; +static int started, wanted; +static volatile int nreqs; +static int max_outstanding = 1<<30; static int respipe [2]; static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; @@ -66,6 +91,168 @@ static volatile aio_req reqs, reqe; /* queue start, queue end */ static volatile aio_req ress, rese; /* queue start, queue end */ +static void free_req (aio_req req) +{ + 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 () +{ + if (nreqs && !ress) + { + fd_set rfd; + FD_ZERO(&rfd); + FD_SET(respipe [0], &rfd); + + select (respipe [0] + 1, &rfd, 0, 0, 0); + } +} + +static int +poll_cb () +{ + dSP; + int count = 0; + int do_croak = 0; + aio_req req; + + for (;;) + { + pthread_mutex_lock (&reslock); + req = ress; + + if (req) + { + ress = req->next; + + if (!ress) + { + /* read any signals sent by the worker threads */ + char buf [32]; + while (read (respipe [0], buf, 32) == 32) + ; + + rese = 0; + } + } + + pthread_mutex_unlock (&reslock); + + if (!req) + break; + + nreqs--; + + if (req->type == REQ_QUIT) + started--; + else + { + int errorno = errno; + errno = req->errorno; + + if (req->type == REQ_READ) + SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); + + if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) + SvREADONLY_off (req->data); + + if (req->statdata) + { + PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; + PL_laststatval = req->result; + PL_statcache = *(req->statdata); + } + + ENTER; + PUSHMARK (SP); + + if (req->type == REQ_READDIR) + { + SV *rv = &PL_sv_undef; + + 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--; + } + + rv = sv_2mortal (newRV_noinc ((SV *)av)); + } + + XPUSHs (rv); + } + else + { + XPUSHs (sv_2mortal (newSViv (req->result))); + + 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)) + { + PUTBACK; + call_sv (req->callback, G_VOID | G_EVAL); + SPAGAIN; + + if (SvTRUE (ERRSV)) + { + free_req (req); + croak (0); + } + } + + LEAVE; + + errno = errorno; + count++; + } + + free_req (req); + } + + return count; +} + static void *aio_proc(void *arg); static void @@ -91,6 +278,9 @@ static void send_req (aio_req req) { + while (started < wanted && nreqs >= started) + start_thread (); + nreqs++; pthread_mutex_lock (&reqlock); @@ -107,171 +297,329 @@ pthread_cond_signal (&reqwait); pthread_mutex_unlock (&reqlock); + + if (nreqs > max_outstanding) + for (;;) + { + poll_cb (); + + if (nreqs <= max_outstanding) + break; + + poll_wait (); + } } static void end_thread (void) { aio_req req; - New (0, req, 1, aio_cb); + Newz (0, req, 1, aio_cb); req->type = REQ_QUIT; send_req (req); } -static void -read_write (pTHX_ - int dowrite, int fd, off_t offset, size_t length, - SV *data, STRLEN dataoffset, SV *callback) +static void min_parallel (int nthreads) { - aio_req req; - STRLEN svlen; - char *svptr = SvPV (data, svlen); - - SvUPGRADE (data, SVt_PV); - SvPOK_on (data); + if (wanted < nthreads) + wanted = nthreads; +} - if (dataoffset < 0) - dataoffset += svlen; +static void max_parallel (int nthreads) +{ + int cur = started; - if (dataoffset < 0 || dataoffset > svlen) - croak ("data offset outside of string"); + if (wanted > nthreads) + wanted = nthreads; - if (dowrite) + while (cur > wanted) { - /* write: check length and adjust. */ - if (length < 0 || length + dataoffset > svlen) - length = svlen - dataoffset; + end_thread (); + cur--; } - else + + while (started > wanted) { - /* read: grow scalar as necessary */ - svptr = SvGROW (data, length + dataoffset); + poll_wait (); + poll_cb (); } +} - if (length < 0) - croak ("length must not be negative"); +static void create_pipe () +{ + if (pipe (respipe)) + croak ("unable to initialize result pipe"); - Newz (0, req, 1, aio_cb); + if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) + croak ("cannot set result pipe to nonblocking mode"); - if (!req) - croak ("out of memory during aio_req allocation"); + if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) + croak ("cannot set result pipe to nonblocking mode"); +} - req->type = dowrite ? REQ_WRITE : REQ_READ; - req->fd = fd; - req->offset = offset; - req->length = length; - req->data = SvREFCNT_inc (data); - req->dataptr = (char *)svptr + dataoffset; - req->callback = SvREFCNT_inc (callback); +/*****************************************************************************/ +/* work around various missing functions */ - send_req (req); +#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 void -poll_wait () +static ssize_t +pwrite (int fd, void *buf, size_t count, off_t offset) { - if (!nreqs) - return; + ssize_t res; + off_t ooffset; - fd_set rfd; - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); + 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); - select (respipe [0] + 1, &rfd, 0, 0, 0); + return res; } +#endif -static int -poll_cb (pTHX) +#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) { - dSP; - int count = 0; - aio_req req; + 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. + */ { - /* read and signals sent by the worker threads */ - char buf [32]; - while (read (respipe [0], buf, 32) > 0) - ; + 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; } - for (;;) - { - pthread_mutex_lock (&reslock); +# elif __hpux + res = sendfile (ofd, ifd, offset, count, 0, 0); - req = ress; +# elif __solaris + { + struct sendfilevec vec; + size_t sbytes; - if (ress) - { - ress = ress->next; - if (!ress) rese = 0; - } + vec.sfv_fd = ifd; + vec.sfv_flag = 0; + vec.sfv_off = offset; + vec.sfv_len = count; - pthread_mutex_unlock (&reslock); + res = sendfilev (ofd, &vec, 1, &sbytes); - if (!req) - break; + if (res < 0 && sbytes) + res = sbytes; + } - nreqs--; +# endif +#else + res = -1; + errno = ENOSYS; +#endif - if (req->type == REQ_QUIT) - started--; - else + 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) { - int errorno = errno; - errno = req->errorno; + ssize_t cnt; + + cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); - if (req->type == REQ_READ) - SvCUR_set (req->data, req->dataoffset - + req->result > 0 ? req->result : 0); + if (cnt <= 0) + { + if (cnt && !res) res = -1; + break; + } - if (req->data) - SvREFCNT_dec (req->data); + cnt = write (ofd, buf, cnt); - if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) + if (cnt <= 0) { - PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; - PL_laststatval = req->result; - PL_statcache = *(req->statdata); - - Safefree (req->statdata); + if (cnt && !res) res = -1; + break; } - PUSHMARK (SP); - XPUSHs (sv_2mortal (newSViv (req->result))); + offset += cnt; + res += cnt; + count -= cnt; + } + } - if (req->type == REQ_OPEN) - { - /* convert fd to fh */ - SV *fh; + return res; +} - PUTBACK; - call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); - SPAGAIN; +/* 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; - fh = POPs; + if (!dirp) + return -1; - PUSHMARK (SP); - XPUSHs (fh); - } + names = malloc (memlen); - PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); - SPAGAIN; - - if (req->callback) - SvREFCNT_dec (req->callback); + for (;;) + { + errno = 0, readdir_r (dirp, &u.d, &entp); - errno = errorno; - count++; + 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; } + } - Safefree (req); + errorno = errno; + closedir (dirp); + + if (errorno) + { + free (names); + errno = errorno; + res = -1; } - return count; + *namesp = (void *)names; + return res; } +/*****************************************************************************/ + static void * aio_proc (void *thr_arg) { @@ -306,13 +654,11 @@ switch (type) { - case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break; - case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, req->offset); break; -#if SYS_readahead + case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; + case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; + case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; -#else - case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break; -#endif + case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; @@ -321,9 +667,14 @@ 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_FSYNC: req->result = fsync (req->fd); 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; @@ -359,211 +710,373 @@ 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; + free_req (prv); + } + + reqs = reqe = 0; + + while (ress) + { + prv = ress; + ress = prv->next; + free_req (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 ("clalback 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); + MODULE = IO::AIO PACKAGE = IO::AIO +PROTOTYPES: ENABLE + BOOT: { - 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"); + 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 [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 (aTHX); - } -} +int +max_outstanding (nreqs) + int nreqs + PROTOTYPE: $ + CODE: + RETVAL = max_outstanding; + max_outstanding = nreqs; void -aio_open(pathname,flags,mode,callback) +aio_open (pathname,flags,mode,callback=&PL_sv_undef) SV * pathname int flags int mode SV * callback - PROTOTYPE: $$$$ + PROTOTYPE: $$$;$ CODE: { - 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); } void -aio_close(fh,callback) - InputStream fh - SV * callback - PROTOTYPE: $$ +aio_close (fh,callback=&PL_sv_undef) + SV * fh + SV * callback + PROTOTYPE: $;$ ALIAS: aio_close = REQ_CLOSE aio_fsync = REQ_FSYNC aio_fdatasync = REQ_FDATASYNC CODE: { - aio_req req; - - Newz (0, req, 1, aio_cb); - - if (!req) - croak ("out of memory during aio_req allocation"); + dREQ; req->type = ix; - req->fd = PerlIO_fileno (fh); - req->callback = SvREFCNT_inc (callback); + req->fh = newSVsv (fh); + req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); send_req (req); } void -aio_read(fh,offset,length,data,dataoffset,callback) - InputStream fh - UV offset - IV length - SV * data - IV dataoffset - SV * callback - PROTOTYPE: $$$$$$ +aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) + SV * fh + UV offset + UV length + SV * data + UV dataoffset + SV * callback + ALIAS: + aio_read = REQ_READ + aio_write = REQ_WRITE + PROTOTYPE: $$$$$;$ CODE: - read_write (aTHX_ 0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); +{ + aio_req req; + STRLEN svlen; + char *svptr = SvPVbyte (data, svlen); -void -aio_write(fh,offset,length,data,dataoffset,callback) - OutputStream fh - UV offset - IV length - SV * data - IV dataoffset - SV * callback - PROTOTYPE: $$$$$$ - CODE: - read_write (aTHX_ 1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); + SvUPGRADE (data, SVt_PV); + SvPOK_on (data); + + if (dataoffset < 0) + dataoffset += svlen; + + if (dataoffset < 0 || dataoffset > svlen) + croak ("data offset outside of string"); + + if (ix == REQ_WRITE) + { + /* write: check length and adjust. */ + if (length < 0 || length + dataoffset > svlen) + length = svlen - dataoffset; + } + else + { + /* read: grow scalar as necessary */ + svptr = SvGROW (data, length + dataoffset); + } + + if (length < 0) + croak ("length must not be negative"); + + { + dREQ; + + req->type = ix; + req->fh = newSVsv (fh); + req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) + : IoOFP (sv_2io (fh))); + req->offset = offset; + req->length = length; + req->data = SvREFCNT_inc (data); + req->dataptr = (char *)svptr + dataoffset; + + if (!SvREADONLY (data)) + { + SvREADONLY_on (data); + req->data2ptr = (void *)data; + } + + send_req (req); + } +} void -aio_readahead(fh,offset,length,callback) - InputStream fh - UV offset - IV length - SV * callback - PROTOTYPE: $$$$ +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: $$$$;$ CODE: { - aio_req req; + dREQ; - if (length < 0) - croak ("length must not be negative"); + 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; - Newz (0, req, 1, aio_cb); + send_req (req); +} - if (!req) - croak ("out of memory during aio_req allocation"); +void +aio_readahead (fh,offset,length,callback=&PL_sv_undef) + SV * fh + UV offset + IV length + SV * callback + PROTOTYPE: $$$;$ + CODE: +{ + dREQ; req->type = REQ_READAHEAD; - req->fd = PerlIO_fileno (fh); + 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); } void -aio_stat(fh_or_path,callback) +aio_stat (fh_or_path,callback=&PL_sv_undef) SV * fh_or_path SV * callback - PROTOTYPE: $$ ALIAS: - aio_lstat = 1 + aio_stat = REQ_STAT + aio_lstat = REQ_LSTAT CODE: { - 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"); + { + free_req (req); + croak ("out of memory during aio_req->statdata allocation"); + } if (SvPOK (fh_or_path)) { - req->type = ix ? REQ_LSTAT : REQ_STAT; + req->type = ix; req->data = newSVsv (fh_or_path); - req->dataptr = SvPV_nolen (req->data); + req->dataptr = SvPVbyte_nolen (req->data); } else { req->type = REQ_FSTAT; + req->fh = newSVsv (fh_or_path); req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } - req->callback = SvREFCNT_inc (callback); - send_req (req); } void -aio_unlink(pathname,callback) +aio_unlink (pathname,callback=&PL_sv_undef) SV * pathname SV * callback - PROTOTYPE: $$ + ALIAS: + aio_unlink = REQ_UNLINK + aio_rmdir = REQ_RMDIR + aio_readdir = REQ_READDIR CODE: { - 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"); + send_req (req); +} + +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 + CODE: +{ + 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); } +#if 0 + +# undocumented, because it does not cancel active requests +void +cancel_most_requests () + PROTOTYPE: + CODE: +{ + aio_req *req; + + pthread_mutex_lock (&reqlock); + for (req = reqs; req; req = req->next) + req->flags |= 1; + pthread_mutex_unlock (&reqlock); + + pthread_mutex_lock (&reslock); + for (req = ress; req; req = req->next) + req->flags |= 1; + pthread_mutex_unlock (&reslock); +} + +#endif + +void +flush () + PROTOTYPE: + CODE: + while (nreqs) + { + poll_wait (); + poll_cb (); + } + +void +poll() + PROTOTYPE: + CODE: + if (nreqs) + { + poll_wait (); + poll_cb (); + } + int poll_fileno() PROTOTYPE: @@ -576,7 +1089,7 @@ poll_cb(...) PROTOTYPE: CODE: - RETVAL = poll_cb (aTHX); + RETVAL = poll_cb (); OUTPUT: RETVAL