projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blktrace: Check value of 'merge_buf' pointer before using it
[fio.git]
/
thread_options.h
diff --git
a/thread_options.h
b/thread_options.h
index 393158340e96a52a8068cd39d0d8c3c6c4cc4da3..4b131bdaa3a266cbafdb4d8e11e2747e28f7b31e 100644
(file)
--- a/
thread_options.h
+++ b/
thread_options.h
@@
-140,7
+140,6
@@
struct thread_options {
unsigned int rand_repeatable;
unsigned int allrand_repeatable;
unsigned long long rand_seed;
unsigned int rand_repeatable;
unsigned int allrand_repeatable;
unsigned long long rand_seed;
- unsigned int dep_use_os_rand;
unsigned int log_avg_msec;
unsigned int log_hist_msec;
unsigned int log_hist_coarseness;
unsigned int log_avg_msec;
unsigned int log_hist_msec;
unsigned int log_hist_coarseness;
@@
-173,7
+172,6
@@
struct thread_options {
unsigned int hugepage_size;
unsigned long long rw_min_bs;
unsigned int hugepage_size;
unsigned long long rw_min_bs;
- unsigned int pad2;
unsigned int thinktime;
unsigned int thinktime_spin;
unsigned int thinktime_blocks;
unsigned int thinktime;
unsigned int thinktime_spin;
unsigned int thinktime_blocks;
@@
-203,7
+201,8
@@
struct thread_options {
unsigned long long max_latency;
unsigned long long max_latency;
- unsigned int stonewall;
+ unsigned short exit_what;
+ unsigned short stonewall;
unsigned int new_group;
unsigned int numjobs;
os_cpu_mask_t cpumask;
unsigned int new_group;
unsigned int numjobs;
os_cpu_mask_t cpumask;
@@
-258,6
+257,9
@@
struct thread_options {
char *read_iolog_file;
bool read_iolog_chunked;
char *write_iolog_file;
char *read_iolog_file;
bool read_iolog_chunked;
char *write_iolog_file;
+ char *merge_blktrace_file;
+ fio_fp64_t merge_blktrace_scalars[FIO_IO_U_LIST_MAX_LEN];
+ fio_fp64_t merge_blktrace_iters[FIO_IO_U_LIST_MAX_LEN];
unsigned int write_bw_log;
unsigned int write_lat_log;
unsigned int write_bw_log;
unsigned int write_lat_log;
@@
-312,6
+314,7
@@
struct thread_options {
int flow_watermark;
unsigned int flow_sleep;
int flow_watermark;
unsigned int flow_sleep;
+ unsigned int offset_increment_percent;
unsigned long long offset_increment;
unsigned long long number_ios;
unsigned long long offset_increment;
unsigned long long number_ios;
@@
-427,8
+430,8
@@
struct thread_options_pack {
uint32_t override_sync;
uint32_t rand_repeatable;
uint32_t allrand_repeatable;
uint32_t override_sync;
uint32_t rand_repeatable;
uint32_t allrand_repeatable;
+ uint32_t pad;
uint64_t rand_seed;
uint64_t rand_seed;
- uint32_t dep_use_os_rand;
uint32_t log_avg_msec;
uint32_t log_hist_msec;
uint32_t log_hist_coarseness;
uint32_t log_avg_msec;
uint32_t log_hist_msec;
uint32_t log_hist_coarseness;
@@
-487,7
+490,8
@@
struct thread_options_pack {
uint32_t mem_type;
uint32_t mem_align;
uint32_t mem_type;
uint32_t mem_align;
- uint32_t stonewall;
+ uint16_t exit_what;
+ uint16_t stonewall;
uint32_t new_group;
uint32_t numjobs;
/*
uint32_t new_group;
uint32_t numjobs;
/*
@@
-540,6
+544,9
@@
struct thread_options_pack {
uint8_t read_iolog_file[FIO_TOP_STR_MAX];
uint8_t write_iolog_file[FIO_TOP_STR_MAX];
uint8_t read_iolog_file[FIO_TOP_STR_MAX];
uint8_t write_iolog_file[FIO_TOP_STR_MAX];
+ uint8_t merge_blktrace_file[FIO_TOP_STR_MAX];
+ fio_fp64_t merge_blktrace_scalars[FIO_IO_U_LIST_MAX_LEN];
+ fio_fp64_t merge_blktrace_iters[FIO_IO_U_LIST_MAX_LEN];
uint32_t write_bw_log;
uint32_t write_lat_log;
uint32_t write_bw_log;
uint32_t write_lat_log;
@@
-566,7
+573,7
@@
struct thread_options_pack {
uint32_t rate_iops_min[DDIR_RWDIR_CNT];
uint32_t rate_process;
uint32_t rate_ign_think;
uint32_t rate_iops_min[DDIR_RWDIR_CNT];
uint32_t rate_process;
uint32_t rate_ign_think;
- uint32_t pad;
+ uint32_t pad
3
;
uint8_t ioscheduler[FIO_TOP_STR_MAX];
uint8_t ioscheduler[FIO_TOP_STR_MAX];
@@
-595,6
+602,8
@@
struct thread_options_pack {
int32_t flow_watermark;
uint32_t flow_sleep;
int32_t flow_watermark;
uint32_t flow_sleep;
+ uint32_t offset_increment_percent;
+ uint32_t pad4;
uint64_t offset_increment;
uint64_t number_ios;
uint64_t offset_increment;
uint64_t number_ios;