--- IO-AIO/AIO.xs	2012/10/11 03:20:52	1.224
+++ IO-AIO/AIO.xs	2015/06/13 00:06:13	1.232
@@ -21,7 +21,11 @@
 # include <sys/mman.h>
 #endif
 
-#if __linux__
+/* the incompetent fool that created musl keeps __linux__, refuses
+ * to implement any linux standard apis, and also has no way to test
+ * for his broken iplementation. on't complain if this fails for you.
+ */
+#if __linux__ && (defined __GLIBC__ || defined __UCLIBC__)
 # include <linux/fs.h>
 # ifdef FS_IOC_FIEMAP
 #  include <linux/types.h>
@@ -155,7 +159,7 @@
 # define minor(dev) ((dev) & 0xff)
 #endif
 
-#ifndef PAGESIZE
+#if PAGESIZE <= 0
 # define PAGESIZE sysconf (_SC_PAGESIZE)
 #endif
 
@@ -200,7 +204,7 @@
     goto done;
 
   /* else we have to loop -
-   * it would be tempting (atcually I tried that first) to just query the
+   * it would be tempting (actually 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.
@@ -223,6 +227,9 @@
       if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0)
         return;
 
+      if (!incmap->fm_mapped_extents)
+        goto done;
+
       count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
       fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
       errno = ENOMEM;
@@ -303,7 +310,7 @@
 static SV *
 newSVaio_wd (aio_wd wd)
 {
-  return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
+  return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_stash);
 }
 
 static aio_req
@@ -1028,6 +1035,8 @@
 
     const_eio (FALLOC_FL_KEEP_SIZE)
     const_eio (FALLOC_FL_PUNCH_HOLE)
+    const_eio (FALLOC_FL_COLLAPSE_RANGE)
+    const_eio (FALLOC_FL_ZERO_RANGE)
 
     const_eio (READDIR_DENTS)
     const_eio (READDIR_DIRS_FIRST)
@@ -1105,7 +1114,7 @@
         max_outstanding = maxreqs;
 
 void
-aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
+aio_wd (SV8 *pathname, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
         dREQ;
@@ -1117,7 +1126,7 @@
 }
 
 void
-aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
+aio_open (SV8 *pathname, int flags, int mode, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
         dREQ;
@@ -1131,7 +1140,7 @@
 }
 
 void
-aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
+aio_fsync (SV *fh, SV *callback = &PL_sv_undef)
         ALIAS:
            aio_fsync     = EIO_FSYNC
            aio_fdatasync = EIO_FDATASYNC
@@ -1149,7 +1158,7 @@
 }
 
 void
-aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV 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)
 	PPCODE:
 {
 	int fd = s_fileno_croak (fh, 0);
@@ -1166,7 +1175,7 @@
 }
 
 void
-aio_allocate (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);
@@ -1183,7 +1192,7 @@
 }
 
 void
-aio_close (SV *fh, SV *callback=&PL_sv_undef)
+aio_close (SV *fh, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
         static int close_fd = -1; /* dummy fd to close fds via dup2 */
@@ -1217,7 +1226,7 @@
 }
 
 void
-aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef)
+aio_seek (SV *fh, SV *offset, int whence, SV *callback = &PL_sv_undef)
         PPCODE:
 {
         int fd = s_fileno_croak (fh, 0);
@@ -1233,7 +1242,7 @@
 }
 
 void
-aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
+aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback = &PL_sv_undef)
         ALIAS:
            aio_read  = EIO_READ
            aio_write = EIO_WRITE
@@ -1259,9 +1268,8 @@
         else
           {
             /* read: check type and grow scalar as necessary */
-            SvUPGRADE (data, SVt_PV);
-            if (SvLEN (data) >= SvCUR (data))
-              svptr = SvGROW (data, len + dataoffset + 1);
+            if (!SvPOK (data) || SvLEN (data) >= SvCUR (data))
+              svptr = sv_grow (data, len + dataoffset + 1);
             else if (SvCUR (data) < len + dataoffset)
               croak ("length + dataoffset outside of scalar, and cannot grow");
           }
@@ -1289,7 +1297,7 @@
 }
 
 void
-aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
+aio_readlink (SV8 *pathname, SV *callback = &PL_sv_undef)
         ALIAS:
            aio_readlink = EIO_READLINK
            aio_realpath = EIO_REALPATH
@@ -1304,7 +1312,7 @@
 }
 
 void
-aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t 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)
         PPCODE:
 {
 	int ifd = s_fileno_croak (in_fh , 0);
@@ -1323,7 +1331,7 @@
 }
 
 void
-aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
+aio_readahead (SV *fh, off_t offset, size_t length, SV *callback = &PL_sv_undef)
         PPCODE:
 {
 	int fd = s_fileno_croak (fh, 0);
@@ -1339,7 +1347,7 @@
 }
 
 void
-aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
+aio_stat (SV8 *fh_or_path, SV *callback = &PL_sv_undef)
         ALIAS:
            aio_stat    = EIO_STAT
            aio_lstat   = EIO_LSTAT
@@ -1370,7 +1378,7 @@
         RETVAL
 
 void
-aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
+aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
 	dREQ;
@@ -1383,7 +1391,7 @@
 }
 
 void
-aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
+aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
 	dREQ;
@@ -1395,7 +1403,7 @@
 }
 
 void
-aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
+aio_chmod (SV8 *fh_or_path, int mode, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
 	dREQ;
@@ -1407,7 +1415,7 @@
 }
 
 void
-aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
+aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
 	dREQ;
@@ -1420,7 +1428,7 @@
 }
 
 void
-aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
+aio_readdirx (SV8 *pathname, IV flags, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
 	dREQ;
@@ -1437,7 +1445,7 @@
 }
 
 void
-aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
+aio_mkdir (SV8 *pathname, int mode, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
 	dREQ;
@@ -1450,7 +1458,7 @@
 }
 
 void
-aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
+aio_unlink (SV8 *pathname, SV *callback = &PL_sv_undef)
         ALIAS:
            aio_unlink  = EIO_UNLINK
            aio_rmdir   = EIO_RMDIR
@@ -1466,7 +1474,7 @@
 }
 
 void
-aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
+aio_link (SV8 *oldpath, SV8 *newpath, SV *callback = &PL_sv_undef)
         ALIAS:
            aio_link    = EIO_LINK
            aio_symlink = EIO_SYMLINK
@@ -1485,7 +1493,7 @@
 }
 
 void
-aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
+aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
 	dREQ;
@@ -1499,7 +1507,7 @@
 }
 
 void
-aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
+aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback = &PL_sv_undef)
         ALIAS:
            aio_mtouch = EIO_MTOUCH
            aio_msync  = EIO_MSYNC
@@ -1532,7 +1540,7 @@
 }
 
 void
-aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef)
+aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback = &PL_sv_undef)
         PPCODE:
 {
         STRLEN svlen;
@@ -1561,7 +1569,7 @@
 }
 
 void
-aio_mlockall (IV flags, SV *callback=&PL_sv_undef)
+aio_mlockall (IV flags, SV *callback = &PL_sv_undef)
         PPCODE:
 {
         dREQ;
@@ -1573,7 +1581,7 @@
 }
 
 void
-aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef)
+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);
@@ -1596,7 +1604,7 @@
 }
 
 void
-aio_busy (double delay, SV *callback=&PL_sv_undef)
+aio_busy (double delay, SV *callback = &PL_sv_undef)
 	PPCODE:
 {
 	dREQ;
@@ -1608,19 +1616,22 @@
 }
 
 void
-aio_group (SV *callback=&PL_sv_undef)
+aio_group (SV *callback = &PL_sv_undef)
         PPCODE:
 {
 	dREQ;
 
         req->type = EIO_GROUP;
 
+        PUTBACK;
         req_submit (req);
+        SPAGAIN;
+
         XPUSHs (req_sv (req, aio_grp_stash));
 }
 
 void
-aio_nop (SV *callback=&PL_sv_undef)
+aio_nop (SV *callback = &PL_sv_undef)
 	ALIAS:
            aio_nop  = EIO_NOP
            aio_sync = EIO_SYNC
@@ -1634,7 +1645,7 @@
 }
 
 int
-aioreq_pri (int pri = 0)
+aioreq_pri (int pri = NO_INIT)
 	CODE:
 	RETVAL = next_pri;
 	if (items > 0)
@@ -1734,7 +1745,7 @@
         RETVAL
 
 void
-mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
+mmap (SV *scalar, STRLEN length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
 	PPCODE:
         sv_unmagic (scalar, MMAP_MAGIC);
 {
@@ -1771,14 +1782,14 @@
         sv_unmagic (scalar, MMAP_MAGIC);
 
 int
-madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
+madvise (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
 	ALIAS:
         mprotect = 1
         CODE:
 {
 	STRLEN svlen;
 	void *addr = SvPVbyte (scalar, svlen);
-        size_t len = SvUV (length);
+        STRLEN len = SvUV (length);
 
         if (offset < 0)
           offset += svlen;
@@ -1802,7 +1813,7 @@
         RETVAL
 
 int
-munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
+munlock (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef)
         CODE:
 {
 	STRLEN svlen;
@@ -1869,6 +1880,22 @@
 	OUTPUT:
         RETVAL
 
+int
+pipesize (aio_rfd rfh, int new_size = -1)
+	PROTOTYPE: $;$
+        CODE:
+#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
+        if (new_size >= 0)
+          RETVAL = fcntl (rfh, F_SETPIPE_SZ, new_size);
+        else
+          RETVAL = fcntl (rfh, F_GETPIPE_SZ);
+#else
+        errno = ENOSYS;
+        RETVAL = -1;
+#endif
+        OUTPUT:
+        RETVAL
+
 void _on_next_submit (SV *cb)
 	CODE:
         SvREFCNT_dec (on_next_submit);
@@ -1912,7 +1939,7 @@
         eio_cancel (req);
 
 void
-cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
+cb (aio_req_ornot req, SV *callback = NO_INIT)
 	PPCODE:
 {
         if (GIMME_V != G_VOID)
@@ -1920,7 +1947,7 @@
 
         if (items > 1)
           {
-            SV *cb_cv =get_cb (callback);
+            SV *cb_cv = get_cb (callback);
 
             SvREFCNT_dec (req->callback);
             req->callback = SvREFCNT_inc (cb_cv);
@@ -1987,7 +2014,7 @@
         eio_grp_limit (grp, limit);
 
 void
-feed (aio_req grp, SV *callback=&PL_sv_undef)
+feed (aio_req grp, SV *callback = &PL_sv_undef)
 	CODE:
 {
         SvREFCNT_dec (grp->sv2);