--- Linux-AIO/AIO.xs 2001/12/25 02:33:48 1.12 +++ Linux-AIO/AIO.xs 2005/06/29 15:28:14 1.23 @@ -1,28 +1,38 @@ +#define PERL_NO_GET_CONTEXT + #include "EXTERN.h" #include "perl.h" #include "XSUB.h" #include +#include #include #include #include #include -typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ - -#define STACKSIZE 1024 /* yeah */ - -enum { REQ_QUIT, REQ_READ, REQ_WRITE, REQ_OPEN, REQ_CLOSE }; +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 STACKSIZE (128 * sizeof (long)) /* yeah */ + +enum { + REQ_QUIT, + REQ_OPEN, REQ_CLOSE, REQ_READ, REQ_WRITE, + REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK +}; typedef struct { char stack[STACKSIZE]; } aio_thread; -typedef struct { +typedef struct aio_cb { + struct aio_cb *next; + int type; aio_thread *thread; -/* read/write */ int fd; off_t offset; size_t length; @@ -32,6 +42,8 @@ SV *data, *callback; void *dataptr; STRLEN dataoffset; + + Stat_t *statdata; } aio_cb; typedef aio_cb *aio_req; @@ -40,18 +52,20 @@ static int nreqs; static int reqpipe[2], respipe[2]; +static aio_req qs, qe; /* queue start, queue end */ + static int aio_proc(void *arg); static void -start_thread(void) +start_thread (void) { aio_thread *thr; New (0, thr, 1, aio_thread); if (clone (aio_proc, - &(thr->stack[STACKSIZE]), - CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND, + &(thr->stack[STACKSIZE - sizeof (long)]), + CLONE_VM|CLONE_FS|CLONE_FILES, thr) >= 0) started++; else @@ -59,29 +73,55 @@ } static void -end_thread(void) +send_reqs (void) { - aio_req req; - New (0, req, 1, aio_cb); - req->type = REQ_QUIT; - write (reqpipe[1], &req, sizeof (aio_req)); + /* this write is atomic */ + while (qs && write (reqpipe[1], &qs, sizeof qs) == sizeof qs) + { + qs = qs->next; + if (!qs) qe = 0; + } } static void send_req (aio_req req) { nreqs++; - write (reqpipe[1], &req, sizeof (aio_req)); + req->next = 0; + + if (qe) + { + qe->next = req; + qe = req; + } + else + qe = qs = req; + + send_reqs (); +} + +static void +end_thread (void) +{ + aio_req req; + New (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) +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; @@ -103,7 +143,7 @@ if (length < 0) croak ("length must not be negative"); - New (0, req, 1, aio_cb); + Newz (0, req, 1, aio_cb); if (!req) croak ("out of memory during aio_req allocation"); @@ -119,6 +159,16 @@ send_req (req); } +static void +poll_wait () +{ + fd_set rfd; + FD_ZERO(&rfd); + FD_SET(respipe[0], &rfd); + + select (respipe[0] + 1, &rfd, 0, 0, 0); +} + static int poll_cb (pTHX) { @@ -128,6 +178,8 @@ while (read (respipe[0], (void *)&req, sizeof (req)) == sizeof (req)) { + nreqs--; + if (req->type == REQ_QUIT) { Safefree (req->thread); @@ -142,23 +194,37 @@ SvCUR_set (req->data, req->dataoffset + 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 = *(req->statdata); + + 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); + if (req->callback) + SvREFCNT_dec (req->callback); errno = errorno; - nreqs--; count++; } Safefree (req); } + if (qs) + send_reqs (); + return count; } @@ -166,51 +232,100 @@ #undef errno #include +#include + +#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) +aio_proc (void *thr_arg) { aio_thread *thr = thr_arg; aio_req req; int errno; + /* this is very much kernel-specific :(:(:( */ /* 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) + _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) +#ifdef __NR_pread64 + _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) +#elif __NR_pread + _syscall4(int,pread,int,fd,char *,buf,size_t,count,offset_t,offset) + _syscall4(int,pwrite,int,fd,char *,buf,size_t,count,offset_t,offset) +#else +# error "neither pread nor pread64 defined" +#endif + + +#ifdef __NR_stat64 + _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) +#elif __NR_stat + _syscall2(int,stat, const char *, filename, struct stat *, buf) + _syscall2(int,lstat, const char *, filename, struct stat *, buf) + _syscall2(int,fstat, int, fd, struct stat *, buf) +#else +# error "neither stat64 nor stat defined" +#endif + + _syscall1(int,unlink, char *, filename); + sigprocmask (SIG_SETMASK, &fullsigset, 0); + prctl (PR_SET_PDEATHSIG, SIGKILL); /* then loop */ while (read (reqpipe[0], (void *)&req, sizeof (req)) == sizeof (req)) { req->thread = thr; - errno = 0; + errno = 0; /* strictly unnecessary */ - if (req->type == REQ_READ || req->type == REQ_WRITE) + switch (req->type) { - 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); - } - } - 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 - { - write (respipe[1], (void *)&req, sizeof (req)); - break; +#ifdef __NR_pread64 + 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; +#else + 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; +#endif +#ifdef __NR_stat64 + struct stat64 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 stat 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_QUIT: + default: + write (respipe[1], (void *)&req, sizeof (req)); + return 0; } req->errorno = errno; @@ -233,6 +348,9 @@ if (pipe (reqpipe) || pipe (respipe)) croak ("unable to initialize request or result pipe"); + if (fcntl (reqpipe[1], F_SETFL, O_NONBLOCK)) + croak ("cannot set result pipe to nonblocking mode"); + if (fcntl (respipe[0], F_SETFL, O_NONBLOCK)) croak ("cannot set result pipe to nonblocking mode"); } @@ -257,34 +375,15 @@ cur--; } - poll_cb (); while (started > nthreads) { - sched_yield (); - fcntl (respipe[0], F_SETFL, 0); - poll_cb (); - fcntl (respipe[0], F_SETFL, O_NONBLOCK); + poll_wait (); + poll_cb (aTHX); } void -aio_read(fh,offset,length,data,dataoffset,callback) - InOutStream fh - UV offset - IV length - SV * data - IV dataoffset - SV * callback - PROTOTYPE: $$$$$$ - ALIAS: - aio_write = 1 - CODE: - SvUPGRADE (data, SVt_PV); - SvPOK_on (data); - read_write (aTHX_ ix, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); - -void aio_open(pathname,flags,mode,callback) - char * pathname + SV * pathname int flags int mode SV * callback @@ -292,13 +391,14 @@ CODE: aio_req req; - New (0, req, 1, aio_cb); + Newz (0, req, 1, aio_cb); if (!req) croak ("out of memory during aio_req allocation"); req->type = REQ_OPEN; - req->dataptr = pathname; + req->data = newSVsv (pathname); + req->dataptr = SvPV_nolen (req->data); req->fd = flags; req->mode = mode; req->callback = SvREFCNT_inc (callback); @@ -307,13 +407,13 @@ void aio_close(fh,callback) - InOutStream fh + InputStream fh SV * callback - PROTOTYPE: $ + PROTOTYPE: $$ CODE: aio_req req; - New (0, req, 1, aio_cb); + Newz (0, req, 1, aio_cb); if (!req) croak ("out of memory during aio_req allocation"); @@ -324,6 +424,86 @@ 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 +aio_stat(fh_or_path,callback) + SV * fh_or_path + SV * callback + PROTOTYPE: $$ + ALIAS: + aio_lstat = 1 + CODE: + aio_req req; + + Newz (0, req, 1, aio_cb); + + if (!req) + croak ("out of memory during aio_req allocation"); + + New (0, req->statdata, 1, Stat_t); + + 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->data = newSVsv (fh_or_path); + req->dataptr = SvPV_nolen (req->data); + } + else + { + req->type = REQ_FSTAT; + req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + 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() PROTOTYPE: @@ -340,6 +520,12 @@ OUTPUT: RETVAL +void +poll_wait() + PROTOTYPE: + CODE: + poll_wait (); + int nreqs() PROTOTYPE: