From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 27 Mar 2007 07:56:08 +0000 (+0200)
Subject: NULL engine: ->commit() has side effects, make sure it always works
X-Git-Tag: fio-1.15~31
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ed8bd849b04b336b8f666a547aafa2661b0d8c89;p=fio.git

NULL engine: ->commit() has side effects, make sure it always works

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/engines/null.c b/engines/null.c
index acb8cf41..86b9cbd3 100644
--- a/engines/null.c
+++ b/engines/null.c
@@ -45,8 +45,11 @@ static int fio_null_commit(struct thread_data *td)
 {
 	struct null_data *nd = td->io_ops->data;
 
-	nd->events += nd->queued;
-	nd->queued = 0;
+	if (!nd->events) {
+		nd->events = nd->queued;
+		nd->queued = 0;
+	}
+
 	return 0;
 }
 
@@ -56,6 +59,8 @@ static int fio_null_queue(struct thread_data fio_unused *td, struct io_u *io_u)
 
 	if (td->io_ops->flags & FIO_SYNCIO)
 		return FIO_Q_COMPLETED;
+	if (nd->events)
+		return FIO_Q_BUSY;
 
 	nd->io_us[nd->queued++] = io_u;
 	return FIO_Q_QUEUED;