Make experimental_verify=1 handle all cases properly

[fio.git] / ioengine.h

diff --git a/ioengine.h b/ioengine.h
index e27dab1c1785ea1ac7af9b4f84361efe331082d8..d5a0dc9c88d16c7b53e6d221b6cb9484e6a83e75 100644 (file)
--- a/ioengine.h
+++ b/ioengine.h
@@ -1,7 +1,14 @@
 #ifndef FIO_IOENGINE_H
 #define FIO_IOENGINE_H
 
-#define FIO_IOOPS_VERSION      13
+#ifdef CONFIG_LIBAIO
+#include <libaio.h>
+#endif
+#ifdef CONFIG_GUASI
+#include <guasi.h>
+#endif
+
+#define FIO_IOOPS_VERSION      15
 
 enum {
        IO_U_F_FREE             = 1 << 0,
@@ -19,25 +26,25 @@ enum {
  */
 struct io_u {
        union {
-#ifdef FIO_HAVE_LIBAIO
+#ifdef CONFIG_LIBAIO
                struct iocb iocb;
 #endif
-#ifdef FIO_HAVE_POSIXAIO
+#ifdef CONFIG_POSIXAIO
                os_aiocb_t aiocb;
 #endif
 #ifdef FIO_HAVE_SGIO
                struct sg_io_hdr hdr;
 #endif
-#ifdef FIO_HAVE_GUASI
+#ifdef CONFIG_GUASI
                guasi_req_t greq;
 #endif
-#ifdef FIO_HAVE_SOLARISAIO
+#ifdef CONFIG_SOLARISAIO
                aio_result_t resultp;
 #endif
 #ifdef FIO_HAVE_BINJECT
                struct b_user_cmd buc;
 #endif
-#ifdef FIO_HAVE_RDMA
+#ifdef CONFIG_RDMA
                struct ibv_mr *mr;
 #endif
                void *mmap_data;
@@ -49,6 +56,12 @@ struct io_u {
        unsigned int flags;
        enum fio_ddir ddir;
 
+       /*
+        * For replay workloads, we may want to account as a different
+        * IO type than what is being submitted.
+        */
+       enum fio_ddir acct_ddir;
+
        /*
         * Allocated/set buffer and length
         */
@@ -120,6 +133,9 @@ 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 (*io_u_init)(struct thread_data *, struct io_u *);
+       void (*io_u_free)(struct thread_data *, struct io_u *);
        int option_struct_size;
        struct fio_option *options;
        void *data;
@@ -134,10 +150,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 */
 };
 
 /*
@@ -201,4 +216,12 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p)
 #define dprint_io_u(io_u, p)
 #endif
 
+static inline enum fio_ddir acct_ddir(struct io_u *io_u)
+{
+       if (io_u->acct_ddir != -1)
+               return io_u->acct_ddir;
+
+       return io_u->ddir;
+}
+
 #endif