--- IO-AIO/AIO.xs 2005/07/20 21:55:27 1.11 +++ IO-AIO/AIO.xs 2005/07/31 18:45:48 1.17 @@ -1,9 +1,9 @@ -#define _XOPEN_SOURCE 500 - #include "EXTERN.h" #include "perl.h" #include "XSUB.h" +#include "autoconf/config.h" + #include #include @@ -11,9 +11,6 @@ #include #include #include -#if __linux -#include -#endif #include @@ -46,7 +43,7 @@ ssize_t result; mode_t mode; /* open */ int errorno; - SV *data, *callback; + SV *data, *callback, *fh; void *dataptr; STRLEN dataoffset; @@ -87,9 +84,6 @@ int count = 0; aio_req req, prv; - static int rl;//D - //printf ("%d ENTER\n", ++rl);//D - pthread_mutex_lock (&reslock); { @@ -107,7 +101,6 @@ while (req) { nreqs--; - //printf ("%d count %d %p->%p\n", rl, count, req, req->next);//D if (req->type == REQ_QUIT) started--; @@ -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); @@ -171,7 +170,6 @@ /* TODO: croak on errors? */ } - //printf ("%d LEAVE %p %p\n", rl--, ress, rese);//D return count; } @@ -234,53 +232,76 @@ send_req (req); } -static void -read_write (int dowrite, int fd, off_t offset, size_t length, - SV *data, STRLEN dataoffset, SV *callback) +/* 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 iolock = PTHREAD_MUTEX_INITIALIZER; + +static ssize_t +pread (int fd, void *buf, size_t count, off_t offset) { - aio_req req; - STRLEN svlen; - char *svptr = SvPV (data, svlen); + ssize_t res; + off_t ooffset; - SvUPGRADE (data, SVt_PV); - SvPOK_on (data); + pthread_mutex_lock (&iolock); + ooffset = lseek (fd, 0, SEEK_CUR); + lseek (fd, offset, SEEK_SET); + res = read (fd, buf, count); + lseek (fd, ooffset, SEEK_SET); + pthread_mutex_unlock (&iolock); - if (dataoffset < 0) - dataoffset += svlen; + return res; +} - if (dataoffset < 0 || dataoffset > svlen) - croak ("data offset outside of string"); +static ssize_t +pwrite (int fd, void *buf, size_t count, off_t offset) +{ + ssize_t res; + off_t ooffset; - 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); - } + pthread_mutex_lock (&iolock); + ooffset = lseek (fd, 0, SEEK_CUR); + lseek (fd, offset, SEEK_SET); + res = write (fd, buf, count); + lseek (fd, offset, SEEK_SET); + pthread_mutex_unlock (&iolock); - if (length < 0) - croak ("length must not be negative"); + return res; +} +#endif - Newz (0, req, 1, aio_cb); +#if !HAVE_FDATASYNC +# define fdatasync fsync +#endif - if (!req) - croak ("out of memory during aio_req allocation"); +#if !HAVE_READAHEAD +# define readahead aio_readahead - 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); +static char readahead_buf[4096]; - send_req (req); +static ssize_t +readahead (int fd, off_t offset, size_t count) +{ + 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 static void * aio_proc (void *thr_arg) @@ -318,11 +339,8 @@ { 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; @@ -332,8 +350,8 @@ case REQ_CLOSE: req->result = close (req->fd); break; case REQ_UNLINK: req->result = unlink (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_QUIT: break; @@ -449,8 +467,8 @@ void aio_close(fh,callback=&PL_sv_undef) - InputStream fh - SV * callback + SV * fh + SV * callback PROTOTYPE: $;$ ALIAS: aio_close = REQ_CLOSE @@ -466,7 +484,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); @@ -474,34 +493,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: { @@ -516,7 +571,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); @@ -554,6 +610,7 @@ else { req->type = REQ_FSTAT; + req->fh = newSVsv (fh_or_path); req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); }