For non-file engines, set ->real_file_size if total size is known

[fio.git] / engines / null.c

diff --git a/engines/null.c b/engines/null.c
index 1988678946ca397e8ac20c6b0532262c20c5f0bf..318952c2c00d492bed40486c05a12d3300a6a075 100644 (file)
--- a/engines/null.c
+++ b/engines/null.c
@@ -1,5 +1,8 @@
 /*
- * null engine - doesn't do any transfers. Used to test fio.
+ * null engine
+ *
+ * IO engine that doesn't do any real IO transfers, it just pretends to.
+ * The main purpose is to test fio itself.
  *
  */
 #include <stdio.h>
@@ -9,7 +12,6 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 struct null_data {
        struct io_u **io_us;
@@ -24,14 +26,17 @@ 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 fio_unused min,
+static int fio_null_getevents(struct thread_data *td, int min_events,
                              int fio_unused max, struct timespec fio_unused *t)
 {
        struct null_data *nd = td->io_ops->data;
-       int ret;
+       int ret = 0;
+       
+       if (min_events) {
+               ret = nd->events;
+               nd->events = 0;
+       }
 
-       ret = nd->events;
-       nd->events = 0;
        return ret;
 }
 
@@ -39,8 +44,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;
 }
 
@@ -50,6 +58,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;
@@ -58,19 +68,13 @@ static int fio_null_queue(struct thread_data fio_unused *td, struct io_u *io_u)
 static int fio_null_setup(struct thread_data *td)
 {
        struct fio_file *f;
-       int i;
-
-       if (!td->total_file_size) {
-               log_err("fio: need size= set\n");
-               return 1;
-       }
-
-       td->io_size = td->total_file_size;
-       td->total_io_size = td->io_size;
+       unsigned int i;
 
        for_each_file(td, f, i) {
-               f->real_file_size = td->total_io_size / td->nr_files;
-               f->file_size = f->real_file_size;
+               if (td->o.size)
+                       f->real_file_size = td->o.size / td->o.nr_files;
+               else
+                       f->real_file_size = -1ULL;
        }
 
        return 0;
@@ -79,7 +83,6 @@ static int fio_null_setup(struct thread_data *td)
 static int fio_null_open(struct thread_data fio_unused *td,
                         struct fio_file fio_unused *f)
 {
-       f->fd = 0;
        return 0;
 }
 
@@ -101,9 +104,9 @@ static int fio_null_init(struct thread_data *td)
 
        memset(nd, 0, sizeof(*nd));
 
-       if (td->iodepth != 1) {
-               nd->io_us = malloc(td->iodepth * sizeof(struct io_u *));
-               memset(nd->io_us, 0, td->iodepth * sizeof(struct io_u *));
+       if (td->o.iodepth != 1) {
+               nd->io_us = malloc(td->o.iodepth * sizeof(struct io_u *));
+               memset(nd->io_us, 0, td->o.iodepth * sizeof(struct io_u *));
        } else
                td->io_ops->flags |= FIO_SYNCIO;