options: fix buffer overrun

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 14c6969f3acb4bd741e1d33a5b70b1aac8d68b4a..0a033430103d075a6e9fda5e5fef43b84fff1c64 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -83,6 +83,7 @@ struct thread_options {
        unsigned long long size;
        unsigned long long io_size;
        unsigned int size_percent;
+       unsigned int io_size_percent;
        unsigned int fill_device;
        unsigned int file_append;
        unsigned long long file_size_low;
@@ -165,6 +166,7 @@ struct thread_options {
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
        fio_fp64_t gauss_dev;
+       fio_fp64_t random_center;
 
        unsigned int random_generator;
 
@@ -193,6 +195,7 @@ struct thread_options {
        unsigned int loops;
        unsigned long long zone_range;
        unsigned long long zone_size;
+       unsigned long long zone_capacity;
        unsigned long long zone_skip;
        enum fio_zone_mode zone_mode;
        unsigned long long lockmem;
@@ -201,6 +204,7 @@ struct thread_options {
 
        unsigned long long max_latency;
 
+       unsigned int exit_what;
        unsigned int stonewall;
        unsigned int new_group;
        unsigned int numjobs;
@@ -249,6 +253,7 @@ struct thread_options {
        unsigned int trim_zero;
        unsigned long long trim_backlog;
        unsigned int clat_percentiles;
+       unsigned int slat_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];
@@ -308,11 +313,7 @@ struct thread_options {
        unsigned int uid;
        unsigned int gid;
 
-       int flow_id;
-       int flow;
-       int flow_watermark;
-       unsigned int flow_sleep;
-
+       unsigned int offset_increment_percent;
        unsigned long long offset_increment;
        unsigned long long number_ios;
 
@@ -321,6 +322,14 @@ struct thread_options {
        unsigned long long latency_target;
        unsigned long long latency_window;
        fio_fp64_t latency_percentile;
+       uint32_t latency_run;
+
+       /*
+        * flow support
+        */
+       int flow_id;
+       unsigned int flow;
+       unsigned int flow_sleep;
 
        unsigned int sig_figs;
 
@@ -339,6 +348,7 @@ struct thread_options {
        /* Parameters that affect zonemode=zbd */
        unsigned int read_beyond_wp;
        int max_open_zones;
+       unsigned int job_max_open_zones;
        fio_fp64_t zrt;
        fio_fp64_t zrf;
 };
@@ -368,11 +378,12 @@ struct thread_options_pack {
        uint32_t iodepth_batch_complete_min;
        uint32_t iodepth_batch_complete_max;
        uint32_t serialize_overlap;
-       uint32_t lat_percentiles;
+       uint32_t pad;
 
        uint64_t size;
        uint64_t io_size;
        uint32_t size_percent;
+       uint32_t io_size_percent;
        uint32_t fill_device;
        uint32_t file_append;
        uint32_t unique_filename;
@@ -428,7 +439,7 @@ struct thread_options_pack {
        uint32_t override_sync;
        uint32_t rand_repeatable;
        uint32_t allrand_repeatable;
-       uint32_t pad;
+       uint32_t pad2;
        uint64_t rand_seed;
        uint32_t log_avg_msec;
        uint32_t log_hist_msec;
@@ -452,9 +463,12 @@ struct thread_options_pack {
        struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
        uint32_t zone_split_nr[DDIR_RWDIR_CNT];
 
+       uint8_t pad1[4];
+
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
        fio_fp64_t gauss_dev;
+       fio_fp64_t random_center;
 
        uint32_t random_generator;
 
@@ -462,7 +476,6 @@ struct thread_options_pack {
 
        uint32_t hugepage_size;
        uint64_t rw_min_bs;
-       uint32_t pad2;
        uint32_t thinktime;
        uint32_t thinktime_spin;
        uint32_t thinktime_blocks;
@@ -483,11 +496,13 @@ struct thread_options_pack {
        uint32_t loops;
        uint64_t zone_range;
        uint64_t zone_size;
+       uint64_t zone_capacity;
        uint64_t zone_skip;
        uint64_t lockmem;
        uint32_t mem_type;
        uint32_t mem_align;
 
+       uint32_t exit_what;
        uint32_t stonewall;
        uint32_t new_group;
        uint32_t numjobs;
@@ -536,6 +551,8 @@ struct thread_options_pack {
        uint32_t trim_zero;
        uint64_t trim_backlog;
        uint32_t clat_percentiles;
+       uint32_t lat_percentiles;
+       uint32_t slat_percentiles;
        uint32_t percentile_precision;
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
@@ -570,7 +587,6 @@ struct thread_options_pack {
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
        uint32_t rate_process;
        uint32_t rate_ign_think;
-       uint32_t pad3;
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
@@ -594,11 +610,7 @@ struct thread_options_pack {
        uint32_t uid;
        uint32_t gid;
 
-       int32_t flow_id;
-       int32_t flow;
-       int32_t flow_watermark;
-       uint32_t flow_sleep;
-
+       uint32_t offset_increment_percent;
        uint64_t offset_increment;
        uint64_t number_ios;
 
@@ -606,6 +618,14 @@ struct thread_options_pack {
        uint64_t latency_window;
        uint64_t max_latency;
        fio_fp64_t latency_percentile;
+       uint32_t latency_run;
+
+       /*
+        * flow support
+        */
+       int32_t flow_id;
+       uint32_t flow;
+       uint32_t flow_sleep;
 
        uint32_t sig_figs;