--- IO-AIO/AIO.xs 2012/04/06 11:39:25 1.210 +++ IO-AIO/AIO.xs 2012/08/28 03:13:33 1.223 @@ -24,6 +24,7 @@ #if __linux__ # include # ifdef FS_IOC_FIEMAP +# include # include # define HAVE_FIEMAP 1 # endif @@ -166,50 +167,86 @@ req->result = -1; #if HAVE_FIEMAP - for (;;) - { - int count = req->int3; + /* assume some c99 */ + struct fiemap *fiemap = 0; + size_t end_offset; + int count = req->int3; + + req->flags |= EIO_FLAG_PTR1_FREE; + + /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */ + /* increase in 3.5kb steps */ + if (count < 0) + count = 8; + + fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); + errno = ENOMEM; + if (!fiemap) + return; - if (count < 0) - { - struct fiemap fiemap; + req->ptr1 = fiemap; + + fiemap->fm_start = req->offs; + fiemap->fm_length = req->size; + fiemap->fm_flags = req->int2; + fiemap->fm_extent_count = count; - fiemap.fm_start = req->offs; - fiemap.fm_length = req->size; - fiemap.fm_flags = req->int2; - fiemap.fm_extent_count = 0; + if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap) < 0) + return; - if (ioctl (req->int1, FS_IOC_FIEMAP, &fiemap)) - return; + if (req->int3 >= 0 /* not autosizing */ + || !fiemap->fm_mapped_extents /* no more extents */ + || fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST /* hit eof */) + goto done; + + /* else we have to loop - + * it would be tempting (atcually I tried that first) to just query the + * number of extents needed, but linux often feels like not returning all + * extents, without telling us it left any out. this complicates + * this quite a bit. + */ - count = fiemap.fm_mapped_extents; - } + end_offset = fiemap->fm_length + (fiemap->fm_length == FIEMAP_MAX_OFFSET ? 0 : fiemap->fm_start); + + for (;;) + { + /* we go in 54 extent steps - 3kb, in the hope that this fits nicely on the eio stack (normally 16+ kb) */ + char scratch[3072]; + struct fiemap *incmap = (struct fiemap *)scratch; + + incmap->fm_start = fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_logical + + fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_length; + incmap->fm_length = fiemap->fm_length - (incmap->fm_start - fiemap->fm_start); + incmap->fm_flags = fiemap->fm_flags; + incmap->fm_extent_count = (sizeof (scratch) - sizeof (struct fiemap)) / sizeof (struct fiemap_extent); - struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); + if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0) + return; + + count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents; + fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); errno = ENOMEM; if (!fiemap) return; req->ptr1 = fiemap; - req->flags |= EIO_FLAG_PTR1_FREE; - fiemap->fm_start = req->offs; - fiemap->fm_length = req->size; - fiemap->fm_flags = req->int2; - fiemap->fm_extent_count = count; + for (count = 0; count < incmap->fm_mapped_extents; ++count) + { + struct fiemap_extent *e = incmap->fm_extents + count; - if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) - return; + if (e->fe_logical + e->fe_length >= end_offset) + goto done; - if (req->int3 >= 0) - break; /* when not autosizing we are done */ + fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e; - if (fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST) - break; /* autosizing successful, we are done */ + if (e->fe_flags & FIEMAP_EXTENT_LAST) + goto done; - free (fiemap); + } } +done: req->result = 0; #else @@ -547,6 +584,7 @@ case EIO_CUSTOM: if (req->feed == fiemap) { +#if HAVE_FIEMAP if (!req->result) { struct fiemap *fiemap = (struct fiemap *)req->ptr1; @@ -577,6 +615,7 @@ PUSHs (sv_result); } } +#endif } else PUSHs (sv_result); @@ -698,12 +737,12 @@ /*****************************************************************************/ #if !_POSIX_MAPPED_FILES -# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) -# define munmap(addr,length) (errno = ENOSYS, -1) +# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS () +# define munmap(addr,length) EIO_ENOSYS () #endif #if !_POSIX_MEMORY_PROTECTION -# define mprotect(addr,len,prot) (errno = ENOSYS, -1) +# define mprotect(addr,len,prot) EIO_ENOSYS () # define PROT_NONE 0 # define PROT_WRITE 0 # define MAP_PRIVATE 0 @@ -956,6 +995,15 @@ const_iv (FIEMAP_EXTENT_MERGED) const_iv (FIEMAP_EXTENT_SHARED) + const_iv (SPLICE_F_MOVE) + const_iv (SPLICE_F_NONBLOCK) + const_iv (SPLICE_F_MORE) + const_iv (SPLICE_F_GIFT) + + const_iv (SEEK_DATA) + const_iv (SEEK_HOLE) + + /* libeio constants */ const_eio (SEEK_SET) const_eio (SEEK_CUR) const_eio (SEEK_END) @@ -974,6 +1022,7 @@ const_eio (SYNC_FILE_RANGE_WAIT_AFTER) const_eio (FALLOC_FL_KEEP_SIZE) + const_eio (FALLOC_FL_PUNCH_HOLE) const_eio (READDIR_DENTS) const_eio (READDIR_DIRS_FIRST) @@ -1084,7 +1133,7 @@ aio_syncfs = EIO_SYNCFS PPCODE: { - int fd = s_fileno_croak (fh, 0); + int fd = s_fileno_croak (fh, 0); dREQ; req->type = ix; @@ -1098,7 +1147,7 @@ aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) PPCODE: { - int fd = s_fileno_croak (fh, 0); + int fd = s_fileno_croak (fh, 0); dREQ; req->type = EIO_SYNC_FILE_RANGE; @@ -1112,10 +1161,10 @@ } void -aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) +aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) PPCODE: { - int fd = s_fileno_croak (fh, 0); + int fd = s_fileno_croak (fh, 0); dREQ; req->type = EIO_FALLOCATE; @@ -1133,7 +1182,7 @@ PPCODE: { static int close_fd = -1; /* dummy fd to close fds via dup2 */ - int fd = s_fileno_croak (fh, 0); + int fd = s_fileno_croak (fh, 0); dREQ; if (expect_false (close_fd < 0)) @@ -1166,7 +1215,6 @@ aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef) PPCODE: { - STRLEN svlen; int fd = s_fileno_croak (fh, 0); dREQ; @@ -1207,7 +1255,10 @@ { /* read: check type and grow scalar as necessary */ SvUPGRADE (data, SVt_PV); - svptr = SvGROW (data, len + dataoffset + 1); + if (SvLEN (data) >= SvCUR (data)) + svptr = SvGROW (data, len + dataoffset + 1); + else if (SvCUR (data) < len + dataoffset) + croak ("length + dataoffset outside of scalar, and cannot grow"); } { @@ -1251,8 +1302,8 @@ aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) PPCODE: { - int ifd = s_fileno_croak (in_fh , 0); - int ofd = s_fileno_croak (out_fh, 1); + int ifd = s_fileno_croak (in_fh , 0); + int ofd = s_fileno_croak (out_fh, 1); dREQ; req->type = EIO_SENDFILE; @@ -1270,7 +1321,7 @@ aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) PPCODE: { - int fd = s_fileno_croak (fh, 0); + int fd = s_fileno_croak (fh, 0); dREQ; req->type = EIO_READAHEAD; @@ -1520,7 +1571,7 @@ aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef) PPCODE: { - int fd = s_fileno_croak (fh, 0); + int fd = s_fileno_croak (fh, 0); dREQ; req->type = EIO_CUSTOM; @@ -1528,11 +1579,13 @@ req->int1 = fd; req->feed = fiemap; +#if HAVE_FIEMAP /* keep our fingers crossed that the next two types are 64 bit */ req->offs = start; req->size = SvOK (length) ? SvVAL64 (length) : ~0ULL; req->int2 = flags; req->int3 = SvOK (count) ? SvIV (count) : -1; +#endif REQ_SEND; } @@ -1676,7 +1729,7 @@ RETVAL void -mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) +mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0) PPCODE: sv_unmagic (scalar, MMAP_MAGIC); { @@ -1719,7 +1772,7 @@ CODE: { STRLEN svlen; - void *addr = SvPVbyte (scalar, svlen); + void *addr = SvPVbyte (scalar, svlen); size_t len = SvUV (length); if (offset < 0) @@ -1748,7 +1801,7 @@ CODE: { STRLEN svlen; - void *addr = SvPVbyte (scalar, svlen); + void *addr = SvPVbyte (scalar, svlen); size_t len = SvUV (length); if (offset < 0) @@ -1765,7 +1818,7 @@ #if _POSIX_MEMLOCK_RANGE RETVAL = munlock (addr, len); #else - RETVAL = ((errno = ENOSYS), -1); + RETVAL = EIO_ENOSYS (); #endif } OUTPUT: @@ -1777,12 +1830,40 @@ #if _POSIX_MEMLOCK munlockall (); #else - RETVAL = -1; - errno = ENOSYS; + RETVAL = EIO_ENOSYS (); #endif OUTPUT: RETVAL +int +splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags) + CODE: +{ +#if HAVE_LINUX_SPLICE + loff_t off_in_, off_out_; + RETVAL = splice ( + rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0, + wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0, + length, flags + ); +#else + RETVAL = EIO_ENOSYS (); +#endif +} + OUTPUT: + RETVAL + +int +tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags) + CODE: +#if HAVE_LINUX_SPLICE + RETVAL = tee (rfh, wfh, length, flags); +#else + RETVAL = EIO_ENOSYS (); +#endif + OUTPUT: + RETVAL + void _on_next_submit (SV *cb) CODE: SvREFCNT_dec (on_next_submit);