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

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 6e1a2cddd1876a6796fd9cd048b27153da01b2c4..634070af00eca3f9cfc3b5ed7e669b1ff240a7ad 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -50,6 +50,12 @@ struct split {
        unsigned long long val2[ZONESPLIT_MAX];
 };
 
+struct split_prio {
+       uint64_t bs;
+       int32_t prio;
+       uint32_t perc;
+};
+
 struct bssplit {
        uint64_t bs;
        uint32_t perc;
@@ -166,6 +172,8 @@ struct thread_options {
        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;
        unsigned int softrandommap;
        unsigned int bs_unaligned;
@@ -255,6 +263,7 @@ struct thread_options {
        unsigned int dedupe_percentage;
        unsigned int dedupe_mode;
        unsigned int dedupe_working_set_percentage;
+       unsigned int dedupe_global;
        unsigned int time_based;
        unsigned int disable_lat;
        unsigned int disable_clat;
@@ -377,6 +386,7 @@ struct thread_options {
        fio_fp64_t zrt;
        fio_fp64_t zrf;
 
+       unsigned int log_entries;
        unsigned int log_prio;
 };
 
@@ -481,6 +491,8 @@ struct thread_options_pack {
        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;
        uint32_t softrandommap;
        uint32_t bs_unaligned;
@@ -567,6 +579,7 @@ struct thread_options_pack {
        uint32_t dedupe_percentage;
        uint32_t dedupe_mode;
        uint32_t dedupe_working_set_percentage;
+       uint32_t dedupe_global;
        uint32_t time_based;
        uint32_t disable_lat;
        uint32_t disable_clat;
@@ -585,6 +598,7 @@ struct thread_options_pack {
        uint32_t lat_percentiles;
        uint32_t slat_percentiles;
        uint32_t percentile_precision;
+       uint32_t pad5;
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
@@ -683,6 +697,7 @@ struct thread_options_pack {
        int32_t max_open_zones;
        uint32_t ignore_zone_limits;
 
+       uint32_t log_entries;
        uint32_t log_prio;
 } __attribute__((packed));
 
@@ -700,4 +715,8 @@ extern int str_split_parse(struct thread_data *td, char *str,
 extern int split_parse_ddir(struct thread_options *o, struct split *split,
                            char *str, bool absolute, unsigned int max_splits);
 
+extern int split_parse_prio_ddir(struct thread_options *o,
+                                struct split_prio **entries, int *nr_entries,
+                                char *str);
+
 #endif