--- IO-AIO/AIO.xs 2009/06/03 12:24:49 1.140 +++ IO-AIO/AIO.xs 2009/07/01 08:11:24 1.150 @@ -77,9 +77,13 @@ /* use NV for 32 bit perls as it allows larger offsets */ #if IVSIZE >= 8 +# define VAL64 IV # define SvVAL64 SvIV +# define newSVval64 newSViv #else +# define VAL64 NV # define SvVAL64 SvNV +# define newSVval64 newSVnv #endif /*****************************************************************************/ @@ -97,6 +101,8 @@ static HV *stash; typedef SV SV8; /* byte-sv, used for argument-checking */ +typedef int aio_rfd; /* read file desriptor */ +typedef int aio_wfd; /* write file descriptor */ #define AIO_REQ_KLASS "IO::AIO::REQ" #define AIO_GRP_KLASS "IO::AIO::GRP" @@ -111,6 +117,31 @@ #include "libeio/eio.h" +#ifndef POSIX_FADV_NORMAL +# define POSIX_FADV_NORMAL 0 +# define NO_FADVISE 1 +#endif + +#ifndef POSIX_FADV_SEQUENTIAL +# define POSIX_FADV_SEQUENTIAL 0 +#endif + +#ifndef POSIX_FADV_RANDOM +# define POSIX_FADV_RANDOM 0 +#endif + +#ifndef POSIX_FADV_NOREUSE +# define POSIX_FADV_NOREUSE 0 +#endif + +#ifndef POSIX_FADV_WILLNEED +# define POSIX_FADV_WILLNEED 0 +#endif + +#ifndef POSIX_FADV_DONTNEED +# define POSIX_FADV_DONTNEED 0 +#endif + static int req_invoke (eio_req *req); #define EIO_FINISH(req) req_invoke (req) static void req_destroy (eio_req *grp); @@ -230,23 +261,57 @@ if (req->result >= 0) { int i; - char *buf = req->ptr2; + char *names = (char *)req->ptr2; + eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */ AV *av = newAV (); av_extend (av, req->result - 1); for (i = 0; i < req->result; ++i) { - SV *sv = newSVpv (buf, 0); - - av_store (av, i, sv); - buf += SvCUR (sv) + 1; + if (req->int1 & EIO_READDIR_DENTS) + { + SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen); + + if (req->int1 & EIO_READDIR_CUSTOM2) + { + static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */ + AV *avent = newAV (); + + av_extend (avent, 2); + + if (!sv_type [ent->type]) + { + sv_type [ent->type] = newSViv (ent->type); + SvREADONLY_on (sv_type [ent->type]); + } + + av_store (avent, 0, namesv); + av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type])); + av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode)); + + av_store (av, i, newRV_noinc ((SV *)avent)); + } + else + av_store (av, i, namesv); + + ++ent; + } + else + { + SV *name = newSVpv (names, 0); + av_store (av, i, name); + names += SvCUR (name) + 1; + } } rv = sv_2mortal (newRV_noinc ((SV *)av)); } PUSHs (rv); + + if (req->int1 & EIO_READDIR_CUSTOM1) + XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2)))); } break; @@ -262,7 +327,7 @@ char sym [64]; int symlen; - symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); + symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result); gv_init (gv, stash, sym, symlen, 0); symlen = snprintf ( @@ -270,7 +335,7 @@ sizeof (sym), "%s&=%d", flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", - req->result + (int)req->result ); if (do_open (gv, sym, symlen, 0, 0, 0, 0)) @@ -523,29 +588,60 @@ BOOT: { - stash = gv_stashpv ("IO::AIO", 1); - - newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); - newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS)); - 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)); + static const struct { + const char *name; + IV iv; + } *civ, const_iv[] = { +# define const_iv(name, value) { # name, (IV) value }, +# define const_eio(name) { # name, (IV) EIO_ ## name }, + const_iv (EXDEV , EXDEV) + const_iv (ENOSYS , ENOSYS) + const_iv (O_RDONLY, O_RDONLY) + const_iv (O_WRONLY, O_WRONLY) + const_iv (O_CREAT , O_CREAT) + const_iv (O_TRUNC , O_TRUNC) #ifndef _WIN32 - newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); + const_iv (S_IFIFO , S_IFIFO) #endif - newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); - newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE)); - newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE)); - newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER)); + const_iv (FADV_NORMAL , POSIX_FADV_NORMAL) + const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL) + const_iv (FADV_RANDOM , POSIX_FADV_RANDOM) + const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE) + const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED) + const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED) + + const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) + const_eio (SYNC_FILE_RANGE_WRITE) + const_eio (SYNC_FILE_RANGE_WAIT_AFTER) + + const_eio (READDIR_DENTS) + const_eio (READDIR_DIRS_FIRST) + const_eio (READDIR_STAT_ORDER) + const_eio (READDIR_FOUND_UNKNOWN) + + const_eio (DT_UNKNOWN) + const_eio (DT_FIFO) + const_eio (DT_CHR) + const_eio (DT_DIR) + const_eio (DT_BLK) + const_eio (DT_REG) + const_eio (DT_LNK) + const_eio (DT_SOCK) + const_eio (DT_WHT) + }; - create_respipe (); + stash = gv_stashpv ("IO::AIO", 1); - if (eio_init (want_poll, done_poll) < 0) - croak ("IO::AIO: unable to initialise eio library"); + for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) + newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); - /* atfork child called in fifo order, so before eio's handler */ - X_THREAD_ATFORK (0, 0, atfork_child); + create_respipe (); + + if (eio_init (want_poll, done_poll) < 0) + croak ("IO::AIO: unable to initialise eio library"); + + /* atfork child called in fifo order, so before eio's handler */ + X_THREAD_ATFORK (0, 0, atfork_child); } void @@ -619,7 +715,7 @@ } void -aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) +aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) PROTOTYPE: $$$$;$ PPCODE: { @@ -629,8 +725,8 @@ req->type = EIO_SYNC_FILE_RANGE; req->sv1 = newSVsv (fh); req->int1 = fd; - req->offs = SvVAL64 (offset); - req->size = SvVAL64 (nbytes); + req->offs = offset; + req->size = nbytes; req->int2 = flags; REQ_SEND (req); @@ -735,7 +831,7 @@ } void -aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) +aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) PROTOTYPE: $$$$;$ PPCODE: { @@ -748,14 +844,14 @@ req->int1 = ofd; req->sv2 = newSVsv (in_fh); req->int2 = ifd; - req->offs = SvVAL64 (in_offset); + req->offs = in_offset; req->size = length; REQ_SEND; } void -aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) +aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) PROTOTYPE: $$$;$ PPCODE: { @@ -765,7 +861,7 @@ req->type = EIO_READAHEAD; req->sv1 = newSVsv (fh); req->int1 = fd; - req->offs = SvVAL64 (offset); + req->offs = offset; req->size = length; REQ_SEND; @@ -894,6 +990,23 @@ } void +aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_READDIR; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; + + if (flags & EIO_READDIR_DENTS) + req->int1 |= EIO_READDIR_CUSTOM2; + + REQ_SEND; +} + +void aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) ALIAS: aio_unlink = EIO_UNLINK @@ -1078,6 +1191,24 @@ OUTPUT: RETVAL +int +fadvise (aio_rfd fh, off_t offset, off_t length, IV advice) + PROTOTYPE: $$$$ + CODE: +#if _XOPEN_SOURCE >= 600 && !NO_FADVISE + RETVAL = posix_fadvise (fh, offset, length, advice); +#else + RETVAL = errno = ENOSYS; +#endif + OUTPUT: + RETVAL + +ssize_t +sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) + PROTOTYPE: $$$$ + CODE: + eio_sendfile_sync (ofh, ifh, offset, count); + void _on_next_submit (SV *cb) CODE: SvREFCNT_dec (on_next_submit); @@ -1148,6 +1279,7 @@ grp->errorno = errno; av = newAV (); + av_extend (av, items - 1); for (i = 1; i < items; ++i ) av_push (av, newSVsv (ST (i)));