Adjustments to support C++ engines

diff --git a/engines/null.c b/engines/null.c
index 812cadfe5ba8910018e6d98ca75ce7f3f88fe66e..570f75d3a19609cb59b6ac70f444e6b6d2f9b948 100644 (file)
--- a/engines/null.c
+++ b/engines/null.c
@@ -6,7 +6,11 @@
  *
  * It also can act as external C++ engine - compiled with:
  *
  *
  * It also can act as external C++ engine - compiled with:
  *

- * g++ -O2 -g -shared -rdynamic -fPIC -o null.so null.c -DFIO_EXTERNAL_ENGINE
+ * g++ -O2 -g -shared -rdynamic -fPIC -o cpp_null null.c -DFIO_EXTERNAL_ENGINE
+ *
+ * to test it execute:
+ *
+ * LD_LIBRARY_PATH=./engines ./fio examples/cpp_null.fio

  *
  */
 #include <stdio.h>
  *
  */
 #include <stdio.h>


@@ -23,20 +27,17 @@ struct null_data {
        int events;
 };
 
        int events;
 };
 

-static struct io_u *fio_null_event(struct thread_data *td, int event)
+static struct io_u *null_event(struct null_data *nd, int event)

 {
 {

-       struct null_data *nd = (struct null_data *) td->io_ops_data;
-

        return nd->io_us[event];
 }
 
        return nd->io_us[event];
 }
 

-static int fio_null_getevents(struct thread_data *td, unsigned int min_events,
-                             unsigned int fio_unused max,
-                             const struct timespec fio_unused *t)
+static int null_getevents(struct null_data *nd, 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;

        int ret = 0;
        int ret = 0;

-       
+

        if (min_events) {
                ret = nd->events;
                nd->events = 0;
        if (min_events) {
                ret = nd->events;
                nd->events = 0;


@@ -45,10 +46,8 @@ static int fio_null_getevents(struct thread_data *td, unsigned int min_events,
        return ret;
 }
 
        return ret;
 }
 

-static int fio_null_commit(struct thread_data *td)
+static int null_commit(struct thread_data *td, struct null_data *nd)

 {
 {

-       struct null_data *nd = (struct null_data *) td->io_ops_data;
-

        if (!nd->events) {
 #ifndef FIO_EXTERNAL_ENGINE
                io_u_mark_submit(td, nd->queued);
        if (!nd->events) {
 #ifndef FIO_EXTERNAL_ENGINE
                io_u_mark_submit(td, nd->queued);


@@ -60,10 +59,9 @@ static int fio_null_commit(struct thread_data *td)
        return 0;
 }
 
        return 0;
 }
 

-static int fio_null_queue(struct thread_data *td, struct io_u *io_u)
+static int null_queue(struct thread_data *td, struct null_data *nd,
+                     struct io_u *io_u)

 {
 {

-       struct null_data *nd = (struct null_data *) td->io_ops_data;
-

        fio_ro_check(td, io_u);
 
        if (td->io_ops->flags & FIO_SYNCIO)
        fio_ro_check(td, io_u);
 
        if (td->io_ops->flags & FIO_SYNCIO)


@@ -75,25 +73,23 @@ static int fio_null_queue(struct thread_data *td, struct io_u *io_u)
        return FIO_Q_QUEUED;
 }
 
        return FIO_Q_QUEUED;
 }
 

-static int fio_null_open(struct thread_data fio_unused *td,
-                        struct fio_file fio_unused *f)
+static int null_open(struct null_data fio_unused *nd,
+                    struct fio_file fio_unused *f)

 {
        return 0;
 }
 
 {
        return 0;
 }
 

-static void fio_null_cleanup(struct thread_data *td)
+static void null_cleanup(struct null_data *nd)

 {
 {

-       struct null_data *nd = (struct null_data *) td->io_ops_data;
-

        if (nd) {
                free(nd->io_us);
                free(nd);
        }
 }
 
        if (nd) {
                free(nd->io_us);
                free(nd);
        }
 }
 

-static int fio_null_init(struct thread_data *td)
+static int null_init(struct thread_data *td, struct null_data **nd_ptr)

 {
 {

-       struct null_data *nd = (struct null_data *) malloc(sizeof(*nd));
+       struct null_data *nd = (struct null_data *) malloc(sizeof(**nd_ptr));

 
        memset(nd, 0, sizeof(*nd));
 
 
        memset(nd, 0, sizeof(*nd));
 


@@ -103,11 +99,50 @@ static int fio_null_init(struct thread_data *td)
        } else
                td->io_ops->flags |= FIO_SYNCIO;
 
        } else
                td->io_ops->flags |= FIO_SYNCIO;
 

-       td->io_ops_data = nd;
+       *nd_ptr = nd;

        return 0;
 }
 
 #ifndef __cplusplus
        return 0;
 }
 
 #ifndef __cplusplus

+
+static struct io_u *fio_null_event(struct thread_data *td, int event)
+{
+       return null_event((struct null_data *)td->io_ops_data, event);
+}
+
+static int fio_null_getevents(struct thread_data *td, unsigned int min_events,
+                             unsigned int max, const struct timespec *t)
+{
+       struct null_data *nd = (struct null_data *)td->io_ops_data;
+       return null_getevents(nd, min_events, max, t);
+}
+
+static int fio_null_commit(struct thread_data *td)
+{
+       return null_commit(td, (struct null_data *)td->io_ops_data);
+}
+
+static int fio_null_queue(struct thread_data *td, struct io_u *io_u)
+{
+       return null_queue(td, (struct null_data *)td->io_ops_data, io_u);
+}
+
+static int fio_null_open(struct thread_data *td, struct fio_file *f)
+{
+       return null_open((struct null_data *)td->io_ops_data, f);
+}
+
+static void fio_null_cleanup(struct thread_data *td)
+{
+       null_cleanup((struct null_data *)td->io_ops_data);
+}
+
+static int fio_null_init(struct thread_data *td)
+{
+       struct null_data *nd = (struct null_data *)td->io_ops_data;
+       return null_init(td, &nd);
+}
+

 static struct ioengine_ops ioengine = {
        .name           = "null",
        .version        = FIO_IOOPS_VERSION,
 static struct ioengine_ops ioengine = {
        .name           = "null",
        .version        = FIO_IOOPS_VERSION,


@@ -134,7 +169,91 @@ static void fio_exit fio_null_unregister(void)
 #else
 
 #ifdef FIO_EXTERNAL_ENGINE
 #else
 
 #ifdef FIO_EXTERNAL_ENGINE

+
+struct NullData {
+       NullData(struct thread_data *td)
+       {
+               null_init(td, &impl_);
+       }
+
+       ~NullData()
+       {
+               null_cleanup(impl_);
+       }
+
+       static NullData *get(struct thread_data *td)
+       {
+               return reinterpret_cast<NullData *>(td->io_ops_data);
+       }
+
+       io_u *fio_null_event(struct thread_data *, int event)
+       {
+               return null_event(impl_, event);
+       }
+
+       int fio_null_getevents(struct thread_data *, unsigned int min_events,
+                              unsigned int max, const struct timespec *t)
+       {
+               return null_getevents(impl_, min_events, max, t);
+       }
+
+       int fio_null_commit(struct thread_data *td)
+       {
+               return null_commit(td, impl_);
+       }
+
+       int fio_null_queue(struct thread_data *td, struct io_u *io_u)
+       {
+               return null_queue(td, impl_, io_u);
+       }
+
+       int fio_null_open(struct thread_data *, struct fio_file *f)
+       {
+               return null_open(impl_, f);
+       }
+
+       struct null_data *impl_;
+};
+

 extern "C" {
 extern "C" {

+
+static struct io_u *fio_null_event(struct thread_data *td, int event)
+{
+       return NullData::get(td)->fio_null_event(td, event);
+}
+
+static int fio_null_getevents(struct thread_data *td, unsigned int min_events,
+                             unsigned int max, const struct timespec *t)
+{
+       return NullData::get(td)->fio_null_getevents(td, min_events, max, t);
+}
+
+static int fio_null_commit(struct thread_data *td)
+{
+       return NullData::get(td)->fio_null_commit(td);
+}
+
+static int fio_null_queue(struct thread_data *td, struct io_u *io_u)
+{
+       return NullData::get(td)->fio_null_queue(td, io_u);
+}
+
+static int fio_null_open(struct thread_data *td, struct fio_file *f)
+{
+       return NullData::get(td)->fio_null_open(td, f);
+}
+
+static int fio_null_init(struct thread_data *td)
+{
+       td->io_ops_data = new NullData(td);
+       return 0;
+}
+
+static void fio_null_cleanup(struct thread_data *td)
+{
+       delete NullData::get(td);
+}
+

 static struct ioengine_ops ioengine;
 void get_ioengine(struct ioengine_ops **ioengine_ptr)
 {
 static struct ioengine_ops ioengine;
 void get_ioengine(struct ioengine_ops **ioengine_ptr)
 {

diff --git a/examples/cpp_null.fio b/examples/cpp_null.fio
new file mode 100644 (file)
index 0000000..436ed90
--- /dev/null
+++ b/examples/cpp_null.fio
@@ -0,0 +1,10 @@
+[global]
+bs=4k
+gtod_reduce=1
+
+[null]
+ioengine=cpp_null
+size=100g
+rw=randread
+norandommap
+time_based=0

diff --git a/file.h b/file.h
index 9801bb584007558da4d7c2a17e78f50133c22fb6..4c2ebd4adcbdaf4d1cc04b1b71d7e1950027118b 100644 (file)
--- a/file.h
+++ b/file.h
@@ -187,9 +187,15 @@ extern void close_and_free_files(struct thread_data *);
 extern uint64_t get_start_offset(struct thread_data *, struct fio_file *);
 extern int __must_check setup_files(struct thread_data *);
 extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
 extern uint64_t get_start_offset(struct thread_data *, struct fio_file *);
 extern int __must_check setup_files(struct thread_data *);
 extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);

+#ifdef __cplusplus
+extern "C" {
+#endif

 extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
 extern int __must_check generic_close_file(struct thread_data *, struct fio_file *);
 extern int __must_check generic_get_file_size(struct thread_data *, struct fio_file *);
 extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
 extern int __must_check generic_close_file(struct thread_data *, struct fio_file *);
 extern int __must_check generic_get_file_size(struct thread_data *, struct fio_file *);

+#ifdef __cplusplus
+}
+#endif

 extern int __must_check file_lookup_open(struct fio_file *f, int flags);
 extern int __must_check pre_read_files(struct thread_data *);
 extern unsigned long long get_rand_file_size(struct thread_data *td);
 extern int __must_check file_lookup_open(struct fio_file *f, int flags);
 extern int __must_check pre_read_files(struct thread_data *);
 extern unsigned long long get_rand_file_size(struct thread_data *td);

diff --git a/ioengines.c b/ioengines.c
index c90a2ca5bde30e75dec5261130b6b77fb6a1999b..04fd06ec6bb7f9200c699ac874883614c5fbf5d8 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -136,8 +136,10 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
        /*
         * linux libaio has alias names, so convert to what we want
         */
        /*
         * linux libaio has alias names, so convert to what we want
         */

-       if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
+       if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3)) {
+               dprint(FD_IO, "converting ioengine name: %s -> libaio\n", name);

                strcpy(engine, "libaio");
                strcpy(engine, "libaio");

+       }

 
        ops = find_ioengine(engine);
        if (!ops)
 
        ops = find_ioengine(engine);
        if (!ops)


@@ -412,6 +414,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 {
        assert(!fio_file_open(f));
        assert(f->fd == -1);
 {
        assert(!fio_file_open(f));
        assert(f->fd == -1);

+       assert(td->io_ops->open_file);

 
        if (td->io_ops->open_file(td, f)) {
                if (td->error == EINVAL && td->o.odirect)
 
        if (td->io_ops->open_file(td, f)) {
                if (td->error == EINVAL && td->o.odirect)

diff --git a/lib/types.h b/lib/types.h
index 287a3b42b7c462e1cb43cc1f7869e4fb93068fff..bb2450680872255cebdc0b7f121031dcafab4cd0 100644 (file)
--- a/lib/types.h
+++ b/lib/types.h
@@ -1,7 +1,7 @@
 #ifndef FIO_TYPES_H
 #define FIO_TYPES_H
 
 #ifndef FIO_TYPES_H
 #define FIO_TYPES_H
 

-#ifndef CONFIG_HAVE_BOOL
+#if !defined(CONFIG_HAVE_BOOL) && !defined(__cplusplus)

 typedef int bool;
 #ifndef false
 #define false  0
 typedef int bool;
 #ifndef false
 #define false  0