--- IO-AIO/AIO.xs 2006/10/26 16:28:33 1.79 +++ IO-AIO/AIO.xs 2006/11/08 02:01:02 1.93 @@ -45,6 +45,9 @@ # endif #endif +/* number of seconds after which idle threads exit */ +#define IDLE_TIMEOUT 10 + /* used for struct dirent, AIX doesn't provide it */ #ifndef NAME_MAX # define NAME_MAX 4096 @@ -67,11 +70,11 @@ * this is conservatice, likely most arches this runs * on have atomic word read/writes. */ -#ifndef WORDREAD_UNSAFE +#ifndef WORDACCESS_UNSAFE # if __i386 || __x86_64 -# define WORDREAD_UNSAFE 0 +# define WORDACCESS_UNSAFE 0 # else -# define WORDREAD_UNSAFE 1 +# define WORDACCESS_UNSAFE 1 # endif #endif @@ -86,6 +89,8 @@ if (!aio_buf) \ return -1; +typedef SV SV8; /* byte-sv, used for argument-checking */ + enum { REQ_QUIT, REQ_OPEN, REQ_CLOSE, @@ -94,8 +99,8 @@ REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_FSYNC, REQ_FDATASYNC, REQ_UNLINK, REQ_RMDIR, REQ_RENAME, - REQ_READDIR, - REQ_LINK, REQ_SYMLINK, + REQ_MKNOD, REQ_READDIR, + REQ_LINK, REQ_SYMLINK, REQ_READLINK, REQ_GROUP, REQ_NOP, REQ_BUSY, }; @@ -107,17 +112,16 @@ { struct aio_cb *volatile next; - SV *data, *callback; - SV *fh, *fh2; - void *dataptr, *data2ptr; - Stat_t *statdata; - off_t offset; - size_t length; + SV *callback, *fh; + SV *sv1, *sv2; + void *ptr1, *ptr2; + off_t offs; + size_t size; ssize_t result; - STRLEN dataoffset; + STRLEN stroffset; int type; - int fd, fd2; + int int1, int2; int errorno; mode_t mode; /* open */ @@ -129,7 +133,9 @@ } aio_cb; enum { - FLAG_CANCELLED = 0x01, + FLAG_CANCELLED = 0x01, /* request was cancelled */ + FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ + FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */ }; typedef aio_cb *aio_req; @@ -144,12 +150,21 @@ NUM_PRI = PRI_MAX + PRI_BIAS + 1, }; +#define AIO_TICKS ((1000000 + 1023) >> 10) + +static unsigned int max_poll_time = 0; +static unsigned int max_poll_reqs = 0; + +/* calculcate time difference in ~1/AIO_TICKS of a second */ +static int tvdiff (struct timeval *tv1, struct timeval *tv2) +{ + return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS + + ((tv2->tv_usec - tv1->tv_usec) >> 10); +} + static int next_pri = DEFAULT_PRI + PRI_BIAS; -static unsigned int started, wanted; -static volatile unsigned int nreqs, nready, npending; -static volatile unsigned int max_outstanding = 0xffffffff; -static int respipe [2]; +static unsigned int started, idle, wanted; #if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) # define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP @@ -200,10 +215,58 @@ free (wrk); } +static volatile unsigned int nreqs, nready, npending; +static volatile unsigned int max_idle = 4; +static volatile unsigned int max_outstanding = 0xffffffff; +static int respipe [2]; + static pthread_mutex_t reslock = AIO_MUTEX_INIT; static pthread_mutex_t reqlock = AIO_MUTEX_INIT; static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; +#if WORDACCESS_UNSAFE + +static unsigned int get_nready () +{ + unsigned int retval; + + LOCK (reqlock); + retval = nready; + UNLOCK (reqlock); + + return retval; +} + +static unsigned int get_npending () +{ + unsigned int retval; + + LOCK (reslock); + retval = npending; + UNLOCK (reslock); + + return retval; +} + +static unsigned int get_nthreads () +{ + unsigned int retval; + + LOCK (wrklock); + retval = started; + UNLOCK (wrklock); + + return retval; +} + +#else + +# define get_nready() nready +# define get_npending() npending +# define get_nthreads() started + +#endif + /* * a somewhat faster data structure might be nice, but * with 8 priorities this actually needs <20 insns @@ -258,7 +321,7 @@ abort (); } -static int poll_cb (int max); +static int poll_cb (); static void req_invoke (aio_req req); static void req_free (aio_req req); static void req_cancel (aio_req req); @@ -289,11 +352,11 @@ static void aio_grp_feed (aio_req grp) { - while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) + while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED)) { - int old_len = grp->length; + int old_len = grp->size; - if (grp->fh2 && SvOK (grp->fh2)) + if (grp->sv2 && SvOK (grp->sv2)) { dSP; @@ -302,17 +365,17 @@ PUSHMARK (SP); XPUSHs (req_sv (grp, AIO_GRP_KLASS)); PUTBACK; - call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); + call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); SPAGAIN; FREETMPS; LEAVE; } /* stop if no progress has been made */ - if (old_len == grp->length) + if (old_len == grp->size) { - SvREFCNT_dec (grp->fh2); - grp->fh2 = 0; + SvREFCNT_dec (grp->sv2); + grp->sv2 = 0; break; } } @@ -320,44 +383,26 @@ static void aio_grp_dec (aio_req grp) { - --grp->length; + --grp->size; /* call feeder, if applicable */ aio_grp_feed (grp); /* finish, if done */ - if (!grp->length && grp->fd) + if (!grp->size && grp->int1) { req_invoke (grp); req_free (grp); } } -static void poll_wait () -{ - fd_set rfd; - - while (nreqs) - { - int size; - if (WORDREAD_UNSAFE) LOCK (reslock); - size = res_queue.size; - if (WORDREAD_UNSAFE) UNLOCK (reslock); - - if (size) - return; - - FD_ZERO(&rfd); - FD_SET(respipe [0], &rfd); - - select (respipe [0] + 1, &rfd, 0, 0, 0); - } -} - static void req_invoke (aio_req req) { dSP; + if (req->flags & FLAG_SV1_RO_OFF) + SvREADONLY_off (req->sv1); + if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) { ENTER; @@ -374,7 +419,7 @@ if (req->result >= 0) { int i; - char *buf = req->data2ptr; + char *buf = req->ptr2; AV *av = newAV (); av_extend (av, req->result - 1); @@ -404,20 +449,19 @@ call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); SPAGAIN; - fh = SvREFCNT_inc (POPs); - + fh = POPs; PUSHMARK (SP); - XPUSHs (sv_2mortal (fh)); + XPUSHs (fh); } break; case REQ_GROUP: - req->fd = 2; /* mark group as finished */ + req->int1 = 2; /* mark group as finished */ - if (req->data) + if (req->sv1) { int i; - AV *av = (AV *)req->data; + AV *av = (AV *)req->sv1; EXTEND (SP, AvFILL (av) + 1); for (i = 0; i <= AvFILL (av); ++i) @@ -429,6 +473,30 @@ case REQ_BUSY: break; + case REQ_READLINK: + if (req->result > 0) + { + SvCUR_set (req->sv1, req->result); + *SvEND (req->sv1) = 0; + PUSHs (req->sv1); + } + break; + + case REQ_STAT: + case REQ_LSTAT: + case REQ_FSTAT: + PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; + PL_laststatval = req->result; + PL_statcache = *(Stat_t *)(req->ptr2); + PUSHs (sv_2mortal (newSViv (req->result))); + break; + + case REQ_READ: + SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); + *SvEND (req->sv1) = 0; + PUSHs (sv_2mortal (newSViv (req->result))); + break; + default: PUSHs (sv_2mortal (newSViv (req->result))); break; @@ -473,14 +541,13 @@ SvREFCNT_dec (req->self); } - SvREFCNT_dec (req->data); SvREFCNT_dec (req->fh); - SvREFCNT_dec (req->fh2); + SvREFCNT_dec (req->sv1); + SvREFCNT_dec (req->sv2); SvREFCNT_dec (req->callback); - Safefree (req->statdata); - if (req->type == REQ_READDIR) - free (req->data2ptr); + if (req->flags & FLAG_PTR2_FREE) + free (req->ptr2); Safefree (req); } @@ -492,8 +559,8 @@ if (grp->type != REQ_GROUP) return; - SvREFCNT_dec (grp->fh2); - grp->fh2 = 0; + SvREFCNT_dec (grp->sv2); + grp->sv2 = 0; for (sub = grp->grp_first; sub; sub = sub->grp_next) req_cancel (sub); @@ -506,81 +573,6 @@ req_cancel_subs (req); } -static int poll_cb (int max) -{ - dSP; - int count = 0; - int do_croak = 0; - aio_req req; - - for (;;) - { - while (max <= 0 || count < max) - { - LOCK (reslock); - req = reqq_shift (&res_queue); - - if (req) - { - --npending; - - if (!res_queue.size) - { - /* read any signals sent by the worker threads */ - char buf [32]; - while (read (respipe [0], buf, 32) == 32) - ; - } - } - - UNLOCK (reslock); - - if (!req) - break; - - --nreqs; - - if (req->type == REQ_QUIT) - --started; - else if (req->type == REQ_GROUP && req->length) - { - req->fd = 1; /* mark request as delayed */ - continue; - } - else - { - if (req->type == REQ_READ) - SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); - - if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) - SvREADONLY_off (req->data); - - if (req->statdata) - { - PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; - PL_laststatval = req->result; - PL_statcache = *(req->statdata); - } - - req_invoke (req); - - count++; - } - - req_free (req); - } - - if (nreqs <= max_outstanding) - break; - - poll_wait (); - - max = 0; - } - - return count; -} - static void *aio_proc(void *arg); static void start_thread (void) @@ -596,6 +588,9 @@ pthread_attr_init (&attr); pthread_attr_setstacksize (&attr, STACKSIZE); pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); +#ifdef PTHREAD_SCOPE_PROCESS + pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS); +#endif sigfillset (&fullsigset); @@ -617,11 +612,20 @@ UNLOCK (wrklock); } -static void req_send (aio_req req) +static void maybe_start_thread () { - while (started < wanted && nreqs >= started) - start_thread (); + if (get_nthreads () >= wanted) + return; + + /* todo: maybe use idle here, but might be less exact */ + if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs) + return; + + start_thread (); +} +static void req_send (aio_req req) +{ ++nreqs; LOCK (reqlock); @@ -629,6 +633,8 @@ reqq_push (&req_queue, req); pthread_cond_signal (&reqwait); UNLOCK (reqlock); + + maybe_start_thread (); } static void end_thread (void) @@ -640,7 +646,21 @@ req->type = REQ_QUIT; req->pri = PRI_MAX + PRI_BIAS; - req_send (req); + LOCK (reqlock); + reqq_push (&req_queue, req); + pthread_cond_signal (&reqwait); + UNLOCK (reqlock); + + LOCK (wrklock); + --started; + UNLOCK (wrklock); +} + +static void set_max_idle (int nthreads) +{ + if (WORDACCESS_UNSAFE) LOCK (reqlock); + max_idle = nthreads <= 0 ? 1 : nthreads; + if (WORDACCESS_UNSAFE) UNLOCK (reqlock); } static void min_parallel (int nthreads) @@ -651,22 +671,112 @@ static void max_parallel (int nthreads) { - int cur = started; - if (wanted > nthreads) wanted = nthreads; - while (cur > wanted) + while (started > wanted) + end_thread (); +} + +static void poll_wait () +{ + fd_set rfd; + + while (nreqs) { - end_thread (); - cur--; + int size; + if (WORDACCESS_UNSAFE) LOCK (reslock); + size = res_queue.size; + if (WORDACCESS_UNSAFE) UNLOCK (reslock); + + if (size) + return; + + maybe_start_thread (); + + FD_ZERO(&rfd); + FD_SET(respipe [0], &rfd); + + select (respipe [0] + 1, &rfd, 0, 0, 0); } +} - while (started > wanted) +static int poll_cb () +{ + dSP; + int count = 0; + int maxreqs = max_poll_reqs; + int do_croak = 0; + struct timeval tv_start, tv_now; + aio_req req; + + if (max_poll_time) + gettimeofday (&tv_start, 0); + + for (;;) { + for (;;) + { + maybe_start_thread (); + + LOCK (reslock); + req = reqq_shift (&res_queue); + + if (req) + { + --npending; + + if (!res_queue.size) + { + /* read any signals sent by the worker threads */ + char buf [32]; + while (read (respipe [0], buf, 32) == 32) + ; + } + } + + UNLOCK (reslock); + + if (!req) + break; + + --nreqs; + + if (req->type == REQ_GROUP && req->size) + { + req->int1 = 1; /* mark request as delayed */ + continue; + } + else + { + req_invoke (req); + + count++; + } + + req_free (req); + + if (maxreqs && !--maxreqs) + break; + + if (max_poll_time) + { + gettimeofday (&tv_now, 0); + + if (tvdiff (&tv_start, &tv_now) >= max_poll_time) + break; + } + } + + if (nreqs <= max_outstanding) + break; + poll_wait (); - poll_cb (0); + + ++maxreqs; } + + return count; } static void create_pipe () @@ -891,9 +1001,10 @@ int errorno; LOCK (wrklock); - self->dirp = dirp = opendir (req->dataptr); + self->dirp = dirp = opendir (req->ptr1); self->dbuf = u = malloc (sizeof (*u)); - req->data2ptr = names = malloc (memlen); + req->flags |= FLAG_PTR2_FREE; + req->ptr2 = names = malloc (memlen); UNLOCK (wrklock); if (dirp && u && names) @@ -917,7 +1028,7 @@ { memlen *= 2; LOCK (wrklock); - req->data2ptr = names = realloc (names, memlen); + req->ptr2 = names = realloc (names, memlen); UNLOCK (wrklock); if (!names) @@ -940,11 +1051,17 @@ static void *aio_proc (void *thr_arg) { aio_req req; - int type; + struct timespec ts; worker *self = (worker *)thr_arg; - do + /* try to distribute timeouts somewhat evenly */ + ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) + * (1000000000UL / 1024UL); + + for (;;) { + ts.tv_sec = time (0) + IDLE_TIMEOUT; + LOCK (reqlock); for (;;) @@ -954,7 +1071,27 @@ if (req) break; - pthread_cond_wait (&reqwait, &reqlock); + ++idle; + + if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) + == ETIMEDOUT) + { + if (idle > max_idle) + { + --idle; + UNLOCK (reqlock); + LOCK (wrklock); + --started; + UNLOCK (wrklock); + goto quit; + } + + /* we are allowed to idle, so do so without any timeout */ + pthread_cond_wait (&reqwait, &reqlock); + ts.tv_sec = time (0) + IDLE_TIMEOUT; + } + + --idle; } --nready; @@ -962,48 +1099,51 @@ UNLOCK (reqlock); errno = 0; /* strictly unnecessary */ - type = req->type; /* remember type for QUIT check */ if (!(req->flags & FLAG_CANCELLED)) - switch (type) + 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_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; + case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); 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, self); break; + case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; + case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); 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_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break; + case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break; + case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break; + + case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; + case REQ_CLOSE: req->result = close (req->int1); break; + case REQ_UNLINK: req->result = unlink (req->ptr1); break; + case REQ_RMDIR: req->result = rmdir (req->ptr1); break; + case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; + case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; + case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; + case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; + case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; - case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; - case REQ_FSYNC: req->result = fsync (req->fd); break; + case REQ_FDATASYNC: req->result = fdatasync (req->int1); break; + case REQ_FSYNC: req->result = fsync (req->int1); break; case REQ_READDIR: scandir_ (req, self); break; case REQ_BUSY: { struct timeval tv; - tv.tv_sec = req->fd; - tv.tv_usec = req->fd2; + tv.tv_sec = req->int1; + tv.tv_usec = req->int2; req->result = select (0, 0, 0, 0, &tv); } case REQ_GROUP: case REQ_NOP: - case REQ_QUIT: break; + case REQ_QUIT: + goto quit; + default: req->result = ENOSYS; break; @@ -1024,8 +1164,8 @@ UNLOCK (reslock); } - while (type != REQ_QUIT); +quit: LOCK (wrklock); worker_free (self); UNLOCK (wrklock); @@ -1082,8 +1222,11 @@ worker_free (wrk); } - started = 0; - nreqs = 0; + started = 0; + idle = 0; + nreqs = 0; + nready = 0; + npending = 0; close (respipe [0]); close (respipe [1]); @@ -1120,15 +1263,31 @@ 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)); + newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); + newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); + newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); create_pipe (); pthread_atfork (atfork_prepare, atfork_parent, atfork_child); } void +max_poll_reqs (int nreqs) + PROTOTYPE: $ + CODE: + max_poll_reqs = nreqs; + +void +max_poll_time (double nseconds) + PROTOTYPE: $ + CODE: + max_poll_time = nseconds * AIO_TICKS; + +void min_parallel (int nthreads) PROTOTYPE: $ @@ -1136,6 +1295,12 @@ max_parallel (int nthreads) PROTOTYPE: $ +void +max_idle (int nthreads) + PROTOTYPE: $ + CODE: + set_max_idle (nthreads); + int max_outstanding (int maxreqs) PROTOTYPE: $ @@ -1147,7 +1312,7 @@ void aio_open (pathname,flags,mode,callback=&PL_sv_undef) - SV * pathname + SV8 * pathname int flags int mode SV * callback @@ -1157,9 +1322,9 @@ dREQ; req->type = REQ_OPEN; - req->data = newSVsv (pathname); - req->dataptr = SvPVbyte_nolen (req->data); - req->fd = flags; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->int1 = flags; req->mode = mode; REQ_SEND; @@ -1179,8 +1344,8 @@ dREQ; req->type = ix; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->fh = newSVsv (fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); REQ_SEND (req); } @@ -1190,7 +1355,7 @@ SV * fh UV offset UV length - SV * data + SV8 * data UV dataoffset SV * callback ALIAS: @@ -1199,7 +1364,6 @@ PROTOTYPE: $$$$$;$ PPCODE: { - aio_req req; STRLEN svlen; char *svptr = SvPVbyte (data, svlen); @@ -1231,18 +1395,19 @@ dREQ; req->type = ix; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) - : IoOFP (sv_2io (fh))); - req->offset = offset; - req->length = length; - req->data = SvREFCNT_inc (data); - req->dataptr = (char *)svptr + dataoffset; + req->fh = newSVsv (fh); + req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) + : IoOFP (sv_2io (fh))); + req->offs = offset; + req->size = length; + req->sv1 = SvREFCNT_inc (data); + req->ptr1 = (char *)svptr + dataoffset; + req->stroffset = dataoffset; if (!SvREADONLY (data)) { SvREADONLY_on (data); - req->data2ptr = (void *)data; + req->flags |= FLAG_SV1_RO_OFF; } REQ_SEND; @@ -1250,6 +1415,28 @@ } void +aio_readlink (path,callback=&PL_sv_undef) + SV8 * path + SV * callback + PROTOTYPE: $$;$ + PPCODE: +{ + SV *data; + dREQ; + + data = newSV (NAME_MAX); + SvPOK_on (data); + + req->type = REQ_READLINK; + req->fh = newSVsv (path); + req->ptr2 = SvPVbyte_nolen (req->fh); + req->sv1 = data; + req->ptr1 = SvPVbyte_nolen (data); + + REQ_SEND; +} + +void aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) SV * out_fh SV * in_fh @@ -1262,12 +1449,12 @@ dREQ; req->type = REQ_SENDFILE; - req->fh = newSVsv (out_fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); - req->fh2 = newSVsv (in_fh); - req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); - req->offset = in_offset; - req->length = length; + req->fh = newSVsv (out_fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); + req->sv2 = newSVsv (in_fh); + req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); + req->offs = in_offset; + req->size = length; REQ_SEND; } @@ -1284,17 +1471,17 @@ dREQ; req->type = REQ_READAHEAD; - req->fh = newSVsv (fh); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); - req->offset = offset; - req->length = length; + req->fh = newSVsv (fh); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->offs = offset; + req->size = length; REQ_SEND; } void aio_stat (fh_or_path,callback=&PL_sv_undef) - SV * fh_or_path + SV8 * fh_or_path SV * callback ALIAS: aio_stat = REQ_STAT @@ -1303,24 +1490,26 @@ { dREQ; - New (0, req->statdata, 1, Stat_t); - if (!req->statdata) + req->ptr2 = malloc (sizeof (Stat_t)); + if (!req->ptr2) { req_free (req); - croak ("out of memory during aio_req->statdata allocation"); + croak ("out of memory during aio_stat statdata allocation"); } + req->flags |= FLAG_PTR2_FREE; + if (SvPOK (fh_or_path)) { req->type = ix; - req->data = newSVsv (fh_or_path); - req->dataptr = SvPVbyte_nolen (req->data); + req->sv1 = newSVsv (fh_or_path); + req->ptr1 = SvPVbyte_nolen (req->sv1); } else { req->type = REQ_FSTAT; - req->fh = newSVsv (fh_or_path); - req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + req->fh = newSVsv (fh_or_path); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } REQ_SEND; @@ -1328,8 +1517,8 @@ void aio_unlink (pathname,callback=&PL_sv_undef) - SV * pathname - SV * callback + SV8 * pathname + SV * callback ALIAS: aio_unlink = REQ_UNLINK aio_rmdir = REQ_RMDIR @@ -1339,17 +1528,17 @@ dREQ; req->type = ix; - req->data = newSVsv (pathname); - req->dataptr = SvPVbyte_nolen (req->data); - + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + REQ_SEND; } void aio_link (oldpath,newpath,callback=&PL_sv_undef) - SV * oldpath - SV * newpath - SV * callback + SV8 * oldpath + SV8 * newpath + SV * callback ALIAS: aio_link = REQ_LINK aio_symlink = REQ_SYMLINK @@ -1359,25 +1548,44 @@ dREQ; req->type = ix; - req->fh = newSVsv (oldpath); - req->data2ptr = SvPVbyte_nolen (req->fh); - req->data = newSVsv (newpath); - req->dataptr = SvPVbyte_nolen (req->data); + req->fh = newSVsv (oldpath); + req->ptr2 = SvPVbyte_nolen (req->fh); + req->sv1 = newSVsv (newpath); + req->ptr1 = SvPVbyte_nolen (req->sv1); + + REQ_SEND; +} + +void +aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) + SV8 * pathname + SV * callback + UV mode + UV dev + PPCODE: +{ + dREQ; + + req->type = REQ_MKNOD; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->mode = (mode_t)mode; + req->offs = dev; REQ_SEND; } void aio_busy (delay,callback=&PL_sv_undef) - double delay - SV * callback + double delay + SV * callback PPCODE: { dREQ; req->type = REQ_BUSY; - req->fd = delay < 0. ? 0 : delay; - req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); + req->int1 = delay < 0. ? 0 : delay; + req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1); REQ_SEND; } @@ -1391,14 +1599,14 @@ dREQ; req->type = REQ_GROUP; - req_send (req); + req_send (req); XPUSHs (req_sv (req, AIO_GRP_KLASS)); } void aio_nop (callback=&PL_sv_undef) - SV * callback + SV * callback PPCODE: { dREQ; @@ -1437,18 +1645,17 @@ while (nreqs) { poll_wait (); - poll_cb (0); + poll_cb (); } -void +int poll() PROTOTYPE: CODE: - if (nreqs) - { - poll_wait (); - poll_cb (0); - } + poll_wait (); + RETVAL = poll_cb (); + OUTPUT: + RETVAL int poll_fileno() @@ -1462,15 +1669,7 @@ poll_cb(...) PROTOTYPE: CODE: - RETVAL = poll_cb (0); - OUTPUT: - RETVAL - -int -poll_some(int max = 0) - PROTOTYPE: $ - CODE: - RETVAL = poll_cb (max); + RETVAL = poll_cb (); OUTPUT: RETVAL @@ -1478,8 +1677,7 @@ poll_wait() PROTOTYPE: CODE: - if (nreqs) - poll_wait (); + poll_wait (); int nreqs() @@ -1493,9 +1691,7 @@ nready() PROTOTYPE: CODE: - if (WORDREAD_UNSAFE) LOCK (reqlock); - RETVAL = nready; - if (WORDREAD_UNSAFE) UNLOCK (reqlock); + RETVAL = get_nready (); OUTPUT: RETVAL @@ -1503,9 +1699,17 @@ npending() PROTOTYPE: CODE: - if (WORDREAD_UNSAFE) LOCK (reslock); - RETVAL = npending; - if (WORDREAD_UNSAFE) UNLOCK (reslock); + RETVAL = get_npending (); + OUTPUT: + RETVAL + +int +nthreads() + PROTOTYPE: + CODE: + if (WORDACCESS_UNSAFE) LOCK (wrklock); + RETVAL = started; + if (WORDACCESS_UNSAFE) UNLOCK (wrklock); OUTPUT: RETVAL @@ -1533,7 +1737,7 @@ int i; aio_req req; - if (grp->fd == 2) + if (grp->int1 == 2) croak ("cannot add requests to IO::AIO::GRP after the group finished"); for (i = 1; i < items; ++i ) @@ -1545,7 +1749,7 @@ if (req) { - ++grp->length; + ++grp->size; req->grp = grp; req->grp_prev = 0; @@ -1578,8 +1782,8 @@ for (i = 1; i < items; ++i ) av_push (av, newSVsv (ST (i))); - SvREFCNT_dec (grp->data); - grp->data = (SV *)av; + SvREFCNT_dec (grp->sv1); + grp->sv1 = (SV *)av; } void @@ -1590,18 +1794,18 @@ void limit (aio_req grp, int limit) CODE: - grp->fd2 = limit; + grp->int2 = limit; aio_grp_feed (grp); void feed (aio_req grp, SV *callback=&PL_sv_undef) CODE: { - SvREFCNT_dec (grp->fh2); - grp->fh2 = newSVsv (callback); + SvREFCNT_dec (grp->sv2); + grp->sv2 = newSVsv (callback); - if (grp->fd2 <= 0) - grp->fd2 = 2; + if (grp->int2 <= 0) + grp->int2 = 2; aio_grp_feed (grp); }