--- IO-AIO/AIO.xs	2009/07/14 00:32:27	1.152
+++ IO-AIO/AIO.xs	2010/01/02 12:58:37	1.157
@@ -101,13 +101,11 @@
 
 /*****************************************************************************/
 
-static HV *stash;
 typedef SV SV8; /* byte-sv, used for argument-checking */
 typedef int aio_rfd; /* read file desriptor */
 typedef int aio_wfd; /* write file descriptor */
 
-#define AIO_REQ_KLASS "IO::AIO::REQ"
-#define AIO_GRP_KLASS "IO::AIO::GRP"
+static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
 
 #define EIO_REQ_MEMBERS	\
   SV *callback;		\
@@ -162,7 +160,7 @@
 static int next_pri = EIO_PRI_DEFAULT;
 static int max_outstanding;
 
-static int respipe_osf [2], respipe [2] = { -1, -1 };
+static s_epipe respipe;
 
 static void req_destroy (aio_req req);
 static void req_cancel (aio_req req);
@@ -170,19 +168,17 @@
 static void want_poll (void)
 {
   /* write a dummy byte to the pipe so fh becomes ready */
-  respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
+  s_epipe_signal (&respipe);
 }
 
 static void done_poll (void)
 {
   /* read any signals sent by the worker threads */
-  char buf [4];
-  while (respipe_read (respipe [0], buf, 4) == 4)
-    ;
+  s_epipe_drain (&respipe);
 }
 
 /* must be called at most once */
-static SV *req_sv (aio_req req, const char *klass)
+static SV *req_sv (aio_req req, HV *stash)
 {
   if (!req->self)
     {
@@ -190,15 +186,18 @@
       sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
     }
 
-  return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
+  return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
 }
 
 static aio_req SvAIO_REQ (SV *sv)
 {
   MAGIC *mg;
 
-  if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
-    croak ("object of class " AIO_REQ_KLASS " expected");
+  if (!SvROK (sv)
+      || (SvSTASH (SvRV (sv)) != aio_grp_stash
+          && SvSTASH (SvRV (sv)) != aio_req_stash
+          && !sv_derived_from (sv, "IO::AIO::REQ")))
+    croak ("object of class IO::AIO::REQ expected");
 
   mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
 
@@ -214,7 +213,7 @@
       ENTER;
       SAVETMPS;
       PUSHMARK (SP);
-      XPUSHs (req_sv (grp, AIO_GRP_KLASS));
+      XPUSHs (req_sv (grp, aio_grp_stash));
       PUTBACK;
       call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
       SPAGAIN;
@@ -330,7 +329,7 @@
                   int symlen;
                   
                   symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
-                  gv_init (gv, stash, sym, symlen, 0);
+                  gv_init (gv, aio_stash, sym, symlen, 0);
 
                   symlen = snprintf (
                      sym,
@@ -443,54 +442,15 @@
   eio_grp_cancel (grp);
 }
 
-#ifdef USE_SOCKETS_AS_HANDLES
-# define TO_SOCKET(x) (win32_get_osfhandle (x))
-#else
-# define TO_SOCKET(x) (x)
-#endif
-
 static void
 create_respipe (void)
 {
-  int old_readfd = respipe [0];
-
-  if (respipe [1] >= 0)
-    respipe_close (TO_SOCKET (respipe [1]));
-
-#ifdef _WIN32
-  if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
-#else
-  if (pipe (respipe))
-#endif
-    croak ("unable to initialize result pipe");
-
-  if (old_readfd >= 0)
-    {
-      if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
-        croak ("unable to initialize result pipe(2)");
-
-      respipe_close (respipe [0]);
-      respipe [0] = old_readfd;
-    }
-
-#ifdef _WIN32
-  int arg = 1;
-  if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
-      || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
-#else
-  if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
-      || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
-#endif
-    croak ("unable to initialize result pipe(3)");
-
-  respipe_osf [0] = TO_SOCKET (respipe [0]);
-  respipe_osf [1] = TO_SOCKET (respipe [1]);
+  if (s_epipe_renew (&respipe))
+    croak ("IO::AIO: unable to initialize result pipe");
 }
 
 static void poll_wait (void)
 {
-  fd_set rfd;
-
   while (eio_nreqs ())
     {
       int size;
@@ -504,10 +464,7 @@
 
       etp_maybe_start_thread ();
 
-      FD_ZERO (&rfd);
-      FD_SET (respipe [0], &rfd);
-
-      PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
+      s_epipe_wait (&respipe);
     }
 }
 
@@ -560,7 +517,7 @@
   SPAGAIN;							\
 								\
   if (GIMME_V != G_VOID)					\
-    XPUSHs (req_sv (req, AIO_REQ_KLASS));
+    XPUSHs (req_sv (req, aio_req_stash));
 
 MODULE = IO::AIO                PACKAGE = IO::AIO
 
@@ -610,10 +567,12 @@
     const_eio (DT_WHT)
   };
 
-  stash = gv_stashpv ("IO::AIO", 1);
+  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);
 
   for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
-    newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
+    newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
 
   create_respipe ();
 
@@ -1059,7 +1018,7 @@
         req->type = EIO_GROUP;
 
         req_submit (req);
-        XPUSHs (req_sv (req, AIO_GRP_KLASS));
+        XPUSHs (req_sv (req, aio_grp_stash));
 }
 
 void
@@ -1121,7 +1080,7 @@
 poll_fileno()
 	PROTOTYPE:
 	CODE:
-        RETVAL = respipe [0];
+        RETVAL = s_epipe_fd (&respipe);
 	OUTPUT:
 	RETVAL
 
@@ -1187,7 +1146,9 @@
 sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
         PROTOTYPE: $$$$
         CODE:
-        eio_sendfile_sync (ofh, ifh, offset, count);
+        RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
+	OUTPUT:
+        RETVAL
 
 void _on_next_submit (SV *cb)
 	CODE: