--- IO-AIO/AIO.xs	2010/01/10 23:05:12	1.162
+++ IO-AIO/AIO.xs	2010/08/04 14:02:58	1.168
@@ -22,11 +22,6 @@
 # include <sys/mman.h>
 #endif
 
-#if !_POSIX_MAPPED_FILES
-# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
-# define munmap(addr,length)                  (errno = ENOSYS, -1)
-#endif
-
 /* perl namespace pollution */
 #undef VERSION
 
@@ -311,18 +306,32 @@
 
 static int req_invoke (eio_req *req)
 {
-  dSP;
-
   if (req->flags & FLAG_SV2_RO_OFF)
     SvREADONLY_off (req->sv2);
 
   if (!EIO_CANCELLED (req) && req->callback)
     {
+      dSP;
+      static SV *sv_result_cache; /* caches the result integer SV */
+      SV *sv_result;
+
       ENTER;
       SAVETMPS;
       PUSHMARK (SP);
       EXTEND (SP, 1);
 
+      /* do not recreate the result IV from scratch each time */
+      if (expect_true (sv_result_cache))
+        {
+          sv_result = sv_result_cache; sv_result_cache = 0;
+          SvIV_set (sv_result, req->result);
+        }
+      else
+        {
+          sv_result = newSViv (req->result);
+          SvREADONLY_on (sv_result);
+        }
+
       switch (req->type)
         {
           case EIO_READDIR:
@@ -476,7 +485,7 @@
             PL_laststype   = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
             PL_laststatval = req->result;
             PL_statcache   = *(EIO_STRUCT_STAT *)(req->ptr2);
-            PUSHs (sv_2mortal (newSViv (req->result)));
+            PUSHs (sv_result);
             break;
 
           case EIO_READ:
@@ -485,17 +494,17 @@
               *SvEND (req->sv2) = 0;
               SvPOK_only (req->sv2);
               SvSETMAGIC (req->sv2);
-              PUSHs (sv_2mortal (newSViv (req->result)));
+              PUSHs (sv_result);
             }
             break;
 
-          case EIO_DUP2:
+          case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
             if (req->result > 0)
-              req->result = 0;
+              SvIV_set (sv_result, 0);
             /* FALLTHROUGH */
 
           default:
-            PUSHs (sv_2mortal (newSViv (req->result)));
+            PUSHs (sv_result);
             break;
         }
 
@@ -505,6 +514,11 @@
       call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
       SPAGAIN;
 
+      if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
+        SvREFCNT_dec (sv_result);
+      else
+        sv_result_cache = sv_result;
+
       FREETMPS;
       LEAVE;
 
@@ -591,6 +605,11 @@
 
 /*****************************************************************************/
 
+#if !_POSIX_MAPPED_FILES
+# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
+# define munmap(addr,length)                  (errno = ENOSYS, -1)
+#endif
+
 #define MMAP_MAGIC PERL_MAGIC_ext
 
 static int
@@ -603,8 +622,11 @@
   mg->mg_obj = 0; /* just in case */
 
   SvREADONLY_off (sv);
+
+  if (SvPVX (sv) != mg->mg_ptr)
+    croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
+
   SvCUR_set (sv, 0);
-  SvLEN_set (sv, 0);
   SvPVX (sv) = 0;
   SvOK_off (sv);
 
@@ -664,8 +686,11 @@
     const_iv (ENOSYS)
     const_iv (O_RDONLY)
     const_iv (O_WRONLY)
+    const_iv (O_RDWR)
     const_iv (O_CREAT)
     const_iv (O_TRUNC)
+    const_iv (O_EXCL)
+    const_iv (O_APPEND)
 #ifndef _WIN32
     const_iv (S_IFIFO)
 #endif
@@ -1366,14 +1391,20 @@
 	if (addr == (void *)-1)
 	  XSRETURN_NO;
 
+        sv_force_normal (scalar);
+
         /* we store the length in mg_obj, as namlen is I32 :/ */
         sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
           ->mg_obj = (SV *)length;
 
 	SvUPGRADE (scalar, SVt_PV); /* nop... */
+
 	if (!(prot & PROT_WRITE))
 	  SvREADONLY_on (scalar);
 
+        if (SvLEN (scalar))
+          Safefree (SvPVX (scalar));
+
 	SvPVX (scalar) = (char *)addr;
 	SvCUR_set (scalar, length);
 	SvLEN_set (scalar, 0);