thread_options: drop fadvise_stream from thread_options

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index dd5b9ef72a1dfd3d93f061f2053a4c5b35c09a24..793df8a587327d0224410f90e0db0e0ef36010e6 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -20,12 +20,13 @@ enum fio_memtype {
        MEM_MMAP,       /* use anonynomous mmap */
        MEM_MMAPHUGE,   /* memory mapped huge file */
        MEM_MMAPSHARED, /* use mmap with shared flag */
+       MEM_CUDA_MALLOC,/* use GPU memory */
 };
 
 #define ERROR_STR_MAX  128
 
 #define BSSPLIT_MAX    64
-#define ZONESPLIT_MAX  64
+#define ZONESPLIT_MAX  256
 
 struct bssplit {
        uint32_t bs;
@@ -35,6 +36,8 @@ struct bssplit {
 struct zone_split {
        uint8_t access_perc;
        uint8_t size_perc;
+       uint8_t pad[6];
+       uint64_t size;
 };
 
 #define NR_OPTS_SZ     (FIO_MAX_OPTS / (8 * sizeof(uint64_t)))
@@ -52,6 +55,7 @@ struct thread_options {
        char *filename_format;
        char *opendir;
        char *ioengine;
+       char *ioengine_so_path;
        char *mmapfile;
        enum td_ddir td_ddir;
        unsigned int rw_seq;
@@ -64,17 +68,19 @@ struct thread_options {
        unsigned int iodepth_batch;
        unsigned int iodepth_batch_complete_min;
        unsigned int iodepth_batch_complete_max;
+       unsigned int serialize_overlap;
 
        unsigned int unique_filename;
 
        unsigned long long size;
-       unsigned long long io_limit;
+       unsigned long long io_size;
        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;
+       unsigned long long start_offset_align;
 
        unsigned int bs[DDIR_RWDIR_CNT];
        unsigned int ba[DDIR_RWDIR_CNT];
@@ -101,6 +107,7 @@ struct thread_options {
        unsigned int end_fsync;
        unsigned int pre_read;
        unsigned int sync_io;
+       unsigned int write_hint;
        unsigned int verify;
        unsigned int do_verify;
        unsigned int verifysort;
@@ -185,7 +192,7 @@ struct thread_options {
        enum fio_memtype mem_type;
        unsigned int mem_align;
 
-       unsigned int max_latency;
+       unsigned long long max_latency;
 
        unsigned int stonewall;
        unsigned int new_group;
@@ -198,6 +205,9 @@ struct thread_options {
        unsigned short numa_mem_mode;
        unsigned int numa_mem_prefer_node;
        char *numa_memnodes;
+       unsigned int gpu_dev_id;
+       unsigned int start_offset_percent;
+
        unsigned int iolog;
        unsigned int rwmixcycle;
        unsigned int rwmix[DDIR_RWDIR_CNT];
@@ -206,8 +216,8 @@ struct thread_options {
        unsigned int ioprio_class;
        unsigned int file_service_type;
        unsigned int group_reporting;
+       unsigned int stats;
        unsigned int fadvise_hint;
-       unsigned int fadvise_stream;
        enum fio_fallocate_mode fallocate_mode;
        unsigned int zero_buffers;
        unsigned int refill_buffers;
@@ -232,6 +242,7 @@ struct thread_options {
        unsigned int trim_zero;
        unsigned long long trim_backlog;
        unsigned int clat_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];
 
@@ -299,8 +310,9 @@ struct thread_options {
        unsigned long long latency_window;
        fio_fp64_t latency_percentile;
 
+       unsigned int sig_figs;
+
        unsigned block_error_hist;
-       unsigned int skip_bad;
 
        unsigned int replay_align;
        unsigned int replay_scale;
@@ -335,10 +347,11 @@ struct thread_options_pack {
        uint32_t iodepth_batch;
        uint32_t iodepth_batch_complete_min;
        uint32_t iodepth_batch_complete_max;
-       uint32_t __proper_alignment_for_64b;
+       uint32_t serialize_overlap;
+       uint32_t lat_percentiles;
 
        uint64_t size;
-       uint64_t io_limit;
+       uint64_t io_size;
        uint32_t size_percent;
        uint32_t fill_device;
        uint32_t file_append;
@@ -346,6 +359,7 @@ struct thread_options_pack {
        uint64_t file_size_low;
        uint64_t file_size_high;
        uint64_t start_offset;
+       uint64_t start_offset_align;
 
        uint32_t bs[DDIR_RWDIR_CNT];
        uint32_t ba[DDIR_RWDIR_CNT];
@@ -372,6 +386,7 @@ struct thread_options_pack {
        uint32_t end_fsync;
        uint32_t pre_read;
        uint32_t sync_io;
+       uint32_t write_hint;
        uint32_t verify;
        uint32_t do_verify;
        uint32_t verifysort;
@@ -410,11 +425,12 @@ struct thread_options_pack {
        uint32_t bs_unaligned;
        uint32_t fsync_on_close;
        uint32_t bs_is_seq_rand;
-       uint32_t pad1;
 
        uint32_t random_distribution;
        uint32_t exitall_error;
 
+       uint32_t sync_file_range;
+
        struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
        uint32_t zone_split_nr[DDIR_RWDIR_CNT];
 
@@ -453,8 +469,6 @@ struct thread_options_pack {
        uint32_t mem_type;
        uint32_t mem_align;
 
-       uint32_t max_latency;
-
        uint32_t stonewall;
        uint32_t new_group;
        uint32_t numjobs;
@@ -466,6 +480,8 @@ struct thread_options_pack {
        uint8_t verify_cpumask[FIO_TOP_STR_MAX];
        uint8_t log_gz_cpumask[FIO_TOP_STR_MAX];
 #endif
+       uint32_t gpu_dev_id;
+       uint32_t start_offset_percent;
        uint32_t cpus_allowed_policy;
        uint32_t iolog;
        uint32_t rwmixcycle;
@@ -475,8 +491,8 @@ struct thread_options_pack {
        uint32_t ioprio_class;
        uint32_t file_service_type;
        uint32_t group_reporting;
+       uint32_t stats;
        uint32_t fadvise_hint;
-       uint32_t fadvise_stream;
        uint32_t fallocate_mode;
        uint32_t zero_buffers;
        uint32_t refill_buffers;
@@ -502,7 +518,6 @@ 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];
@@ -563,15 +578,14 @@ struct thread_options_pack {
        uint64_t offset_increment;
        uint64_t number_ios;
 
-       uint32_t sync_file_range;
-       uint32_t pad2;
-
        uint64_t latency_target;
        uint64_t latency_window;
+       uint64_t max_latency;
        fio_fp64_t latency_percentile;
 
+       uint32_t sig_figs;
+
        uint32_t block_error_hist;
-       uint32_t skip_bad;
 
        uint32_t replay_align;
        uint32_t replay_scale;