--- IO-AIO/AIO.xs	2009/07/15 01:36:04	1.153
+++ IO-AIO/AIO.xs	2009/11/12 00:01:52	1.156
@@ -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,6 @@
 static int next_pri = EIO_PRI_DEFAULT;
 static int max_outstanding;
 
-static int respipe_osf [2];
 static s_epipe respipe;
 
 static void req_destroy (aio_req req);
@@ -181,7 +178,7 @@
 }
 
 /* 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)
     {
@@ -189,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);
 
@@ -213,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;
@@ -329,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,
@@ -446,10 +446,7 @@
 create_respipe (void)
 {
   if (s_epipe_renew (&respipe))
-    croak ("unable to initialize result pipe");
-
-  respipe_osf [0] = S_TO_SOCKET (respipe.fd [0]);
-  respipe_osf [1] = S_TO_SOCKET (respipe.fd [1]);
+    croak ("IO::AIO: unable to initialize result pipe");
 }
 
 static void poll_wait (void)
@@ -520,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
 
@@ -570,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 ();
 
@@ -1019,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