--- IO-AIO/AIO.xs 2005/08/23 12:37:19 1.37 +++ IO-AIO/AIO.xs 2006/10/21 23:20:29 1.44 @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -33,6 +34,11 @@ # endif #endif +/* used for struct dirent, AIX doesn't provide it */ +#ifndef NAME_MAX +# define NAME_MAX 4096 +#endif + #if __ia64 # define STACKSIZE 65536 #else @@ -46,32 +52,42 @@ REQ_SENDFILE, REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_FSYNC, REQ_FDATASYNC, - REQ_UNLINK, REQ_RMDIR, + REQ_UNLINK, REQ_RMDIR, REQ_RENAME, REQ_READDIR, - REQ_SYMLINK, + REQ_LINK, REQ_SYMLINK, + REQ_GROUP, }; -typedef struct aio_cb { +#define AIO_REQ_KLASS "IO::AIO::REQ" +#define AIO_GRP_KLASS "IO::AIO::GRP" + +typedef struct aio_cb +{ + struct aio_cb *grp, *grp_prev, *grp_next; + struct aio_cb *volatile next; - int type; + SV *self; /* the perl counterpart of this request, if any */ - /* should receive a cleanup, with unions */ - int fd, fd2; + SV *data, *callback; + SV *fh, *fh2; + void *dataptr, *data2ptr; + Stat_t *statdata; off_t offset; size_t length; ssize_t result; - mode_t mode; /* open */ + + int type; + int fd, fd2; int errorno; - SV *data, *callback; - SV *fh, *fh2; - void *dataptr, *data2ptr; STRLEN dataoffset; - - Stat_t *statdata; + mode_t mode; /* open */ + unsigned char cancelled; } aio_cb; typedef aio_cb *aio_req; +typedef aio_cb *aio_req_ornot; +typedef aio_cb *aio_group; static int started, wanted; static volatile int nreqs; @@ -85,8 +101,33 @@ static volatile aio_req reqs, reqe; /* queue start, queue end */ static volatile aio_req ress, rese; /* queue start, queue end */ -static void free_req (aio_req req) +/* must be called at most once */ +static SV *req_sv (aio_req req, const char *klass) +{ + req->self = (SV *)newHV (); + sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); + + return sv_2mortal (sv_bless (newRV_noinc (req->self), gv_stashpv (klass, 1))); +} + +static aio_req SvAIO_REQ (SV *sv, const char *klass) +{ + if (!sv_derived_from (sv, klass) || !SvROK (sv)) + croak ("object of class %s expected", klass); + + MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); + + return mg ? (aio_req)mg->mg_ptr : 0; +} + +static void req_free (aio_req req) { + if (req->self) + { + sv_unmagic (req->self, PERL_MAGIC_ext); + SvREFCNT_dec (req->self); + } + if (req->data) SvREFCNT_dec (req->data); @@ -222,7 +263,7 @@ } } - if (SvOK (req->callback)) + if (SvOK (req->callback) && !req->cancelled) { PUTBACK; call_sv (req->callback, G_VOID | G_EVAL); @@ -230,7 +271,7 @@ if (SvTRUE (ERRSV)) { - free_req (req); + req_free (req); croak (0); } } @@ -241,7 +282,7 @@ count++; } - free_req (req); + req_free (req); } return count; @@ -270,7 +311,7 @@ } static void -send_req (aio_req req) +req_send (aio_req req) { while (started < wanted && nreqs >= started) start_thread (); @@ -311,7 +352,7 @@ Newz (0, req, 1, aio_cb); req->type = REQ_QUIT; - send_req (req); + req_send (req); } static void min_parallel (int nthreads) @@ -501,10 +542,10 @@ res = sbytes; } -# else +# endif +#else res = -1; errno = ENOSYS; -# endif #endif if (res < 0 @@ -519,11 +560,11 @@ char buf[4096]; res = 0; - for (;;) + while (count) { ssize_t cnt; - cnt = pread (ifd, buf, 4096, offset); + cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); if (cnt <= 0) { @@ -541,6 +582,7 @@ offset += cnt; res += cnt; + count -= cnt; } } @@ -643,37 +685,38 @@ errno = 0; /* strictly unnecessary */ - type = req->type; - - switch (type) - { - 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 (!req->cancelled) + switch (req->type) + { + 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; - case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; - case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; + case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; + case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; - case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; - case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; - case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); 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_UNLINK: req->result = unlink (req->dataptr); break; - case REQ_RMDIR: req->result = rmdir (req->dataptr); break; - case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; - - case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; - case REQ_FSYNC: req->result = fsync (req->fd); break; - case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; + case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; + case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; + case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); 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_UNLINK: req->result = unlink (req->dataptr); break; + case REQ_RMDIR: req->result = rmdir (req->dataptr); break; + case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; + case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; + case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; + + case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; + case REQ_FSYNC: req->result = fsync (req->fd); break; + case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; - case REQ_QUIT: - break; + case REQ_QUIT: + break; - default: - req->result = ENOSYS; - break; - } + default: + req->result = ENOSYS; + break; + } req->errorno = errno; @@ -737,7 +780,7 @@ { prv = reqs; reqs = prv->next; - free_req (prv); + req_free (prv); } reqs = reqe = 0; @@ -746,7 +789,7 @@ { prv = ress; ress = prv->next; - free_req (prv); + req_free (prv); } ress = rese = 0; @@ -762,13 +805,19 @@ aio_req req; \ \ if (SvOK (callback) && !SvROK (callback)) \ - croak ("clalback must be undef or of reference type"); \ + croak ("callback must be undef or of reference type"); \ \ Newz (0, req, 1, aio_cb); \ if (!req) \ croak ("out of memory during aio_req allocation"); \ \ - req->callback = newSVsv (callback); + req->callback = newSVsv (callback) + +#define REQ_SEND \ + req_send (req); \ + \ + if (GIMME_V != G_VOID) \ + XPUSHs (req_sv (req, AIO_REQ_KLASS)); MODULE = IO::AIO PACKAGE = IO::AIO @@ -776,22 +825,27 @@ BOOT: { + HV *stash = gv_stashpv ("IO::AIO", 1); + newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); + newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); + newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); + create_pipe (); pthread_atfork (atfork_prepare, atfork_parent, atfork_child); } void -min_parallel(nthreads) +min_parallel (nthreads) int nthreads PROTOTYPE: $ void -max_parallel(nthreads) +max_parallel (nthreads) int nthreads PROTOTYPE: $ int -max_outstanding(nreqs) +max_outstanding (nreqs) int nreqs PROTOTYPE: $ CODE: @@ -799,13 +853,13 @@ max_outstanding = nreqs; void -aio_open(pathname,flags,mode,callback=&PL_sv_undef) +aio_open (pathname,flags,mode,callback=&PL_sv_undef) SV * pathname int flags int mode SV * callback PROTOTYPE: $$$;$ - CODE: + PPCODE: { dREQ; @@ -815,11 +869,11 @@ req->fd = flags; req->mode = mode; - send_req (req); + REQ_SEND; } void -aio_close(fh,callback=&PL_sv_undef) +aio_close (fh,callback=&PL_sv_undef) SV * fh SV * callback PROTOTYPE: $;$ @@ -827,7 +881,7 @@ aio_close = REQ_CLOSE aio_fsync = REQ_FSYNC aio_fdatasync = REQ_FDATASYNC - CODE: + PPCODE: { dREQ; @@ -835,11 +889,11 @@ req->fh = newSVsv (fh); req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - send_req (req); + REQ_SEND (req); } void -aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) +aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) SV * fh UV offset UV length @@ -850,7 +904,7 @@ aio_read = REQ_READ aio_write = REQ_WRITE PROTOTYPE: $$$$$;$ - CODE: + PPCODE: { aio_req req; STRLEN svlen; @@ -898,19 +952,19 @@ req->data2ptr = (void *)data; } - send_req (req); + REQ_SEND; } } void -aio_sendfile(out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) +aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) SV * out_fh SV * in_fh UV in_offset UV length SV * callback PROTOTYPE: $$$$;$ - CODE: + PPCODE: { dREQ; @@ -922,17 +976,17 @@ req->offset = in_offset; req->length = length; - send_req (req); + REQ_SEND; } void -aio_readahead(fh,offset,length,callback=&PL_sv_undef) +aio_readahead (fh,offset,length,callback=&PL_sv_undef) SV * fh UV offset IV length SV * callback PROTOTYPE: $$$;$ - CODE: + PPCODE: { dREQ; @@ -942,24 +996,24 @@ req->offset = offset; req->length = length; - send_req (req); + REQ_SEND; } void -aio_stat(fh_or_path,callback=&PL_sv_undef) +aio_stat (fh_or_path,callback=&PL_sv_undef) SV * fh_or_path SV * callback ALIAS: aio_stat = REQ_STAT aio_lstat = REQ_LSTAT - CODE: + PPCODE: { dREQ; New (0, req->statdata, 1, Stat_t); if (!req->statdata) { - free_req (req); + req_free (req); croak ("out of memory during aio_req->statdata allocation"); } @@ -976,17 +1030,18 @@ req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } - send_req (req); + REQ_SEND; } void -aio_unlink(pathname,callback=&PL_sv_undef) +aio_unlink (pathname,callback=&PL_sv_undef) SV * pathname SV * callback ALIAS: - aio_unlink = REQ_UNLINK - aio_rmdir = REQ_RMDIR - CODE: + aio_unlink = REQ_UNLINK + aio_rmdir = REQ_RMDIR + aio_readdir = REQ_READDIR + PPCODE: { dREQ; @@ -994,44 +1049,44 @@ req->data = newSVsv (pathname); req->dataptr = SvPVbyte_nolen (req->data); - send_req (req); + REQ_SEND; } void -aio_symlink(oldpath,newpath,callback=&PL_sv_undef) +aio_link (oldpath,newpath,callback=&PL_sv_undef) SV * oldpath SV * newpath SV * callback - CODE: + ALIAS: + aio_link = REQ_LINK + aio_symlink = REQ_SYMLINK + aio_rename = REQ_RENAME + PPCODE: { dREQ; - req->type = REQ_SYMLINK; + req->type = ix; req->fh = newSVsv (oldpath); req->data2ptr = SvPVbyte_nolen (req->fh); req->data = newSVsv (newpath); req->dataptr = SvPVbyte_nolen (req->data); - send_req (req); + REQ_SEND; } void -aio_readdir(pathname,callback=&PL_sv_undef) - SV * pathname - SV * callback - CODE: +aio_group (callback=&PL_sv_undef) + SV * callback + PROTOTYPE: ;& + PPCODE: { dREQ; - - req->type = REQ_READDIR; - req->data = newSVsv (pathname); - req->dataptr = SvPVbyte_nolen (req->data); - - send_req (req); + req->type = REQ_GROUP; + XPUSHs (req_sv (req, AIO_GRP_KLASS)); } void -flush() +flush () PROTOTYPE: CODE: while (nreqs) @@ -1081,3 +1136,11 @@ OUTPUT: RETVAL +MODULE = IO::AIO PACKAGE = IO::AIO::REQ + +void +cancel (aio_req_ornot req) + PROTOTYPE: + CODE: + req->cancelled = 1; +