--- IO-AIO/AIO.xs 2009/04/19 13:06:15 1.135 +++ IO-AIO/AIO.xs 2009/06/12 16:55:17 1.145 @@ -237,16 +237,50 @@ 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) + { + eio_dirent *ent = (eio_dirent *)buf; + SV *namesv = newSVpvn (ent->name, 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); + + buf += sizeof (eio_dirent); + } + else + { + SV *name = newSVpv (buf, 0); + av_store (av, i, name); + buf += 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,15 +296,15 @@ char sym [64]; int symlen; - symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); + symlen = snprintf (sym, sizeof (sym), "fd#%u", (unsigned int)req->result); gv_init (gv, stash, sym, symlen, 0); symlen = snprintf ( sym, sizeof (sym), - "%s&=%d", + "%s&=%u", flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", - req->result + (unsigned int)req->result ); if (do_open (gv, sym, symlen, 0, 0, 0, 0)) @@ -314,9 +348,13 @@ break; case EIO_READ: - SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); - *SvEND (req->sv2) = 0; - PUSHs (sv_2mortal (newSViv (req->result))); + { + SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); + *SvEND (req->sv2) = 0; + SvPOK_only (req->sv2); + SvSETMAGIC (req->sv2); + PUSHs (sv_2mortal (newSViv (req->result))); + } break; case EIO_DUP2: @@ -501,35 +539,71 @@ \ if (GIMME_V != G_VOID) \ XPUSHs (req_sv (req, AIO_REQ_KLASS)); - + +static int +extract_fd (SV *fh, int wr) +{ + int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh))); + + if (fd < 0) + croak ("illegal fh argument, either not an OS file or read/write mode mismatch"); + + return fd; +} + MODULE = IO::AIO PACKAGE = IO::AIO PROTOTYPES: ENABLE BOOT: { - stash = gv_stashpv ("IO::AIO", 1); + 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)); + 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_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 (); + for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) + newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); - if (eio_init (want_poll, done_poll) < 0) - croak ("IO::AIO: unable to initialise eio library"); + 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); + /* atfork child called in fifo order, so before eio's handler */ + X_THREAD_ATFORK (0, 0, atfork_child); } void @@ -592,11 +666,12 @@ aio_fdatasync = EIO_FDATASYNC PPCODE: { + int fd = extract_fd (fh, 0); dREQ; req->type = ix; req->sv1 = newSVsv (fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->int1 = fd; REQ_SEND (req); } @@ -606,11 +681,12 @@ PROTOTYPE: $$$$;$ PPCODE: { + int fd = extract_fd (fh, 0); dREQ; req->type = EIO_SYNC_FILE_RANGE; req->sv1 = newSVsv (fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->int1 = fd; req->offs = SvVAL64 (offset); req->size = SvVAL64 (nbytes); req->int2 = flags; @@ -624,6 +700,7 @@ PPCODE: { static int close_pipe = -1; /* dummy fd to close fds via dup2 */ + int fd = extract_fd (fh, 0); dREQ; if (close_pipe < 0) @@ -641,7 +718,7 @@ req->type = EIO_DUP2; req->int1 = close_pipe; req->sv2 = newSVsv (fh); - req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->int2 = fd; REQ_SEND (req); } @@ -655,15 +732,9 @@ PPCODE: { STRLEN svlen; + int fd = extract_fd (fh, ix == EIO_WRITE); char *svptr = SvPVbyte (data, svlen); UV len = SvUV (length); - int fd; - - if (SvTYPE (data) > SVt_PVMG) - croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data)); - - SvUPGRADE (data, SVt_PV); - SvPOK_only (data); if (dataoffset < 0) dataoffset += svlen; @@ -679,19 +750,11 @@ } else { - /* read: grow scalar as necessary */ + /* read: check type and grow scalar as necessary */ + SvUPGRADE (data, SVt_PV); svptr = SvGROW (data, len + dataoffset + 1); } - if (len < 0) - croak ("length must not be negative"); - - fd = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) - : IoOFP (sv_2io (fh))); - - if (fd < 0) - croak ("illegal fh argument, either not an OS file or read/write mode mismatch"); - { dREQ; @@ -734,13 +797,15 @@ PROTOTYPE: $$$$;$ PPCODE: { + int ifd = extract_fd (in_fh , 0); + int ofd = extract_fd (out_fh, 0); dREQ; req->type = EIO_SENDFILE; req->sv1 = newSVsv (out_fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); + req->int1 = ofd; req->sv2 = newSVsv (in_fh); - req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); + req->int2 = ifd; req->offs = SvVAL64 (in_offset); req->size = length; @@ -752,11 +817,12 @@ PROTOTYPE: $$$;$ PPCODE: { + int fd = extract_fd (fh, 0); dREQ; req->type = EIO_READAHEAD; req->sv1 = newSVsv (fh); - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); + req->int1 = fd; req->offs = SvVAL64 (offset); req->size = length; @@ -886,6 +952,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 @@ -1140,6 +1223,7 @@ grp->errorno = errno; av = newAV (); + av_extend (av, items - 1); for (i = 1; i < items; ++i ) av_push (av, newSVsv (ST (i)));