--- Linux-AIO/AIO.xs 2001/08/14 04:33:50 1.3 +++ Linux-AIO/AIO.xs 2002/04/01 20:30:08 1.13 @@ -3,14 +3,19 @@ #include "XSUB.h" #include +#include #include +#include +#include #include -#define STACKSIZE 128 /* yeah */ +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 ;) */ -#define REQ_QUIT 0 -#define REQ_READ 1 -#define REQ_WRITE 2 +#define STACKSIZE 1024 /* yeah */ + +enum { REQ_QUIT, REQ_OPEN, REQ_CLOSE, REQ_READ, REQ_WRITE, REQ_STAT, REQ_LSTAT, REQ_FSTAT}; typedef struct { char stack[STACKSIZE]; @@ -20,21 +25,25 @@ int type; aio_thread *thread; -/* read/write */ + SV *savesv; + int fd; off_t offset; size_t length; ssize_t result; + mode_t mode; /* open */ int errorno; - - SV *data; + SV *data, *callback; void *dataptr; STRLEN dataoffset; + + struct stat64 *statdata; } aio_cb; typedef aio_cb *aio_req; static int started; +static int nreqs; static int reqpipe[2], respipe[2]; static int aio_proc(void *arg); @@ -58,17 +67,136 @@ static void end_thread(void) { - aio_req req = 0; + aio_req req; + New (0, req, 1, aio_cb); + req->type = REQ_QUIT; + write (reqpipe[1], &req, sizeof (aio_req)); +} + +static void +send_req (aio_req req) +{ + nreqs++; write (reqpipe[1], &req, sizeof (aio_req)); - started--; } static void -set_errno(int errorno) +read_write (pTHX_ 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"); + + New (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 int +poll_cb (pTHX) { - errno = errorno; + dSP; + int count = 0; + aio_req req; + + while (read (respipe[0], (void *)&req, sizeof (req)) == sizeof (req)) + { + if (req->type == REQ_QUIT) + { + Safefree (req->thread); + started--; + } + else + { + int errorno = errno; + errno = req->errorno; + + if (req->savesv) + SvREFCNT_dec (req->savesv); + + if (req->type == REQ_READ) + SvCUR_set (req->data, req->dataoffset + + req->result > 0 ? req->result : 0); + + if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) + { + PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; + PL_laststatval = req->result; + PL_statcache.st_dev = req->statdata->st_dev; + PL_statcache.st_ino = req->statdata->st_ino; + PL_statcache.st_mode = req->statdata->st_mode; + PL_statcache.st_nlink = req->statdata->st_nlink; + PL_statcache.st_uid = req->statdata->st_uid; + PL_statcache.st_gid = req->statdata->st_gid; + PL_statcache.st_rdev = req->statdata->st_rdev; + PL_statcache.st_size = req->statdata->st_size; + PL_statcache.st_atime = req->statdata->st_atime; + PL_statcache.st_mtime = req->statdata->st_mtime; + PL_statcache.st_ctime = req->statdata->st_ctime; + PL_statcache.st_blksize = req->statdata->st_blksize; + PL_statcache.st_blocks = req->statdata->st_blocks; + + Safefree (req->statdata); + } + + PUSHMARK (SP); + XPUSHs (sv_2mortal (newSViv (req->result))); + PUTBACK; + call_sv (req->callback, G_VOID); + SPAGAIN; + + SvREFCNT_dec (req->data); + SvREFCNT_dec (req->callback); + + errno = errorno; + nreqs--; + count++; + } + + Safefree (req); + } + + return count; } +static sigset_t fullsigset; + #undef errno #include @@ -76,45 +204,52 @@ aio_proc(void *thr_arg) { aio_thread *thr = thr_arg; - int sig; - int errno; aio_req req; + int errno; /* we rely on gcc's ability to create closures. */ - _syscall3(int,lseek,int,fd,off_t,offset,int,whence); - _syscall3(int,read,int,fd,char *,buf,off_t,count); - _syscall3(int,write,int,fd,char *,buf,off_t,count); - - /* first get rid of any signals */ - for (sig = 1; sig < _NSIG; sig++) - if (sig != SIGTERM) - signal (sig, SIG_IGN); - + _syscall3(int,read,int,fd,char *,buf,size_t,count) + _syscall3(int,write,int,fd,char *,buf,size_t,count) + + _syscall3(int,open,char *,pathname,int,flags,mode_t,mode) + _syscall1(int,close,int,fd) + + _syscall4(int,pread,int,fd,char *,buf,size_t,count,off_t,offset) + _syscall4(int,pwrite,int,fd,char *,buf,size_t,count,off_t,offset) + + _syscall2(int,stat64, const char *, filename, struct stat64 *, buf) + _syscall2(int,lstat64, const char *, filename, struct stat64 *, buf) + _syscall2(int,fstat64, int, fd, struct stat64 *, buf) + + sigprocmask (SIG_SETMASK, &fullsigset, 0); + /* then loop */ while (read (reqpipe[0], (void *)&req, sizeof (req)) == sizeof (req)) { req->thread = thr; + errno = 0; - if (req->type == REQ_READ || req->type == REQ_WRITE) - { - errno = 0; - - if (lseek (req->fd, req->offset, SEEK_SET) == req->offset) - { - if (req->type == REQ_READ) - req->result = read (req->fd, req->dataptr, req->length); - else - req->result = write(req->fd, req->dataptr, req->length); - } - - req->errorno = errno; - } + if (req->type == REQ_READ) + req->result = pread (req->fd, req->dataptr, req->length, req->offset); + else if (req->type == REQ_WRITE) + req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); + else if (req->type == REQ_OPEN) + req->result = open (req->dataptr, req->fd, req->mode); + else if (req->type == REQ_CLOSE) + req->result = close (req->fd); + else if (req->type == REQ_STAT) + req->result = stat64 (req->dataptr, req->statdata); + else if (req->type == REQ_LSTAT) + req->result = lstat64 (req->dataptr, req->statdata); + else if (req->type == REQ_FSTAT) + req->result = fstat64 (req->fd, req->statdata); else { write (respipe[1], (void *)&req, sizeof (req)); break; } + req->errorno = errno; write (respipe[1], (void *)&req, sizeof (req)); } @@ -125,13 +260,23 @@ BOOT: { + sigfillset (&fullsigset); + sigdelset (&fullsigset, SIGTERM); + sigdelset (&fullsigset, SIGQUIT); + sigdelset (&fullsigset, SIGABRT); + sigdelset (&fullsigset, SIGINT); + if (pipe (reqpipe) || pipe (respipe)) croak ("unable to initialize request or result pipe"); + + if (fcntl (respipe[0], F_SETFL, O_NONBLOCK)) + croak ("cannot set result pipe to nonblocking mode"); } void min_parallel(nthreads) int nthreads + PROTOTYPE: $ CODE: while (nthreads > started) start_thread (); @@ -139,12 +284,148 @@ void max_parallel(nthreads) int nthreads + PROTOTYPE: $ CODE: + int cur = started; + while (cur > nthreads) + { + end_thread (); + cur--; + } + + poll_cb (); while (started > nthreads) - end_thread (); + { + sched_yield (); + fcntl (respipe[0], F_SETFL, 0); + poll_cb (); + fcntl (respipe[0], F_SETFL, O_NONBLOCK); + } + +void +aio_open(pathname,flags,mode,callback) + SV * pathname + int flags + int mode + SV * callback + PROTOTYPE: $$$$ + CODE: + aio_req req; + + New (0, req, 1, aio_cb); + + if (!req) + croak ("out of memory during aio_req allocation"); + + req->type = REQ_OPEN; + req->savesv = newSVsv (pathname); + req->dataptr = SvPV_nolen (req->savesv); + req->fd = flags; + req->mode = mode; + req->callback = SvREFCNT_inc (callback); + + send_req (req); + +void +aio_close(fh,callback) + InputStream fh + SV * callback + PROTOTYPE: $ + CODE: + aio_req req; + + New (0, req, 1, aio_cb); + + if (!req) + croak ("out of memory during aio_req allocation"); + + req->type = REQ_CLOSE; + req->fd = PerlIO_fileno (fh); + req->callback = SvREFCNT_inc (callback); + + 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: $$$$$$ + CODE: + read_write (aTHX_ 0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); + +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); void -read(fh,offset,length,data,dataoffset,callback) - ALIAS: - write = 1 +aio_stat(fh_or_path,callback) + SV * fh_or_path + SV * callback + PROTOTYPE: $$ + ALIAS: + aio_lstat = 1 CODE: + aio_req req; + + New (0, req, 1, aio_cb); + + if (!req) + croak ("out of memory during aio_req allocation"); + + New (0, req->statdata, 1, struct stat64); + + if (!req->statdata) + croak ("out of memory during aio_req->statdata allocation"); + + if (SvPOK (fh_or_path)) + { + req->type = ix ? REQ_LSTAT : REQ_STAT; + req->savesv = newSVsv (fh_or_path); + req->dataptr = SvPV_nolen (req->savesv); + } + else + { + req->type = REQ_FSTAT; + req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + req->callback = SvREFCNT_inc (callback); + + send_req (req); + +int +poll_fileno() + PROTOTYPE: + CODE: + RETVAL = respipe[0]; + OUTPUT: + RETVAL + +int +poll_cb(...) + PROTOTYPE: + CODE: + RETVAL = poll_cb (aTHX); + OUTPUT: + RETVAL + +int +nreqs() + PROTOTYPE: + CODE: + RETVAL = nreqs; + OUTPUT: + RETVAL +