Merge branch 'atomic-writes'

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index fdde055e7d71932753b4b1fd500a510929f61693..d0e0a4aea2d3222f5eac37c96006e1ab04f5eed4 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -156,6 +156,7 @@ struct thread_options {
        unsigned int experimental_verify;
        unsigned int verify_state;
        unsigned int verify_state_save;
+       unsigned int verify_write_sequence;
        unsigned int use_thread;
        unsigned int unlink;
        unsigned int unlink_each_loop;
@@ -309,6 +310,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 +354,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,14 +392,16 @@ 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;
+       uint16_t dp_ids[FIO_MAX_DP_IDS];
+       unsigned int dp_nr_ids;
+       char *dp_scheme_file;
 
        unsigned int log_entries;
        unsigned int log_prio;
+       unsigned int log_issue_time;
 };
 
 #define FIO_TOP_STR_MAX                256
@@ -626,6 +633,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;
@@ -671,8 +680,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
@@ -701,12 +710,16 @@ struct thread_options_pack {
 
        uint32_t log_entries;
        uint32_t log_prio;
+       uint32_t log_issue_time;
 
        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;
+       uint16_t dp_ids[FIO_MAX_DP_IDS];
+       uint32_t dp_nr_ids;
+       uint8_t dp_scheme_file[FIO_TOP_STR_MAX];
 
+       uint32_t num_range;
        /*
         * verify_pattern followed by buffer_pattern from the unpacked struct
         */