options: make max_latency a 64-bit variable

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index fd6576e252c75ae3e294b6cf6f5c449486ca2d90..353230055fb473ddb03a7f12b1f84cb966fce946 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -36,6 +36,8 @@ struct bssplit {
 struct zone_split {
        uint8_t access_perc;
        uint8_t size_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)))
 };
 
 #define NR_OPTS_SZ     (FIO_MAX_OPTS / (8 * sizeof(uint64_t)))


@@ -78,6 +80,7 @@ struct thread_options {
        unsigned long long file_size_low;
        unsigned long long file_size_high;
        unsigned long long start_offset;
        unsigned long long file_size_low;
        unsigned long long file_size_high;
        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 bs[DDIR_RWDIR_CNT];
        unsigned int ba[DDIR_RWDIR_CNT];


@@ -189,7 +192,7 @@ struct thread_options {
        enum fio_memtype mem_type;
        unsigned int mem_align;
 
        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;
 
        unsigned int stonewall;
        unsigned int new_group;


@@ -240,6 +243,7 @@ struct thread_options {
        unsigned int trim_zero;
        unsigned long long trim_backlog;
        unsigned int clat_percentiles;
        unsigned int trim_zero;
        unsigned long long trim_backlog;
        unsigned int clat_percentiles;

+       unsigned int lat_percentiles;

        unsigned int percentile_precision;      /* digits after decimal for percentiles */
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        unsigned int percentile_precision;      /* digits after decimal for percentiles */
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 


@@ -307,6 +311,8 @@ struct thread_options {
        unsigned long long latency_window;
        fio_fp64_t latency_percentile;
 
        unsigned long long latency_window;
        fio_fp64_t latency_percentile;
 

+       unsigned int sig_figs;
+

        unsigned block_error_hist;
 
        unsigned int replay_align;
        unsigned block_error_hist;
 
        unsigned int replay_align;


@@ -343,7 +349,7 @@ struct thread_options_pack {
        uint32_t iodepth_batch_complete_min;
        uint32_t iodepth_batch_complete_max;
        uint32_t serialize_overlap;
        uint32_t iodepth_batch_complete_min;
        uint32_t iodepth_batch_complete_max;
        uint32_t serialize_overlap;

-       uint32_t pad3;
+       uint32_t lat_percentiles;

 
        uint64_t size;
        uint64_t io_size;
 
        uint64_t size;
        uint64_t io_size;


@@ -354,6 +360,7 @@ struct thread_options_pack {
        uint64_t file_size_low;
        uint64_t file_size_high;
        uint64_t start_offset;
        uint64_t file_size_low;
        uint64_t file_size_high;
        uint64_t start_offset;

+       uint64_t start_offset_align;

 
        uint32_t bs[DDIR_RWDIR_CNT];
        uint32_t ba[DDIR_RWDIR_CNT];
 
        uint32_t bs[DDIR_RWDIR_CNT];
        uint32_t ba[DDIR_RWDIR_CNT];


@@ -422,7 +429,8 @@ struct thread_options_pack {
 
        uint32_t random_distribution;
        uint32_t exitall_error;
 
        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];
 
        struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
        uint32_t zone_split_nr[DDIR_RWDIR_CNT];


@@ -462,8 +470,6 @@ struct thread_options_pack {
        uint32_t mem_type;
        uint32_t mem_align;
 
        uint32_t mem_type;
        uint32_t mem_align;
 

-       uint32_t max_latency;
-

        uint32_t stonewall;
        uint32_t new_group;
        uint32_t numjobs;
        uint32_t stonewall;
        uint32_t new_group;
        uint32_t numjobs;


@@ -514,6 +520,7 @@ struct thread_options_pack {
        uint64_t trim_backlog;
        uint32_t clat_percentiles;
        uint32_t percentile_precision;
        uint64_t trim_backlog;
        uint32_t clat_percentiles;
        uint32_t percentile_precision;

+       uint32_t pad;

        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];


@@ -574,13 +581,13 @@ struct thread_options_pack {
        uint64_t offset_increment;
        uint64_t number_ios;
 
        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 latency_target;
        uint64_t latency_window;

+       uint64_t max_latency;

        fio_fp64_t latency_percentile;
 
        fio_fp64_t latency_percentile;
 

+       uint32_t sig_figs;
+

        uint32_t block_error_hist;
 
        uint32_t replay_align;
        uint32_t block_error_hist;
 
        uint32_t replay_align;