Get rid of _set variables

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index bacd86b483aa4f9f2f863227d845d1a76506893f..530dd9a6f460e7b33a2c86efa62a6f0d45ffb93b 100644 (file)
--- 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;
@@ -52,8 +56,10 @@ struct thread_options {
        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;
@@ -97,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;
@@ -104,8 +112,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;
@@ -152,18 +163,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;
-#ifdef CONFIG_LIBNUMA
-       struct bitmask *numa_cpunodesmask;
-       unsigned int numa_cpumask_set;
+       char *numa_cpunodes;
        unsigned short numa_mem_mode;
        unsigned int numa_mem_prefer_node;
-       struct bitmask *numa_memnodesmask;
-       unsigned int numa_memmask_set;
-#endif
+       char *numa_memnodes;
        unsigned int iolog;
        unsigned int rwmixcycle;
        unsigned int rwmix[DDIR_RWDIR_CNT];
@@ -181,6 +186,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;
@@ -259,6 +265,7 @@ struct thread_options {
 #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];
@@ -279,8 +286,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;
@@ -324,6 +333,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;
@@ -331,8 +342,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;
@@ -340,6 +354,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;
 
@@ -376,9 +391,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;
@@ -395,8 +408,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;
@@ -466,6 +480,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;