stat: Fix another memory leak in add_ddir_status_json()

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 4f791cf366dd38360cb31a53daa32a4ca2cae4e1..4b131bdaa3a266cbafdb4d8e11e2747e28f7b31e 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -140,7 +140,6 @@ struct thread_options {
        unsigned int rand_repeatable;
        unsigned int allrand_repeatable;
        unsigned long long rand_seed;
-       unsigned int dep_use_os_rand;
        unsigned int log_avg_msec;
        unsigned int log_hist_msec;
        unsigned int log_hist_coarseness;
@@ -173,7 +172,6 @@ struct thread_options {
 
        unsigned int hugepage_size;
        unsigned long long rw_min_bs;
-       unsigned int pad2;
        unsigned int thinktime;
        unsigned int thinktime_spin;
        unsigned int thinktime_blocks;
@@ -203,7 +201,8 @@ struct thread_options {
 
        unsigned long long max_latency;
 
-       unsigned int stonewall;
+       unsigned short exit_what;
+       unsigned short stonewall;
        unsigned int new_group;
        unsigned int numjobs;
        os_cpu_mask_t cpumask;
@@ -315,6 +314,7 @@ struct thread_options {
        int flow_watermark;
        unsigned int flow_sleep;
 
+       unsigned int offset_increment_percent;
        unsigned long long offset_increment;
        unsigned long long number_ios;
 
@@ -430,8 +430,8 @@ struct thread_options_pack {
        uint32_t override_sync;
        uint32_t rand_repeatable;
        uint32_t allrand_repeatable;
+       uint32_t pad;
        uint64_t rand_seed;
-       uint32_t dep_use_os_rand;
        uint32_t log_avg_msec;
        uint32_t log_hist_msec;
        uint32_t log_hist_coarseness;
@@ -490,7 +490,8 @@ struct thread_options_pack {
        uint32_t mem_type;
        uint32_t mem_align;
 
-       uint32_t stonewall;
+       uint16_t exit_what;
+       uint16_t stonewall;
        uint32_t new_group;
        uint32_t numjobs;
        /*
@@ -572,7 +573,7 @@ struct thread_options_pack {
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
        uint32_t rate_process;
        uint32_t rate_ign_think;
-       uint32_t pad;
+       uint32_t pad3;
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
@@ -601,6 +602,8 @@ struct thread_options_pack {
        int32_t flow_watermark;
        uint32_t flow_sleep;
 
+       uint32_t offset_increment_percent;
+       uint32_t pad4;
        uint64_t offset_increment;
        uint64_t number_ios;