--- IO-AIO/AIO.xs 2011/07/05 09:24:11 1.183 +++ IO-AIO/AIO.xs 2011/09/29 09:51:24 1.200 @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -25,61 +24,56 @@ /* perl namespace pollution */ #undef VERSION +/* perl stupidly overrides readdir and maybe others */ +/* with thread-unsafe versions, imagine that :( */ +#undef readdir +#undef opendir +#undef closedir + #ifdef _WIN32 -# define EIO_STRUCT_DIRENT Direntry_t -# undef malloc -# undef free - -// perl overrides all those nice win32 functions -# undef open -# undef read -# undef write -# undef send -# undef recv -# undef stat -# undef fstat -# define lstat stat -# undef truncate -# undef ftruncate -# undef open -# undef close -# undef unlink -# undef rmdir -# undef rename -# undef lseek - -# define chown(a,b,c) (errno = ENOSYS, -1) -# define fchown(a,b,c) (errno = ENOSYS, -1) -# define fchmod(a,b) (errno = ENOSYS, -1) -# define symlink(a,b) (errno = ENOSYS, -1) -# define readlink(a,b,c) (errno = ENOSYS, -1) -# define mknod(a,b,c) (errno = ENOSYS, -1) -# define truncate(a,b) (errno = ENOSYS, -1) -# define ftruncate(fd,o) chsize ((fd), (o)) -# define fsync(fd) _commit (fd) -# define opendir(fd) (errno = ENOSYS, 0) -# define readdir(fd) (errno = ENOSYS, -1) -# define closedir(fd) (errno = ENOSYS, -1) -# define mkdir(a,b) mkdir (a) + // perl overrides all those nice libc functions + + #undef malloc + #undef free + #undef open + #undef read + #undef write + #undef send + #undef recv + #undef stat + #undef lstat + #undef fstat + #undef truncate + #undef ftruncate + #undef open + #undef link + #undef close + #undef unlink + #undef mkdir + #undef rmdir + #undef rename + #undef lseek + #undef opendir + #undef readdir + #undef closedir + #undef chmod + #undef fchmod + #undef dup + #undef dup2 + #undef abort + #undef pipe #else -# include -# include -# include -# include -# include -# define EIO_STRUCT_DIRENT struct dirent + #include + #include + #include + #include + #include #endif -/* perl stupidly overrides readdir and maybe others */ -/* with thread-unsafe versions, imagine that :( */ -#undef readdir -#undef opendir -#undef closedir - #define EIO_STRUCT_STAT Stat_t /* use NV for 32 bit perls as it allows larger offsets */ @@ -110,11 +104,12 @@ typedef int aio_rfd; /* read file desriptor */ typedef int aio_wfd; /* write file descriptor */ -static HV *aio_stash, *aio_req_stash, *aio_grp_stash; +static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash; #define EIO_REQ_MEMBERS \ SV *callback; \ SV *sv1, *sv2; \ + SV *sv3, *sv4; \ STRLEN stroffset; \ SV *self; @@ -123,6 +118,13 @@ #include "libeio/config.h" #include "libeio/eio.h" +static int req_invoke (eio_req *req); +#define EIO_FINISH(req) req_invoke (req) +static void req_destroy (eio_req *grp); +#define EIO_DESTROY(req) req_destroy (req) + +#include "libeio/eio.c" + /* Linux/others */ #ifndef O_ASYNC # define O_ASYNC 0 @@ -225,6 +227,12 @@ # define PROT_EXEC 0 #endif +#ifndef ST_RDONLY +# define ST_RDONLY 0 +#endif +#ifndef ST_NOSUID +# define ST_NOSUID 0 +#endif #ifndef ST_NODEV # define ST_NODEV 0 #endif @@ -318,19 +326,13 @@ # define PAGESIZE sysconf (_SC_PAGESIZE) #endif -static int req_invoke (eio_req *req); -#define EIO_FINISH(req) req_invoke (req) -static void req_destroy (eio_req *grp); -#define EIO_DESTROY(req) req_destroy (req) - enum { FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ }; -#include "libeio/eio.c" - typedef eio_req *aio_req; typedef eio_req *aio_req_ornot; +typedef eio_wd aio_wd; static SV *on_next_submit; static int next_pri = EIO_PRI_DEFAULT; @@ -365,6 +367,12 @@ return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); } +static SV * +newSVaio_wd (aio_wd wd) +{ + return sv_bless (newRV_noinc (newSViv ((long)wd)), aio_wd_stash); +} + static aio_req SvAIO_REQ (SV *sv) { MAGIC *mg; @@ -380,6 +388,16 @@ return mg ? (aio_req)mg->mg_ptr : 0; } +static aio_wd SvAIO_WD (SV *sv) +{ + if (!SvROK (sv) + || SvSTASH (SvRV (sv)) != aio_wd_stash + || SvTYPE (SvRV (sv)) != SVt_PVMG) + croak ("IO::AIO: expected a working directory object as returned by aio_wd"); + + return (aio_wd)(long)SvIVX (SvRV (sv)); +} + static void aio_grp_feed (aio_req grp) { if (grp->sv2 && SvOK (grp->sv2)) @@ -446,6 +464,10 @@ switch (req->type) { + case EIO_WD_OPEN: + PUSHs (sv_2mortal (newSVaio_wd (req->wd))); + break; + case EIO_READDIR: { SV *rv = &PL_sv_undef; @@ -543,6 +565,7 @@ { SV *rv = &PL_sv_undef; +#ifndef _WIN32 if (req->result >= 0) { EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); @@ -562,6 +585,7 @@ hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); } +#endif PUSHs (rv); } @@ -595,9 +619,12 @@ case EIO_STAT: case EIO_LSTAT: case EIO_FSTAT: - PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; - PL_laststatval = req->result; - PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); + PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; + + if (!(PL_laststatval = req->result)) + /* if compilation fails here then perl's Stat_t is not struct _stati64 */ + PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); + PUSHs (sv_result); break; @@ -651,6 +678,8 @@ SvREFCNT_dec (req->sv1); SvREFCNT_dec (req->sv2); + SvREFCNT_dec (req->sv3); + SvREFCNT_dec (req->sv4); SvREFCNT_dec (req->callback); Safefree (req); @@ -658,8 +687,6 @@ static void req_cancel_subs (aio_req grp) { - aio_req sub; - if (grp->type != EIO_GROUP) return; @@ -669,8 +696,7 @@ eio_grp_cancel (grp); } -static void -create_respipe (void) +static void create_respipe (void) { if (s_epipe_renew (&respipe)) croak ("IO::AIO: unable to initialize result pipe"); @@ -711,9 +737,13 @@ } } -static void atfork_child (void) +static void ecb_cold +reinit (void) { create_respipe (); + + if (eio_init (want_poll, done_poll) < 0) + croak ("IO::AIO: unable to initialise eio library"); } /*****************************************************************************/ @@ -734,8 +764,7 @@ #define MMAP_MAGIC PERL_MAGIC_ext -static int -mmap_free (pTHX_ SV *sv, MAGIC *mg) +static int mmap_free (pTHX_ SV *sv, MAGIC *mg) { int old_errno = errno; munmap (mg->mg_ptr, (size_t)mg->mg_obj); @@ -761,8 +790,7 @@ /*****************************************************************************/ -static SV * -get_cb (SV *cb_sv) +static SV * get_cb (SV *cb_sv) { SvGETMAGIC (cb_sv); return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; @@ -791,6 +819,62 @@ if (GIMME_V != G_VOID) \ XPUSHs (req_sv (req, aio_req_stash)); +static void +req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr) +{ + if (expect_false (SvROK (path))) + { + AV *av = (AV *)SvRV (path); + SV *wdob; + + if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) + croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs"); + + path = AvARRAY (av)[1]; + wdob = AvARRAY (av)[0]; + + if (SvOK (wdob)) + { + *wd = SvAIO_WD (wdob); + *wdsv = SvREFCNT_inc_NN (SvRV (wdob)); + } + else + *wd = EIO_INVALID_WD; + } + + *pathsv = newSVsv (path); + *ptr = SvPVbyte_nolen (*pathsv); +} + +static void +req_set_path1 (aio_req req, SV *path) +{ + req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1); +} + +static void +req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path) +{ + SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path; + + switch (SvTYPE (rv)) + { + case SVt_PVIO: + case SVt_PVLV: + case SVt_PVGV: + req->type = type_fh; + req->sv1 = newSVsv (fh_or_path); + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + break; + + default: + req->type = type_path; + req_set_path1 (req, fh_or_path); + break; + } + +} + MODULE = IO::AIO PACKAGE = IO::AIO PROTOTYPES: ENABLE @@ -896,6 +980,8 @@ const_eio (SYNC_FILE_RANGE_WRITE) const_eio (SYNC_FILE_RANGE_WAIT_AFTER) + const_eio (FALLOC_FL_KEEP_SIZE) + const_eio (READDIR_DENTS) const_eio (READDIR_DIRS_FIRST) const_eio (READDIR_STAT_ORDER) @@ -915,22 +1001,21 @@ aio_stash = gv_stashpv ("IO::AIO" , 1); aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); + aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1); - for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) - newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); + for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) + newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); - 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); + reinit (); } void +reinit () + PROTOTYPE: + +void max_poll_reqs (unsigned int nreqs) PROTOTYPE: $ CODE: @@ -973,14 +1058,25 @@ max_outstanding = maxreqs; void +aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_WD_OPEN; + req_set_path1 (req, pathname); + + REQ_SEND; +} + +void aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) PPCODE: { dREQ; req->type = EIO_OPEN; - req->sv1 = newSVsv (pathname); - req->ptr1 = SvPVbyte_nolen (req->sv1); + req_set_path1 (req, pathname); req->int1 = flags; req->int2 = mode; @@ -992,6 +1088,7 @@ ALIAS: aio_fsync = EIO_FSYNC aio_fdatasync = EIO_FDATASYNC + aio_syncfs = EIO_SYNCFS PPCODE: { int fd = s_fileno_croak (fh, 0); @@ -1022,27 +1119,50 @@ } void +aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) + PPCODE: +{ + int fd = s_fileno_croak (fh, 0); + dREQ; + + req->type = EIO_FALLOCATE; + req->sv1 = newSVsv (fh); + req->int1 = fd; + req->int2 = mode; + req->offs = offset; + req->size = len; + + REQ_SEND (req); +} + +void aio_close (SV *fh, SV *callback=&PL_sv_undef) PPCODE: { - static int close_pipe = -1; /* dummy fd to close fds via dup2 */ + static int close_fd = -1; /* dummy fd to close fds via dup2 */ int fd = s_fileno_croak (fh, 0); dREQ; - if (close_pipe < 0) + if (expect_false (close_fd < 0)) { int pipefd [2]; - if (pipe (pipefd) < 0 - || close (pipefd [1]) < 0 - || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) + if ( +#ifdef _WIN32 + _pipe (pipefd, 1, _O_BINARY) < 0 +#else + pipe (pipefd) < 0 + || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0 +#endif + || close (pipefd [1]) < 0 + ) abort (); /*D*/ - close_pipe = pipefd [0]; + close_fd = pipefd [0]; } req->type = EIO_DUP2; - req->int1 = close_pipe; + req->int1 = close_fd; req->sv2 = newSVsv (fh); req->int2 = fd; @@ -1103,18 +1223,16 @@ } void -aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) +aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef) ALIAS: aio_readlink = EIO_READLINK aio_realpath = EIO_REALPATH PPCODE: { - SV *data; dREQ; req->type = ix; - req->sv1 = newSVsv (path); - req->ptr1 = SvPVbyte_nolen (req->sv1); + req_set_path1 (req, pathname); REQ_SEND; } @@ -1165,18 +1283,7 @@ dREQ; req->sv1 = newSVsv (fh_or_path); - - if (SvPOK (req->sv1)) - { - req->type = ix; - req->ptr1 = SvPVbyte_nolen (req->sv1); - } - else - { - req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT; - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); - } - + req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path); REQ_SEND; } @@ -1204,18 +1311,7 @@ req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; - req->sv1 = newSVsv (fh_or_path); - - if (SvPOK (req->sv1)) - { - req->type = EIO_UTIME; - req->ptr1 = SvPVbyte_nolen (req->sv1); - } - else - { - req->type = EIO_FUTIME; - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); - } + req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path); REQ_SEND; } @@ -1226,45 +1322,20 @@ { dREQ; - req->sv1 = newSVsv (fh_or_path); req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; - - if (SvPOK (req->sv1)) - { - req->type = EIO_TRUNCATE; - req->ptr1 = SvPVbyte_nolen (req->sv1); - } - else - { - req->type = EIO_FTRUNCATE; - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); - } + req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path); REQ_SEND; } void aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) - ALIAS: - aio_chmod = EIO_CHMOD - aio_mkdir = EIO_MKDIR PPCODE: { dREQ; req->int2 = mode; - req->sv1 = newSVsv (fh_or_path); - - if (SvPOK (req->sv1)) - { - req->type = ix; - req->ptr1 = SvPVbyte_nolen (req->sv1); - } - else - { - req->type = EIO_FCHMOD; - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); - } + req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path); REQ_SEND; } @@ -1277,18 +1348,7 @@ req->int2 = SvOK (uid) ? SvIV (uid) : -1; req->int3 = SvOK (gid) ? SvIV (gid) : -1; - req->sv1 = newSVsv (fh_or_path); - - if (SvPOK (req->sv1)) - { - req->type = EIO_CHOWN; - req->ptr1 = SvPVbyte_nolen (req->sv1); - } - else - { - req->type = EIO_FCHOWN; - req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); - } + req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path); REQ_SEND; } @@ -1300,17 +1360,30 @@ 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_set_path1 (req, pathname); + REQ_SEND; } void +aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = EIO_MKDIR; + req->int2 = mode; + req_set_path1 (req, pathname); + + REQ_SEND; +} + +void aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) ALIAS: aio_unlink = EIO_UNLINK @@ -1321,8 +1394,7 @@ dREQ; req->type = ix; - req->sv1 = newSVsv (pathname); - req->ptr1 = SvPVbyte_nolen (req->sv1); + req_set_path1 (req, pathname); REQ_SEND; } @@ -1336,12 +1408,12 @@ PPCODE: { dREQ; + eio_wd wd2 = 0; req->type = ix; - req->sv1 = newSVsv (oldpath); - req->ptr1 = SvPVbyte_nolen (req->sv1); - req->sv2 = newSVsv (newpath); - req->ptr2 = SvPVbyte_nolen (req->sv2); + req_set_path1 (req, oldpath); + req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); + req->int3 = (long)wd2; REQ_SEND; } @@ -1353,10 +1425,9 @@ dREQ; req->type = EIO_MKNOD; - req->sv1 = newSVsv (pathname); - req->ptr1 = SvPVbyte_nolen (req->sv1); req->int2 = (mode_t)mode; req->offs = dev; + req_set_path1 (req, pathname); REQ_SEND; } @@ -1566,7 +1637,7 @@ OUTPUT: RETVAL -ssize_t +IV sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) CODE: RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); @@ -1688,6 +1759,30 @@ PROTOTYPES: DISABLE +MODULE = IO::AIO PACKAGE = IO::AIO::WD + +BOOT: +{ + newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD )); + newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD)); +} + +void +DESTROY (SV *self) + CODE: +{ + aio_wd wd = SvAIO_WD (self); +#if HAVE_AT + SV *callback = &PL_sv_undef; + dREQ; /* clobbers next_pri :/ */ + req->type = EIO_WD_CLOSE; + req->wd = wd; + REQ_SEND; +#else + eio_wd_close_sync (wd); +#endif +} + MODULE = IO::AIO PACKAGE = IO::AIO::REQ void