Merge branch 'ci' of https://github.com/sitsofe/fio

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 1b4590f751f0c72a7345ee730a52ac6bde360fa3..26a3e0e67c4968098319bca119a9c26d7ec5efa8 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -20,6 +20,7 @@ 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
@@ -64,11 +65,12 @@ 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;
@@ -101,6 +103,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;
@@ -170,6 +173,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;
@@ -194,6 +201,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];
@@ -202,6 +212,7 @@ 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;
@@ -233,6 +244,12 @@ struct thread_options {
 
        char *read_iolog_file;
        char *write_iolog_file;
+
+       unsigned int write_bw_log;
+       unsigned int write_lat_log;
+       unsigned int write_iops_log;
+       unsigned int write_hist_log;
+
        char *bw_log_file;
        char *lat_log_file;
        char *iops_log_file;
@@ -245,8 +262,8 @@ struct thread_options {
        char *exec_prerun;
        char *exec_postrun;
 
-       unsigned int rate[DDIR_RWDIR_CNT];
-       unsigned int ratemin[DDIR_RWDIR_CNT];
+       uint64_t rate[DDIR_RWDIR_CNT];
+       uint64_t ratemin[DDIR_RWDIR_CNT];
        unsigned int ratecycle;
        unsigned int io_submit_mode;
        unsigned int rate_iops[DDIR_RWDIR_CNT];
@@ -290,7 +307,6 @@ struct thread_options {
        fio_fp64_t latency_percentile;
 
        unsigned block_error_hist;
-       unsigned int skip_bad;
 
        unsigned int replay_align;
        unsigned int replay_scale;
@@ -325,10 +341,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 pad3;
 
        uint64_t size;
-       uint64_t io_limit;
+       uint64_t io_size;
        uint32_t size_percent;
        uint32_t fill_device;
        uint32_t file_append;
@@ -362,6 +379,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;
@@ -400,10 +418,10 @@ 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 pad;
 
        struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
        uint32_t zone_split_nr[DDIR_RWDIR_CNT];
@@ -428,6 +446,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;
@@ -452,6 +474,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;
@@ -461,6 +485,7 @@ 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;
@@ -492,6 +517,12 @@ struct thread_options_pack {
 
        uint8_t read_iolog_file[FIO_TOP_STR_MAX];
        uint8_t write_iolog_file[FIO_TOP_STR_MAX];
+
+       uint32_t write_bw_log;
+       uint32_t write_lat_log;
+       uint32_t write_iops_log;
+       uint32_t write_hist_log;
+
        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];
@@ -504,8 +535,8 @@ struct thread_options_pack {
        uint8_t exec_prerun[FIO_TOP_STR_MAX];
        uint8_t exec_postrun[FIO_TOP_STR_MAX];
 
-       uint32_t rate[DDIR_RWDIR_CNT];
-       uint32_t ratemin[DDIR_RWDIR_CNT];
+       uint64_t rate[DDIR_RWDIR_CNT];
+       uint64_t ratemin[DDIR_RWDIR_CNT];
        uint32_t ratecycle;
        uint32_t io_submit_mode;
        uint32_t rate_iops[DDIR_RWDIR_CNT];
@@ -550,7 +581,6 @@ struct thread_options_pack {
        fio_fp64_t latency_percentile;
 
        uint32_t block_error_hist;
-       uint32_t skip_bad;
 
        uint32_t replay_align;
        uint32_t replay_scale;