X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=thread_options.h;h=1c48bd83d394577b463ecb9ec5b4572b05123747;hb=0c63576e14bc606f81441f20e58a5b6338a5e2d6;hp=e545a8fdc81b37d82530a58116b5942b97299181;hpb=b26317c97b8bcca7cc9144ea6e1d4ed753f2311a;p=fio.git diff --git a/thread_options.h b/thread_options.h index e545a8fd..1c48bd83 100644 --- a/thread_options.h +++ b/thread_options.h @@ -3,6 +3,7 @@ #include "arch/arch.h" #include "os/os.h" +#include "options.h" #include "stat.h" #include "gettime.h" #include "lib/ieee754.h" @@ -28,10 +29,13 @@ struct bssplit { uint32_t perc; }; +#define NR_OPTS_SZ (FIO_MAX_OPTS / (8 * sizeof(uint64_t))) + #define OPT_MAGIC 0x4f50544e struct thread_options { int magic; + uint64_t set_options[NR_OPTS_SZ]; char *description; char *name; char *directory; @@ -99,6 +103,8 @@ struct thread_options { unsigned long long verify_backlog; unsigned int verify_batch; unsigned int experimental_verify; + unsigned int verify_state; + unsigned int verify_state_save; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -106,7 +112,7 @@ struct thread_options { unsigned int rand_repeatable; unsigned int allrand_repeatable; unsigned long long rand_seed; - unsigned int use_os_rand; + unsigned int dep_use_os_rand; unsigned int log_avg_msec; unsigned int log_offset; unsigned int log_gz; @@ -123,6 +129,7 @@ struct thread_options { fio_fp64_t zipf_theta; fio_fp64_t pareto_h; + fio_fp64_t gauss_dev; unsigned int random_generator; @@ -157,16 +164,12 @@ struct thread_options { unsigned int new_group; unsigned int numjobs; os_cpu_mask_t cpumask; - unsigned int cpumask_set; os_cpu_mask_t verify_cpumask; - unsigned int verify_cpumask_set; unsigned int cpus_allowed_policy; char *numa_cpunodes; - unsigned int numa_cpumask_set; unsigned short numa_mem_mode; unsigned int numa_mem_prefer_node; char *numa_memnodes; - unsigned int numa_memmask_set; unsigned int iolog; unsigned int rwmixcycle; unsigned int rwmix[DDIR_RWDIR_CNT]; @@ -176,6 +179,7 @@ struct thread_options { unsigned int file_service_type; unsigned int group_reporting; unsigned int fadvise_hint; + unsigned int fadvise_stream; enum fio_fallocate_mode fallocate_mode; unsigned int zero_buffers; unsigned int refill_buffers; @@ -184,6 +188,7 @@ struct thread_options { unsigned int buffer_pattern_bytes; unsigned int compress_percentage; unsigned int compress_chunk; + unsigned int dedupe_percentage; unsigned int time_based; unsigned int disable_lat; unsigned int disable_clat; @@ -192,7 +197,6 @@ struct thread_options { unsigned int unified_rw_rep; unsigned int gtod_reduce; unsigned int gtod_cpu; - unsigned int gtod_offload; enum fio_cs clocksource; unsigned int no_stall; unsigned int trim_percentage; @@ -219,6 +223,7 @@ struct thread_options { unsigned int rate[DDIR_RWDIR_CNT]; unsigned int ratemin[DDIR_RWDIR_CNT]; unsigned int ratecycle; + unsigned int io_submit_mode; unsigned int rate_iops[DDIR_RWDIR_CNT]; unsigned int rate_iops_min[DDIR_RWDIR_CNT]; @@ -257,11 +262,18 @@ struct thread_options { unsigned long long latency_target; unsigned long long latency_window; fio_fp64_t latency_percentile; + + unsigned block_error_hist; + unsigned int skip_bad; + + unsigned int replay_align; + unsigned int replay_scale; }; #define FIO_TOP_STR_MAX 256 struct thread_options_pack { + uint64_t set_options[NR_OPTS_SZ]; uint8_t description[FIO_TOP_STR_MAX]; uint8_t name[FIO_TOP_STR_MAX]; uint8_t directory[FIO_TOP_STR_MAX]; @@ -329,6 +341,8 @@ struct thread_options_pack { uint64_t verify_backlog; uint32_t verify_batch; uint32_t experimental_verify; + uint32_t verify_state; + uint32_t verify_state_save; uint32_t use_thread; uint32_t unlink; uint32_t do_disk_util; @@ -336,7 +350,7 @@ struct thread_options_pack { uint32_t rand_repeatable; uint32_t allrand_repeatable; uint64_t rand_seed; - uint32_t use_os_rand; + uint32_t dep_use_os_rand; uint32_t log_avg_msec; uint32_t log_offset; uint32_t log_gz; @@ -348,8 +362,11 @@ struct thread_options_pack { uint32_t bs_is_seq_rand; uint32_t random_distribution; + uint32_t pad; + fio_fp64_t zipf_theta; fio_fp64_t pareto_h; + fio_fp64_t gauss_dev; uint32_t random_generator; @@ -384,9 +401,7 @@ struct thread_options_pack { uint32_t new_group; uint32_t numjobs; uint8_t cpumask[FIO_TOP_STR_MAX]; - uint32_t cpumask_set; uint8_t verify_cpumask[FIO_TOP_STR_MAX]; - uint32_t verify_cpumask_set; uint32_t cpus_allowed_policy; uint32_t iolog; uint32_t rwmixcycle; @@ -397,14 +412,16 @@ struct thread_options_pack { uint32_t file_service_type; uint32_t group_reporting; uint32_t fadvise_hint; + uint32_t fadvise_stream; uint32_t fallocate_mode; 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 compress_percentage; + uint32_t compress_chunk; + uint32_t dedupe_percentage; uint32_t time_based; uint32_t disable_lat; uint32_t disable_clat; @@ -413,7 +430,6 @@ struct thread_options_pack { uint32_t unified_rw_rep; uint32_t gtod_reduce; uint32_t gtod_cpu; - uint32_t gtod_offload; uint32_t clocksource; uint32_t no_stall; uint32_t trim_percentage; @@ -440,6 +456,7 @@ struct thread_options_pack { uint32_t rate[DDIR_RWDIR_CNT]; uint32_t ratemin[DDIR_RWDIR_CNT]; uint32_t ratecycle; + uint32_t io_submit_mode; uint32_t rate_iops[DDIR_RWDIR_CNT]; uint32_t rate_iops_min[DDIR_RWDIR_CNT]; @@ -478,6 +495,12 @@ struct thread_options_pack { uint64_t latency_target; uint64_t latency_window; fio_fp64_t latency_percentile; + + uint32_t block_error_hist; + uint32_t skip_bad; + + uint32_t replay_align; + uint32_t replay_scale; } __attribute__((packed)); extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);