First snapshot of FIO for Windows

[fio.git] / engines / null.c

diff --git a/engines/null.c b/engines/null.c
index 318952c2c00d492bed40486c05a12d3300a6a075..f434550300e7a3d454c7561b808d1cfe24372f1c 100644 (file)
--- a/engines/null.c
+++ b/engines/null.c
@@ -26,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;
@@ -45,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;
        }
@@ -56,6 +58,8 @@ static int fio_null_queue(struct thread_data fio_unused *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)
@@ -65,21 +69,6 @@ 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) {
-               if (td->o.size)
-                       f->real_file_size = td->o.size / td->o.nr_files;
-               else
-                       f->real_file_size = -1ULL;
-       }
-
-       return 0;
-}
-
 static int fio_null_open(struct thread_data fio_unused *td,
                         struct fio_file fio_unused *f)
 {
@@ -94,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;
        }
 }
 
@@ -117,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,