X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengine.h;h=7e0707bc9c35667ab07fda03f08f62f49cc505cf;hp=b4bc22b8968b00039989734ebc720567ff72f340;hb=225ba9e3433cf27d8ff7b213d9f78b7ef2776c70;hpb=1e5324e723116a5faf9da686993cc79c14d62d4b diff --git a/ioengine.h b/ioengine.h index b4bc22b8..7e0707bc 100644 --- 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 13 +#ifdef CONFIG_LIBAIO +#include +#endif +#ifdef CONFIG_GUASI +#include +#endif + +#define FIO_IOOPS_VERSION 17 enum { IO_U_F_FREE = 1 << 0, @@ -19,50 +28,35 @@ 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; + 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; + /* * Allocated/set buffer and length */ - void *buf; unsigned long buflen; unsigned long long offset; + unsigned short numberio; + void *buf; /* * Initial seed for generating the buffer contents */ - unsigned long rand_seed; + uint64_t rand_seed; /* * IO engine state, may be different from above when we get @@ -77,11 +71,11 @@ struct io_u { */ unsigned long buf_filled_len; + struct io_piece *ipo; + unsigned int resid; unsigned int error; - enum fio_ddir ddir; - /* * io engine private data */ @@ -91,16 +85,37 @@ struct io_u { void *engine_data; }; - unsigned int flags; - - struct fio_file *file; - - struct flist_head list; + struct flist_head verify_list; /* * 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; + }; }; /* @@ -129,6 +144,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; @@ -143,12 +161,17 @@ 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 */ + FIO_BIT_BASED = 1 << 10, /* engine uses a bit base (e.g. uses Kbit as opposed to KB) */ }; +/* + * External engine defined symbol to fill in the engine ops structure + */ +typedef void (*get_ioengine_t)(struct ioengine_ops **); + /* * io engine entry points */ @@ -173,20 +196,22 @@ extern int fio_show_ioengine_help(const char *engine); /* * io unit handling */ -#define queue_full(td) flist_empty(&(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); +int queue_full(struct thread_data *); int do_io_u_sync(struct thread_data *, struct io_u *); int do_io_u_trim(struct thread_data *, struct io_u *); @@ -210,4 +235,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