Merge branch 'master' into gfio

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 9975af17d4f24b078f78bfea23c81475c5ba5cf6..ae83f08a2b20023cee0b51562fff1e5ff34ff78d 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -98,6 +98,7 @@ struct thread_options {
        unsigned int verify;
        unsigned int do_verify;
        unsigned int verifysort;
+       unsigned int verifysort_nr;
        unsigned int verify_interval;
        unsigned int verify_offset;
        char verify_pattern[MAX_PATTERN_SIZE];
@@ -107,6 +108,7 @@ struct thread_options {
        unsigned int verify_async;
        unsigned long long verify_backlog;
        unsigned int verify_batch;
+       unsigned int experimental_verify;
        unsigned int use_thread;
        unsigned int unlink;
        unsigned int do_disk_util;
@@ -123,6 +125,8 @@ struct thread_options {
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
 
+       unsigned int random_generator;
+
        unsigned int hugepage_size;
        unsigned int rw_min_bs;
        unsigned int thinktime;
@@ -154,7 +158,7 @@ struct thread_options {
        unsigned int cpumask_set;
        os_cpu_mask_t verify_cpumask;
        unsigned int verify_cpumask_set;
-#ifdef FIO_HAVE_LIBNUMA
+#ifdef CONFIG_LIBNUMA
        struct bitmask *numa_cpunodesmask;
        unsigned int numa_cpumask_set;
        unsigned short numa_mem_mode;
@@ -182,6 +186,7 @@ struct thread_options {
        unsigned int disable_clat;
        unsigned int disable_slat;
        unsigned int disable_bw;
+       unsigned int unified_rw_rep;
        unsigned int gtod_reduce;
        unsigned int gtod_cpu;
        unsigned int gtod_offload;
@@ -301,6 +306,7 @@ struct thread_options_pack {
        uint32_t verify;
        uint32_t do_verify;
        uint32_t verifysort;
+       uint32_t verifysort_nr;
        uint32_t verify_interval;
        uint32_t verify_offset;
        uint8_t verify_pattern[MAX_PATTERN_SIZE];
@@ -310,6 +316,7 @@ struct thread_options_pack {
        uint32_t verify_async;
        uint64_t verify_backlog;
        uint32_t verify_batch;
+       uint32_t experimental_verify;
        uint32_t use_thread;
        uint32_t unlink;
        uint32_t do_disk_util;
@@ -326,6 +333,8 @@ struct thread_options_pack {
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
 
+       uint32_t random_generator;
+
        uint32_t hugepage_size;
        uint32_t rw_min_bs;
        uint32_t thinktime;
@@ -377,6 +386,7 @@ struct thread_options_pack {
        uint32_t disable_clat;
        uint32_t disable_slat;
        uint32_t disable_bw;
+       uint32_t unified_rw_rep;
        uint32_t gtod_reduce;
        uint32_t gtod_cpu;
        uint32_t gtod_offload;