Merge branch 'chunked-iolog-reading' of https://github.com/aclamk/fio

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index ca549b542703de11c32f5958fa6947a3a6c4d916..8bbf54bfbafad3fc41e7dac1e7d5a37d31d6afe9 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -26,16 +26,18 @@ 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;
+       uint64_t bs;
        uint32_t perc;
 };
 
 struct zone_split {
        uint8_t access_perc;
        uint8_t size_perc;
+       uint8_t pad[6];
+       uint64_t size;
 };
 
 #define NR_OPTS_SZ     (FIO_MAX_OPTS / (8 * sizeof(uint64_t)))
@@ -80,10 +82,10 @@ struct thread_options {
        unsigned long long start_offset;
        unsigned long long start_offset_align;
 
-       unsigned int bs[DDIR_RWDIR_CNT];
-       unsigned int ba[DDIR_RWDIR_CNT];
-       unsigned int min_bs[DDIR_RWDIR_CNT];
-       unsigned int max_bs[DDIR_RWDIR_CNT];
+       unsigned long long bs[DDIR_RWDIR_CNT];
+       unsigned long long ba[DDIR_RWDIR_CNT];
+       unsigned long long min_bs[DDIR_RWDIR_CNT];
+       unsigned long long max_bs[DDIR_RWDIR_CNT];
        struct bssplit *bssplit[DDIR_RWDIR_CNT];
        unsigned int bssplit_nr[DDIR_RWDIR_CNT];
 
@@ -108,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];
@@ -164,7 +164,8 @@ struct thread_options {
        unsigned int perc_rand[DDIR_RWDIR_CNT];
 
        unsigned int hugepage_size;
-       unsigned int rw_min_bs;
+       unsigned long long rw_min_bs;
+       unsigned int pad2;
        unsigned int thinktime;
        unsigned int thinktime_spin;
        unsigned int thinktime_blocks;
@@ -172,6 +173,7 @@ struct thread_options {
        unsigned int fdatasync_blocks;
        unsigned int barrier_blocks;
        unsigned long long start_delay;
+       unsigned long long start_delay_orig;
        unsigned long long start_delay_high;
        unsigned long long timeout;
        unsigned long long ramp_time;
@@ -190,7 +192,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;
@@ -216,7 +218,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;
@@ -246,6 +247,7 @@ struct thread_options {
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        char *read_iolog_file;
+       bool read_iolog_chunked;
        char *write_iolog_file;
 
        unsigned int write_bw_log;
@@ -272,6 +274,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;
 
@@ -315,6 +318,8 @@ struct thread_options {
 
        unsigned int replay_align;
        unsigned int replay_scale;
+       unsigned int replay_time_scale;
+       unsigned int replay_skip;
 
        unsigned int per_job_logs;
 
@@ -360,10 +365,10 @@ struct thread_options_pack {
        uint64_t start_offset;
        uint64_t start_offset_align;
 
-       uint32_t bs[DDIR_RWDIR_CNT];
-       uint32_t ba[DDIR_RWDIR_CNT];
-       uint32_t min_bs[DDIR_RWDIR_CNT];
-       uint32_t max_bs[DDIR_RWDIR_CNT];
+       uint64_t bs[DDIR_RWDIR_CNT];
+       uint64_t ba[DDIR_RWDIR_CNT];
+       uint64_t min_bs[DDIR_RWDIR_CNT];
+       uint64_t max_bs[DDIR_RWDIR_CNT];
        struct bssplit bssplit[DDIR_RWDIR_CNT][BSSPLIT_MAX];
        uint32_t bssplit_nr[DDIR_RWDIR_CNT];
 
@@ -388,8 +393,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];
@@ -427,7 +430,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];
@@ -441,7 +445,8 @@ struct thread_options_pack {
        uint32_t perc_rand[DDIR_RWDIR_CNT];
 
        uint32_t hugepage_size;
-       uint32_t rw_min_bs;
+       uint64_t rw_min_bs;
+       uint32_t pad2;
        uint32_t thinktime;
        uint32_t thinktime_spin;
        uint32_t thinktime_blocks;
@@ -467,8 +472,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;
@@ -493,7 +496,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;
@@ -548,6 +550,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];
 
@@ -579,11 +583,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;
@@ -592,6 +594,8 @@ struct thread_options_pack {
 
        uint32_t replay_align;
        uint32_t replay_scale;
+       uint32_t replay_time_scale;
+       uint32_t replay_skip;
 
        uint32_t per_job_logs;