Move thread options into a seperate structure

[fio.git] / engines / null.c

diff --git a/engines/null.c b/engines/null.c
index 7b4b217679bc1d950c02c8b3c5e8a5a03acd4ae2..acb8cf4170c4e00de963f55bae736250a37109da 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>
@@ -12,43 +15,88 @@
 #include "../os.h"
 
 struct null_data {
-       struct io_u *last_io_u;
+       struct io_u **io_us;
+       int queued;
+       int events;
 };
 
-static int fio_null_getevents(struct thread_data *td, int fio_unused min,
-                             int max, struct timespec fio_unused *t)
+static struct io_u *fio_null_event(struct thread_data *td, int event)
 {
-       assert(max <= 1);
-
-       if (list_empty(&td->io_u_busylist))
-               return 0;
+       struct null_data *nd = td->io_ops->data;
 
-       return 1;
+       return nd->io_us[event];
 }
 
-static struct io_u *fio_null_event(struct thread_data *td, int event)
+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 = 0;
+       
+       if (min_events) {
+               ret = nd->events;
+               nd->events = 0;
+       }
+
+       return ret;
+}
 
-       assert(event == 0);
+static int fio_null_commit(struct thread_data *td)
+{
+       struct null_data *nd = td->io_ops->data;
 
-       return nd->last_io_u;
+       nd->events += nd->queued;
+       nd->queued = 0;
+       return 0;
 }
 
-static int fio_null_queue(struct thread_data *td, struct io_u *io_u)
+static int fio_null_queue(struct thread_data fio_unused *td, struct io_u *io_u)
 {
        struct null_data *nd = td->io_ops->data;
 
-       io_u->resid = 0;
-       io_u->error = 0;
-       nd->last_io_u = io_u;
+       if (td->io_ops->flags & FIO_SYNCIO)
+               return FIO_Q_COMPLETED;
+
+       nd->io_us[nd->queued++] = io_u;
+       return FIO_Q_QUEUED;
+}
+
+static int fio_null_setup(struct thread_data *td)
+{
+       struct fio_file *f;
+       unsigned int i;
+
+       if (!td->o.size) {
+               log_err("fio: need size= set\n");
+               return 1;
+       }
+
+       td->io_size = td->o.size;
+       td->total_io_size = td->io_size;
+
+       for_each_file(td, f, i) {
+               f->real_file_size = td->total_io_size / td->o.nr_files;
+               f->file_size = f->real_file_size;
+       }
+
+       return 0;
+}
+
+static int fio_null_open(struct thread_data fio_unused *td,
+                        struct fio_file fio_unused *f)
+{
+       f->fd = 0;
        return 0;
 }
 
 static void fio_null_cleanup(struct thread_data *td)
 {
-       if (td->io_ops->data) {
-               free(td->io_ops->data);
+       struct null_data *nd = td->io_ops->data;
+
+       if (nd) {
+               if (nd->io_us)
+                       free(nd->io_us);
+               free(nd);
                td->io_ops->data = NULL;
        }
 }
@@ -57,7 +105,14 @@ static int fio_null_init(struct thread_data *td)
 {
        struct null_data *nd = malloc(sizeof(*nd));
 
-       nd->last_io_u = NULL;
+       memset(nd, 0, sizeof(*nd));
+
+       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;
+
        td->io_ops->data = nd;
        return 0;
 }
@@ -65,12 +120,15 @@ static int fio_null_init(struct thread_data *td)
 static struct ioengine_ops ioengine = {
        .name           = "null",
        .version        = FIO_IOOPS_VERSION,
-       .init           = fio_null_init,
+       .setup          = fio_null_setup,
        .queue          = fio_null_queue,
+       .commit         = fio_null_commit,
        .getevents      = fio_null_getevents,
        .event          = fio_null_event,
+       .init           = fio_null_init,
        .cleanup        = fio_null_cleanup,
-       .flags          = FIO_SYNCIO | FIO_NULLIO,
+       .open_file      = fio_null_open,
+       .flags          = FIO_DISKLESSIO,
 };
 
 static void fio_init fio_null_register(void)