First snapshot of FIO for Windows

[fio.git] / ioengine.h

diff --git a/ioengine.h b/ioengine.h
index b599b6152c591de806dda5f0d8b4dac5e9d331a2..48a042bdcb6dc81c64fb9da5ed75c8ce203e69fc 100644 (file)
--- a/ioengine.h
+++ b/ioengine.h
@@ -1,13 +1,16 @@
 #ifndef FIO_IOENGINE_H
 #define FIO_IOENGINE_H
 
-#define FIO_IOOPS_VERSION      11
+#define FIO_IOOPS_VERSION      12
 
 enum {
        IO_U_F_FREE             = 1 << 0,
        IO_U_F_FLIGHT           = 1 << 1,
        IO_U_F_FREE_DEF         = 1 << 2,
        IO_U_F_IN_CUR_DEPTH     = 1 << 3,
+       IO_U_F_BUSY_OK          = 1 << 4,
+       IO_U_F_TRIMMED          = 1 << 5,
+       IO_U_F_BARRIER          = 1 << 6,
 };
 
 /*
@@ -29,6 +32,9 @@ struct io_u {
 #endif
 #ifdef FIO_HAVE_SOLARISAIO
                aio_result_t resultp;
+#endif
+#ifdef FIO_HAVE_BINJECT
+               struct b_user_cmd buc;
 #endif
                void *mmap_data;
        };
@@ -42,13 +48,6 @@ struct io_u {
        unsigned long buflen;
        unsigned long long offset;
 
-       /*
-        * Parameters related to pre-filled buffers and
-        * their size to handle variable block sizes.
-        */
-       int buf_filled;
-       unsigned long buf_filled_len;
-
        /*
         * IO engine state, may be different from above when we get
         * partial transfers / residual data counts
@@ -56,6 +55,12 @@ struct io_u {
        void *xfer_buf;
        unsigned long xfer_buflen;
 
+       /*
+        * Parameter related to pre-filled buffers and
+        * their size to handle variable block sizes.
+        */
+       unsigned long buf_filled_len;
+
        unsigned int resid;
        unsigned int error;
 
@@ -120,8 +125,10 @@ 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_SIGQUIT     = 1 << 7,       /* needs SIGQUIT to exit */
+       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 */
 };
 
 /*
@@ -161,6 +168,7 @@ void io_u_mark_complete(struct thread_data *, unsigned int);
 void io_u_mark_submit(struct thread_data *, unsigned int);
 
 int do_io_u_sync(struct thread_data *, struct io_u *);
+int do_io_u_trim(struct thread_data *, struct io_u *);
 
 #ifdef FIO_INC_DEBUG
 static inline void dprint_io_u(struct io_u *io_u, const char *p)