--- IO-AIO/AIO.xs	2006/10/22 13:33:28	1.49
+++ IO-AIO/AIO.xs	2006/10/22 21:13:47	1.50
@@ -103,6 +103,7 @@
 static volatile aio_req reqs, reqe; /* queue start, queue end */
 static volatile aio_req ress, rese; /* queue start, queue end */
 
+static void req_invoke (aio_req req);
 static void req_free (aio_req req);
 
 /* must be called at most once */
@@ -158,6 +159,21 @@
     }
 }
 
+static void aio_grp_dec (aio_req grp)
+{
+  --grp->length;
+
+  /* call feeder, if applicable */
+  aio_grp_feed (grp);
+
+  /* finish, if done */
+  if (!grp->length && grp->fd)
+    {
+      req_invoke (grp);
+      req_free (grp);
+    }
+}
+
 static void poll_wait ()
 {
   if (nreqs && !ress)
@@ -281,17 +297,7 @@
       if (grp->grp_first == req)
         grp->grp_first = req->grp_next;
 
-      --grp->length;
-
-      /* call feeder, if applicable */
-      aio_grp_feed (grp);
-
-      /* finish, if done */
-      if (!grp->length && grp->fd)
-        {
-          req_invoke (grp);
-          req_free (grp);
-        }
+      aio_grp_dec (grp);
     }
 
   if (req->self)
@@ -357,7 +363,7 @@
       if (!req)
         break;
 
-      nreqs--;
+      --nreqs;
 
       if (req->type == REQ_QUIT)
         started--;
@@ -418,7 +424,7 @@
   while (started < wanted && nreqs >= started)
     start_thread ();
 
-  nreqs++;
+  ++nreqs;
 
   pthread_mutex_lock (&reqlock);
 
@@ -780,7 +786,7 @@
       errno = 0; /* strictly unnecessary */
 
       if (!req->cancelled)
-        switch (req->type)
+        switch (type = req->type) /* remember type for QUIT check */
           {
             case REQ_READ:      req->result = pread     (req->fd, req->dataptr, req->length, req->offset); break;
             case REQ_WRITE:     req->result = pwrite    (req->fd, req->dataptr, req->length, req->offset); break;
@@ -1301,18 +1307,14 @@
 }
 
 void
-result (aio_req grp, ...)
+lock (aio_req grp)
 	CODE:
-{
-	int i;
-	AV *av = newAV ();
+        ++grp->length;
 
-	for (i = 1; i < items; ++i )
-          av_push (av, newSVsv (ST (i)));
-
-        SvREFCNT_dec (grp->data);
-        grp->data = (SV *)av;
-}
+void
+unlock (aio_req grp)
+	CODE:
+        aio_grp_dec (grp);
 
 void
 feeder_limit (aio_req grp, int limit)