Merge branch 'master' of https://github.com/bvanassche/fio

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 8adba48ce7b491a3250422a83f256d9db93ab3b4..c78ed43de9867876ee0b6dbefdc6b09334d5167a 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -10,6 +10,14 @@
 #include "lib/pattern.h"
 #include "td_error.h"
 
+enum fio_zone_mode {
+       ZONE_MODE_NOT_SPECIFIED = 0,
+       ZONE_MODE_NONE          = 1,
+       ZONE_MODE_STRIDED       = 2, /* perform I/O in one zone at a time */
+       /* perform I/O across multiple zones simultaneously */
+       ZONE_MODE_ZBD           = 3,
+};
+
 /*
  * What type of allocation to use for io buffers
  */
@@ -132,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;
@@ -165,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;
@@ -188,13 +194,15 @@ struct thread_options {
        unsigned long long zone_range;
        unsigned long long zone_size;
        unsigned long long zone_skip;
+       enum fio_zone_mode zone_mode;
        unsigned long long lockmem;
        enum fio_memtype mem_type;
        unsigned int mem_align;
 
        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;
@@ -242,12 +250,17 @@ struct thread_options {
        unsigned int trim_zero;
        unsigned long long trim_backlog;
        unsigned int clat_percentiles;
+       unsigned int slat_percentiles;
        unsigned int lat_percentiles;
        unsigned int percentile_precision;      /* digits after decimal for percentiles */
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        char *read_iolog_file;
+       bool read_iolog_chunked;
        char *write_iolog_file;
+       char *merge_blktrace_file;
+       fio_fp64_t merge_blktrace_scalars[FIO_IO_U_LIST_MAX_LEN];
+       fio_fp64_t merge_blktrace_iters[FIO_IO_U_LIST_MAX_LEN];
 
        unsigned int write_bw_log;
        unsigned int write_lat_log;
@@ -302,6 +315,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;
 
@@ -324,6 +338,12 @@ struct thread_options {
 
        unsigned int allow_create;
        unsigned int allow_mounted_write;
+
+       /* Parameters that affect zonemode=zbd */
+       unsigned int read_beyond_wp;
+       int max_open_zones;
+       fio_fp64_t zrt;
+       fio_fp64_t zrf;
 };
 
 #define FIO_TOP_STR_MAX                256
@@ -351,7 +371,7 @@ struct thread_options_pack {
        uint32_t iodepth_batch_complete_min;
        uint32_t iodepth_batch_complete_max;
        uint32_t serialize_overlap;
-       uint32_t lat_percentiles;
+       uint32_t pad;
 
        uint64_t size;
        uint64_t io_size;
@@ -411,8 +431,8 @@ struct thread_options_pack {
        uint32_t override_sync;
        uint32_t rand_repeatable;
        uint32_t allrand_repeatable;
+       uint32_t pad2;
        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;
@@ -445,7 +465,6 @@ struct thread_options_pack {
 
        uint32_t hugepage_size;
        uint64_t rw_min_bs;
-       uint32_t pad2;
        uint32_t thinktime;
        uint32_t thinktime_spin;
        uint32_t thinktime_blocks;
@@ -471,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;
        /*
@@ -519,11 +539,17 @@ struct thread_options_pack {
        uint32_t trim_zero;
        uint64_t trim_backlog;
        uint32_t clat_percentiles;
+       uint32_t lat_percentiles;
+       uint32_t slat_percentiles;
        uint32_t percentile_precision;
+       uint32_t pad3;
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
        uint8_t write_iolog_file[FIO_TOP_STR_MAX];
+       uint8_t merge_blktrace_file[FIO_TOP_STR_MAX];
+       fio_fp64_t merge_blktrace_scalars[FIO_IO_U_LIST_MAX_LEN];
+       fio_fp64_t merge_blktrace_iters[FIO_IO_U_LIST_MAX_LEN];
 
        uint32_t write_bw_log;
        uint32_t write_lat_log;
@@ -550,7 +576,6 @@ struct thread_options_pack {
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
        uint32_t rate_process;
        uint32_t rate_ign_think;
-       uint32_t pad;
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
@@ -579,6 +604,7 @@ struct thread_options_pack {
        int32_t flow_watermark;
        uint32_t flow_sleep;
 
+       uint32_t offset_increment_percent;
        uint64_t offset_increment;
        uint64_t number_ios;
 
@@ -600,6 +626,8 @@ struct thread_options_pack {
 
        uint32_t allow_create;
        uint32_t allow_mounted_write;
+
+       uint32_t zone_mode;
 } __attribute__((packed));
 
 extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);