->getevents() should take unsigned args

[fio.git] / engines / null.c

diff --git a/engines/null.c b/engines/null.c
index fc829473acc39bc8b494bde47ba59012cf3de145..85d6847e18388eee2822f7b7cf38b7d230b5ec27 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,46 +12,76 @@
 #include <assert.h>
 
 #include "../fio.h"
-#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);
+       struct null_data *nd = td->io_ops->data;
 
-       if (list_empty(&td->io_u_busylist))
-               return 0;
+       return nd->io_us[event];
+}
 
-       return 1;
+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;
+       
+       if (min_events) {
+               ret = nd->events;
+               nd->events = 0;
+       }
+
+       return ret;
 }
 
-static struct io_u *fio_null_event(struct thread_data *td, int event)
+static int fio_null_commit(struct thread_data *td)
 {
        struct null_data *nd = td->io_ops->data;
 
-       assert(event == 0);
+       if (!nd->events) {
+               nd->events = nd->queued;
+               nd->queued = 0;
+       }
 
-       return nd->last_io_u;
+       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;
+       fio_ro_check(td, 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;
+}
+
+static int fio_null_open(struct thread_data fio_unused *td,
+                        struct fio_file fio_unused *f)
+{
        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 +90,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 +105,14 @@ static int fio_null_init(struct thread_data *td)
 static struct ioengine_ops ioengine = {
        .name           = "null",
        .version        = FIO_IOOPS_VERSION,
-       .init           = fio_null_init,
        .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,
+       .open_file      = fio_null_open,
+       .flags          = FIO_DISKLESSIO,
 };
 
 static void fio_init fio_null_register(void)