projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fio: move thread_options
[fio.git]
/
ioengine.h
diff --git
a/ioengine.h
b/ioengine.h
index 55039578d9edad878519cde64b665ea81c5e2b0f..08e8fabfacecb5b57996ba9dbec9bc87e9704d03 100644
(file)
--- a/
ioengine.h
+++ b/
ioengine.h
@@
-7,6
+7,7
@@
#include "io_ddir.h"
#include "debug.h"
#include "file.h"
#include "io_ddir.h"
#include "debug.h"
#include "file.h"
+#include "workqueue.h"
#ifdef CONFIG_LIBAIO
#include <libaio.h>
#ifdef CONFIG_LIBAIO
#include <libaio.h>
@@
-15,12
+16,12
@@
#include <guasi.h>
#endif
#include <guasi.h>
#endif
-#define FIO_IOOPS_VERSION
15
+#define FIO_IOOPS_VERSION
23
enum {
IO_U_F_FREE = 1 << 0,
IO_U_F_FLIGHT = 1 << 1,
enum {
IO_U_F_FREE = 1 << 0,
IO_U_F_FLIGHT = 1 << 1,
- IO_U_F_
FREE_DEF
= 1 << 2,
+ 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_IN_CUR_DEPTH = 1 << 3,
IO_U_F_BUSY_OK = 1 << 4,
IO_U_F_TRIMMED = 1 << 5,
@@
-28,36
+29,10
@@
enum {
IO_U_F_VER_LIST = 1 << 7,
};
IO_U_F_VER_LIST = 1 << 7,
};
-struct thread_data;
-
/*
* The io unit
*/
struct io_u {
/*
* The io unit
*/
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;
- };
struct timeval start_time;
struct timeval issue_time;
struct timeval start_time;
struct timeval issue_time;
@@
-71,6
+46,11
@@
struct io_u {
*/
enum fio_ddir acct_ddir;
*/
enum fio_ddir acct_ddir;
+ /*
+ * Write generation
+ */
+ unsigned short numberio;
+
/*
* Allocated/set buffer and length
*/
/*
* Allocated/set buffer and length
*/
@@
-81,7
+61,7
@@
struct io_u {
/*
* Initial seed for generating the buffer contents
*/
/*
* Initial seed for generating the buffer contents
*/
- u
nsigned long
rand_seed;
+ u
int64_t
rand_seed;
/*
* IO engine state, may be different from above when we get
/*
* IO engine state, may be different from above when we get
@@
-96,6
+76,8
@@
struct io_u {
*/
unsigned long buf_filled_len;
*/
unsigned long buf_filled_len;
+ struct io_piece *ipo;
+
unsigned int resid;
unsigned int error;
unsigned int resid;
unsigned int error;
@@
-108,12
+90,41
@@
struct io_u {
void *engine_data;
};
void *engine_data;
};
- struct flist_head list;
+ union {
+ struct flist_head verify_list;
+ struct workqueue_work work;
+ };
/*
* Callback for io completion
*/
/*
* Callback for io completion
*/
- int (*end_io)(struct thread_data *, struct io_u *);
+ 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;
+ uint64_t null;
+ };
};
/*
};
/*
@@
-127,7
+138,7
@@
enum {
struct ioengine_ops {
struct flist_head list;
struct ioengine_ops {
struct flist_head list;
- c
har name[16]
;
+ c
onst char *name
;
int version;
int flags;
int (*setup)(struct thread_data *);
int version;
int flags;
int (*setup)(struct thread_data *);
@@
-135,20
+146,23
@@
struct ioengine_ops {
int (*prep)(struct thread_data *, struct io_u *);
int (*queue)(struct thread_data *, struct io_u *);
int (*commit)(struct thread_data *);
int (*prep)(struct thread_data *, struct io_u *);
int (*queue)(struct thread_data *, struct io_u *);
int (*commit)(struct thread_data *);
- int (*getevents)(struct thread_data *, unsigned int, unsigned int, struct timespec *);
+ int (*getevents)(struct thread_data *, unsigned int, unsigned int,
const
struct timespec *);
struct io_u *(*event)(struct thread_data *, int);
struct io_u *(*event)(struct thread_data *, int);
+ char *(*errdetails)(struct io_u *);
int (*cancel)(struct thread_data *, struct io_u *);
void (*cleanup)(struct thread_data *);
int (*open_file)(struct thread_data *, struct fio_file *);
int (*close_file)(struct thread_data *, struct fio_file *);
int (*cancel)(struct thread_data *, struct io_u *);
void (*cleanup)(struct thread_data *);
int (*open_file)(struct thread_data *, struct fio_file *);
int (*close_file)(struct thread_data *, struct fio_file *);
+ int (*invalidate)(struct thread_data *, struct fio_file *);
+ int (*unlink_file)(struct thread_data *, struct fio_file *);
int (*get_file_size)(struct thread_data *, struct fio_file *);
void (*terminate)(struct thread_data *);
int (*get_file_size)(struct thread_data *, struct fio_file *);
void (*terminate)(struct thread_data *);
+ int (*iomem_alloc)(struct thread_data *, size_t);
+ void (*iomem_free)(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;
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;
- void *dlhandle;
};
enum fio_ioengine_flags {
};
enum fio_ioengine_flags {
@@
-162,8
+176,15
@@
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_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) */
+ FIO_FAKEIO = 1 << 11, /* engine pretends to do IO */
};
};
+/*
+ * External engine defined symbol to fill in the engine ops structure
+ */
+typedef void (*get_ioengine_t)(struct ioengine_ops **);
+
/*
* io engine entry points
*/
/*
* io engine entry points
*/
@@
-171,10
+192,11
@@
extern int __must_check td_io_init(struct thread_data *);
extern int __must_check td_io_prep(struct thread_data *, struct io_u *);
extern int __must_check td_io_queue(struct thread_data *, struct io_u *);
extern int __must_check td_io_sync(struct thread_data *, struct fio_file *);
extern int __must_check td_io_prep(struct thread_data *, struct io_u *);
extern int __must_check td_io_queue(struct thread_data *, struct io_u *);
extern int __must_check td_io_sync(struct thread_data *, struct fio_file *);
-extern int __must_check td_io_getevents(struct thread_data *, unsigned int, unsigned int, struct timespec *);
+extern int __must_check td_io_getevents(struct thread_data *, unsigned int, unsigned int,
const
struct timespec *);
extern int __must_check td_io_commit(struct thread_data *);
extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
extern int td_io_close_file(struct thread_data *, struct fio_file *);
extern int __must_check td_io_commit(struct thread_data *);
extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
extern int td_io_close_file(struct thread_data *, struct fio_file *);
+extern int td_io_unlink_file(struct thread_data *, struct fio_file *);
extern int __must_check td_io_get_file_size(struct thread_data *, struct fio_file *);
extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
extern int __must_check td_io_get_file_size(struct thread_data *, struct fio_file *);
extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
@@
-188,23
+210,25
@@
extern int fio_show_ioengine_help(const char *engine);
/*
* io unit handling
*/
/*
* 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 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 *
, uint64_t *
);
-extern int __must_check io_u_queued_complete(struct thread_data *, int
, uint64_t *
);
+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 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 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);
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(struct thread_data *, struct io_u *);
-int do_io_u_trim(struct thread_data *, struct io_u *);
+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)
#ifdef FIO_INC_DEBUG
static inline void dprint_io_u(struct io_u *io_u, const char *p)
@@
-233,4
+257,9
@@
static inline enum fio_ddir acct_ddir(struct io_u *io_u)
return io_u->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
#endif