Merge branch 'doc-patches' of https://github.com/vincentkfu/fio

[fio.git] / engines / null.c

diff --git a/engines/null.c b/engines/null.c
index 41d42e0513b2f2670424c7955d0d03fee2761eb0..812cadfe5ba8910018e6d98ca75ce7f3f88fe66e 100644 (file)
--- a/engines/null.c
+++ b/engines/null.c
@@ -25,7 +25,7 @@ struct null_data {
 
 static struct io_u *fio_null_event(struct thread_data *td, int event)
 {
-       struct null_data *nd = (struct null_data *) td->io_ops->data;
+       struct null_data *nd = (struct null_data *) td->io_ops_data;
 
        return nd->io_us[event];
 }
@@ -34,7 +34,7 @@ static int fio_null_getevents(struct thread_data *td, unsigned int min_events,
                              unsigned int fio_unused max,
                              const struct timespec fio_unused *t)
 {
-       struct null_data *nd = (struct null_data *) td->io_ops->data;
+       struct null_data *nd = (struct null_data *) td->io_ops_data;
        int ret = 0;
        
        if (min_events) {
@@ -47,7 +47,7 @@ static int fio_null_getevents(struct thread_data *td, unsigned int min_events,
 
 static int fio_null_commit(struct thread_data *td)
 {
-       struct null_data *nd = (struct null_data *) td->io_ops->data;
+       struct null_data *nd = (struct null_data *) td->io_ops_data;
 
        if (!nd->events) {
 #ifndef FIO_EXTERNAL_ENGINE
@@ -62,7 +62,7 @@ static int fio_null_commit(struct thread_data *td)
 
 static int fio_null_queue(struct thread_data *td, struct io_u *io_u)
 {
-       struct null_data *nd = (struct null_data *) td->io_ops->data;
+       struct null_data *nd = (struct null_data *) td->io_ops_data;
 
        fio_ro_check(td, io_u);
 
@@ -83,7 +83,7 @@ static int fio_null_open(struct thread_data fio_unused *td,
 
 static void fio_null_cleanup(struct thread_data *td)
 {
-       struct null_data *nd = (struct null_data *) td->io_ops->data;
+       struct null_data *nd = (struct null_data *) td->io_ops_data;
 
        if (nd) {
                free(nd->io_us);
@@ -103,7 +103,7 @@ static int fio_null_init(struct thread_data *td)
        } else
                td->io_ops->flags |= FIO_SYNCIO;
 
-       td->io_ops->data = nd;
+       td->io_ops_data = nd;
        return 0;
 }
 
@@ -135,23 +135,21 @@ static void fio_exit fio_null_unregister(void)
 
 #ifdef FIO_EXTERNAL_ENGINE
 extern "C" {
+static struct ioengine_ops ioengine;
 void get_ioengine(struct ioengine_ops **ioengine_ptr)
 {
-       struct ioengine_ops *ioengine;
-
-       *ioengine_ptr = (struct ioengine_ops *) malloc(sizeof(struct ioengine_ops));
-       ioengine = *ioengine_ptr;
-
-       strcpy(ioengine->name, "cpp_null");
-       ioengine->version        = FIO_IOOPS_VERSION;
-       ioengine->queue          = fio_null_queue;
-       ioengine->commit         = fio_null_commit;
-       ioengine->getevents      = fio_null_getevents;
-       ioengine->event          = fio_null_event;
-       ioengine->init           = fio_null_init;
-       ioengine->cleanup        = fio_null_cleanup;
-       ioengine->open_file      = fio_null_open;
-       ioengine->flags          = FIO_DISKLESSIO | FIO_FAKEIO;
+       *ioengine_ptr = &ioengine;
+
+       ioengine.name           = "cpp_null";
+       ioengine.version        = FIO_IOOPS_VERSION;
+       ioengine.queue          = fio_null_queue;
+       ioengine.commit         = fio_null_commit;
+       ioengine.getevents      = fio_null_getevents;
+       ioengine.event          = fio_null_event;
+       ioengine.init           = fio_null_init;
+       ioengine.cleanup        = fio_null_cleanup;
+       ioengine.open_file      = fio_null_open;
+       ioengine.flags          = FIO_DISKLESSIO | FIO_FAKEIO;
 }
 }
 #endif /* FIO_EXTERNAL_ENGINE */