projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fio: make client operations pluggable
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index cc1f65f51b5bc358b5a2ad2097a34bdfa6ff0e68..3efda51acf6ad37be6cc27ab7c20f966b81f87d7 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-33,10
+33,13
@@
struct thread_data;
#include "options.h"
#include "profile.h"
#include "time.h"
#include "options.h"
#include "profile.h"
#include "time.h"
+#include "gettime.h"
#include "lib/getopt.h"
#include "lib/rand.h"
#include "lib/getopt.h"
#include "lib/rand.h"
+#include "client.h"
#include "server.h"
#include "stat.h"
#include "server.h"
#include "stat.h"
+#include "flow.h"
#ifdef FIO_HAVE_GUASI
#include <guasi.h>
#ifdef FIO_HAVE_GUASI
#include <guasi.h>
@@
-65,6
+68,17
@@
enum {
RW_SEQ_IDENT,
};
RW_SEQ_IDENT,
};
+/*
+ * What type of errors to continue on when continue_on_error is used
+ */
+enum error_type {
+ ERROR_TYPE_NONE = 0,
+ ERROR_TYPE_READ = 1 << 0,
+ ERROR_TYPE_WRITE = 1 << 1,
+ ERROR_TYPE_VERIFY = 1 << 2,
+ ERROR_TYPE_ANY = 0xffff,
+};
+
struct bssplit {
unsigned int bs;
unsigned char perc;
struct bssplit {
unsigned int bs;
unsigned char perc;
@@
-136,6
+150,7
@@
struct thread_options {
unsigned int write_lat_log;
unsigned int write_bw_log;
unsigned int write_iops_log;
unsigned int write_lat_log;
unsigned int write_bw_log;
unsigned int write_iops_log;
+ unsigned int log_avg_msec;
unsigned int norandommap;
unsigned int softrandommap;
unsigned int bs_unaligned;
unsigned int norandommap;
unsigned int softrandommap;
unsigned int bs_unaligned;
@@
-156,6
+171,7
@@
struct thread_options {
unsigned int bw_avg_time;
unsigned int iops_avg_time;
unsigned int loops;
unsigned int bw_avg_time;
unsigned int iops_avg_time;
unsigned int loops;
+ unsigned long long zone_range;
unsigned long long zone_size;
unsigned long long zone_skip;
enum fio_memtype mem_type;
unsigned long long zone_size;
unsigned long long zone_skip;
enum fio_memtype mem_type;
@@
-227,7
+243,7
@@
struct thread_options {
/*
* I/O Error handling
*/
/*
* I/O Error handling
*/
-
unsigned int
continue_on_error;
+
enum error_type
continue_on_error;
/*
* Benchmark profile type
/*
* Benchmark profile type
@@
-244,6
+260,11
@@
struct thread_options {
unsigned int uid;
unsigned int gid;
unsigned int uid;
unsigned int gid;
+ int flow_id;
+ int flow;
+ int flow_watermark;
+ unsigned int flow_sleep;
+
unsigned int sync_file_range;
};
unsigned int sync_file_range;
};
@@
-334,10
+355,23
@@
struct thread_data {
struct ioengine_ops *io_ops;
/*
struct ioengine_ops *io_ops;
/*
- *
Current IO depth and list of free and busy io_u's.
+ *
Queue depth of io_u's that fio MIGHT do
*/
unsigned int cur_depth;
*/
unsigned int cur_depth;
+
+ /*
+ * io_u's about to be committed
+ */
unsigned int io_u_queued;
unsigned int io_u_queued;
+
+ /*
+ * io_u's submitted but not completed yet
+ */
+ unsigned int io_u_in_flight;
+
+ /*
+ * List of free and busy io_u's
+ */
struct flist_head io_u_freelist;
struct flist_head io_u_busylist;
struct flist_head io_u_requeues;
struct flist_head io_u_freelist;
struct flist_head io_u_busylist;
struct flist_head io_u_requeues;
@@
-443,6
+477,8
@@
struct thread_data {
unsigned int total_err_count;
int first_error;
unsigned int total_err_count;
int first_error;
+ struct fio_flow *flow;
+
/*
* Can be overloaded by profiles
*/
/*
* Can be overloaded by profiles
*/
@@
-520,6
+556,15
@@
static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
#define td_non_fatal_error(e) ((e) == EIO || (e) == EILSEQ)
#define td_non_fatal_error(e) ((e) == EIO || (e) == EILSEQ)
+static inline enum error_type td_error_type(enum fio_ddir ddir, int err)
+{
+ if (err == EILSEQ)
+ return ERROR_TYPE_VERIFY;
+ if (ddir == DDIR_READ)
+ return ERROR_TYPE_READ;
+ return ERROR_TYPE_WRITE;
+}
+
static inline void update_error_count(struct thread_data *td, int err)
{
td->total_err_count++;
static inline void update_error_count(struct thread_data *td, int err)
{
td->total_err_count++;
@@
-545,8
+590,9
@@
static inline int should_fsync(struct thread_data *td)
extern int __must_check parse_options(int, char **);
extern int parse_jobs_ini(char *, int, int);
extern int parse_cmd_line(int, char **);
extern int __must_check parse_options(int, char **);
extern int parse_jobs_ini(char *, int, int);
extern int parse_cmd_line(int, char **);
-extern int
exec_run
(void);
+extern int
fio_backend
(void);
extern void reset_fio_state(void);
extern void reset_fio_state(void);
+extern void clear_io_state(struct thread_data *);
extern int fio_options_parse(struct thread_data *, char **, int);
extern void fio_keywords_init(void);
extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);
extern int fio_options_parse(struct thread_data *, char **, int);
extern void fio_keywords_init(void);
extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);