X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fnull.c;h=bf7885e92187e68488c3c5109ca52ed77cd4fd36;hp=724feca716edea0d105be29fab963ffd6f97341f;hb=f0c48a70c5cb8e9f04d263999e0b8d9188f08562;hpb=7bb48f84ac78cac1f90e3e04d0220d90d6a64a6b;ds=sidebyside

diff --git a/engines/null.c b/engines/null.c
index 724feca7..bf7885e9 100644
--- a/engines/null.c
+++ b/engines/null.c
@@ -12,7 +12,6 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 struct null_data {
 	struct io_u **io_us;
@@ -27,8 +26,9 @@ static struct io_u *fio_null_event(struct thread_data *td, int event)
 	return nd->io_us[event];
 }
 
-static int fio_null_getevents(struct thread_data *td, int min_events,
-			      int fio_unused max, struct timespec fio_unused *t)
+static int fio_null_getevents(struct thread_data *td, unsigned int min_events,
+			      unsigned int fio_unused max,
+			      struct timespec fio_unused *t)
 {
 	struct null_data *nd = td->io_ops->data;
 	int ret = 0;
@@ -46,6 +46,7 @@ static int fio_null_commit(struct thread_data *td)
 	struct null_data *nd = td->io_ops->data;
 
 	if (!nd->events) {
+		io_u_mark_submit(td, nd->queued);
 		nd->events = nd->queued;
 		nd->queued = 0;
 	}
@@ -53,10 +54,12 @@ static int fio_null_commit(struct thread_data *td)
 	return 0;
 }
 
-static int fio_null_queue(struct thread_data fio_unused *td, struct io_u *io_u)
+static int fio_null_queue(struct thread_data *td, struct io_u *io_u)
 {
 	struct null_data *nd = td->io_ops->data;
 
+	fio_ro_check(td, io_u);
+
 	if (td->io_ops->flags & FIO_SYNCIO)
 		return FIO_Q_COMPLETED;
 	if (nd->events)
@@ -66,21 +69,9 @@ static int fio_null_queue(struct thread_data fio_unused *td, struct io_u *io_u)
 	return FIO_Q_QUEUED;
 }
 
-static int fio_null_setup(struct thread_data *td)
-{
-	struct fio_file *f;
-	unsigned int i;
-
-	for_each_file(td, f, i)
-		f->real_file_size = -1ULL;
-
-	return 0;
-}
-
 static int fio_null_open(struct thread_data fio_unused *td,
 			 struct fio_file fio_unused *f)
 {
-	f->fd = 0;
 	return 0;
 }
 
@@ -92,7 +83,6 @@ static void fio_null_cleanup(struct thread_data *td)
 		if (nd->io_us)
 			free(nd->io_us);
 		free(nd);
-		td->io_ops->data = NULL;
 	}
 }
 
@@ -115,7 +105,6 @@ static int fio_null_init(struct thread_data *td)
 static struct ioengine_ops ioengine = {
 	.name		= "null",
 	.version	= FIO_IOOPS_VERSION,
-	.setup		= fio_null_setup,
 	.queue		= fio_null_queue,
 	.commit		= fio_null_commit,
 	.getevents	= fio_null_getevents,