From: Bruce Cran <bruce@cran.org.uk>
Date: Wed, 29 May 2013 10:06:24 +0000 (+0200)
Subject: Update windowsaio for changes to the thread structure
X-Git-Tag: fio-2.1.1~4
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=7b2dfab10422559d2454f07967247d57bd50a52b

Update windowsaio for changes to the thread structure

The free/busy/requeue list has been replaced with a FIFO + ring: update
windowsaio.c to work with the new code.

Modified by Jens to check for IO_U_F_FLIGHT before doing engine
private checks.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/engines/windowsaio.c b/engines/windowsaio.c
index ee89fa12..16df7403 100644
--- a/engines/windowsaio.c
+++ b/engines/windowsaio.c
@@ -259,9 +259,9 @@ static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min,
 					unsigned int max, struct timespec *t)
 {
 	struct windowsaio_data *wd = td->io_ops->data;
-	struct flist_head *entry;
 	unsigned int dequeued = 0;
 	struct io_u *io_u;
+	int i;
 	struct fio_overlapped *fov;
 	DWORD start_count = 0;
 	DWORD end_count = 0;
@@ -275,8 +275,10 @@ static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min,
 	}
 
 	do {
-		flist_for_each(entry, &td->io_u_busylist) {
-			io_u = flist_entry(entry, struct io_u, list);
+		io_u_qiter(&td->io_u_all, io_u, i) {
+			if (!(io_u->flags & IO_U_F_FLIGHT))
+				continue;
+
 			fov = (struct fio_overlapped*)io_u->engine_data;
 
 			if (fov->io_complete) {