Avoid buildenv conditional in thread_option struct

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 46421205cdf9f1ba5fb0c3da997adcc98055bda4..57d84dbba3defda3df5ae44fa0880954a3c28a93 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -52,6 +52,7 @@ struct thread_options {
        unsigned int iodepth_batch_complete;
 
        unsigned long long size;
+       unsigned long long io_limit;
        unsigned int size_percent;
        unsigned int fill_device;
        unsigned int file_append;
@@ -157,14 +158,12 @@ struct thread_options {
        os_cpu_mask_t verify_cpumask;
        unsigned int verify_cpumask_set;
        unsigned int cpus_allowed_policy;
-#ifdef CONFIG_LIBNUMA
-       struct bitmask *numa_cpunodesmask;
+       char *numa_cpunodes;
        unsigned int numa_cpumask_set;
        unsigned short numa_mem_mode;
        unsigned int numa_mem_prefer_node;
-       struct bitmask *numa_memnodesmask;
+       char *numa_memnodes;
        unsigned int numa_memmask_set;
-#endif
        unsigned int iolog;
        unsigned int rwmixcycle;
        unsigned int rwmix[DDIR_RWDIR_CNT];
@@ -280,6 +279,7 @@ struct thread_options_pack {
        uint32_t iodepth_batch_complete;
 
        uint64_t size;
+       uint64_t io_limit;
        uint32_t size_percent;
        uint32_t fill_device;
        uint32_t file_append;