Fio 3.15

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 8b06f55a415efcddfda3dbdc9fa50640a9ff761a..14c6969f3acb4bd741e1d33a5b70b1aac8d68b4a 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -140,7 +140,6 @@ struct thread_options {
        unsigned int rand_repeatable;
        unsigned int allrand_repeatable;
        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;
@@ -173,7 +172,6 @@ struct thread_options {
 
        unsigned int hugepage_size;
        unsigned long long rw_min_bs;
-       unsigned int pad2;
        unsigned int thinktime;
        unsigned int thinktime_spin;
        unsigned int thinktime_blocks;
@@ -259,6 +257,8 @@ struct thread_options {
        bool read_iolog_chunked;
        char *write_iolog_file;
        char *merge_blktrace_file;
+       fio_fp64_t merge_blktrace_scalars[FIO_IO_U_LIST_MAX_LEN];
+       fio_fp64_t merge_blktrace_iters[FIO_IO_U_LIST_MAX_LEN];
 
        unsigned int write_bw_log;
        unsigned int write_lat_log;
@@ -428,8 +428,8 @@ struct thread_options_pack {
        uint32_t override_sync;
        uint32_t rand_repeatable;
        uint32_t allrand_repeatable;
+       uint32_t pad;
        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;
@@ -542,6 +542,8 @@ struct thread_options_pack {
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
        uint8_t write_iolog_file[FIO_TOP_STR_MAX];
        uint8_t merge_blktrace_file[FIO_TOP_STR_MAX];
+       fio_fp64_t merge_blktrace_scalars[FIO_IO_U_LIST_MAX_LEN];
+       fio_fp64_t merge_blktrace_iters[FIO_IO_U_LIST_MAX_LEN];
 
        uint32_t write_bw_log;
        uint32_t write_lat_log;
@@ -568,7 +570,7 @@ struct thread_options_pack {
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
        uint32_t rate_process;
        uint32_t rate_ign_think;
-       uint32_t pad;
+       uint32_t pad3;
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];