t/zbd: avoid test case 31 failure with small devices

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 38a9993d23a3eef4395d450ed73253a1d1ee5e2a..a36b79094f26a77afdfe327b85182f601cd09c31 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -170,7 +170,6 @@ struct thread_options {
        unsigned int log_offset;
        unsigned int log_gz;
        unsigned int log_gz_store;
-       unsigned int log_unix_epoch;
        unsigned int log_alternate_epoch;
        unsigned int log_alternate_epoch_clock_id;
        unsigned int norandommap;
@@ -273,6 +272,7 @@ struct thread_options {
        unsigned int unified_rw_rep;
        unsigned int gtod_reduce;
        unsigned int gtod_cpu;
+       unsigned int job_start_clock_id;
        enum fio_cs clocksource;
        unsigned int no_stall;
        unsigned int trim_percentage;
@@ -309,6 +309,8 @@ struct thread_options {
        char *exec_prerun;
        char *exec_postrun;
 
+       unsigned int thinkcycles;
+
        unsigned int thinktime;
        unsigned int thinktime_spin;
        unsigned int thinktime_blocks;
@@ -351,12 +353,14 @@ struct thread_options {
        unsigned long long offset_increment;
        unsigned long long number_ios;
 
+       unsigned int num_range;
+
        unsigned int sync_file_range;
 
        unsigned long long latency_target;
        unsigned long long latency_window;
-       fio_fp64_t latency_percentile;
        uint32_t latency_run;
+       fio_fp64_t latency_percentile;
 
        /*
         * flow support
@@ -387,11 +391,11 @@ struct thread_options {
        fio_fp64_t zrt;
        fio_fp64_t zrf;
 
-#define FIO_MAX_PLIS 16
        unsigned int fdp;
-       unsigned int fdp_pli_select;
-       unsigned int fdp_plis[FIO_MAX_PLIS];
-       unsigned int fdp_nrpli;
+       unsigned int dp_type;
+       unsigned int dp_id_select;
+       unsigned int dp_ids[FIO_MAX_DP_IDS];
+       unsigned int dp_nr_ids;
 
        unsigned int log_entries;
        unsigned int log_prio;
@@ -422,7 +426,6 @@ struct thread_options_pack {
        uint32_t iodepth_batch_complete_min;
        uint32_t iodepth_batch_complete_max;
        uint32_t serialize_overlap;
-       uint32_t pad;
 
        uint64_t size;
        uint64_t io_size;
@@ -433,13 +436,11 @@ struct thread_options_pack {
        uint32_t fill_device;
        uint32_t file_append;
        uint32_t unique_filename;
-       uint32_t pad3;
        uint64_t file_size_low;
        uint64_t file_size_high;
        uint64_t start_offset;
        uint64_t start_offset_align;
        uint32_t start_offset_nz;
-       uint32_t pad4;
 
        uint64_t bs[DDIR_RWDIR_CNT];
        uint64_t ba[DDIR_RWDIR_CNT];
@@ -494,7 +495,6 @@ struct thread_options_pack {
        uint32_t log_offset;
        uint32_t log_gz;
        uint32_t log_gz_store;
-       uint32_t log_unix_epoch;
        uint32_t log_alternate_epoch;
        uint32_t log_alternate_epoch_clock_id;
        uint32_t norandommap;
@@ -593,6 +593,7 @@ struct thread_options_pack {
        uint32_t unified_rw_rep;
        uint32_t gtod_reduce;
        uint32_t gtod_cpu;
+       uint32_t job_start_clock_id;
        uint32_t clocksource;
        uint32_t no_stall;
        uint32_t trim_percentage;
@@ -603,6 +604,7 @@ struct thread_options_pack {
        uint32_t lat_percentiles;
        uint32_t slat_percentiles;
        uint32_t percentile_precision;
+       uint32_t pad;
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
@@ -628,6 +630,8 @@ struct thread_options_pack {
        uint8_t exec_prerun[FIO_TOP_STR_MAX];
        uint8_t exec_postrun[FIO_TOP_STR_MAX];
 
+       uint32_t thinkcycles;
+
        uint32_t thinktime;
        uint32_t thinktime_spin;
        uint32_t thinktime_blocks;
@@ -673,8 +677,8 @@ struct thread_options_pack {
        uint64_t latency_target;
        uint64_t latency_window;
        uint64_t max_latency[DDIR_RWDIR_CNT];
-       fio_fp64_t latency_percentile;
        uint32_t latency_run;
+       fio_fp64_t latency_percentile;
 
        /*
         * flow support
@@ -705,10 +709,12 @@ struct thread_options_pack {
        uint32_t log_prio;
 
        uint32_t fdp;
-       uint32_t fdp_pli_select;
-       uint32_t fdp_plis[FIO_MAX_PLIS];
-       uint32_t fdp_nrpli;
+       uint32_t dp_type;
+       uint32_t dp_id_select;
+       uint32_t dp_ids[FIO_MAX_DP_IDS];
+       uint32_t dp_nr_ids;
 
+       uint32_t num_range;
        /*
         * verify_pattern followed by buffer_pattern from the unpacked struct
         */