thread_options: drop fadvise_stream from thread_options

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index ca549b542703de11c32f5958fa6947a3a6c4d916..793df8a587327d0224410f90e0db0e0ef36010e6 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;
@@ -36,6 +36,8 @@ struct bssplit {
 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)))
@@ -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;
@@ -427,7 +428,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];
@@ -467,8 +469,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 +493,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;
@@ -579,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;