iolog: fix duplicate handling of compression end

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index ed960eeb2861de263d3ac036d3e55483ab008396..10d7ba61334a08045e26e0fe9447314f11461761 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -25,12 +25,18 @@ enum fio_memtype {
 #define ERROR_STR_MAX  128
 
 #define BSSPLIT_MAX    64
+#define ZONESPLIT_MAX  64
 
 struct bssplit {
        uint32_t bs;
        uint32_t perc;
 };
 
+struct zone_split {
+       uint8_t access_perc;
+       uint8_t size_perc;
+};
+
 #define NR_OPTS_SZ     (FIO_MAX_OPTS / (8 * sizeof(uint64_t)))
 
 #define OPT_MAGIC      0x4f50544e
@@ -40,6 +46,7 @@ struct thread_options {
        uint64_t set_options[NR_OPTS_SZ];
        char *description;
        char *name;
+       char *wait_for;
        char *directory;
        char *filename;
        char *filename_format;
@@ -119,6 +126,7 @@ struct thread_options {
        unsigned long long rand_seed;
        unsigned int dep_use_os_rand;
        unsigned int log_avg_msec;
+       unsigned int log_max;
        unsigned int log_offset;
        unsigned int log_gz;
        unsigned int log_gz_store;
@@ -131,6 +139,10 @@ struct thread_options {
        unsigned int verify_only;
 
        unsigned int random_distribution;
+       unsigned int exitall_error;
+
+       struct zone_split *zone_split[DDIR_RWDIR_CNT];
+       unsigned int zone_split_nr[DDIR_RWDIR_CNT];
 
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
@@ -170,6 +182,7 @@ struct thread_options {
        unsigned int numjobs;
        os_cpu_mask_t cpumask;
        os_cpu_mask_t verify_cpumask;
+       os_cpu_mask_t log_gz_cpumask;
        unsigned int cpus_allowed_policy;
        char *numa_cpunodes;
        unsigned short numa_mem_mode;
@@ -231,6 +244,7 @@ struct thread_options {
        unsigned int io_submit_mode;
        unsigned int rate_iops[DDIR_RWDIR_CNT];
        unsigned int rate_iops_min[DDIR_RWDIR_CNT];
+       unsigned int rate_process;
 
        char *ioscheduler;
 
@@ -286,6 +300,7 @@ struct thread_options_pack {
        uint64_t set_options[NR_OPTS_SZ];
        uint8_t description[FIO_TOP_STR_MAX];
        uint8_t name[FIO_TOP_STR_MAX];
+       uint8_t wait_for[FIO_TOP_STR_MAX];
        uint8_t directory[FIO_TOP_STR_MAX];
        uint8_t filename[FIO_TOP_STR_MAX];
        uint8_t filename_format[FIO_TOP_STR_MAX];
@@ -364,6 +379,7 @@ struct thread_options_pack {
        uint64_t rand_seed;
        uint32_t dep_use_os_rand;
        uint32_t log_avg_msec;
+       uint32_t log_max;
        uint32_t log_offset;
        uint32_t log_gz;
        uint32_t log_gz_store;
@@ -374,7 +390,10 @@ struct thread_options_pack {
        uint32_t bs_is_seq_rand;
 
        uint32_t random_distribution;
-       uint32_t pad;
+       uint32_t exitall_error;
+
+       struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
+       uint32_t zone_split_nr[DDIR_RWDIR_CNT];
 
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
@@ -392,6 +411,7 @@ struct thread_options_pack {
        uint32_t fsync_blocks;
        uint32_t fdatasync_blocks;
        uint32_t barrier_blocks;
+       uint32_t pad1;
        uint64_t start_delay;
        uint64_t start_delay_high;
        uint64_t timeout;
@@ -412,8 +432,14 @@ struct thread_options_pack {
        uint32_t stonewall;
        uint32_t new_group;
        uint32_t numjobs;
+       /*
+        * We currently can't convert these, so don't enable them
+        */
+#if 0
        uint8_t cpumask[FIO_TOP_STR_MAX];
        uint8_t verify_cpumask[FIO_TOP_STR_MAX];
+       uint8_t log_gz_cpumask[FIO_TOP_STR_MAX];
+#endif
        uint32_t cpus_allowed_policy;
        uint32_t iolog;
        uint32_t rwmixcycle;
@@ -450,6 +476,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];
@@ -471,6 +498,7 @@ struct thread_options_pack {
        uint32_t io_submit_mode;
        uint32_t rate_iops[DDIR_RWDIR_CNT];
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
+       uint32_t rate_process;
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
@@ -503,6 +531,7 @@ struct thread_options_pack {
        uint64_t number_ios;
 
        uint32_t sync_file_range;
+       uint32_t pad3;
 
        uint64_t latency_target;
        uint64_t latency_window;