Avoid buildenv conditional in thread_option struct

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 7476d8c264d0871e54ec034a01ccb0a4cc1be956..57d84dbba3defda3df5ae44fa0880954a3c28a93 100644 (file)
--- 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;
@@ -100,6 +104,8 @@ struct thread_options {
        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;
@@ -108,6 +114,8 @@ struct thread_options {
        unsigned int fsync_on_close;
        unsigned int bs_is_seq_rand;
 
+       unsigned int verify_only;
+
        unsigned int random_distribution;
 
        fio_fp64_t zipf_theta;
@@ -126,6 +134,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;
@@ -148,14 +157,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];
@@ -169,6 +177,8 @@ struct thread_options {
        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;
@@ -269,8 +279,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;
@@ -319,6 +331,8 @@ struct thread_options_pack {
        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;
@@ -344,6 +358,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;
@@ -366,6 +381,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];
@@ -379,6 +395,8 @@ struct thread_options_pack {
        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;