fio: Fix (unsigned) integer overflow issues

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 6ae0335698c1de41ed60f8b69394106e004e9190..8ec6b971292a553f075527349f75314da65bf40d 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -25,12 +25,18 @@ enum fio_memtype {
 #define ERROR_STR_MAX  128
 
 #define BSSPLIT_MAX    64
+#define ZONESPLIT_MAX  64
 
 struct bssplit {
        uint32_t bs;
        uint32_t perc;
 };
 
+struct zone_split {
+       uint8_t access_perc;
+       uint8_t size_perc;
+};
+
 #define NR_OPTS_SZ     (FIO_MAX_OPTS / (8 * sizeof(uint64_t)))
 
 #define OPT_MAGIC      0x4f50544e
@@ -40,6 +46,7 @@ struct thread_options {
        uint64_t set_options[NR_OPTS_SZ];
        char *description;
        char *name;
+       char *wait_for;
        char *directory;
        char *filename;
        char *filename_format;
@@ -58,6 +65,8 @@ struct thread_options {
        unsigned int iodepth_batch_complete_min;
        unsigned int iodepth_batch_complete_max;
 
+       unsigned int unique_filename;
+
        unsigned long long size;
        unsigned long long io_limit;
        unsigned int size_percent;
@@ -112,6 +121,7 @@ struct thread_options {
        unsigned int verify_state_save;
        unsigned int use_thread;
        unsigned int unlink;
+       unsigned int unlink_each_loop;
        unsigned int do_disk_util;
        unsigned int override_sync;
        unsigned int rand_repeatable;
@@ -119,9 +129,13 @@ struct thread_options {
        unsigned long long rand_seed;
        unsigned int dep_use_os_rand;
        unsigned int log_avg_msec;
+       unsigned int log_hist_msec;
+       unsigned int log_hist_coarseness;
+       unsigned int log_max;
        unsigned int log_offset;
        unsigned int log_gz;
        unsigned int log_gz_store;
+       unsigned int log_unix_epoch;
        unsigned int norandommap;
        unsigned int softrandommap;
        unsigned int bs_unaligned;
@@ -133,6 +147,9 @@ struct thread_options {
        unsigned int random_distribution;
        unsigned int exitall_error;
 
+       struct zone_split *zone_split[DDIR_RWDIR_CNT];
+       unsigned int zone_split_nr[DDIR_RWDIR_CNT];
+
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
        fio_fp64_t gauss_dev;
@@ -216,9 +233,16 @@ struct thread_options {
 
        char *read_iolog_file;
        char *write_iolog_file;
+
+       unsigned int write_bw_log;
+       unsigned int write_lat_log;
+       unsigned int write_iops_log;
+       unsigned int write_hist_log;
+
        char *bw_log_file;
        char *lat_log_file;
        char *iops_log_file;
+       char *hist_log_file;
        char *replay_redirect;
 
        /*
@@ -227,8 +251,8 @@ struct thread_options {
        char *exec_prerun;
        char *exec_postrun;
 
-       unsigned int rate[DDIR_RWDIR_CNT];
-       unsigned int ratemin[DDIR_RWDIR_CNT];
+       uint64_t rate[DDIR_RWDIR_CNT];
+       uint64_t ratemin[DDIR_RWDIR_CNT];
        unsigned int ratecycle;
        unsigned int io_submit_mode;
        unsigned int rate_iops[DDIR_RWDIR_CNT];
@@ -289,6 +313,7 @@ struct thread_options_pack {
        uint64_t set_options[NR_OPTS_SZ];
        uint8_t description[FIO_TOP_STR_MAX];
        uint8_t name[FIO_TOP_STR_MAX];
+       uint8_t wait_for[FIO_TOP_STR_MAX];
        uint8_t directory[FIO_TOP_STR_MAX];
        uint8_t filename[FIO_TOP_STR_MAX];
        uint8_t filename_format[FIO_TOP_STR_MAX];
@@ -313,6 +338,7 @@ struct thread_options_pack {
        uint32_t size_percent;
        uint32_t fill_device;
        uint32_t file_append;
+       uint32_t unique_filename;
        uint64_t file_size_low;
        uint64_t file_size_high;
        uint64_t start_offset;
@@ -360,6 +386,7 @@ struct thread_options_pack {
        uint32_t verify_state_save;
        uint32_t use_thread;
        uint32_t unlink;
+       uint32_t unlink_each_loop;
        uint32_t do_disk_util;
        uint32_t override_sync;
        uint32_t rand_repeatable;
@@ -367,18 +394,26 @@ struct thread_options_pack {
        uint64_t rand_seed;
        uint32_t dep_use_os_rand;
        uint32_t log_avg_msec;
+       uint32_t log_hist_msec;
+       uint32_t log_hist_coarseness;
+       uint32_t log_max;
        uint32_t log_offset;
        uint32_t log_gz;
        uint32_t log_gz_store;
+       uint32_t log_unix_epoch;
        uint32_t norandommap;
        uint32_t softrandommap;
        uint32_t bs_unaligned;
        uint32_t fsync_on_close;
        uint32_t bs_is_seq_rand;
+       uint32_t pad1;
 
        uint32_t random_distribution;
        uint32_t exitall_error;
 
+       struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
+       uint32_t zone_split_nr[DDIR_RWDIR_CNT];
+
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
        fio_fp64_t gauss_dev;
@@ -463,9 +498,16 @@ struct thread_options_pack {
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
        uint8_t write_iolog_file[FIO_TOP_STR_MAX];
+
+       uint32_t write_bw_log;
+       uint32_t write_lat_log;
+       uint32_t write_iops_log;
+       uint32_t write_hist_log;
+
        uint8_t bw_log_file[FIO_TOP_STR_MAX];
        uint8_t lat_log_file[FIO_TOP_STR_MAX];
        uint8_t iops_log_file[FIO_TOP_STR_MAX];
+       uint8_t hist_log_file[FIO_TOP_STR_MAX];
        uint8_t replay_redirect[FIO_TOP_STR_MAX];
 
        /*
@@ -474,14 +516,13 @@ struct thread_options_pack {
        uint8_t exec_prerun[FIO_TOP_STR_MAX];
        uint8_t exec_postrun[FIO_TOP_STR_MAX];
 
-       uint32_t rate[DDIR_RWDIR_CNT];
-       uint32_t ratemin[DDIR_RWDIR_CNT];
+       uint64_t rate[DDIR_RWDIR_CNT];
+       uint64_t ratemin[DDIR_RWDIR_CNT];
        uint32_t ratecycle;
        uint32_t io_submit_mode;
        uint32_t rate_iops[DDIR_RWDIR_CNT];
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
        uint32_t rate_process;
-       uint32_t padding_0;   /* for alignment assert */
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
@@ -514,6 +555,7 @@ struct thread_options_pack {
        uint64_t number_ios;
 
        uint32_t sync_file_range;
+       uint32_t pad2;
 
        uint64_t latency_target;
        uint64_t latency_window;