--- IO-AIO/AIO.xs	2008/05/13 19:35:16	1.122
+++ IO-AIO/AIO.xs	2008/09/30 13:17:32	1.127
@@ -67,6 +67,12 @@
 
 #endif
 
+/* perl stupidly overrides readdir and maybe others */
+/* with thread-unsafe versions, imagine that :( */
+#undef readdir
+#undef opendir
+#undef closedir
+
 #define EIO_STRUCT_STAT Stat_t
 
 /* use NV for 32 bit perls as it allows larger offsets */
@@ -76,6 +82,19 @@
 # define SvVAL64 SvNV
 #endif
 
+/*****************************************************************************/
+
+#if __GNUC__ >= 3
+# define expect(expr,value) __builtin_expect ((expr),(value))
+#else
+# define expect(expr,value) (expr)
+#endif
+
+#define expect_false(expr) expect ((expr) != 0, 0)
+#define expect_true(expr)  expect ((expr) != 0, 1)
+
+/*****************************************************************************/
+
 static HV *stash;
 typedef SV SV8; /* byte-sv, used for argument-checking */
 
@@ -177,7 +196,7 @@
 {
   eio_submit (req);
 
-  if (on_next_submit)
+  if (expect_false (on_next_submit))
     {
       dSP;
       SV *cb = sv_2mortal (on_next_submit);
@@ -414,7 +433,7 @@
       if (size)
         return;
 
-      maybe_start_thread ();
+      etp_maybe_start_thread ();
 
       FD_ZERO (&rfd);
       FD_SET (respipe [0], &rfd);
@@ -425,18 +444,18 @@
 
 static int poll_cb (void)
 {
-  int res;
-
-  do 
+  for (;;)
     {
-      res = eio_poll ();
+      int res = eio_poll ();
 
       if (res > 0)
         croak (0);
-    }
-  while (max_outstanding && max_outstanding <= eio_nreqs ());
 
-  return res;
+      if (!max_outstanding || max_outstanding > eio_nreqs ())
+        return res;
+
+      poll_wait ();
+    }
 }
 
 static void atfork_child (void)
@@ -460,7 +479,9 @@
   req->pri = req_pri
 
 #define REQ_SEND						\
+  PUTBACK;							\
   req_submit (req);						\
+  SPAGAIN;							\
 								\
   if (GIMME_V != G_VOID)					\
     XPUSHs (req_sv (req, AIO_REQ_KLASS));
@@ -890,7 +911,7 @@
 
         req->type = EIO_GROUP;
 
-        eio_submit (req);
+        req_submit (req);
         XPUSHs (req_sv (req, AIO_GRP_KLASS));
 }