X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Flibaio.c;h=d4f48303becb8af99a63bcc0e1667a030bdd0a66;hp=ca7bfdef58a35a58d29de89a33d7176eef3e4cf7;hb=936e37bda7eb4796ee0e6d14c91d090742b2296d;hpb=a120ca7f793b41532b04e3915fcd6646fa37bb4f

diff --git a/engines/libaio.c b/engines/libaio.c
index ca7bfdef..d4f48303 100644
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -13,6 +13,8 @@
 
 #include "../fio.h"
 
+static int fio_libaio_commit(struct thread_data *td);
+
 struct libaio_data {
 	io_context_t aio_ctx;
 	struct io_event *aio_events;
@@ -35,7 +37,7 @@ struct libaio_data {
 };
 
 struct libaio_options {
-	struct thread_data *td;
+	void *pad;
 	unsigned int userspace_reap;
 };
 
@@ -163,10 +165,13 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
 			r = io_getevents(ld->aio_ctx, actual_min,
 				max, ld->aio_events + events, lt);
 		}
-		if (r >= 0)
+		if (r > 0)
 			events += r;
-		else if (r == -EAGAIN)
+		else if ((min && r == 0) || r == -EAGAIN) {
+			fio_libaio_commit(td);
 			usleep(100);
+		} else if (r != -EINTR)
+			break;
 	} while (events < min);
 
 	return r < 0 ? r : events;
@@ -255,9 +260,11 @@ static int fio_libaio_commit(struct thread_data *td)
 			ld->queued -= ret;
 			ring_inc(ld, &ld->tail, ret);
 			ret = 0;
+			wait_start = 0;
 		} else if (ret == -EINTR || !ret) {
 			if (!ret)
 				io_u_mark_submit(td, ret);
+			wait_start = 0;
 			continue;
 		} else if (ret == -EAGAIN) {
 			/*
@@ -274,16 +281,25 @@ static int fio_libaio_commit(struct thread_data *td)
 			}
 			if (!wait_start) {
 				fio_gettime(&tv, NULL);
-				wait_start = 0;
+				wait_start = 1;
 			} else if (mtime_since_now(&tv) > 30000) {
 				log_err("fio: aio appears to be stalled, giving up\n");
 				break;
 			}
 			usleep(1);
 			continue;
+		} else if (ret == -ENOMEM) {
+			/*
+			 * If we get -ENOMEM, reap events if we can. If
+			 * we cannot, treat it as a fatal event since there's
+			 * nothing we can do about it.
+			 */
+			if (ld->queued)
+				ret = 0;
+			break;
 		} else
 			break;
-	} while (ld->head != ld->tail);
+	} while (ld->queued);
 
 	return ret;
 }