Abstract out the thread_options structure

[fio.git] / ioengine.h

diff --git a/ioengine.h b/ioengine.h
index 48a042bdcb6dc81c64fb9da5ed75c8ce203e69fc..41bd4d6fcc3429bb19ef5df006bcf0f6b51377bc 100644 (file)
--- a/ioengine.h
+++ b/ioengine.h
@@ -1,7 +1,9 @@
 #ifndef FIO_IOENGINE_H
 #define FIO_IOENGINE_H
 
-#define FIO_IOOPS_VERSION      12
+#include "debug.h"
+
+#define FIO_IOOPS_VERSION      13
 
 enum {
        IO_U_F_FREE             = 1 << 0,
@@ -22,7 +24,7 @@ struct io_u {
                struct iocb iocb;
 #endif
 #ifdef FIO_HAVE_POSIXAIO
-               struct aiocb aiocb;
+               os_aiocb_t aiocb;
 #endif
 #ifdef FIO_HAVE_SGIO
                struct sg_io_hdr hdr;
@@ -35,6 +37,9 @@ struct io_u {
 #endif
 #ifdef FIO_HAVE_BINJECT
                struct b_user_cmd buc;
+#endif
+#ifdef FIO_HAVE_RDMA
+               struct ibv_mr *mr;
 #endif
                void *mmap_data;
        };
@@ -48,6 +53,11 @@ struct io_u {
        unsigned long buflen;
        unsigned long long offset;
 
+       /*
+        * Initial seed for generating the buffer contents
+        */
+       unsigned long rand_seed;
+
        /*
         * IO engine state, may be different from above when we get
         * partial transfers / residual data counts
@@ -113,6 +123,8 @@ struct ioengine_ops {
        int (*open_file)(struct thread_data *, struct fio_file *);
        int (*close_file)(struct thread_data *, struct fio_file *);
        int (*get_file_size)(struct thread_data *, struct fio_file *);
+       int option_struct_size;
+       struct fio_option *options;
        void *data;
        void *dlhandle;
 };
@@ -122,7 +134,7 @@ enum fio_ioengine_flags {
        FIO_RAWIO       = 1 << 1,       /* some sort of direct/raw io */
        FIO_DISKLESSIO  = 1 << 2,       /* no disk involved */
        FIO_NOEXTEND    = 1 << 3,       /* engine can't extend file */
-       FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
+       FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
        FIO_UNIDIR      = 1 << 5,       /* engine is uni-directional */
        FIO_NOIO        = 1 << 6,       /* thread does only pseudo IO */
        FIO_SIGTERM     = 1 << 7,       /* needs SIGTERM to exit */
@@ -147,8 +159,11 @@ extern int __must_check td_io_get_file_size(struct thread_data *, struct fio_fil
 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
 extern void register_ioengine(struct ioengine_ops *);
 extern void unregister_ioengine(struct ioengine_ops *);
+extern void free_ioengine(struct thread_data *);
 extern void close_ioengine(struct thread_data *);
 
+extern int fio_show_ioengine_help(const char *engine);
+
 /*
  * io unit handling
  */