Introduce new option: iodepth_batch_complete_max

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index ecf4e4729403399f2418241cc10e6bff485641f8..5ef560ef157d02e58f7c42f74f5a0780a9feefc0 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -3,9 +3,11 @@
 
 #include "arch/arch.h"
 #include "os/os.h"
+#include "options.h"
 #include "stat.h"
 #include "gettime.h"
 #include "lib/ieee754.h"
+#include "lib/pattern.h"
 #include "td_error.h"
 
 /*
@@ -28,10 +30,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;
@@ -49,7 +54,8 @@ struct thread_options {
        unsigned int iodepth;
        unsigned int iodepth_low;
        unsigned int iodepth_batch;
-       unsigned int iodepth_batch_complete;
+       unsigned int iodepth_batch_complete_min;
+       unsigned int iodepth_batch_complete_max;
 
        unsigned long long size;
        unsigned long long io_limit;
@@ -93,12 +99,16 @@ struct thread_options {
        unsigned int verify_offset;
        char verify_pattern[MAX_PATTERN_SIZE];
        unsigned int verify_pattern_bytes;
+       struct pattern_fmt verify_fmt[8];
+       unsigned int verify_fmt_sz;
        unsigned int verify_fatal;
        unsigned int verify_dump;
        unsigned int verify_async;
        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 +116,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 +133,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 +168,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 +183,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;
@@ -193,7 +201,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;
@@ -220,6 +227,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];
 
@@ -258,11 +266,23 @@ 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;
+
+       unsigned int per_job_logs;
+
+       unsigned int allow_create;
+       unsigned int allow_mounted_write;
 };
 
 #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];
@@ -280,7 +300,9 @@ struct thread_options_pack {
        uint32_t iodepth;
        uint32_t iodepth_low;
        uint32_t iodepth_batch;
-       uint32_t iodepth_batch_complete;
+       uint32_t iodepth_batch_complete_min;
+       uint32_t iodepth_batch_complete_max;
+       uint32_t __proper_alignment_for_64b;
 
        uint64_t size;
        uint64_t io_limit;
@@ -330,6 +352,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;
@@ -337,7 +361,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;
@@ -350,8 +374,10 @@ struct thread_options_pack {
 
        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;
 
@@ -386,9 +412,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;
@@ -399,6 +423,7 @@ 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;
@@ -416,7 +441,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;
@@ -443,6 +467,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];
 
@@ -477,11 +502,21 @@ struct thread_options_pack {
        uint64_t number_ios;
 
        uint32_t sync_file_range;
-       uint32_t pad2;
 
        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;
+
+       uint32_t per_job_logs;
+
+       uint32_t allow_create;
+       uint32_t allow_mounted_write;
 } __attribute__((packed));
 
 extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);