--- IO-AIO/AIO.xs 2006/10/27 20:10:06 1.81 +++ IO-AIO/AIO.xs 2006/10/30 23:43:17 1.88 @@ -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 @@ -95,7 +98,7 @@ REQ_FSYNC, REQ_FDATASYNC, REQ_UNLINK, REQ_RMDIR, REQ_RENAME, REQ_MKNOD, REQ_READDIR, - REQ_LINK, REQ_SYMLINK, + REQ_LINK, REQ_SYMLINK, REQ_READLINK, REQ_GROUP, REQ_NOP, REQ_BUSY, }; @@ -107,17 +110,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 +131,9 @@ } aio_cb; enum { - FLAG_CANCELLED = 0x01, + FLAG_CANCELLED = 0x01, + FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ + FLAG_PTR2_FREE = 0x80, /* need free(ptr2) */ }; typedef aio_cb *aio_req; @@ -144,9 +148,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 unsigned int started, idle, wanted; #if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) # define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP @@ -198,6 +214,7 @@ } 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]; @@ -205,7 +222,7 @@ static pthread_mutex_t reqlock = AIO_MUTEX_INIT; static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; -#if WORDREAD_UNSAFE +#if WORDACCESS_UNSAFE static unsigned int get_nready () { @@ -229,10 +246,22 @@ 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 @@ -290,7 +319,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); @@ -321,11 +350,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; @@ -334,17 +363,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; } } @@ -352,13 +381,13 @@ 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); @@ -369,6 +398,9 @@ { dSP; + if (req->flags & FLAG_SV1_RO_OFF) + SvREADONLY_off (req->sv1); + if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) { ENTER; @@ -385,7 +417,7 @@ if (req->result >= 0) { int i; - char *buf = req->data2ptr; + char *buf = req->ptr2; AV *av = newAV (); av_extend (av, req->result - 1); @@ -423,12 +455,12 @@ 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) @@ -440,6 +472,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; @@ -484,14 +540,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); } @@ -503,8 +558,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); @@ -558,35 +613,13 @@ static void maybe_start_thread () { -#if 0 - static struct timeval last; - struct timeval diff, now; -#endif - - if (started >= wanted) + if (get_nthreads () >= wanted) return; - if (nready <= nreqs - get_nready () - get_npending ()) - return; - -#if 0 - gettimeofday (&now, 0); - - diff.tv_sec = now.tv_sec - last.tv_sec; - diff.tv_usec = now.tv_usec - last.tv_usec; - - if (diff.tv_usec < 0) - { - --diff.tv_sec; - diff.tv_usec += 1000000; - } - - if (!diff.tv_sec && diff.tv_usec < 10000) + /* todo: maybe use idle here, but might be less exact */ + if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs) return; - last = now; -#endif - start_thread (); } @@ -612,13 +645,23 @@ 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) { if (wanted < nthreads) @@ -641,9 +684,9 @@ while (nreqs) { int size; - if (WORDREAD_UNSAFE) LOCK (reslock); + if (WORDACCESS_UNSAFE) LOCK (reslock); size = res_queue.size; - if (WORDREAD_UNSAFE) UNLOCK (reslock); + if (WORDACCESS_UNSAFE) UNLOCK (reslock); if (size) return; @@ -657,16 +700,21 @@ } } -static int poll_cb (int max) +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 (;;) { - while (max <= 0 || count < max) + for (;;) { maybe_start_thread (); @@ -693,32 +741,30 @@ --nreqs; - if (req->type == REQ_GROUP && req->length) + if (req->type == REQ_GROUP && req->size) { - req->fd = 1; /* mark request as delayed */ + req->int1 = 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 (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) @@ -726,7 +772,7 @@ poll_wait (); - max = 0; + ++maxreqs; } return count; @@ -954,9 +1000,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) @@ -980,7 +1027,7 @@ { memlen *= 2; LOCK (wrklock); - req->data2ptr = names = realloc (names, memlen); + req->ptr2 = names = realloc (names, memlen); UNLOCK (wrklock); if (!names) @@ -1003,10 +1050,17 @@ static void *aio_proc (void *thr_arg) { aio_req req; + struct timespec ts; worker *self = (worker *)thr_arg; + /* 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 (;;) @@ -1016,7 +1070,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; @@ -1028,35 +1102,36 @@ if (!(req->flags & FLAG_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_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_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); 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); } @@ -1066,11 +1141,7 @@ break; case REQ_QUIT: - LOCK (wrklock); - worker_free (self); - --started; - UNLOCK (wrklock); - return 0; + goto quit; default: req->result = ENOSYS; @@ -1092,6 +1163,13 @@ UNLOCK (reslock); } + +quit: + LOCK (wrklock); + worker_free (self); + UNLOCK (wrklock); + + return 0; } /*****************************************************************************/ @@ -1143,8 +1221,11 @@ worker_free (wrk); } - started = 0; - nreqs = 0; + started = 0; + idle = 0; + nreqs = 0; + nready = 0; + npending = 0; close (respipe [0]); close (respipe [1]); @@ -1181,19 +1262,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); - - start_thread (); } 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: $ @@ -1201,6 +1294,12 @@ max_parallel (int nthreads) PROTOTYPE: $ +void +max_idle (int nthreads) + PROTOTYPE: $ + CODE: + set_max_idle (nthreads); + int max_outstanding (int maxreqs) PROTOTYPE: $ @@ -1222,9 +1321,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 (pathname); + req->int1 = flags; req->mode = mode; REQ_SEND; @@ -1244,8 +1343,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); } @@ -1264,7 +1363,6 @@ PROTOTYPE: $$$$$;$ PPCODE: { - aio_req req; STRLEN svlen; char *svptr = SvPVbyte (data, svlen); @@ -1296,18 +1394,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; @@ -1315,6 +1414,28 @@ } void +aio_readlink (path,callback=&PL_sv_undef) + SV * 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 (path); + 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 @@ -1327,12 +1448,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; } @@ -1349,10 +1470,10 @@ 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; } @@ -1368,24 +1489,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 (fh_or_path); } 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; @@ -1393,8 +1516,8 @@ void aio_unlink (pathname,callback=&PL_sv_undef) - SV * pathname - SV * callback + SV * pathname + SV * callback ALIAS: aio_unlink = REQ_UNLINK aio_rmdir = REQ_RMDIR @@ -1404,17 +1527,17 @@ dREQ; req->type = ix; - req->data = newSVsv (pathname); - req->dataptr = SvPVbyte_nolen (req->data); - + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (pathname); + REQ_SEND; } void aio_link (oldpath,newpath,callback=&PL_sv_undef) - SV * oldpath - SV * newpath - SV * callback + SV * oldpath + SV * newpath + SV * callback ALIAS: aio_link = REQ_LINK aio_symlink = REQ_SYMLINK @@ -1424,44 +1547,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 (newpath); REQ_SEND; } void aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) - SV * pathname - SV * callback - UV mode - UV dev + SV * pathname + SV * callback + UV mode + UV dev PPCODE: { dREQ; req->type = REQ_MKNOD; - req->data = newSVsv (pathname); - req->dataptr = SvPVbyte_nolen (req->data); + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (pathname); req->mode = (mode_t)mode; - req->offset = dev; + 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; } @@ -1475,14 +1598,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; @@ -1546,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 @@ -1589,6 +1704,16 @@ OUTPUT: RETVAL +int +nthreads() + PROTOTYPE: + CODE: + if (WORDACCESS_UNSAFE) LOCK (wrklock); + RETVAL = started; + if (WORDACCESS_UNSAFE) UNLOCK (wrklock); + OUTPUT: + RETVAL + PROTOTYPES: DISABLE MODULE = IO::AIO PACKAGE = IO::AIO::REQ @@ -1613,7 +1738,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 ) @@ -1625,7 +1750,7 @@ if (req) { - ++grp->length; + ++grp->size; req->grp = grp; req->grp_prev = 0; @@ -1658,8 +1783,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 @@ -1670,18 +1795,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); }