--- IO-AIO/AIO.xs 2005/07/11 02:53:59 1.8 +++ IO-AIO/AIO.xs 2005/07/31 18:20:07 1.16 @@ -2,16 +2,17 @@ #include "perl.h" #include "XSUB.h" +#include "autoconf/config.h" + #include #include + #include #include #include #include -#include #include -#include typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ @@ -42,7 +43,7 @@ ssize_t result; mode_t mode; /* open */ int errorno; - SV *data, *callback; + SV *data, *callback, *fh; void *dataptr; STRLEN dataoffset; @@ -52,7 +53,7 @@ typedef aio_cb *aio_req; static int started; -static int nreqs; +static volatile int nreqs; static int max_outstanding = 1<<30; static int respipe [2]; @@ -66,14 +67,14 @@ static void poll_wait () { - if (!nreqs) - return; - - fd_set rfd; - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); + if (nreqs && !ress) + { + fd_set rfd; + FD_ZERO(&rfd); + FD_SET(respipe [0], &rfd); - select (respipe [0] + 1, &rfd, 0, 0, 0); + select (respipe [0] + 1, &rfd, 0, 0, 0); + } } static int @@ -81,32 +82,24 @@ { dSP; int count = 0; - aio_req req; - + aio_req req, prv; + + pthread_mutex_lock (&reslock); + { - /* read and signals sent by the worker threads */ + /* read any signals sent by the worker threads */ char buf [32]; while (read (respipe [0], buf, 32) > 0) ; } - for (;;) - { - pthread_mutex_lock (&reslock); + req = ress; + ress = rese = 0; - req = ress; - - if (ress) - { - ress = ress->next; - if (!ress) rese = 0; - } - - pthread_mutex_unlock (&reslock); - - if (!req) - break; + pthread_mutex_unlock (&reslock); + while (req) + { nreqs--; if (req->type == REQ_QUIT) @@ -123,6 +116,9 @@ if (req->data) SvREFCNT_dec (req->data); + if (req->fh) + SvREFCNT_dec (req->fh); + if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) { PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; @@ -132,6 +128,7 @@ Safefree (req->statdata); } + ENTER; PUSHMARK (SP); XPUSHs (sv_2mortal (newSViv (req->result))); @@ -144,10 +141,10 @@ call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); SPAGAIN; - fh = POPs; + fh = SvREFCNT_inc (POPs); PUSHMARK (SP); - XPUSHs (fh); + XPUSHs (sv_2mortal (fh)); } if (SvOK (req->callback)) @@ -156,6 +153,8 @@ call_sv (req->callback, G_VOID | G_EVAL); SPAGAIN; } + + LEAVE; if (req->callback) SvREFCNT_dec (req->callback); @@ -164,7 +163,11 @@ count++; } - Safefree (req); + prv = req; + req = req->next; + Safefree (prv); + + /* TODO: croak on errors? */ } return count; @@ -229,54 +232,6 @@ send_req (req); } -static void -read_write (int dowrite, int fd, off_t offset, size_t length, - SV *data, STRLEN dataoffset, SV *callback) -{ - aio_req req; - STRLEN svlen; - char *svptr = SvPV (data, svlen); - - SvUPGRADE (data, SVt_PV); - SvPOK_on (data); - - if (dataoffset < 0) - dataoffset += svlen; - - if (dataoffset < 0 || dataoffset > svlen) - croak ("data offset outside of string"); - - if (dowrite) - { - /* 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"); - - Newz (0, req, 1, aio_cb); - - if (!req) - croak ("out of memory during aio_req allocation"); - - 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); - - send_req (req); -} - static void * aio_proc (void *thr_arg) { @@ -311,11 +266,17 @@ 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 +#if HAVE_PREADWRITE + 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; +#else +# error "pread/pwrite cannot be emulated, fix your os" +#endif + +#if HAVE_READAHEAD case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; #else + // TODO: emulate case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break; #endif @@ -327,8 +288,11 @@ case REQ_CLOSE: req->result = close (req->fd); break; case REQ_UNLINK: req->result = unlink (req->dataptr); break; + case REQ_FDATASYNC: +#if HAVE_FDATASYNC + req->result = fdatasync (req->fd); break; +#endif case REQ_FSYNC: req->result = fsync (req->fd); break; - case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; case REQ_QUIT: break; @@ -444,8 +408,8 @@ void aio_close(fh,callback=&PL_sv_undef) - InputStream fh - SV * callback + SV * fh + SV * callback PROTOTYPE: $;$ ALIAS: aio_close = REQ_CLOSE @@ -461,7 +425,8 @@ croak ("out of memory during aio_req allocation"); req->type = ix; - req->fd = PerlIO_fileno (fh); + req->fh = newSVsv (fh); + req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); req->callback = SvREFCNT_inc (callback); send_req (req); @@ -469,34 +434,70 @@ void aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) - InputStream fh - UV offset - IV length - SV * data - IV dataoffset - SV * callback + SV * fh + UV offset + IV length + SV * data + IV dataoffset + SV * callback + ALIAS: + aio_read = REQ_READ + aio_write = REQ_WRITE PROTOTYPE: $$$$$;$ CODE: - read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); +{ + aio_req req; + STRLEN svlen; + char *svptr = SvPV (data, svlen); -void -aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) - OutputStream fh - UV offset - IV length - SV * data - IV dataoffset - SV * callback - PROTOTYPE: $$$$$;$ - CODE: - read_write (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"); + + Newz (0, req, 1, aio_cb); + + 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->callback = SvREFCNT_inc (callback); + + send_req (req); +} void aio_readahead(fh,offset,length,callback=&PL_sv_undef) - InputStream fh - UV offset - IV length - SV * callback + SV * fh + UV offset + IV length + SV * callback PROTOTYPE: $$$;$ CODE: { @@ -511,7 +512,8 @@ croak ("out of memory during aio_req allocation"); 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); @@ -549,6 +551,7 @@ else { req->type = REQ_FSTAT; + req->fh = newSVsv (fh_or_path); req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); }