--- IO-AIO/AIO.xs	2006/10/22 13:33:28	1.49
+++ IO-AIO/AIO.xs	2006/10/23 18:48:08	1.58
@@ -57,8 +57,8 @@
   REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
   REQ_READDIR,
   REQ_LINK, REQ_SYMLINK,
+  REQ_GROUP, REQ_NOP,
   REQ_SLEEP,
-  REQ_GROUP,
 };
 
 #define AIO_REQ_KLASS "IO::AIO::REQ"
@@ -85,9 +85,14 @@
   int errorno;
   STRLEN dataoffset;
   mode_t mode; /* open */
-  unsigned char cancelled;
+  unsigned char pri;
+  unsigned char flags;
 } aio_cb;
 
+enum {
+  FLAG_CANCELLED = 0x01,
+};
+
 typedef aio_cb *aio_req;
 typedef aio_cb *aio_req_ornot;
 
@@ -103,6 +108,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 */
@@ -119,17 +125,19 @@
 
 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");
 
-  MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
+  mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
 
   return mg ? (aio_req)mg->mg_ptr : 0;
 }
 
 static void aio_grp_feed (aio_req grp)
 {
-  while (grp->length < grp->fd2)
+  while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
     {
       int old_len = grp->length;
 
@@ -158,6 +166,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)
@@ -175,7 +198,7 @@
   dSP;
   int errorno = errno;
 
-  if (req->cancelled || !SvOK (req->callback))
+  if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
     return;
 
   errno = req->errorno;
@@ -243,6 +266,7 @@
           }
         break;
 
+      case REQ_NOP:
       case REQ_SLEEP:
         break;
 
@@ -256,16 +280,16 @@
   call_sv (req->callback, G_VOID | G_EVAL);
   SPAGAIN;
 
+  FREETMPS;
+  LEAVE;
+
+  errno = errorno;
+
   if (SvTRUE (ERRSV))
     {
       req_free (req);
       croak (0);
     }
-
-  FREETMPS;
-  LEAVE;
-
-  errno = errorno;
 }
 
 static void req_free (aio_req req)
@@ -281,17 +305,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)
@@ -314,7 +328,7 @@
 
 static void req_cancel (aio_req req)
 {
-  req->cancelled = 1;
+  req->flags |= FLAG_CANCELLED;
 
   if (req->type == REQ_GROUP)
     {
@@ -357,7 +371,7 @@
       if (!req)
         break;
 
-      nreqs--;
+      --nreqs;
 
       if (req->type == REQ_QUIT)
         started--;
@@ -418,7 +432,7 @@
   while (started < wanted && nreqs >= started)
     start_thread ();
 
-  nreqs++;
+  ++nreqs;
 
   pthread_mutex_lock (&reqlock);
 
@@ -779,8 +793,8 @@
      
       errno = 0; /* strictly unnecessary */
 
-      if (!req->cancelled)
-        switch (req->type)
+      if (!(req->flags & FLAG_CANCELLED))
+        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;
@@ -814,6 +828,8 @@
                 req->result = select (0, 0, 0, 0, &tv);
               }
 
+            case REQ_GROUP:
+            case REQ_NOP:
             case REQ_QUIT:
               break;
 
@@ -1206,6 +1222,18 @@
 }
 
 void
+aio_nop (callback=&PL_sv_undef)
+	SV * callback
+	PPCODE:
+{
+	dREQ;
+
+        req->type = REQ_NOP;
+
+	REQ_SEND;
+}
+
+void
 flush ()
 	PROTOTYPE:
 	CODE:
@@ -1266,6 +1294,12 @@
 	CODE:
         req_cancel (req);
 
+void
+cb (aio_req req, SV *callback=&PL_sv_undef)
+	CODE:
+        SvREFCNT_dec (req->callback);
+        req->callback = newSVsv (callback);
+
 MODULE = IO::AIO                PACKAGE = IO::AIO::GRP
 
 void
@@ -1273,6 +1307,7 @@
         PPCODE:
 {
 	int i;
+        aio_req req;
 
         if (grp->fd == 2)
           croak ("cannot add requests to IO::AIO::GRP after the group finished");
@@ -1282,7 +1317,7 @@
             if (GIMME_V != G_VOID)
               XPUSHs (sv_2mortal (newSVsv (ST (i))));
 
-            aio_req req = SvAIO_REQ (ST (i));
+            req = SvAIO_REQ (ST (i));
 
             if (req)
               {
@@ -1302,12 +1337,12 @@
 
 void
 result (aio_req grp, ...)
-	CODE:
+        CODE:
 {
-	int i;
-	AV *av = newAV ();
+        int i;
+        AV *av = newAV ();
 
-	for (i = 1; i < items; ++i )
+        for (i = 1; i < items; ++i )
           av_push (av, newSVsv (ST (i)));
 
         SvREFCNT_dec (grp->data);
@@ -1315,13 +1350,13 @@
 }
 
 void
-feeder_limit (aio_req grp, int limit)
+feed_limit (aio_req grp, int limit)
 	CODE:
         grp->fd2 = limit;
         aio_grp_feed (grp);
 
 void
-set_feeder (aio_req grp, SV *callback=&PL_sv_undef)
+feed (aio_req grp, SV *callback=&PL_sv_undef)
 	CODE:
 {
         SvREFCNT_dec (grp->fh2);