ioengine: if we get BUSY in queuing, adjust accounting

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index f0c6325b76fd52e527948909b1aa1af4a21bf1cb..611f8e7376fab6eff15272bb08adb62ec09270ab 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -163,16 +163,12 @@ struct thread_options {
        unsigned int new_group;
        unsigned int numjobs;
        os_cpu_mask_t cpumask;
-       unsigned int cpumask_set;
        os_cpu_mask_t verify_cpumask;
-       unsigned int verify_cpumask_set;
        unsigned int cpus_allowed_policy;
        char *numa_cpunodes;
-       unsigned int numa_cpumask_set;
        unsigned short numa_mem_mode;
        unsigned int numa_mem_prefer_node;
        char *numa_memnodes;
-       unsigned int numa_memmask_set;
        unsigned int iolog;
        unsigned int rwmixcycle;
        unsigned int rwmix[DDIR_RWDIR_CNT];
@@ -199,7 +195,6 @@ struct thread_options {
        unsigned int unified_rw_rep;
        unsigned int gtod_reduce;
        unsigned int gtod_cpu;
-       unsigned int gtod_offload;
        enum fio_cs clocksource;
        unsigned int no_stall;
        unsigned int trim_percentage;
@@ -339,7 +334,6 @@ struct thread_options_pack {
        uint32_t experimental_verify;
        uint32_t verify_state;
        uint32_t verify_state_save;
-       uint32_t pad;
        uint32_t use_thread;
        uint32_t unlink;
        uint32_t do_disk_util;
@@ -359,6 +353,7 @@ struct thread_options_pack {
        uint32_t bs_is_seq_rand;
 
        uint32_t random_distribution;
+       uint32_t pad;
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
 
@@ -395,9 +390,7 @@ struct thread_options_pack {
        uint32_t new_group;
        uint32_t numjobs;
        uint8_t cpumask[FIO_TOP_STR_MAX];
-       uint32_t cpumask_set;
        uint8_t verify_cpumask[FIO_TOP_STR_MAX];
-       uint32_t verify_cpumask_set;
        uint32_t cpus_allowed_policy;
        uint32_t iolog;
        uint32_t rwmixcycle;
@@ -425,7 +418,6 @@ struct thread_options_pack {
        uint32_t unified_rw_rep;
        uint32_t gtod_reduce;
        uint32_t gtod_cpu;
-       uint32_t gtod_offload;
        uint32_t clocksource;
        uint32_t no_stall;
        uint32_t trim_percentage;
@@ -434,6 +426,7 @@ struct thread_options_pack {
        uint64_t trim_backlog;
        uint32_t clat_percentiles;
        uint32_t percentile_precision;
+       uint32_t pad2;
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
@@ -486,10 +479,10 @@ struct thread_options_pack {
        uint64_t number_ios;
 
        uint32_t sync_file_range;
-       uint32_t pad2;
 
        uint64_t latency_target;
        uint64_t latency_window;
+       uint32_t pad3;
        fio_fp64_t latency_percentile;
 } __attribute__((packed));