Fix the return type of log_err and log_info functions

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index e28c59d01bccfe2b8db9d934310c9686a09db3a2..dd5b9ef72a1dfd3d93f061f2053a4c5b35c09a24 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -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,7 +170,7 @@ struct thread_options {
        unsigned long long start_delay_high;
        unsigned long long timeout;
        unsigned long long ramp_time;
-       unsigned int ss;
+       unsigned int ss_state;
        fio_fp64_t ss_limit;
        unsigned long long ss_dur;
        unsigned long long ss_ramp_time;
@@ -236,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;
@@ -248,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];
@@ -397,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;
@@ -431,7 +440,7 @@ struct thread_options_pack {
        uint64_t ramp_time;
        uint64_t ss_dur;
        uint64_t ss_ramp_time;
-       uint32_t ss;
+       uint32_t ss_state;
        fio_fp64_t ss_limit;
        uint32_t overwrite;
        uint32_t bw_avg_time;
@@ -498,6 +507,12 @@ 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];
@@ -510,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];