--- IO-AIO/AIO.xs 2006/10/21 23:06:04 1.43 +++ IO-AIO/AIO.xs 2006/10/23 18:38:15 1.57 @@ -11,6 +11,8 @@ #include #include +#include +#include #include #include #include @@ -55,17 +57,19 @@ REQ_UNLINK, REQ_RMDIR, REQ_RENAME, REQ_READDIR, REQ_LINK, REQ_SYMLINK, + REQ_GROUP, REQ_NOP, + REQ_SLEEP, }; -#define AIO_CB_KLASS "IO::AIO::CB" +#define AIO_REQ_KLASS "IO::AIO::REQ" +#define AIO_GRP_KLASS "IO::AIO::GRP" typedef struct aio_cb { - struct aio_cb *grp_prev, *grp_next; - struct aio_grp *grp; - struct aio_cb *volatile next; + struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; + SV *self; /* the perl counterpart of this request, if any */ SV *data, *callback; @@ -99,80 +103,217 @@ static volatile aio_req reqs, reqe; /* queue start, queue end */ static volatile aio_req ress, rese; /* queue start, queue end */ -typedef struct aio_grp +static void req_invoke (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) { - struct aio_cb *first, *last; - SV *callback; - int busycount; -} aio_grp; + if (!req->self) + { + req->self = (SV *)newHV (); + sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); + } -static void aio_grp_begin (aio_grp *grp) + return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); +} + +static aio_req SvAIO_REQ (SV *sv) { - ++grp->busycount; + MAGIC *mg; + + if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) + croak ("object of class " AIO_REQ_KLASS " expected"); + + mg = mg_find (SvRV (sv), PERL_MAGIC_ext); + + return mg ? (aio_req)mg->mg_ptr : 0; } -static void aio_grp_end (aio_grp *grp) +static void aio_grp_feed (aio_req grp) { - --grp->busycount; + while (grp->length < grp->fd2 && !grp->cancelled) + { + int old_len = grp->length; - if (grp->busycount) - return; + if (grp->fh2 && SvOK (grp->fh2)) + { + dSP; + + ENTER; + SAVETMPS; + PUSHMARK (SP); + XPUSHs (req_sv (grp, AIO_GRP_KLASS)); + PUTBACK; + call_sv (grp->fh2, G_VOID | G_EVAL); + SPAGAIN; + FREETMPS; + LEAVE; + } - SvREFCNT_dec (grp->callback); - grp->callback = 0; + /* stop if no progress has been made */ + if (old_len == grp->length) + { + SvREFCNT_dec (grp->fh2); + grp->fh2 = 0; + break; + } + } } -static aio_grp *aio_grp_new () +static void aio_grp_dec (aio_req grp) { - aio_grp *grp; + --grp->length; - Newz (0, grp, 1, aio_grp); - aio_grp_begin (grp); + /* call feeder, if applicable */ + aio_grp_feed (grp); - return grp; + /* finish, if done */ + if (!grp->length && grp->fd) + { + req_invoke (grp); + req_free (grp); + } } -/* must be called at most once */ -static SV *req_sv (aio_req req) +static void poll_wait () { - req->self = (SV *)newHV (); - sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); + if (nreqs && !ress) + { + fd_set rfd; + FD_ZERO(&rfd); + FD_SET(respipe [0], &rfd); - return sv_bless (newRV_noinc (req->self), gv_stashpv (AIO_CB_KLASS, 1)); + select (respipe [0] + 1, &rfd, 0, 0, 0); + } } -static aio_req SvAIO_REQ (SV *sv) +static void req_invoke (aio_req req) { - if (!sv_derived_from (sv, AIO_CB_KLASS) || !SvROK (sv)) - croak ("object of class " AIO_CB_KLASS " expected"); + dSP; + int errorno = errno; - MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); + if (req->cancelled || !SvOK (req->callback)) + return; - return mg ? (aio_req)mg->mg_ptr : 0; + errno = req->errorno; + + ENTER; + SAVETMPS; + 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: + req->fd = 2; /* mark group as finished */ + + 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_NOP: + case REQ_SLEEP: + break; + + default: + PUSHs (sv_2mortal (newSViv (req->result))); + break; + } + + + PUTBACK; + call_sv (req->callback, G_VOID | G_EVAL); + SPAGAIN; + + FREETMPS; + LEAVE; + + errno = errorno; + + if (SvTRUE (ERRSV)) + { + req_free (req); + croak (0); + } } static void req_free (aio_req req) { - if (req->self) + if (req->grp) { - sv_unmagic (req->self, PERL_MAGIC_ext); - SvREFCNT_dec (req->self); - } + aio_req grp = req->grp; - if (req->data) - SvREFCNT_dec (req->data); + /* unlink request */ + if (req->grp_next) req->grp_next->grp_prev = req->grp_prev; + if (req->grp_prev) req->grp_prev->grp_next = req->grp_next; - if (req->fh) - SvREFCNT_dec (req->fh); + if (grp->grp_first == req) + grp->grp_first = req->grp_next; - if (req->fh2) - SvREFCNT_dec (req->fh2); + aio_grp_dec (grp); + } - if (req->statdata) - Safefree (req->statdata); + if (req->self) + { + sv_unmagic (req->self, PERL_MAGIC_ext); + SvREFCNT_dec (req->self); + } - if (req->callback) - SvREFCNT_dec (req->callback); + SvREFCNT_dec (req->data); + SvREFCNT_dec (req->fh); + SvREFCNT_dec (req->fh2); + SvREFCNT_dec (req->callback); + Safefree (req->statdata); if (req->type == REQ_READDIR && req->result >= 0) free (req->data2ptr); @@ -180,21 +321,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_first; sub; sub = sub->grp_next) + req_cancel (sub); } } -static int -poll_cb () +static int poll_cb () { dSP; int count = 0; @@ -226,15 +366,17 @@ if (!req) break; - nreqs--; + --nreqs; if (req->type == REQ_QUIT) started--; + else if (req->type == REQ_GROUP && req->length) + { + 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)); @@ -248,68 +390,8 @@ 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--; - } - - 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) && !req->cancelled) - { - PUTBACK; - call_sv (req->callback, G_VOID | G_EVAL); - SPAGAIN; - - if (SvTRUE (ERRSV)) - { - req_free (req); - croak (0); - } - } - - LEAVE; + req_invoke (req); - errno = errorno; count++; } @@ -321,8 +403,7 @@ static void *aio_proc(void *arg); -static void -start_thread (void) +static void start_thread (void) { sigset_t fullsigset, oldsigset; pthread_t tid; @@ -341,13 +422,12 @@ sigprocmask (SIG_SETMASK, &oldsigset, 0); } -static void -req_send (aio_req req) +static void req_send (aio_req req) { while (started < wanted && nreqs >= started) start_thread (); - nreqs++; + ++nreqs; pthread_mutex_lock (&reqlock); @@ -376,8 +456,7 @@ } } -static void -end_thread (void) +static void end_thread (void) { aio_req req; Newz (0, req, 1, aio_cb); @@ -438,8 +517,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; @@ -454,8 +532,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; @@ -478,8 +555,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]; @@ -501,8 +577,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; @@ -528,8 +603,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; @@ -621,8 +695,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 @@ -686,8 +759,7 @@ /*****************************************************************************/ -static void * -aio_proc (void *thr_arg) +static void *aio_proc (void *thr_arg) { aio_req req; int type; @@ -717,7 +789,7 @@ errno = 0; /* strictly unnecessary */ if (!req->cancelled) - switch (req->type) + switch (type = req->type) /* remember type for QUIT check */ { 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; @@ -741,6 +813,18 @@ 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; + + tv.tv_sec = req->fd; + tv.tv_usec = req->fd2; + + req->result = select (0, 0, 0, 0, &tv); + } + + case REQ_GROUP: + case REQ_NOP: case REQ_QUIT: break; @@ -848,7 +932,7 @@ req_send (req); \ \ if (GIMME_V != G_VOID) \ - XPUSHs (req_sv (req)); + XPUSHs (req_sv (req, AIO_REQ_KLASS)); MODULE = IO::AIO PACKAGE = IO::AIO @@ -1105,28 +1189,44 @@ 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_send (req); + XPUSHs (req_sv (req, AIO_GRP_KLASS)); +} + +void +aio_nop (callback=&PL_sv_undef) + SV * callback + PPCODE: +{ + dREQ; + + req->type = REQ_NOP; + + REQ_SEND; +} void flush () @@ -1179,11 +1279,87 @@ OUTPUT: RETVAL -MODULE = IO::AIO PACKAGE = IO::AIO::CB +PROTOTYPES: DISABLE + +MODULE = IO::AIO PACKAGE = IO::AIO::REQ void cancel (aio_req_ornot req) PROTOTYPE: CODE: - req->cancelled = 1; + req_cancel (req); + +void +cb (aio_req req, SV *callback=&PL_sv_undef) + CODE: + SvREFCNT_dec (req->callback); + req->callback = newSVsv (callback); + +MODULE = IO::AIO PACKAGE = IO::AIO::GRP + +void +add (aio_req grp, ...) + PPCODE: +{ + int i; + aio_req req; + + if (grp->fd == 2) + croak ("cannot add requests to IO::AIO::GRP after the group finished"); + + for (i = 1; i < items; ++i ) + { + if (GIMME_V != G_VOID) + XPUSHs (sv_2mortal (newSVsv (ST (i)))); + + req = SvAIO_REQ (ST (i)); + + if (req) + { + ++grp->length; + req->grp = grp; + + req->grp_prev = 0; + req->grp_next = grp->grp_first; + + if (grp->grp_first) + grp->grp_first->grp_prev = req; + + grp->grp_first = req; + } + } +} + +void +result (aio_req grp, ...) + CODE: +{ + int i; + AV *av = newAV (); + + for (i = 1; i < items; ++i ) + av_push (av, newSVsv (ST (i))); + + SvREFCNT_dec (grp->data); + grp->data = (SV *)av; +} + +void +feed_limit (aio_req grp, int limit) + CODE: + grp->fd2 = limit; + aio_grp_feed (grp); + +void +feed (aio_req grp, SV *callback=&PL_sv_undef) + CODE: +{ + SvREFCNT_dec (grp->fh2); + grp->fh2 = newSVsv (callback); + + if (grp->fd2 <= 0) + grp->fd2 = 2; + + aio_grp_feed (grp); +}