Merge branch 'master' of https://github.com/bvanassche/fio

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 74e7ea45868b50a8701079fa99d23e81d7a2ab9f..a24ebee69c47af1b82643cd73a2446bb80d88f98 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -162,7 +162,6 @@ struct thread_options {
        unsigned int do_disk_util;
        unsigned int override_sync;
        unsigned int rand_repeatable;
-       unsigned int allrand_repeatable;
        unsigned long long rand_seed;
        unsigned int log_avg_msec;
        unsigned int log_hist_msec;
@@ -211,6 +210,7 @@ struct thread_options {
        fio_fp64_t ss_limit;
        unsigned long long ss_dur;
        unsigned long long ss_ramp_time;
+       unsigned long long ss_check_interval;
        unsigned int overwrite;
        unsigned int bw_avg_time;
        unsigned int iops_avg_time;
@@ -386,6 +386,11 @@ struct thread_options {
        fio_fp64_t zrt;
        fio_fp64_t zrf;
 
+#define FIO_MAX_PLIS 16
+       unsigned int fdp;
+       unsigned int fdp_plis[FIO_MAX_PLIS];
+       unsigned int fdp_nrpli;
+
        unsigned int log_entries;
        unsigned int log_prio;
 };
@@ -479,8 +484,6 @@ struct thread_options_pack {
        uint32_t do_disk_util;
        uint32_t override_sync;
        uint32_t rand_repeatable;
-       uint32_t allrand_repeatable;
-       uint32_t pad2;
        uint64_t rand_seed;
        uint32_t log_avg_msec;
        uint32_t log_hist_msec;
@@ -528,6 +531,7 @@ struct thread_options_pack {
        uint64_t ss_ramp_time;
        uint32_t ss_state;
        fio_fp64_t ss_limit;
+       uint64_t ss_check_interval;
        uint32_t overwrite;
        uint32_t bw_avg_time;
        uint32_t iops_avg_time;
@@ -698,6 +702,10 @@ struct thread_options_pack {
        uint32_t log_entries;
        uint32_t log_prio;
 
+       uint32_t fdp;
+       uint32_t fdp_plis[FIO_MAX_PLIS];
+       uint32_t fdp_nrpli;
+
        /*
         * verify_pattern followed by buffer_pattern from the unpacked struct
         */