steadystate: rename options->ss to options->ss_state since ss is used elsewhere to...

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 6604a37610172280417546b5a5b2940753e5928f..d1e74380a41d1edb28d4533a42d97012073d725c 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -7,6 +7,7 @@
 #include "stat.h"
 #include "gettime.h"
 #include "lib/ieee754.h"
+#include "lib/pattern.h"
 #include "td_error.h"
 
 /*
@@ -18,17 +19,24 @@ enum fio_memtype {
        MEM_SHMHUGE,    /* use shared memory segments with huge pages */
        MEM_MMAP,       /* use anonynomous mmap */
        MEM_MMAPHUGE,   /* memory mapped huge file */
+       MEM_MMAPSHARED, /* use mmap with shared flag */
 };
 
 #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
@@ -38,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;
@@ -53,7 +62,10 @@ struct thread_options {
        unsigned int iodepth;
        unsigned int iodepth_low;
        unsigned int iodepth_batch;
-       unsigned int iodepth_batch_complete;
+       unsigned int iodepth_batch_complete_min;
+       unsigned int iodepth_batch_complete_max;
+
+       unsigned int unique_filename;
 
        unsigned long long size;
        unsigned long long io_limit;
@@ -97,6 +109,8 @@ struct thread_options {
        unsigned int verify_offset;
        char verify_pattern[MAX_PATTERN_SIZE];
        unsigned int verify_pattern_bytes;
+       struct pattern_fmt verify_fmt[8];
+       unsigned int verify_fmt_sz;
        unsigned int verify_fatal;
        unsigned int verify_dump;
        unsigned int verify_async;
@@ -107,6 +121,7 @@ struct thread_options {
        unsigned int verify_state_save;
        unsigned int use_thread;
        unsigned int unlink;
+       unsigned int unlink_each_loop;
        unsigned int do_disk_util;
        unsigned int override_sync;
        unsigned int rand_repeatable;
@@ -114,6 +129,9 @@ struct thread_options {
        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;
+       unsigned int log_max;
        unsigned int log_offset;
        unsigned int log_gz;
        unsigned int log_gz_store;
@@ -126,6 +144,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;
@@ -147,6 +169,10 @@ struct thread_options {
        unsigned long long start_delay_high;
        unsigned long long timeout;
        unsigned long long ramp_time;
+       unsigned int ss_state;
+       fio_fp64_t ss_limit;
+       unsigned long long ss_dur;
+       unsigned long long ss_ramp_time;
        unsigned int overwrite;
        unsigned int bw_avg_time;
        unsigned int iops_avg_time;
@@ -165,6 +191,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;
@@ -212,6 +239,7 @@ struct thread_options {
        char *bw_log_file;
        char *lat_log_file;
        char *iops_log_file;
+       char *hist_log_file;
        char *replay_redirect;
 
        /*
@@ -226,6 +254,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;
 
@@ -281,6 +310,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];
@@ -296,13 +326,16 @@ struct thread_options_pack {
        uint32_t iodepth;
        uint32_t iodepth_low;
        uint32_t iodepth_batch;
-       uint32_t iodepth_batch_complete;
+       uint32_t iodepth_batch_complete_min;
+       uint32_t iodepth_batch_complete_max;
+       uint32_t __proper_alignment_for_64b;
 
        uint64_t size;
        uint64_t io_limit;
        uint32_t size_percent;
        uint32_t fill_device;
        uint32_t file_append;
+       uint32_t unique_filename;
        uint64_t file_size_low;
        uint64_t file_size_high;
        uint64_t start_offset;
@@ -350,6 +383,7 @@ struct thread_options_pack {
        uint32_t verify_state_save;
        uint32_t use_thread;
        uint32_t unlink;
+       uint32_t unlink_each_loop;
        uint32_t do_disk_util;
        uint32_t override_sync;
        uint32_t rand_repeatable;
@@ -357,6 +391,9 @@ struct thread_options_pack {
        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;
+       uint32_t log_max;
        uint32_t log_offset;
        uint32_t log_gz;
        uint32_t log_gz_store;
@@ -367,7 +404,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;
@@ -389,6 +429,10 @@ struct thread_options_pack {
        uint64_t start_delay_high;
        uint64_t timeout;
        uint64_t ramp_time;
+       uint64_t ss_dur;
+       uint64_t ss_ramp_time;
+       uint32_t ss_state;
+       fio_fp64_t ss_limit;
        uint32_t overwrite;
        uint32_t bw_avg_time;
        uint32_t iops_avg_time;
@@ -405,8 +449,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;
@@ -443,6 +493,7 @@ struct thread_options_pack {
        uint64_t trim_backlog;
        uint32_t clat_percentiles;
        uint32_t percentile_precision;
+       uint32_t padding;       /* REMOVE ME when possible to maintain alignment */
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
@@ -450,6 +501,7 @@ struct thread_options_pack {
        uint8_t bw_log_file[FIO_TOP_STR_MAX];
        uint8_t lat_log_file[FIO_TOP_STR_MAX];
        uint8_t iops_log_file[FIO_TOP_STR_MAX];
+       uint8_t hist_log_file[FIO_TOP_STR_MAX];
        uint8_t replay_redirect[FIO_TOP_STR_MAX];
 
        /*
@@ -464,6 +516,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];
 
@@ -496,6 +549,7 @@ struct thread_options_pack {
        uint64_t number_ios;
 
        uint32_t sync_file_range;
+       uint32_t pad2;
 
        uint64_t latency_target;
        uint64_t latency_window;