diff -rupN -X /home/daniel_nfs/dontdiff libaio-0.3.93/src/io_queue_run.c libaio-0.3.93-io_queue_run_with_timeout/src/io_queue_run.c
--- libaio-0.3.93/src/io_queue_run.c	2002-09-26 09:39:38.000000000 -0700
+++ libaio-0.3.93-io_queue_run_with_timeout/src/io_queue_run.c	2003-07-08 16:38:52.983739711 -0700
@@ -21,19 +21,33 @@
 #include <stdlib.h>
 #include <time.h>
 
-int io_queue_run(io_context_t ctx)
+#define IO_BATCH_EVENTS	8		/* number of events to batch up */
+
+int io_queue_run(io_context_t ctx, struct timespec *timeout)
 {
-	static struct timespec timeout = { 0, 0 };
-	struct io_event event;
-	int ret;
-
-	/* FIXME: batch requests? */
-	while (1 == (ret = io_getevents(ctx, 0, 1, &event, &timeout))) {
-		io_callback_t cb = (io_callback_t)event.data;
-		struct iocb *iocb = event.obj;
+	struct io_event events[IO_BATCH_EVENTS];
+	struct io_event *ep;
+	int ret = 0;		/* total number of events processed */
+	int n;
+
+	/*
+	 * Process io events and call the callbacks.
+	 * Try to batch the events up to IO_BATCH_EVENTS at a time.
+	 * Loop until we have read all the available events and called the callbacks.
+	 */
+	do {
+		int i;
+
+		if ((n = io_getevents(ctx, 1, IO_BATCH_EVENTS, &events, timeout)) <= 0)
+			break;
+		ret += n;
+		for (ep = events, i = n; i-- > 0; ep++) {
+			io_callback_t cb = (io_callback_t)ep->data;
+			struct iocb *iocb = ep->obj;
 
-		cb(ctx, iocb, event.res, event.res2);
-	}
+			cb(ctx, iocb, ep->res, ep->res2);
+		}
+	} while (n == IO_BATCH_EVENTS);
 
-	return ret;
+	return ret ? ret : n;		/* return number of events or error */
 }
diff -rupN -X /home/daniel_nfs/dontdiff libaio-0.3.93/src/libaio.h libaio-0.3.93-io_queue_run_with_timeout/src/libaio.h
--- libaio-0.3.93/src/libaio.h	2002-10-08 16:33:42.000000000 -0700
+++ libaio-0.3.93-io_queue_run_with_timeout/src/libaio.h	2003-07-08 16:41:06.471880979 -0700
@@ -123,7 +123,7 @@ extern int io_queue_init(int maxevents, 
 /*extern int io_queue_grow(io_context_t ctx, int new_maxevents);*/
 extern int io_queue_release(io_context_t ctx);
 /*extern int io_queue_wait(io_context_t ctx, struct timespec *timeout);*/
-extern int io_queue_run(io_context_t ctx);
+extern int io_queue_run(io_context_t ctx, struct timespec *timeout);
 
 /* Actual syscalls */
 extern int io_setup(int maxevents, io_context_t *ctxp);
Binary files libaio-0.3.93/src/libaio.so.1 and libaio-0.3.93-io_queue_run_with_timeout/src/libaio.so.1 differ
diff -rupN -X /home/daniel_nfs/dontdiff libaio-0.3.93/src/Makefile libaio-0.3.93-io_queue_run_with_timeout/src/Makefile
--- libaio-0.3.93/src/Makefile	2002-09-12 20:30:12.000000000 -0700
+++ libaio-0.3.93-io_queue_run_with_timeout/src/Makefile	2003-07-08 16:47:29.426559122 -0700
@@ -14,7 +14,7 @@ all: $(all_targets)
 
 # libaio provided functions
 libaio_srcs := io_queue_init.c io_queue_release.c
-libaio_srcs += io_queue_wait.c io_queue_run.c
+libaio_srcs += io_queue_run.c
 
 # real syscalls
 libaio_srcs += io_getevents.c io_submit.c io_cancel.c