projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fio: allow to combine terse output with any selected output type
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index d5746dd4453bb42de63ca581d5969b769d5fbcb4..d1180cd4809bb090e5a96e4266be0da5933c80e5 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-14,8
+14,6
@@
#include <inttypes.h>
#include <assert.h>
#include <inttypes.h>
#include <assert.h>
-struct thread_data;
-
#include "compiler/compiler.h"
#include "thread_options.h"
#include "flist.h"
#include "compiler/compiler.h"
#include "thread_options.h"
#include "flist.h"
@@
-41,6
+39,7
@@
struct thread_data;
#include "server.h"
#include "stat.h"
#include "flow.h"
#include "server.h"
#include "stat.h"
#include "flow.h"
+#include "io_u_queue.h"
#ifdef CONFIG_SOLARISAIO
#include <sys/asynch.h>
#ifdef CONFIG_SOLARISAIO
#include <sys/asynch.h>
@@
-83,6
+82,10
@@
enum {
FIO_RAND_FILE_SIZE_OFF,
FIO_RAND_TRIM_OFF,
FIO_RAND_BUF_OFF,
FIO_RAND_FILE_SIZE_OFF,
FIO_RAND_TRIM_OFF,
FIO_RAND_BUF_OFF,
+ FIO_RAND_SEQ_RAND_READ_OFF,
+ FIO_RAND_SEQ_RAND_WRITE_OFF,
+ FIO_RAND_SEQ_RAND_TRIM_OFF,
+ FIO_RAND_START_DELAY,
FIO_RAND_NR_OFFS,
};
FIO_RAND_NR_OFFS,
};
@@
-162,6
+165,10
@@
struct thread_data {
os_random_state_t trim_state;
struct frand_state __trim_state;
};
os_random_state_t trim_state;
struct frand_state __trim_state;
};
+ union {
+ os_random_state_t delay_state;
+ struct frand_state __delay_state;
+ };
struct frand_state buf_state;
struct frand_state buf_state;
@@
-194,9
+201,9
@@
struct thread_data {
/*
* List of free and busy io_u's
*/
/*
* List of free and busy io_u's
*/
- struct
flist_head io_u_freelist
;
- struct
flist_head io_u_busy
list;
- struct
flist_head io_u_requeues
;
+ struct
io_u_ring io_u_requeues
;
+ struct
io_u_queue io_u_free
list;
+ struct
io_u_queue io_u_all
;
pthread_mutex_t io_u_lock;
pthread_cond_t free_cond;
pthread_mutex_t io_u_lock;
pthread_cond_t free_cond;
@@
-246,6
+253,16
@@
struct thread_data {
unsigned int tv_cache_mask;
unsigned int ramp_time_over;
unsigned int tv_cache_mask;
unsigned int ramp_time_over;
+ /*
+ * Time since last latency_window was started
+ */
+ struct timeval latency_ts;
+ unsigned int latency_qd;
+ unsigned int latency_qd_high;
+ unsigned int latency_qd_low;
+ unsigned int latency_failed;
+ uint64_t latency_ios;
+
/*
* read/write mixed workload state
*/
/*
* read/write mixed workload state
*/
@@
-257,6
+274,14
@@
struct thread_data {
enum fio_ddir rwmix_ddir;
unsigned int ddir_seq_nr;
enum fio_ddir rwmix_ddir;
unsigned int ddir_seq_nr;
+ /*
+ * rand/seq mixed workload state
+ */
+ union {
+ os_random_state_t seq_rand_state[DDIR_RWDIR_CNT];
+ struct frand_state __seq_rand_state[DDIR_RWDIR_CNT];
+ };
+
/*
* IO history logs for verification. We use a tree for sorting,
* if we are overwriting. Otherwise just use a fifo.
/*
* IO history logs for verification. We use a tree for sorting,
* if we are overwriting. Otherwise just use a fifo.
@@
-323,10
+348,10
@@
enum {
#define __td_verror(td, err, msg, func) \
do { \
#define __td_verror(td, err, msg, func) \
do { \
+ int ____e = (err); \
if ((td)->error) \
break; \
if ((td)->error) \
break; \
- int e = (err); \
- (td)->error = e; \
+ (td)->error = ____e; \
if (!(td)->first_error) \
snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg)); \
} while (0)
if (!(td)->first_error) \
snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg)); \
} while (0)
@@
-348,6
+373,7
@@
extern unsigned int stat_number;
extern int shm_id;
extern int groupid;
extern int output_format;
extern int shm_id;
extern int groupid;
extern int output_format;
+extern int append_terse_output;
extern int temp_stall_ts;
extern uintptr_t page_mask, page_size;
extern int read_only;
extern int temp_stall_ts;
extern uintptr_t page_mask, page_size;
extern int read_only;
@@
-364,6
+390,7
@@
extern int terse_version;
extern int is_backend;
extern int nr_clients;
extern int log_syslog;
extern int is_backend;
extern int nr_clients;
extern int log_syslog;
+extern int status_interval;
extern const char fio_version_string[];
extern struct thread_data *threads;
extern const char fio_version_string[];
extern struct thread_data *threads;
@@
-395,7
+422,7
@@
extern int parse_cmd_line(int, char **, int);
extern int fio_backend(void);
extern void reset_fio_state(void);
extern void clear_io_state(struct thread_data *);
extern int fio_backend(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 int fio_options_parse(struct thread_data *, char **, int
, int
);
extern void fio_keywords_init(void);
extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);
extern int fio_cmd_ioengine_option_parse(struct thread_data *, const char *, char *);
extern void fio_keywords_init(void);
extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);
extern int fio_cmd_ioengine_option_parse(struct thread_data *, const char *, char *);
@@
-409,6
+436,7
@@
extern void td_fill_rand_seeds(struct thread_data *);
extern void add_job_opts(const char **, int);
extern char *num2str(unsigned long, int, int, int, int);
extern int ioengine_load(struct thread_data *);
extern void add_job_opts(const char **, int);
extern char *num2str(unsigned long, int, int, int, int);
extern int ioengine_load(struct thread_data *);
+extern int parse_dryrun(void);
extern uintptr_t page_mask;
extern uintptr_t page_size;
extern uintptr_t page_mask;
extern uintptr_t page_size;
@@
-467,16
+495,15
@@
extern void reset_all_stats(struct thread_data *);
* blktrace support
*/
#ifdef FIO_HAVE_BLKTRACE
* blktrace support
*/
#ifdef FIO_HAVE_BLKTRACE
-extern int is_blktrace(const char *);
-extern int load_blktrace(struct thread_data *, const char *);
+extern int is_blktrace(const char *
, int *
);
+extern int load_blktrace(struct thread_data *, const char *
, int
);
#endif
/*
#endif
/*
- *
Mark unused variables passed to ops functions as unused, to silence gcc
+ *
Latency target helpers
*/
*/
-#define fio_unused __attribute((__unused__))
-#define fio_init __attribute__((constructor))
-#define fio_exit __attribute__((destructor))
+extern void lat_target_check(struct thread_data *);
+extern void lat_target_init(struct thread_data *);
#define for_each_td(td, i) \
for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
#define for_each_td(td, i) \
for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
@@
-543,6
+570,14
@@
static inline unsigned int td_max_bs(struct thread_data *td)
return max(td->o.max_bs[DDIR_TRIM], max_bs);
}
return max(td->o.max_bs[DDIR_TRIM], max_bs);
}
+static inline unsigned int td_min_bs(struct thread_data *td)
+{
+ unsigned int min_bs;
+
+ min_bs = min(td->o.min_bs[DDIR_READ], td->o.min_bs[DDIR_WRITE]);
+ return min(td->o.min_bs[DDIR_TRIM], min_bs);
+}
+
static inline int is_power_of_2(unsigned int val)
{
return (val != 0 && ((val & (val - 1)) == 0));
static inline int is_power_of_2(unsigned int val)
{
return (val != 0 && ((val & (val - 1)) == 0));