Bump IO engine version number

[fio.git] / ioengine.h

diff --git a/ioengine.h b/ioengine.h
index df5f8893dc76ed1174331f9f025bfbe55706c526..31662ebeb5eea6af9012d921a9ce368cb0551a8e 100644 (file)
--- a/ioengine.h
+++ b/ioengine.h
@@ -2,11 +2,20 @@
 #define FIO_IOENGINE_H
 
 #include "compiler/compiler.h"
+#include "os/os.h"
+#include "log.h"
 #include "io_ddir.h"
 #include "debug.h"
 #include "file.h"
 
-#define FIO_IOOPS_VERSION      14
+#ifdef CONFIG_LIBAIO
+#include <libaio.h>
+#endif
+#ifdef CONFIG_GUASI
+#include <guasi.h>
+#endif
+
+#define FIO_IOOPS_VERSION      16
 
 enum {
        IO_U_F_FREE             = 1 << 0,
@@ -19,36 +28,10 @@ enum {
        IO_U_F_VER_LIST         = 1 << 7,
 };
 
-struct thread_data;
-
 /*
  * The io unit
  */
 struct io_u {
-       union {
-#ifdef FIO_HAVE_LIBAIO
-               struct iocb iocb;
-#endif
-#ifdef FIO_HAVE_POSIXAIO
-               os_aiocb_t aiocb;
-#endif
-#ifdef FIO_HAVE_SGIO
-               struct sg_io_hdr hdr;
-#endif
-#ifdef FIO_HAVE_GUASI
-               guasi_req_t greq;
-#endif
-#ifdef FIO_HAVE_SOLARISAIO
-               aio_result_t resultp;
-#endif
-#ifdef FIO_HAVE_BINJECT
-               struct b_user_cmd buc;
-#endif
-#ifdef FIO_HAVE_RDMA
-               struct ibv_mr *mr;
-#endif
-               void *mmap_data;
-       };
        struct timeval start_time;
        struct timeval issue_time;
 
@@ -56,6 +39,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
         */
@@ -81,6 +70,31 @@ struct io_u {
         */
        unsigned long buf_filled_len;
 
+       union {
+#ifdef CONFIG_LIBAIO
+               struct iocb iocb;
+#endif
+#ifdef CONFIG_POSIXAIO
+               os_aiocb_t aiocb;
+#endif
+#ifdef FIO_HAVE_SGIO
+               struct sg_io_hdr hdr;
+#endif
+#ifdef CONFIG_GUASI
+               guasi_req_t greq;
+#endif
+#ifdef CONFIG_SOLARISAIO
+               aio_result_t resultp;
+#endif
+#ifdef FIO_HAVE_BINJECT
+               struct b_user_cmd buc;
+#endif
+#ifdef CONFIG_RDMA
+               struct ibv_mr *mr;
+#endif
+               void *mmap_data;
+       };
+
        unsigned int resid;
        unsigned int error;
 
@@ -93,7 +107,7 @@ struct io_u {
                void *engine_data;
        };
 
-       struct flist_head list;
+       struct flist_head verify_list;
 
        /*
         * Callback for io completion
@@ -147,6 +161,7 @@ enum fio_ioengine_flags {
        FIO_PIPEIO      = 1 << 7,       /* input/output no seekable */
        FIO_BARRIER     = 1 << 8,       /* engine supports barriers */
        FIO_MEMALIGN    = 1 << 9,       /* engine wants aligned memory */
+       FIO_BIT_BASED   = 1 << 10,      /* engine uses a bit base (e.g. uses Kbit as opposed to KB) */
 };
 
 /*
@@ -173,17 +188,19 @@ extern int fio_show_ioengine_help(const char *engine);
 /*
  * io unit handling
  */
-#define queue_full(td) flist_empty(&(td)->io_u_freelist)
+#define queue_full(td) io_u_qempty(&(td)->io_u_freelist)
 extern struct io_u *__get_io_u(struct thread_data *);
 extern struct io_u *get_io_u(struct thread_data *);
 extern void put_io_u(struct thread_data *, struct io_u *);
 extern void clear_io_u(struct thread_data *, struct io_u *);
 extern void requeue_io_u(struct thread_data *, struct io_u **);
-extern int __must_check io_u_sync_complete(struct thread_data *, struct io_u *, unsigned long *);
-extern int __must_check io_u_queued_complete(struct thread_data *, int, unsigned long *);
+extern int __must_check io_u_sync_complete(struct thread_data *, struct io_u *, uint64_t *);
+extern int __must_check io_u_queued_complete(struct thread_data *, int, uint64_t *);
 extern void io_u_queued(struct thread_data *, struct io_u *);
+extern void io_u_quiesce(struct thread_data *);
 extern void io_u_log_error(struct thread_data *, struct io_u *);
 extern void io_u_mark_depth(struct thread_data *, unsigned int);
+extern void fill_io_buffer(struct thread_data *, void *, unsigned int, unsigned int);
 extern void io_u_fill_buffer(struct thread_data *td, struct io_u *, unsigned int, unsigned int);
 void io_u_mark_complete(struct thread_data *, unsigned int);
 void io_u_mark_submit(struct thread_data *, unsigned int);
@@ -210,4 +227,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