Fixup for a minor 0 byte file size case

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index d70fda3f949145ff99dec4026a9e6b137f0f078e..5e72867f234bec9c01b815911859b8ea415d62cf 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -68,7 +68,7 @@ struct thread_options {
        unsigned int unique_filename;
 
        unsigned long long size;
-       unsigned long long io_limit;
+       unsigned long long io_size;
        unsigned int size_percent;
        unsigned int fill_device;
        unsigned int file_append;
@@ -135,6 +135,7 @@ struct thread_options {
        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;
@@ -169,6 +170,10 @@ struct thread_options {
        unsigned long long start_delay_high;
        unsigned long long timeout;
        unsigned long long ramp_time;
+       unsigned int ss_state;
+       fio_fp64_t ss_limit;
+       unsigned long long ss_dur;
+       unsigned long long ss_ramp_time;
        unsigned int overwrite;
        unsigned int bw_avg_time;
        unsigned int iops_avg_time;
@@ -232,6 +237,12 @@ 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;
@@ -244,8 +255,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];
@@ -327,7 +338,7 @@ struct thread_options_pack {
        uint32_t __proper_alignment_for_64b;
 
        uint64_t size;
-       uint64_t io_limit;
+       uint64_t io_size;
        uint32_t size_percent;
        uint32_t fill_device;
        uint32_t file_append;
@@ -393,11 +404,13 @@ struct thread_options_pack {
        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;
@@ -425,6 +438,10 @@ struct thread_options_pack {
        uint64_t start_delay_high;
        uint64_t timeout;
        uint64_t ramp_time;
+       uint64_t ss_dur;
+       uint64_t ss_ramp_time;
+       uint32_t ss_state;
+       fio_fp64_t ss_limit;
        uint32_t overwrite;
        uint32_t bw_avg_time;
        uint32_t iops_avg_time;
@@ -485,10 +502,17 @@ struct thread_options_pack {
        uint64_t trim_backlog;
        uint32_t clat_percentiles;
        uint32_t percentile_precision;
+       uint32_t padding;       /* REMOVE ME when possible to maintain alignment */
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        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];
@@ -501,8 +525,8 @@ 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];