X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=thread_options.h;h=60a1b691bd51122429887950085458f6415b3bfc;hp=4b5f9578b7dd75feea086c37ead325adccfdb479;hb=8f91cc3f7835cdca84944d456e1da77d44a7c354;hpb=28727df79348d4ebbd8fd4b0dd89bbca035f68d0 diff --git a/thread_options.h b/thread_options.h index 4b5f9578..60a1b691 100644 --- a/thread_options.h +++ b/thread_options.h @@ -5,6 +5,7 @@ #include "os/os.h" #include "stat.h" #include "gettime.h" +#include "lib/ieee754.h" /* * What type of allocation to use for io buffers @@ -20,11 +21,20 @@ enum fio_memtype { /* * What type of errors to continue on when continue_on_error is used */ +enum error_type_bit { + ERROR_TYPE_READ_BIT = 0, + ERROR_TYPE_WRITE_BIT = 1, + ERROR_TYPE_VERIFY_BIT = 2, + ERROR_TYPE_CNT = 3, +}; + +#define ERROR_STR_MAX 128 + enum error_type { ERROR_TYPE_NONE = 0, - ERROR_TYPE_READ = 1 << 0, - ERROR_TYPE_WRITE = 1 << 1, - ERROR_TYPE_VERIFY = 1 << 2, + ERROR_TYPE_READ = 1 << ERROR_TYPE_READ_BIT, + ERROR_TYPE_WRITE = 1 << ERROR_TYPE_WRITE_BIT, + ERROR_TYPE_VERIFY = 1 << ERROR_TYPE_VERIFY_BIT, ERROR_TYPE_ANY = 0xffff, }; @@ -41,12 +51,14 @@ struct thread_options { char *name; char *directory; char *filename; + char *filename_format; char *opendir; char *ioengine; char *mmapfile; enum td_ddir td_ddir; unsigned int rw_seq; unsigned int kb_base; + unsigned int unit_base; unsigned int ddir_seq_nr; long ddir_seq_add; unsigned int iodepth; @@ -61,29 +73,34 @@ struct thread_options { unsigned long long file_size_high; unsigned long long start_offset; - unsigned int bs[2]; - unsigned int ba[2]; - unsigned int min_bs[2]; - unsigned int max_bs[2]; - struct bssplit *bssplit[2]; - unsigned int bssplit_nr[2]; + unsigned int bs[DDIR_RWDIR_CNT]; + unsigned int ba[DDIR_RWDIR_CNT]; + unsigned int min_bs[DDIR_RWDIR_CNT]; + unsigned int max_bs[DDIR_RWDIR_CNT]; + struct bssplit *bssplit[DDIR_RWDIR_CNT]; + unsigned int bssplit_nr[DDIR_RWDIR_CNT]; + + int *ignore_error[ERROR_TYPE_CNT]; + unsigned int ignore_error_nr[ERROR_TYPE_CNT]; + unsigned int error_dump; unsigned int nr_files; unsigned int open_files; enum file_lock_mode file_lock_mode; - unsigned int lockfile_batch; unsigned int odirect; unsigned int invalidate_cache; unsigned int create_serialize; unsigned int create_fsync; unsigned int create_on_open; + unsigned int create_only; unsigned int end_fsync; unsigned int pre_read; unsigned int sync_io; unsigned int verify; unsigned int do_verify; unsigned int verifysort; + unsigned int verifysort_nr; unsigned int verify_interval; unsigned int verify_offset; char verify_pattern[MAX_PATTERN_SIZE]; @@ -93,21 +110,26 @@ struct thread_options { unsigned int verify_async; unsigned long long verify_backlog; unsigned int verify_batch; + unsigned int experimental_verify; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; unsigned int override_sync; unsigned int rand_repeatable; unsigned int use_os_rand; - unsigned int write_lat_log; - unsigned int write_bw_log; - unsigned int write_iops_log; unsigned int log_avg_msec; unsigned int norandommap; unsigned int softrandommap; unsigned int bs_unaligned; unsigned int fsync_on_close; + unsigned int random_distribution; + + fio_fp64_t zipf_theta; + fio_fp64_t pareto_h; + + unsigned int random_generator; + unsigned int hugepage_size; unsigned int rw_min_bs; unsigned int thinktime; @@ -130,6 +152,8 @@ struct thread_options { enum fio_memtype mem_type; unsigned int mem_align; + unsigned int max_latency; + unsigned int stonewall; unsigned int new_group; unsigned int numjobs; @@ -137,6 +161,14 @@ struct thread_options { unsigned int cpumask_set; os_cpu_mask_t verify_cpumask; unsigned int verify_cpumask_set; +#ifdef CONFIG_LIBNUMA + struct bitmask *numa_cpunodesmask; + unsigned int numa_cpumask_set; + unsigned short numa_mem_mode; + unsigned int numa_mem_prefer_node; + struct bitmask *numa_memnodesmask; + unsigned int numa_memmask_set; +#endif unsigned int iolog; unsigned int rwmixcycle; unsigned int rwmix[2]; @@ -157,6 +189,7 @@ struct thread_options { unsigned int disable_clat; unsigned int disable_slat; unsigned int disable_bw; + unsigned int unified_rw_rep; unsigned int gtod_reduce; unsigned int gtod_cpu; unsigned int gtod_offload; @@ -167,7 +200,7 @@ struct thread_options { unsigned int trim_zero; unsigned long long trim_backlog; unsigned int clat_percentiles; - unsigned int overwrite_plist; + unsigned int percentile_precision; /* digits after decimal for percentiles */ fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN]; char *read_iolog_file; @@ -183,11 +216,11 @@ struct thread_options { char *exec_prerun; char *exec_postrun; - unsigned int rate[2]; - unsigned int ratemin[2]; + unsigned int rate[DDIR_RWDIR_CNT]; + unsigned int ratemin[DDIR_RWDIR_CNT]; unsigned int ratecycle; - unsigned int rate_iops[2]; - unsigned int rate_iops_min[2]; + unsigned int rate_iops[DDIR_RWDIR_CNT]; + unsigned int rate_iops_min[DDIR_RWDIR_CNT]; char *ioscheduler; @@ -228,12 +261,14 @@ struct thread_options_pack { uint8_t name[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]; uint8_t opendir[FIO_TOP_STR_MAX]; uint8_t ioengine[FIO_TOP_STR_MAX]; uint8_t mmapfile[FIO_TOP_STR_MAX]; uint32_t td_ddir; uint32_t rw_seq; uint32_t kb_base; + uint32_t unit_base; uint32_t ddir_seq_nr; uint64_t ddir_seq_add; uint32_t iodepth; @@ -248,29 +283,34 @@ struct thread_options_pack { uint64_t file_size_high; uint64_t start_offset; - uint32_t bs[2]; - uint32_t ba[2]; - uint32_t min_bs[2]; - uint32_t max_bs[2]; - struct bssplit bssplit[2][BSSPLIT_MAX]; - uint32_t bssplit_nr[2]; + uint32_t bs[DDIR_RWDIR_CNT]; + uint32_t ba[DDIR_RWDIR_CNT]; + uint32_t min_bs[DDIR_RWDIR_CNT]; + uint32_t max_bs[DDIR_RWDIR_CNT]; + struct bssplit bssplit[DDIR_RWDIR_CNT][BSSPLIT_MAX]; + uint32_t bssplit_nr[DDIR_RWDIR_CNT]; + + uint32_t ignore_error[ERROR_TYPE_CNT][ERROR_STR_MAX]; + uint32_t ignore_error_nr[ERROR_TYPE_CNT]; + uint32_t error_dump; uint32_t nr_files; uint32_t open_files; uint32_t file_lock_mode; - uint32_t lockfile_batch; uint32_t odirect; uint32_t invalidate_cache; uint32_t create_serialize; uint32_t create_fsync; uint32_t create_on_open; + uint32_t create_only; uint32_t end_fsync; uint32_t pre_read; uint32_t sync_io; uint32_t verify; uint32_t do_verify; uint32_t verifysort; + uint32_t verifysort_nr; uint32_t verify_interval; uint32_t verify_offset; uint8_t verify_pattern[MAX_PATTERN_SIZE]; @@ -280,21 +320,25 @@ struct thread_options_pack { uint32_t verify_async; uint64_t verify_backlog; uint32_t verify_batch; + uint32_t experimental_verify; uint32_t use_thread; uint32_t unlink; uint32_t do_disk_util; uint32_t override_sync; uint32_t rand_repeatable; uint32_t use_os_rand; - uint32_t write_lat_log; - uint32_t write_bw_log; - uint32_t write_iops_log; uint32_t log_avg_msec; uint32_t norandommap; uint32_t softrandommap; uint32_t bs_unaligned; uint32_t fsync_on_close; + uint32_t random_distribution; + fio_fp64_t zipf_theta; + fio_fp64_t pareto_h; + + uint32_t random_generator; + uint32_t hugepage_size; uint32_t rw_min_bs; uint32_t thinktime; @@ -317,6 +361,8 @@ 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; @@ -344,6 +390,7 @@ struct thread_options_pack { uint32_t disable_clat; uint32_t disable_slat; uint32_t disable_bw; + uint32_t unified_rw_rep; uint32_t gtod_reduce; uint32_t gtod_cpu; uint32_t gtod_offload; @@ -354,7 +401,7 @@ struct thread_options_pack { uint32_t trim_zero; uint64_t trim_backlog; uint32_t clat_percentiles; - uint32_t overwrite_plist; + uint32_t percentile_precision; fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN]; uint8_t read_iolog_file[FIO_TOP_STR_MAX]; @@ -370,11 +417,11 @@ struct thread_options_pack { uint8_t exec_prerun[FIO_TOP_STR_MAX]; uint8_t exec_postrun[FIO_TOP_STR_MAX]; - uint32_t rate[2]; - uint32_t ratemin[2]; + uint32_t rate[DDIR_RWDIR_CNT]; + uint32_t ratemin[DDIR_RWDIR_CNT]; uint32_t ratecycle; - uint32_t rate_iops[2]; - uint32_t rate_iops_min[2]; + uint32_t rate_iops[DDIR_RWDIR_CNT]; + uint32_t rate_iops_min[DDIR_RWDIR_CNT]; uint8_t ioscheduler[FIO_TOP_STR_MAX];