--- IO-AIO/AIO.xs	2006/10/23 00:47:29	1.55
+++ IO-AIO/AIO.xs	2006/10/23 20:05:27	1.60
@@ -68,10 +68,6 @@
 {
   struct aio_cb *volatile next;
 
-  struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
-
-  SV *self; /* the perl counterpart of this request, if any */
-
   SV *data, *callback;
   SV *fh, *fh2;
   void *dataptr, *data2ptr;
@@ -80,17 +76,36 @@
   size_t length;
   ssize_t result;
 
+  STRLEN dataoffset;
   int type;
   int fd, fd2;
   int errorno;
-  STRLEN dataoffset;
   mode_t mode; /* open */
-  unsigned char cancelled;
+
+  unsigned char flags;
+  unsigned char pri;
+
+  SV *self; /* the perl counterpart of this request, if any */
+  struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
 } aio_cb;
 
+enum {
+  FLAG_CANCELLED = 0x01,
+};
+
 typedef aio_cb *aio_req;
 typedef aio_cb *aio_req_ornot;
 
+enum {
+  PRI_MIN     =  4,
+  PRI_MAX     = -4,
+
+  DEFAULT_PRI = 0,
+  PRI_BIAS    = PRI_MIN,
+};
+
+static int next_pri = DEFAULT_PRI + PRI_BIAS;
+
 static int started, wanted;
 static volatile int nreqs;
 static int max_outstanding = 1<<30;
@@ -132,7 +147,7 @@
 
 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;
 
@@ -178,8 +193,16 @@
 
 static void poll_wait ()
 {
-  if (nreqs && !ress)
+  while (nreqs)
     {
+      aio_req req;
+      pthread_mutex_lock (&reslock);
+      req = ress;
+      pthread_mutex_unlock (&reslock);
+
+      if (req)
+        return;
+
       fd_set rfd;
       FD_ZERO(&rfd);
       FD_SET(respipe [0], &rfd);
@@ -193,7 +216,7 @@
   dSP;
   int errorno = errno;
 
-  if (req->cancelled || !SvOK (req->callback))
+  if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
     return;
 
   errno = req->errorno;
@@ -323,7 +346,7 @@
 
 static void req_cancel (aio_req req)
 {
-  req->cancelled = 1;
+  req->flags |= FLAG_CANCELLED;
 
   if (req->type == REQ_GROUP)
     {
@@ -787,9 +810,10 @@
       pthread_mutex_unlock (&reqlock);
      
       errno = 0; /* strictly unnecessary */
+      type = req->type; /* remember type for QUIT check */
 
-      if (!req->cancelled)
-        switch (type = req->type) /* remember type for QUIT check */
+      if (!(req->flags & FLAG_CANCELLED))
+        switch (type)
           {
             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;
@@ -918,6 +942,8 @@
 
 #define dREQ							\
   aio_req req;							\
+  int req_pri = next_pri;					\
+  next_pri = DEFAULT_PRI + PRI_BIAS;				\
 								\
   if (SvOK (callback) && !SvROK (callback))			\
     croak ("callback must be undef or of reference type");	\
@@ -926,7 +952,8 @@
   if (!req)							\
     croak ("out of memory during aio_req allocation");		\
 								\
-  req->callback = newSVsv (callback)
+  req->callback = newSVsv (callback);				\
+  req->pri = req_pri
 
 #define REQ_SEND						\
   req_send (req);						\
@@ -1211,8 +1238,10 @@
         PPCODE:
 {
 	dREQ;
+
         req->type = REQ_GROUP;
         req_send (req);
+
         XPUSHs (req_sv (req, AIO_GRP_KLASS));
 }
 
@@ -1228,6 +1257,17 @@
 	REQ_SEND;
 }
 
+#if 0
+
+void
+aio_pri (int pri = DEFAULT_PRI)
+	CODE:
+        if (pri > PRI_MIN) pri = PRI_MIN;
+        if (pri < PRI_MAX) pri = PRI_MAX;
+        next_pri = pri + PRI_BIAS;
+
+#endif
+
 void
 flush ()
 	PROTOTYPE:
@@ -1289,6 +1329,12 @@
 	CODE:
         req_cancel (req);
 
+void
+cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
+	CODE:
+        SvREFCNT_dec (req->callback);
+        req->callback = newSVsv (callback);
+
 MODULE = IO::AIO                PACKAGE = IO::AIO::GRP
 
 void
@@ -1339,23 +1385,13 @@
 }
 
 void
-lock (aio_req grp)
-	CODE:
-        ++grp->length;
-
-void
-unlock (aio_req grp)
-	CODE:
-        aio_grp_dec (grp);
-
-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);