Separate io_u from ioengine [1/3] - add io_u.h

Extract io_u related structures and functions from ioengine.h to
a new header io_u.h which is intended to be a header for io_u.c
(similar to the way there is io_u_queue.h for io_u_queue.c),
since there isn't much reason for them to be a part of ioengine.h.

This commit does nothing other than separating them out (and make
other related files include the new header).

Confirmed this compiles on Linux, Cygwin and several BSDs.

Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/fio.h b/fio.h
index 52a9b75cf4b299fc74928e7bfc99cd94e3bbea1f..806f7ed55bf5a46e9f71bf4c525639436eca5307 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -39,6 +39,7 @@
 #include "server.h"
 #include "stat.h"
 #include "flow.h"
+#include "io_u.h"
 #include "io_u_queue.h"
 #include "workqueue.h"
 #include "steadystate.h"

diff --git a/io_u.h b/io_u.h
new file mode 100644 (file)
index 0000000..155344d
--- /dev/null
+++ b/io_u.h
@@ -0,0 +1,179 @@
+#ifndef FIO_IO_U
+#define FIO_IO_U
+
+#include "compiler/compiler.h"
+#include "os/os.h"
+#include "log.h"
+#include "io_ddir.h"
+#include "debug.h"
+#include "file.h"
+#include "workqueue.h"
+
+#ifdef CONFIG_LIBAIO
+#include <libaio.h>
+#endif
+#ifdef CONFIG_GUASI
+#include <guasi.h>
+#endif
+
+enum {
+       IO_U_F_FREE             = 1 << 0,
+       IO_U_F_FLIGHT           = 1 << 1,
+       IO_U_F_NO_FILE_PUT      = 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,
+       IO_U_F_VER_LIST         = 1 << 7,
+};
+
+/*
+ * The io unit
+ */
+struct io_u {
+       struct timeval start_time;
+       struct timeval issue_time;
+
+       struct fio_file *file;
+       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;
+
+       /*
+        * Write generation
+        */
+       unsigned short numberio;
+
+       /*
+        * Allocated/set buffer and length
+        */
+       unsigned long buflen;
+       unsigned long long offset;
+       void *buf;
+
+       /*
+        * Initial seed for generating the buffer contents
+        */
+       uint64_t rand_seed;
+
+       /*
+        * IO engine state, may be different from above when we get
+        * partial transfers / residual data counts
+        */
+       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;
+
+       struct io_piece *ipo;
+
+       unsigned int resid;
+       unsigned int error;
+
+       /*
+        * io engine private data
+        */
+       union {
+               unsigned int index;
+               unsigned int seen;
+               void *engine_data;
+       };
+
+       union {
+               struct flist_head verify_list;
+               struct workqueue_work work;
+       };
+
+       /*
+        * Callback for io completion
+        */
+       int (*end_io)(struct thread_data *, struct io_u **);
+
+       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;
+       };
+};
+
+/*
+ * io unit handling
+ */
+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 *);
+extern int __must_check io_u_queued_complete(struct thread_data *, int);
+extern void io_u_queued(struct thread_data *, struct io_u *);
+extern int 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);
+bool queue_full(const struct thread_data *);
+
+int do_io_u_sync(const struct thread_data *, struct io_u *);
+int do_io_u_trim(const struct thread_data *, struct io_u *);
+
+#ifdef FIO_INC_DEBUG
+static inline void dprint_io_u(struct io_u *io_u, const char *p)
+{
+       struct fio_file *f = io_u->file;
+
+       dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
+                                       (unsigned long long) io_u->offset,
+                                       io_u->buflen, io_u->ddir);
+       if (f)
+               dprint(FD_IO, "/%s", f->file_name);
+       dprint(FD_IO, "\n");
+}
+#else
+#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;
+}
+
+#define io_u_clear(td, io_u, val)      \
+       td_flags_clear((td), &(io_u->flags), (val))
+#define io_u_set(td, io_u, val)                \
+       td_flags_set((td), &(io_u)->flags, (val))
+
+#endif

diff --git a/ioengine.h b/ioengine.h
index dc2c26951747af7b61b198a53508d6ad1b67f34f..f24f4df5389ba691e248cb9598fdad83dcdb4362 100644 (file)
--- a/ioengine.h
+++ b/ioengine.h
@@ -3,129 +3,11 @@
 
 #include "compiler/compiler.h"
 #include "os/os.h"
-#include "log.h"
-#include "io_ddir.h"
-#include "debug.h"
 #include "file.h"
-#include "workqueue.h"
-
-#ifdef CONFIG_LIBAIO
-#include <libaio.h>
-#endif
-#ifdef CONFIG_GUASI
-#include <guasi.h>
-#endif
+#include "io_u.h"
 
 #define FIO_IOOPS_VERSION      23
 
-enum {
-       IO_U_F_FREE             = 1 << 0,
-       IO_U_F_FLIGHT           = 1 << 1,
-       IO_U_F_NO_FILE_PUT      = 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,
-       IO_U_F_VER_LIST         = 1 << 7,
-};
-
-/*
- * The io unit
- */
-struct io_u {
-       struct timeval start_time;
-       struct timeval issue_time;
-
-       struct fio_file *file;
-       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;
-
-       /*
-        * Write generation
-        */
-       unsigned short numberio;
-
-       /*
-        * Allocated/set buffer and length
-        */
-       unsigned long buflen;
-       unsigned long long offset;
-       void *buf;
-
-       /*
-        * Initial seed for generating the buffer contents
-        */
-       uint64_t rand_seed;
-
-       /*
-        * IO engine state, may be different from above when we get
-        * partial transfers / residual data counts
-        */
-       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;
-
-       struct io_piece *ipo;
-
-       unsigned int resid;
-       unsigned int error;
-
-       /*
-        * io engine private data
-        */
-       union {
-               unsigned int index;
-               unsigned int seen;
-               void *engine_data;
-       };
-
-       union {
-               struct flist_head verify_list;
-               struct workqueue_work work;
-       };
-
-       /*
-        * Callback for io completion
-        */
-       int (*end_io)(struct thread_data *, struct io_u **);
-
-       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;
-       };
-};
-
 /*
  * io_ops->queue() return values
  */
@@ -205,56 +87,4 @@ extern void close_ioengine(struct thread_data *);
 
 extern int fio_show_ioengine_help(const char *engine);
 
-/*
- * io unit handling
- */
-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 *);
-extern int __must_check io_u_queued_complete(struct thread_data *, int);
-extern void io_u_queued(struct thread_data *, struct io_u *);
-extern int 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);
-bool queue_full(const struct thread_data *);
-
-int do_io_u_sync(const struct thread_data *, struct io_u *);
-int do_io_u_trim(const struct thread_data *, struct io_u *);
-
-#ifdef FIO_INC_DEBUG
-static inline void dprint_io_u(struct io_u *io_u, const char *p)
-{
-       struct fio_file *f = io_u->file;
-
-       dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
-                                       (unsigned long long) io_u->offset,
-                                       io_u->buflen, io_u->ddir);
-       if (f)
-               dprint(FD_IO, "/%s", f->file_name);
-       dprint(FD_IO, "\n");
-}
-#else
-#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;
-}
-
-#define io_u_clear(td, io_u, val)      \
-       td_flags_clear((td), &(io_u->flags), (val))
-#define io_u_set(td, io_u, val)                \
-       td_flags_set((td), &(io_u)->flags, (val))
-
 #endif