projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify the time handling
[fio.git]
/
thread_options.h
diff --git
a/thread_options.h
b/thread_options.h
index a79494978e3be2c2e0f1ee2a59c0ae350e8e4894..b7a88ed358f14f73e9933f859a5837c6362bdded 100644
(file)
--- a/
thread_options.h
+++ b/
thread_options.h
@@
-5,6
+5,8
@@
#include "os/os.h"
#include "stat.h"
#include "gettime.h"
#include "os/os.h"
#include "stat.h"
#include "gettime.h"
+#include "lib/ieee754.h"
+#include "td_error.h"
/*
* What type of allocation to use for io buffers
/*
* What type of allocation to use for io buffers
@@
-17,26
+19,8
@@
enum fio_memtype {
MEM_MMAPHUGE, /* memory mapped huge file */
};
MEM_MMAPHUGE, /* memory mapped huge file */
};
-/*
- * What type of errors to continue on when continue_on_error is used
- */
-enum error_type_bit {
- ERROR_TYPE_READ_BIT = 0,
- ERROR_TYPE_WRITE_BIT = 1,
- ERROR_TYPE_VERIFY_BIT = 2,
- ERROR_TYPE_CNT = 3,
-};
-
#define ERROR_STR_MAX 128
#define ERROR_STR_MAX 128
-enum error_type {
- ERROR_TYPE_NONE = 0,
- ERROR_TYPE_READ = 1 << ERROR_TYPE_READ_BIT,
- ERROR_TYPE_WRITE = 1 << ERROR_TYPE_WRITE_BIT,
- ERROR_TYPE_VERIFY = 1 << ERROR_TYPE_VERIFY_BIT,
- ERROR_TYPE_ANY = 0xffff,
-};
-
#define BSSPLIT_MAX 64
struct bssplit {
#define BSSPLIT_MAX 64
struct bssplit {
@@
-88,6
+72,7
@@
struct thread_options {
enum file_lock_mode file_lock_mode;
unsigned int odirect;
enum file_lock_mode file_lock_mode;
unsigned int odirect;
+ unsigned int oatomic;
unsigned int invalidate_cache;
unsigned int create_serialize;
unsigned int create_fsync;
unsigned int invalidate_cache;
unsigned int create_serialize;
unsigned int create_fsync;
@@
-115,19
+100,27
@@
struct thread_options {
unsigned int do_disk_util;
unsigned int override_sync;
unsigned int rand_repeatable;
unsigned int do_disk_util;
unsigned int override_sync;
unsigned int rand_repeatable;
+ unsigned int allrand_repeatable;
+ unsigned long long rand_seed;
unsigned int use_os_rand;
unsigned int log_avg_msec;
unsigned int norandommap;
unsigned int softrandommap;
unsigned int bs_unaligned;
unsigned int fsync_on_close;
unsigned int use_os_rand;
unsigned int log_avg_msec;
unsigned int norandommap;
unsigned int softrandommap;
unsigned int bs_unaligned;
unsigned int fsync_on_close;
+ unsigned int bs_is_seq_rand;
+
+ unsigned int verify_only;
unsigned int random_distribution;
unsigned int random_distribution;
+
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
unsigned int random_generator;
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
unsigned int random_generator;
+ unsigned int perc_rand[DDIR_RWDIR_CNT];
+
unsigned int hugepage_size;
unsigned int rw_min_bs;
unsigned int thinktime;
unsigned int hugepage_size;
unsigned int rw_min_bs;
unsigned int thinktime;
@@
-137,6
+130,7
@@
struct thread_options {
unsigned int fdatasync_blocks;
unsigned int barrier_blocks;
unsigned long long start_delay;
unsigned int fdatasync_blocks;
unsigned int barrier_blocks;
unsigned long long start_delay;
+ unsigned long long start_delay_high;
unsigned long long timeout;
unsigned long long ramp_time;
unsigned int overwrite;
unsigned long long timeout;
unsigned long long ramp_time;
unsigned int overwrite;
@@
-150,7
+144,7
@@
struct thread_options {
enum fio_memtype mem_type;
unsigned int mem_align;
enum fio_memtype mem_type;
unsigned int mem_align;
- unsigned max_latency;
+ unsigned
int
max_latency;
unsigned int stonewall;
unsigned int new_group;
unsigned int stonewall;
unsigned int new_group;
@@
-169,7
+163,7
@@
struct thread_options {
#endif
unsigned int iolog;
unsigned int rwmixcycle;
#endif
unsigned int iolog;
unsigned int rwmixcycle;
- unsigned int rwmix[
2
];
+ unsigned int rwmix[
DDIR_RWDIR_CNT
];
unsigned int nice;
unsigned int ioprio;
unsigned int ioprio_class;
unsigned int nice;
unsigned int ioprio;
unsigned int ioprio_class;
@@
-180,6
+174,8
@@
struct thread_options {
unsigned int zero_buffers;
unsigned int refill_buffers;
unsigned int scramble_buffers;
unsigned int zero_buffers;
unsigned int refill_buffers;
unsigned int scramble_buffers;
+ char buffer_pattern[MAX_PATTERN_SIZE];
+ unsigned int buffer_pattern_bytes;
unsigned int compress_percentage;
unsigned int compress_chunk;
unsigned int time_based;
unsigned int compress_percentage;
unsigned int compress_chunk;
unsigned int time_based;
@@
-248,8
+244,13
@@
struct thread_options {
unsigned int flow_sleep;
unsigned long long offset_increment;
unsigned int flow_sleep;
unsigned long long offset_increment;
+ unsigned long long number_ios;
unsigned int sync_file_range;
unsigned int sync_file_range;
+
+ unsigned long long latency_target;
+ unsigned long long latency_window;
+ fio_fp64_t latency_percentile;
};
#define FIO_TOP_STR_MAX 256
};
#define FIO_TOP_STR_MAX 256
@@
-297,6
+298,7
@@
struct thread_options_pack {
uint32_t file_lock_mode;
uint32_t odirect;
uint32_t file_lock_mode;
uint32_t odirect;
+ uint32_t oatomic;
uint32_t invalidate_cache;
uint32_t create_serialize;
uint32_t create_fsync;
uint32_t invalidate_cache;
uint32_t create_serialize;
uint32_t create_fsync;
@@
-324,12
+326,15
@@
struct thread_options_pack {
uint32_t do_disk_util;
uint32_t override_sync;
uint32_t rand_repeatable;
uint32_t do_disk_util;
uint32_t override_sync;
uint32_t rand_repeatable;
+ uint32_t allrand_repeatable;
+ uint64_t rand_seed;
uint32_t use_os_rand;
uint32_t log_avg_msec;
uint32_t norandommap;
uint32_t softrandommap;
uint32_t bs_unaligned;
uint32_t fsync_on_close;
uint32_t use_os_rand;
uint32_t log_avg_msec;
uint32_t norandommap;
uint32_t softrandommap;
uint32_t bs_unaligned;
uint32_t fsync_on_close;
+ uint32_t bs_is_seq_rand;
uint32_t random_distribution;
fio_fp64_t zipf_theta;
uint32_t random_distribution;
fio_fp64_t zipf_theta;
@@
-337,6
+342,8
@@
struct thread_options_pack {
uint32_t random_generator;
uint32_t random_generator;
+ uint32_t perc_rand[DDIR_RWDIR_CNT];
+
uint32_t hugepage_size;
uint32_t rw_min_bs;
uint32_t thinktime;
uint32_t hugepage_size;
uint32_t rw_min_bs;
uint32_t thinktime;
@@
-346,6
+353,7
@@
struct thread_options_pack {
uint32_t fdatasync_blocks;
uint32_t barrier_blocks;
uint64_t start_delay;
uint32_t fdatasync_blocks;
uint32_t barrier_blocks;
uint64_t start_delay;
+ uint64_t start_delay_high;
uint64_t timeout;
uint64_t ramp_time;
uint32_t overwrite;
uint64_t timeout;
uint64_t ramp_time;
uint32_t overwrite;
@@
-370,7
+378,7
@@
struct thread_options_pack {
uint32_t verify_cpumask_set;
uint32_t iolog;
uint32_t rwmixcycle;
uint32_t verify_cpumask_set;
uint32_t iolog;
uint32_t rwmixcycle;
- uint32_t rwmix[
2
];
+ uint32_t rwmix[
DDIR_RWDIR_CNT
];
uint32_t nice;
uint32_t ioprio;
uint32_t ioprio_class;
uint32_t nice;
uint32_t ioprio;
uint32_t ioprio_class;
@@
-381,6
+389,8
@@
struct thread_options_pack {
uint32_t zero_buffers;
uint32_t refill_buffers;
uint32_t scramble_buffers;
uint32_t zero_buffers;
uint32_t refill_buffers;
uint32_t scramble_buffers;
+ uint8_t buffer_pattern[MAX_PATTERN_SIZE];
+ uint32_t buffer_pattern_bytes;
unsigned int compress_percentage;
unsigned int compress_chunk;
uint32_t time_based;
unsigned int compress_percentage;
unsigned int compress_chunk;
uint32_t time_based;
@@
-449,8
+459,13
@@
struct thread_options_pack {
uint32_t flow_sleep;
uint64_t offset_increment;
uint32_t flow_sleep;
uint64_t offset_increment;
+ uint64_t number_ios;
uint32_t sync_file_range;
uint32_t sync_file_range;
+
+ uint64_t latency_target;
+ uint64_t latency_window;
+ fio_fp64_t latency_percentile;
} __attribute__((packed));
extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);
} __attribute__((packed));
extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);