X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=thread_options.h;h=74c3e991547983ea65ace9f107e5ea199e973987;hp=65eba7eebd2e02792b835161826d4bccdc390195;hb=b37d19b50ceab74c3947dd1685616e21b8638c95;hpb=56e2a5fc76067c91738f7eb0efbd6ec6d349e0f2 diff --git a/thread_options.h b/thread_options.h index 65eba7ee..74c3e991 100644 --- a/thread_options.h +++ b/thread_options.h @@ -28,8 +28,10 @@ struct bssplit { uint32_t perc; }; +#define OPT_MAGIC 0x4f50544e + struct thread_options { - int pad; + int magic; char *description; char *name; char *directory; @@ -43,15 +45,17 @@ struct thread_options { unsigned int kb_base; unsigned int unit_base; unsigned int ddir_seq_nr; - long ddir_seq_add; + long long ddir_seq_add; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; unsigned int iodepth_batch_complete; unsigned long long size; + unsigned long long io_limit; unsigned int size_percent; unsigned int fill_device; + unsigned int file_append; unsigned long long file_size_low; unsigned long long file_size_high; unsigned long long start_offset; @@ -102,8 +106,11 @@ 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; + unsigned int log_gz_store; unsigned int norandommap; unsigned int softrandommap; unsigned int bs_unaligned; @@ -130,6 +137,7 @@ struct thread_options { 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; @@ -152,14 +160,13 @@ struct thread_options { unsigned int cpumask_set; os_cpu_mask_t verify_cpumask; unsigned int verify_cpumask_set; -#ifdef CONFIG_LIBNUMA - struct bitmask *numa_cpunodesmask; + unsigned int cpus_allowed_policy; + char *numa_cpunodes; unsigned int numa_cpumask_set; unsigned short numa_mem_mode; unsigned int numa_mem_prefer_node; - struct bitmask *numa_memnodesmask; + char *numa_memnodes; unsigned int numa_memmask_set; -#endif unsigned int iolog; unsigned int rwmixcycle; unsigned int rwmix[DDIR_RWDIR_CNT]; @@ -177,6 +184,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; @@ -275,8 +283,10 @@ struct thread_options_pack { uint32_t iodepth_batch_complete; uint64_t size; + uint64_t io_limit; uint32_t size_percent; uint32_t fill_device; + uint32_t file_append; uint64_t file_size_low; uint64_t file_size_high; uint64_t start_offset; @@ -327,8 +337,11 @@ 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; + uint32_t log_gz_store; uint32_t norandommap; uint32_t softrandommap; uint32_t bs_unaligned; @@ -336,6 +349,7 @@ 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; @@ -352,6 +366,7 @@ struct thread_options_pack { 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; @@ -374,6 +389,7 @@ struct thread_options_pack { 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; uint32_t rwmix[DDIR_RWDIR_CNT]; @@ -389,8 +405,9 @@ struct thread_options_pack { 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; @@ -460,6 +477,7 @@ struct thread_options_pack { uint64_t number_ios; uint32_t sync_file_range; + uint32_t pad2; uint64_t latency_target; uint64_t latency_window;