Merge branch 'master' into gfio

[fio.git] / ioengine.h

diff --git a/ioengine.h b/ioengine.h
index b4bc22b8968b00039989734ebc720567ff72f340..1cd08af8c25516a83c47ae33673067e09b361928 100644 (file)
--- a/ioengine.h
+++ b/ioengine.h
@@ -6,7 +6,7 @@
 #include "debug.h"
 #include "file.h"
 
-#define FIO_IOOPS_VERSION      13
+#define FIO_IOOPS_VERSION      14
 
 enum {
        IO_U_F_FREE             = 1 << 0,
@@ -52,12 +52,16 @@ struct io_u {
        struct timeval start_time;
        struct timeval issue_time;
 
+       struct fio_file *file;
+       unsigned int flags;
+       enum fio_ddir ddir;
+
        /*
         * Allocated/set buffer and length
         */
-       void *buf;
        unsigned long buflen;
        unsigned long long offset;
+       void *buf;
 
        /*
         * Initial seed for generating the buffer contents
@@ -80,8 +84,6 @@ struct io_u {
        unsigned int resid;
        unsigned int error;
 
-       enum fio_ddir ddir;
-
        /*
         * io engine private data
         */
@@ -91,10 +93,6 @@ struct io_u {
                void *engine_data;
        };
 
-       unsigned int flags;
-
-       struct fio_file *file;
-
        struct flist_head list;
 
        /*
@@ -129,6 +127,7 @@ 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 *);
+       void (*terminate)(struct thread_data *);
        int option_struct_size;
        struct fio_option *options;
        void *data;
@@ -143,10 +142,9 @@ enum fio_ioengine_flags {
        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 */
-       FIO_PIPEIO      = 1 << 8,       /* input/output no seekable */
-       FIO_BARRIER     = 1 << 9,       /* engine supports barriers */
-       FIO_MEMALIGN    = 1 << 10,      /* engine wants aligned memory */
+       FIO_PIPEIO      = 1 << 7,       /* input/output no seekable */
+       FIO_BARRIER     = 1 << 8,       /* engine supports barriers */
+       FIO_MEMALIGN    = 1 << 9,       /* engine wants aligned memory */
 };
 
 /*