Deprecate verifysort and verifysort_nr

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 050cd382291456c71392235ae95b9790703a71ae..4ec570dc12c65a45dac90e531eec00cde222c013 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -26,7 +26,7 @@ enum fio_memtype {
 #define ERROR_STR_MAX  128
 
 #define BSSPLIT_MAX    64
-#define ZONESPLIT_MAX  64
+#define ZONESPLIT_MAX  256
 
 struct bssplit {
        uint32_t bs;
@@ -110,8 +110,6 @@ struct thread_options {
        unsigned int write_hint;
        unsigned int verify;
        unsigned int do_verify;
-       unsigned int verifysort;
-       unsigned int verifysort_nr;
        unsigned int verify_interval;
        unsigned int verify_offset;
        char verify_pattern[MAX_PATTERN_SIZE];
@@ -192,7 +190,7 @@ struct thread_options {
        enum fio_memtype mem_type;
        unsigned int mem_align;
 
-       unsigned int max_latency;
+       unsigned long long max_latency;
 
        unsigned int stonewall;
        unsigned int new_group;
@@ -218,7 +216,6 @@ struct thread_options {
        unsigned int group_reporting;
        unsigned int stats;
        unsigned int fadvise_hint;
-       unsigned int fadvise_stream;
        enum fio_fallocate_mode fallocate_mode;
        unsigned int zero_buffers;
        unsigned int refill_buffers;
@@ -274,6 +271,7 @@ struct thread_options {
        unsigned int rate_iops[DDIR_RWDIR_CNT];
        unsigned int rate_iops_min[DDIR_RWDIR_CNT];
        unsigned int rate_process;
+       unsigned int rate_ign_think;
 
        char *ioscheduler;
 
@@ -317,6 +315,7 @@ struct thread_options {
 
        unsigned int replay_align;
        unsigned int replay_scale;
+       unsigned int replay_time_scale;
 
        unsigned int per_job_logs;
 
@@ -390,8 +389,6 @@ struct thread_options_pack {
        uint32_t write_hint;
        uint32_t verify;
        uint32_t do_verify;
-       uint32_t verifysort;
-       uint32_t verifysort_nr;
        uint32_t verify_interval;
        uint32_t verify_offset;
        uint8_t verify_pattern[MAX_PATTERN_SIZE];
@@ -429,7 +426,8 @@ struct thread_options_pack {
 
        uint32_t random_distribution;
        uint32_t exitall_error;
-       uint32_t pad;
+
+       uint32_t sync_file_range;
 
        struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
        uint32_t zone_split_nr[DDIR_RWDIR_CNT];
@@ -469,8 +467,6 @@ struct thread_options_pack {
        uint32_t mem_type;
        uint32_t mem_align;
 
-       uint32_t max_latency;
-
        uint32_t stonewall;
        uint32_t new_group;
        uint32_t numjobs;
@@ -495,7 +491,6 @@ struct thread_options_pack {
        uint32_t group_reporting;
        uint32_t stats;
        uint32_t fadvise_hint;
-       uint32_t fadvise_stream;
        uint32_t fallocate_mode;
        uint32_t zero_buffers;
        uint32_t refill_buffers;
@@ -550,6 +545,8 @@ struct thread_options_pack {
        uint32_t rate_iops[DDIR_RWDIR_CNT];
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
        uint32_t rate_process;
+       uint32_t rate_ign_think;
+       uint32_t pad;
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
@@ -581,11 +578,9 @@ struct thread_options_pack {
        uint64_t offset_increment;
        uint64_t number_ios;
 
-       uint32_t sync_file_range;
-       uint32_t pad2;
-
        uint64_t latency_target;
        uint64_t latency_window;
+       uint64_t max_latency;
        fio_fp64_t latency_percentile;
 
        uint32_t sig_figs;
@@ -594,6 +589,7 @@ struct thread_options_pack {
 
        uint32_t replay_align;
        uint32_t replay_scale;
+       uint32_t replay_time_scale;
 
        uint32_t per_job_logs;