Fix cases where td->terminate is set, but terminate clock not marked

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 4ea6ebd06a0c07f5212c237f6f7fcfcc808a84c1..e545a8fdc81b37d82530a58116b5942b97299181 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -45,15 +45,17 @@ struct thread_options {
        unsigned int kb_base;
        unsigned int unit_base;
        unsigned int ddir_seq_nr;
-       long ddir_seq_add;
+       long long ddir_seq_add;
        unsigned int iodepth;
        unsigned int iodepth_low;
        unsigned int iodepth_batch;
        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;
        unsigned long long file_size_low;
        unsigned long long file_size_high;
        unsigned long long start_offset;
@@ -106,6 +108,9 @@ struct thread_options {
        unsigned long long rand_seed;
        unsigned int use_os_rand;
        unsigned int log_avg_msec;
+       unsigned int log_offset;
+       unsigned int log_gz;
+       unsigned int log_gz_store;
        unsigned int norandommap;
        unsigned int softrandommap;
        unsigned int bs_unaligned;
@@ -156,14 +161,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];
@@ -279,8 +282,10 @@ 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;
        uint64_t file_size_low;
        uint64_t file_size_high;
        uint64_t start_offset;
@@ -333,6 +338,9 @@ struct thread_options_pack {
        uint64_t rand_seed;
        uint32_t use_os_rand;
        uint32_t log_avg_msec;
+       uint32_t log_offset;
+       uint32_t log_gz;
+       uint32_t log_gz_store;
        uint32_t norandommap;
        uint32_t softrandommap;
        uint32_t bs_unaligned;