X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=thread_options.h;h=deb3d675c4a52dcbb97cd57debd33e652f73286a;hp=6a8fee72ad3fc5180a5e973a1816750865e27fe5;hb=aee2ab6775d96609a4632703827c409a7f9abcca;hpb=ca20381d58f54a469da1f4b2771c304995bc7f5e diff --git a/thread_options.h b/thread_options.h index 6a8fee72..deb3d675 100644 --- a/thread_options.h +++ b/thread_options.h @@ -5,6 +5,8 @@ #include "os/os.h" #include "stat.h" #include "gettime.h" +#include "lib/ieee754.h" +#include "td_error.h" /* * What type of allocation to use for io buffers @@ -17,16 +19,7 @@ enum fio_memtype { MEM_MMAPHUGE, /* memory mapped huge file */ }; -/* - * What type of errors to continue on when continue_on_error is used - */ -enum error_type { - ERROR_TYPE_NONE = 0, - ERROR_TYPE_READ = 1 << 0, - ERROR_TYPE_WRITE = 1 << 1, - ERROR_TYPE_VERIFY = 1 << 2, - ERROR_TYPE_ANY = 0xffff, -}; +#define ERROR_STR_MAX 128 #define BSSPLIT_MAX 64 @@ -35,54 +28,67 @@ struct bssplit { uint32_t perc; }; +#define OPT_MAGIC 0x4f50544e + struct thread_options { - int pad; + int magic; char *description; 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; + long long ddir_seq_add; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; unsigned int iodepth_batch_complete; unsigned long long size; + unsigned long long io_limit; 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 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 oatomic; 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]; @@ -92,20 +98,34 @@ 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 allrand_repeatable; + unsigned long long rand_seed; 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 log_offset; + unsigned int log_gz; unsigned int norandommap; unsigned int softrandommap; unsigned int bs_unaligned; unsigned int fsync_on_close; + unsigned int bs_is_seq_rand; + + unsigned int verify_only; + + unsigned int random_distribution; + + fio_fp64_t zipf_theta; + fio_fp64_t pareto_h; + + unsigned int random_generator; + + unsigned int perc_rand[DDIR_RWDIR_CNT]; unsigned int hugepage_size; unsigned int rw_min_bs; @@ -116,6 +136,7 @@ struct thread_options { unsigned int fdatasync_blocks; unsigned int barrier_blocks; unsigned long long start_delay; + unsigned long long start_delay_high; unsigned long long timeout; unsigned long long ramp_time; unsigned int overwrite; @@ -125,9 +146,12 @@ struct thread_options { unsigned long long zone_range; unsigned long long zone_size; unsigned long long zone_skip; + unsigned long long lockmem; enum fio_memtype mem_type; unsigned int mem_align; + unsigned int max_latency; + unsigned int stonewall; unsigned int new_group; unsigned int numjobs; @@ -135,10 +159,19 @@ struct thread_options { unsigned int cpumask_set; os_cpu_mask_t verify_cpumask; unsigned int verify_cpumask_set; + unsigned int cpus_allowed_policy; + char *numa_cpunodes; + unsigned int numa_cpumask_set; + unsigned short numa_mem_mode; + unsigned int numa_mem_prefer_node; + char *numa_memnodes; + unsigned int numa_memmask_set; unsigned int iolog; unsigned int rwmixcycle; - unsigned int rwmix[2]; + unsigned int rwmix[DDIR_RWDIR_CNT]; unsigned int nice; + unsigned int ioprio; + unsigned int ioprio_class; unsigned int file_service_type; unsigned int group_reporting; unsigned int fadvise_hint; @@ -146,6 +179,8 @@ struct thread_options { unsigned int zero_buffers; unsigned int refill_buffers; unsigned int scramble_buffers; + char buffer_pattern[MAX_PATTERN_SIZE]; + unsigned int buffer_pattern_bytes; unsigned int compress_percentage; unsigned int compress_chunk; unsigned int time_based; @@ -153,6 +188,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; @@ -163,7 +199,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; @@ -179,20 +215,14 @@ 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; - /* - * CPU "io" cycle burner - */ - unsigned int cpuload; - unsigned int cpucycle; - /* * I/O Error handling */ @@ -219,8 +249,13 @@ struct thread_options { unsigned int flow_sleep; unsigned long long offset_increment; + unsigned long long number_ios; unsigned int sync_file_range; + + unsigned long long latency_target; + unsigned long long latency_window; + fio_fp64_t latency_percentile; }; #define FIO_TOP_STR_MAX 256 @@ -230,11 +265,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; @@ -243,35 +281,43 @@ struct thread_options_pack { uint32_t iodepth_batch_complete; uint64_t size; + uint64_t io_limit; uint32_t size_percent; uint32_t fill_device; + uint32_t file_append; uint64_t file_size_low; 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 oatomic; 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]; @@ -281,20 +327,31 @@ 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 allrand_repeatable; + uint64_t rand_seed; 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 log_offset; + uint32_t log_gz; uint32_t norandommap; uint32_t softrandommap; uint32_t bs_unaligned; uint32_t fsync_on_close; + uint32_t bs_is_seq_rand; + + uint32_t random_distribution; + fio_fp64_t zipf_theta; + fio_fp64_t pareto_h; + + uint32_t random_generator; + + uint32_t perc_rand[DDIR_RWDIR_CNT]; uint32_t hugepage_size; uint32_t rw_min_bs; @@ -305,6 +362,7 @@ struct thread_options_pack { uint32_t fdatasync_blocks; uint32_t barrier_blocks; uint64_t start_delay; + uint64_t start_delay_high; uint64_t timeout; uint64_t ramp_time; uint32_t overwrite; @@ -314,9 +372,12 @@ struct thread_options_pack { uint64_t zone_range; uint64_t zone_size; uint64_t zone_skip; + uint64_t lockmem; uint32_t mem_type; uint32_t mem_align; + uint32_t max_latency; + uint32_t stonewall; uint32_t new_group; uint32_t numjobs; @@ -324,10 +385,13 @@ struct thread_options_pack { uint32_t cpumask_set; uint8_t verify_cpumask[FIO_TOP_STR_MAX]; uint32_t verify_cpumask_set; + uint32_t cpus_allowed_policy; uint32_t iolog; uint32_t rwmixcycle; - uint32_t rwmix[2]; + uint32_t rwmix[DDIR_RWDIR_CNT]; uint32_t nice; + uint32_t ioprio; + uint32_t ioprio_class; uint32_t file_service_type; uint32_t group_reporting; uint32_t fadvise_hint; @@ -335,6 +399,8 @@ struct thread_options_pack { uint32_t zero_buffers; uint32_t refill_buffers; uint32_t scramble_buffers; + uint8_t buffer_pattern[MAX_PATTERN_SIZE]; + uint32_t buffer_pattern_bytes; unsigned int compress_percentage; unsigned int compress_chunk; uint32_t time_based; @@ -342,6 +408,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; @@ -352,7 +419,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]; @@ -368,20 +435,14 @@ 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]; - /* - * CPU "io" cycle burner - */ - uint32_t cpuload; - uint32_t cpucycle; - /* * I/O Error handling */ @@ -408,12 +469,18 @@ struct thread_options_pack { uint32_t flow_sleep; uint64_t offset_increment; + uint64_t number_ios; uint32_t sync_file_range; + + uint64_t latency_target; + uint64_t latency_window; + fio_fp64_t latency_percentile; } __attribute__((packed)); extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top); extern void convert_thread_options_to_net(struct thread_options_pack *top, struct thread_options *); extern int fio_test_cconv(struct thread_options *); +extern void options_default_fill(struct thread_options *o); #endif