--- IO-AIO/AIO.xs 2006/07/21 07:35:31 1.42 +++ IO-AIO/AIO.xs 2006/10/22 10:33:19 1.48 @@ -11,6 +11,8 @@ #include #include +#include +#include #include #include #include @@ -55,29 +57,39 @@ REQ_UNLINK, REQ_RMDIR, REQ_RENAME, REQ_READDIR, REQ_LINK, REQ_SYMLINK, + REQ_SLEEP, + 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; static int started, wanted; static volatile int nreqs; @@ -91,8 +103,156 @@ 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) +static void req_free (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_inc (req->self), gv_stashpv (klass, 1))); +} + +static aio_req SvAIO_REQ (SV *sv) +{ + if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) + croak ("object of class " AIO_REQ_KLASS " expected"); + + MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); + + return mg ? (aio_req)mg->mg_ptr : 0; +} + +static void poll_wait () +{ + if (nreqs && !ress) + { + fd_set rfd; + FD_ZERO(&rfd); + FD_SET(respipe [0], &rfd); + + select (respipe [0] + 1, &rfd, 0, 0, 0); + } +} + +static void req_invoke (aio_req req) +{ + dSP; + int errorno = errno; + + if (req->cancelled || !SvOK (req->callback)) + return; + + errno = req->errorno; + + ENTER; + PUSHMARK (SP); + EXTEND (SP, 1); + + switch (req->type) + { + case REQ_READDIR: + { + SV *rv = &PL_sv_undef; + + if (req->result >= 0) + { + char *buf = req->data2ptr; + AV *av = newAV (); + + while (req->result) + { + SV *sv = newSVpv (buf, 0); + + av_push (av, sv); + buf += SvCUR (sv) + 1; + req->result--; + } + + rv = sv_2mortal (newRV_noinc ((SV *)av)); + } + + PUSHs (rv); + } + break; + + case REQ_OPEN: + { + /* convert fd to fh */ + SV *fh; + + PUSHs (sv_2mortal (newSViv (req->result))); + PUTBACK; + call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); + SPAGAIN; + + fh = SvREFCNT_inc (POPs); + + PUSHMARK (SP); + XPUSHs (sv_2mortal (fh)); + } + break; + + case REQ_GROUP: + if (req->data) + { + int i; + AV *av = (AV *)req->data; + + EXTEND (SP, AvFILL (av) + 1); + for (i = 0; i <= AvFILL (av); ++i) + PUSHs (*av_fetch (av, i, 0)); + } + break; + + case REQ_SLEEP: + break; + + default: + PUSHs (sv_2mortal (newSViv (req->result))); + break; + } + + + PUTBACK; + call_sv (req->callback, G_VOID | G_EVAL); + SPAGAIN; + + if (SvTRUE (ERRSV)) + { + req_free (req); + croak (0); + } + + LEAVE; + + errno = errorno; +} + +static void req_free (aio_req req) { + if (req->grp) + { + aio_req grp = req->grp; + + /* unlink request */ + req->grp_next->grp_prev = req->grp_prev; + req->grp_prev->grp_next = req->grp_next; + + if (grp->grp_next == grp && grp->fd) + { + req_invoke (grp); + req_free (grp); + } + } + + if (req->self) + { + sv_unmagic (req->self, PERL_MAGIC_ext); + SvREFCNT_dec (req->self); + } + if (req->data) SvREFCNT_dec (req->data); @@ -114,21 +274,20 @@ Safefree (req); } -static void -poll_wait () +static void req_cancel (aio_req req) { - if (nreqs && !ress) + req->cancelled = 1; + + if (req->type == REQ_GROUP) { - fd_set rfd; - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); + aio_req sub; - select (respipe [0] + 1, &rfd, 0, 0, 0); + for (sub = req->grp_next; sub != req; sub = sub->grp_next) + req_cancel (sub); } } -static int -poll_cb () +static int poll_cb () { dSP; int count = 0; @@ -164,11 +323,13 @@ if (req->type == REQ_QUIT) started--; + else if (req->type == REQ_GROUP && req->grp_next != req) + { + req->fd = 1; /* mark request as delayed */ + continue; + } else { - int errorno = errno; - errno = req->errorno; - if (req->type == REQ_READ) SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); @@ -182,72 +343,12 @@ PL_statcache = *(req->statdata); } - ENTER; - PUSHMARK (SP); - - if (req->type == REQ_READDIR) - { - SV *rv = &PL_sv_undef; - - if (req->result >= 0) - { - char *buf = req->data2ptr; - AV *av = newAV (); - - while (req->result) - { - SV *sv = newSVpv (buf, 0); - - av_push (av, sv); - buf += SvCUR (sv) + 1; - req->result--; - } + req_invoke (req); - rv = sv_2mortal (newRV_noinc ((SV *)av)); - } - - XPUSHs (rv); - } - else - { - XPUSHs (sv_2mortal (newSViv (req->result))); - - if (req->type == REQ_OPEN) - { - /* convert fd to fh */ - SV *fh; - - PUTBACK; - call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); - SPAGAIN; - - fh = SvREFCNT_inc (POPs); - - PUSHMARK (SP); - XPUSHs (sv_2mortal (fh)); - } - } - - if (SvOK (req->callback)) - { - PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); - SPAGAIN; - - if (SvTRUE (ERRSV)) - { - free_req (req); - croak (0); - } - } - - LEAVE; - - errno = errorno; count++; } - free_req (req); + req_free (req); } return count; @@ -255,8 +356,7 @@ static void *aio_proc(void *arg); -static void -start_thread (void) +static void start_thread (void) { sigset_t fullsigset, oldsigset; pthread_t tid; @@ -275,8 +375,7 @@ sigprocmask (SIG_SETMASK, &oldsigset, 0); } -static void -send_req (aio_req req) +static void req_send (aio_req req) { while (started < wanted && nreqs >= started) start_thread (); @@ -310,14 +409,13 @@ } } -static void -end_thread (void) +static void end_thread (void) { aio_req req; Newz (0, req, 1, aio_cb); req->type = REQ_QUIT; - send_req (req); + req_send (req); } static void min_parallel (int nthreads) @@ -372,8 +470,7 @@ */ static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; -static ssize_t -pread (int fd, void *buf, size_t count, off_t offset) +static ssize_t pread (int fd, void *buf, size_t count, off_t offset) { ssize_t res; off_t ooffset; @@ -388,8 +485,7 @@ return res; } -static ssize_t -pwrite (int fd, void *buf, size_t count, off_t offset) +static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) { ssize_t res; off_t ooffset; @@ -412,8 +508,7 @@ #if !HAVE_READAHEAD # define readahead aio_readahead -static ssize_t -readahead (int fd, off_t offset, size_t count) +static ssize_t readahead (int fd, off_t offset, size_t count) { char readahead_buf[4096]; @@ -435,8 +530,7 @@ static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; -static int -readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) +static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) { struct dirent *e; int errorno; @@ -462,8 +556,7 @@ #endif /* sendfile always needs emulation */ -static ssize_t -sendfile_ (int ofd, int ifd, off_t offset, size_t count) +static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) { ssize_t res; @@ -555,8 +648,7 @@ } /* read a full directory */ -static int -scandir_ (const char *path, void **namesp) +static int scandir_ (const char *path, void **namesp) { DIR *dirp = opendir (path); union @@ -620,8 +712,7 @@ /*****************************************************************************/ -static void * -aio_proc (void *thr_arg) +static void *aio_proc (void *thr_arg) { aio_req req; int type; @@ -650,39 +741,48 @@ errno = 0; /* strictly unnecessary */ - type = req->type; + 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; - 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; + 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_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_SLEEP: + { + struct timeval tv; - 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; + tv.tv_sec = req->fd; + tv.tv_usec = req->fd2; - case REQ_QUIT: - break; + req->result = select (0, 0, 0, 0, &tv); + } - default: - req->result = ENOSYS; - break; - } + case REQ_QUIT: + break; + + default: + req->result = ENOSYS; + break; + } req->errorno = errno; @@ -746,7 +846,7 @@ { prv = reqs; reqs = prv->next; - free_req (prv); + req_free (prv); } reqs = reqe = 0; @@ -755,7 +855,7 @@ { prv = ress; ress = prv->next; - free_req (prv); + req_free (prv); } ress = rese = 0; @@ -771,13 +871,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 @@ -819,7 +925,7 @@ int mode SV * callback PROTOTYPE: $$$;$ - CODE: + PPCODE: { dREQ; @@ -829,7 +935,7 @@ req->fd = flags; req->mode = mode; - send_req (req); + REQ_SEND; } void @@ -841,7 +947,7 @@ aio_close = REQ_CLOSE aio_fsync = REQ_FSYNC aio_fdatasync = REQ_FDATASYNC - CODE: + PPCODE: { dREQ; @@ -849,7 +955,7 @@ req->fh = newSVsv (fh); req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - send_req (req); + REQ_SEND (req); } void @@ -864,7 +970,7 @@ aio_read = REQ_READ aio_write = REQ_WRITE PROTOTYPE: $$$$$;$ - CODE: + PPCODE: { aio_req req; STRLEN svlen; @@ -912,7 +1018,7 @@ req->data2ptr = (void *)data; } - send_req (req); + REQ_SEND; } } @@ -924,7 +1030,7 @@ UV length SV * callback PROTOTYPE: $$$$;$ - CODE: + PPCODE: { dREQ; @@ -936,7 +1042,7 @@ req->offset = in_offset; req->length = length; - send_req (req); + REQ_SEND; } void @@ -946,7 +1052,7 @@ IV length SV * callback PROTOTYPE: $$$;$ - CODE: + PPCODE: { dREQ; @@ -956,7 +1062,7 @@ req->offset = offset; req->length = length; - send_req (req); + REQ_SEND; } void @@ -966,14 +1072,14 @@ 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"); } @@ -990,7 +1096,7 @@ req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } - send_req (req); + REQ_SEND; } void @@ -1001,7 +1107,7 @@ aio_unlink = REQ_UNLINK aio_rmdir = REQ_RMDIR aio_readdir = REQ_READDIR - CODE: + PPCODE: { dREQ; @@ -1009,7 +1115,7 @@ req->data = newSVsv (pathname); req->dataptr = SvPVbyte_nolen (req->data); - send_req (req); + REQ_SEND; } void @@ -1021,7 +1127,7 @@ aio_link = REQ_LINK aio_symlink = REQ_SYMLINK aio_rename = REQ_RENAME - CODE: + PPCODE: { dREQ; @@ -1031,31 +1137,38 @@ req->data = newSVsv (newpath); req->dataptr = SvPVbyte_nolen (req->data); - send_req (req); + REQ_SEND; } -#if 0 - -# undocumented, because it does not cancel active requests void -cancel_most_requests () - PROTOTYPE: - CODE: +aio_sleep (delay,callback=&PL_sv_undef) + double delay + SV * callback + PPCODE: { - aio_req *req; + dREQ; + + req->type = REQ_SLEEP; + req->fd = delay < 0. ? 0 : delay; + req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); - pthread_mutex_lock (&reqlock); - for (req = reqs; req; req = req->next) - req->flags |= 1; - pthread_mutex_unlock (&reqlock); - - pthread_mutex_lock (&reslock); - for (req = ress; req; req = req->next) - req->flags |= 1; - pthread_mutex_unlock (&reslock); + REQ_SEND; } -#endif +void +aio_group (callback=&PL_sv_undef) + SV * callback + PROTOTYPE: ;$ + PPCODE: +{ + dREQ; + req->type = REQ_GROUP; + req->grp_next = req; + req->grp_prev = req; + + req_send (req); + XPUSHs (req_sv (req, AIO_GRP_KLASS)); +} void flush () @@ -1108,3 +1221,56 @@ OUTPUT: RETVAL +PROTOTYPES: DISABLE + +MODULE = IO::AIO PACKAGE = IO::AIO::REQ + +void +cancel (aio_req_ornot req) + PROTOTYPE: + CODE: + req_cancel (req); + +MODULE = IO::AIO PACKAGE = IO::AIO::GRP + +void +add (aio_req grp, ...) + PPCODE: +{ + int i; + + for (i = 1; i < items; ++i ) + { + if (GIMME_V != G_VOID) + XPUSHs (sv_2mortal (newSVsv (ST (i)))); + + aio_req req = SvAIO_REQ (ST (i)); + + if (req) + { + req->grp_prev = grp; + req->grp_next = grp->grp_next; + grp->grp_next->grp_prev = req; + grp->grp_next = req; + + req->grp = grp; + } + } +} + +void +result (aio_req grp, ...) + CODE: +{ + int i; + AV *av = newAV (); + + if (grp->data) + SvREFCNT_dec (grp->data); + + for (i = 1; i < items; ++i ) + av_push (av, newSVsv (ST (i))); + + grp->data = (SV *)av; +} +