--- Linux-AIO/AIO.xs 2004/05/07 00:57:29 1.19 +++ Linux-AIO/AIO.xs 2005/08/17 16:57:53 1.33 @@ -10,21 +10,27 @@ #include #include #include +#include -typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ +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 ;) */ +typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ -#ifndef __NR_pread64 -# define __NR_pread64 __NR_pread -#endif -#ifndef __NR_pwrite64 -# define __NR_pwrite64 __NR_pwrite +#if __i386 || __amd64 +# define STACKSIZE ( 256 * sizeof (long)) +#elif __ia64 +# define STACKSIZE (8192 * sizeof (long)) +#else +# define STACKSIZE ( 512 * sizeof (long)) #endif -#define STACKSIZE 1024 /* yeah */ - -enum { REQ_QUIT, REQ_OPEN, REQ_CLOSE, REQ_READ, REQ_WRITE, REQ_STAT, REQ_LSTAT, REQ_FSTAT}; +enum { + REQ_QUIT, + REQ_OPEN, REQ_CLOSE, + REQ_READ, REQ_WRITE, REQ_READAHEAD, + REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, + REQ_FSYNC, REQ_FDATASYNC, +}; typedef struct { char stack[STACKSIZE]; @@ -46,7 +52,7 @@ void *dataptr; STRLEN dataoffset; - struct stat64 *statdata; + Stat_t *statdata; } aio_cb; typedef aio_cb *aio_req; @@ -67,8 +73,8 @@ New (0, thr, 1, aio_thread); if (clone (aio_proc, - &(thr->stack[STACKSIZE]), - CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND, + &(thr->stack[STACKSIZE - 16]), + CLONE_VM|CLONE_FS|CLONE_FILES, thr) >= 0) started++; else @@ -93,7 +99,10 @@ req->next = 0; if (qe) - qe->next = req; + { + qe->next = req; + qe = req; + } else qe = qs = req; @@ -159,6 +168,19 @@ send_req (req); } +static void +poll_wait () +{ + if (!nreqs) + return; + + fd_set rfd; + FD_ZERO(&rfd); + FD_SET(respipe[0], &rfd); + + select (respipe[0] + 1, &rfd, 0, 0, 0); +} + static int poll_cb (pTHX) { @@ -168,6 +190,8 @@ while (read (respipe[0], (void *)&req, sizeof (req)) == sizeof (req)) { + nreqs--; + if (req->type == REQ_QUIT) { Safefree (req->thread); @@ -180,28 +204,16 @@ if (req->type == REQ_READ) SvCUR_set (req->data, req->dataoffset - + req->result > 0 ? req->result : 0); + + (req->result > 0 ? req->result : 0)); if (req->data) SvREFCNT_dec (req->data); 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; + PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; + PL_laststatval = req->result; + PL_statcache = *(req->statdata); Safefree (req->statdata); } @@ -216,7 +228,6 @@ SvREFCNT_dec (req->callback); errno = errorno; - nreqs--; count++; } @@ -232,7 +243,35 @@ static sigset_t fullsigset; #undef errno -#include +#include +#include +#include + +#if __alpha || __ia64 || __hppa || __v850__ +# define stat kernelstat +# define stat64 kernelstat64 +# include +# undef stat +# undef stat64 +#else +# define kernelstat stat +# define kernelstat64 stat64 +#endif + +#define COPY_STATDATA \ + req->statdata->st_dev = statdata.st_dev; \ + req->statdata->st_ino = statdata.st_ino; \ + req->statdata->st_mode = statdata.st_mode; \ + req->statdata->st_nlink = statdata.st_nlink; \ + req->statdata->st_uid = statdata.st_uid; \ + req->statdata->st_gid = statdata.st_gid; \ + req->statdata->st_rdev = statdata.st_rdev; \ + req->statdata->st_size = statdata.st_size; \ + req->statdata->st_atime = statdata.st_atime; \ + req->statdata->st_mtime = statdata.st_mtime; \ + req->statdata->st_ctime = statdata.st_ctime; \ + req->statdata->st_blksize = statdata.st_blksize; \ + req->statdata->st_blocks = statdata.st_blocks; \ static int aio_proc (void *thr_arg) @@ -241,22 +280,52 @@ aio_req req; int errno; - /* this is very much x86 and kernel-specific :(:(:( */ + /* this is very much kernel-specific :(:(:( */ /* we rely on gcc's ability to create closures. */ - _syscall3(int,read,int,fd,char *,buf,size_t,count) - _syscall3(int,write,int,fd,char *,buf,size_t,count) + _syscall3(__kernel_size_t, read , unsigned int, fd, char *, buf, __kernel_size_t, count) + _syscall3(__kernel_size_t, write, unsigned int, fd, char *, buf, __kernel_size_t, count) - _syscall3(int,open,char *,pathname,int,flags,mode_t,mode) - _syscall1(int,close,int,fd) + _syscall3(long, open, char *, pathname, int, flags, int, mode) + _syscall1(long, close, unsigned int, fd) + _syscall1(long, unlink, char *, filename); + _syscall1(long, fsync, unsigned int, fd); - _syscall5(int,pread64,int,fd,char *,buf,size_t,count,unsigned int,offset_lo,unsigned int,offset_hi) - _syscall5(int,pwrite64,int,fd,char *,buf,size_t,count,unsigned int,offset_lo,unsigned int,offset_hi) +#ifndef __NR_fdatasync +# define __NR_fdatasync __NR_fsync +#endif + _syscall1(long, fdatasync, unsigned int, fd); - _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) +#if BYTE_ORDER == LITTLE_ENDIAN +# define LOFF_ARG(off) (off & 0xffffffff), (off >> 32) +#elif BYTE_ORDER == BIG_ENDIAN +# define LOFF_ARG(off) (off >> 32), (off & 0xffffffff) +#endif +#ifndef __NR_pread64 +# define __NR_pread64 __NR_pread +# define __NR_pwrite64 __NR_write +#endif + _syscall5(__kernel_ssize_t, pread64 , unsigned int, fd, char *, buf, + __kernel_size_t, count, unsigned int, offset_lh, unsigned int, offset_hl) + _syscall5(__kernel_ssize_t, pwrite64, unsigned int, fd, char *, buf, + __kernel_size_t, count, unsigned int, offset_lh, unsigned int, offset_hl) + _syscall4(long, readahead, unsigned int, fd, unsigned int, offset_lh, unsigned int, offset_hl, __kernel_size_t, count); + +#if __NR_stat64 + _syscall2(long, stat64 , const char *, filename, struct kernelstat64 *, buf) + _syscall2(long, lstat64, const char *, filename, struct kernelstat64 *, buf) + _syscall2(long, fstat64, int , fd , struct kernelstat64 *, buf) +#elif __NR_stat + _syscall2(long, stat , const char *, filename, struct kernelstat *, buf) + _syscall2(long, lstat, const char *, filename, struct kernelstat *, buf) + _syscall2(long, fstat, int , fd , struct kernelstat *, buf) +#else +# error "neither stat64 nor stat defined" +#endif + + /* the following two calls might clobber errno */ sigprocmask (SIG_SETMASK, &fullsigset, 0); + prctl (PR_SET_PDEATHSIG, SIGKILL); /* then loop */ while (read (reqpipe[0], (void *)&req, sizeof (req)) == sizeof (req)) @@ -266,18 +335,36 @@ switch (req->type) { - case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset & 0xffffffff, req->offset >> 32); break; - case REQ_WRITE: req->result = pwrite64(req->fd, req->dataptr, req->length, req->offset & 0xffffffff, req->offset >> 32); 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_STAT: req->result = stat64 (req->dataptr, req->statdata); break; - case REQ_LSTAT: req->result = lstat64 (req->dataptr, req->statdata); break; - case REQ_FSTAT: req->result = fstat64 (req->fd, req->statdata); break; + case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, LOFF_ARG (req->offset)); break; + case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, LOFF_ARG (req->offset)); break; + case REQ_READAHEAD: req->result = readahead (req->fd, LOFF_ARG (req->offset), req->length); break; + +#if __NR_stat64 + struct kernelstat64 statdata; + case REQ_STAT: req->result = stat64 (req->dataptr, &statdata); COPY_STATDATA; break; + case REQ_LSTAT: req->result = lstat64 (req->dataptr, &statdata); COPY_STATDATA; break; + case REQ_FSTAT: req->result = fstat64 (req->fd , &statdata); COPY_STATDATA; break; +#else + struct kernelstat statdata; + case REQ_STAT: req->result = stat (req->dataptr, &statdata); COPY_STATDATA; break; + case REQ_LSTAT: req->result = lstat (req->dataptr, &statdata); COPY_STATDATA; break; + case REQ_FSTAT: req->result = fstat (req->fd , &statdata); COPY_STATDATA; break; +#endif + + 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_FSYNC: req->result = fsync (req->fd); break; + case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; case REQ_QUIT: - default: write (respipe[1], (void *)&req, sizeof (req)); return 0; + + default: + req->result = ENOSYS; + break; } req->errorno = errno; @@ -320,6 +407,7 @@ int nthreads PROTOTYPE: $ CODE: +{ int cur = started; while (cur > nthreads) { @@ -329,13 +417,10 @@ while (started > nthreads) { - fd_set rfd; - FD_ZERO(&rfd); - FD_SET(respipe[0], &rfd); - - select (respipe[0] + 1, &rfd, 0, 0, 0); + poll_wait (); poll_cb (aTHX); } +} void aio_open(pathname,flags,mode,callback) @@ -345,6 +430,7 @@ SV * callback PROTOTYPE: $$$$ CODE: +{ aio_req req; Newz (0, req, 1, aio_cb); @@ -360,13 +446,19 @@ req->callback = SvREFCNT_inc (callback); send_req (req); +} void aio_close(fh,callback) InputStream 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); @@ -374,11 +466,12 @@ if (!req) croak ("out of memory during aio_req allocation"); - req->type = REQ_CLOSE; + req->type = ix; req->fd = PerlIO_fileno (fh); req->callback = SvREFCNT_inc (callback); send_req (req); +} void aio_read(fh,offset,length,data,dataoffset,callback) @@ -405,6 +498,34 @@ read_write (aTHX_ 1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); void +aio_readahead(fh,offset,length,callback) + InputStream fh + UV offset + IV length + SV * callback + PROTOTYPE: $$$$ + CODE: +{ + 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"); + + req->type = REQ_READAHEAD; + req->fd = PerlIO_fileno (fh); + req->offset = offset; + req->length = length; + req->callback = SvREFCNT_inc (callback); + + send_req (req); +} + +void aio_stat(fh_or_path,callback) SV * fh_or_path SV * callback @@ -412,6 +533,7 @@ ALIAS: aio_lstat = 1 CODE: +{ aio_req req; Newz (0, req, 1, aio_cb); @@ -419,7 +541,7 @@ if (!req) croak ("out of memory during aio_req allocation"); - New (0, req->statdata, 1, struct stat64); + New (0, req->statdata, 1, Stat_t); if (!req->statdata) croak ("out of memory during aio_req->statdata allocation"); @@ -439,6 +561,29 @@ req->callback = SvREFCNT_inc (callback); send_req (req); +} + +void +aio_unlink(pathname,callback) + SV * pathname + SV * callback + PROTOTYPE: $$ + CODE: +{ + aio_req req; + + Newz (0, req, 1, aio_cb); + + if (!req) + croak ("out of memory during aio_req allocation"); + + req->type = REQ_UNLINK; + req->data = newSVsv (pathname); + req->dataptr = SvPV_nolen (req->data); + req->callback = SvREFCNT_inc (callback); + + send_req (req); +} int poll_fileno() @@ -456,6 +601,12 @@ OUTPUT: RETVAL +void +poll_wait() + PROTOTYPE: + CODE: + poll_wait (); + int nreqs() PROTOTYPE: