X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=thread_options.h;h=1b4590f751f0c72a7345ee730a52ac6bde360fa3;hp=5ef560ef157d02e58f7c42f74f5a0780a9feefc0;hb=1d272416412b0c867224a2b667e6b6124cbc26e8;hpb=82407585a3b3b10281428e4ca9c2d3e7dfca7392 diff --git a/thread_options.h b/thread_options.h index 5ef560ef..1b4590f7 100644 --- a/thread_options.h +++ b/thread_options.h @@ -19,17 +19,24 @@ enum fio_memtype { MEM_SHMHUGE, /* use shared memory segments with huge pages */ MEM_MMAP, /* use anonynomous mmap */ MEM_MMAPHUGE, /* memory mapped huge file */ + MEM_MMAPSHARED, /* use mmap with shared flag */ }; #define ERROR_STR_MAX 128 #define BSSPLIT_MAX 64 +#define ZONESPLIT_MAX 64 struct bssplit { uint32_t bs; uint32_t perc; }; +struct zone_split { + uint8_t access_perc; + uint8_t size_perc; +}; + #define NR_OPTS_SZ (FIO_MAX_OPTS / (8 * sizeof(uint64_t))) #define OPT_MAGIC 0x4f50544e @@ -39,6 +46,7 @@ struct thread_options { uint64_t set_options[NR_OPTS_SZ]; char *description; char *name; + char *wait_for; char *directory; char *filename; char *filename_format; @@ -57,6 +65,8 @@ struct thread_options { unsigned int iodepth_batch_complete_min; unsigned int iodepth_batch_complete_max; + unsigned int unique_filename; + unsigned long long size; unsigned long long io_limit; unsigned int size_percent; @@ -111,6 +121,7 @@ struct thread_options { unsigned int verify_state_save; unsigned int use_thread; unsigned int unlink; + unsigned int unlink_each_loop; unsigned int do_disk_util; unsigned int override_sync; unsigned int rand_repeatable; @@ -118,9 +129,13 @@ struct thread_options { 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; + unsigned int log_max; unsigned int log_offset; unsigned int log_gz; unsigned int log_gz_store; + unsigned int log_unix_epoch; unsigned int norandommap; unsigned int softrandommap; unsigned int bs_unaligned; @@ -130,6 +145,10 @@ struct thread_options { unsigned int verify_only; unsigned int random_distribution; + unsigned int exitall_error; + + struct zone_split *zone_split[DDIR_RWDIR_CNT]; + unsigned int zone_split_nr[DDIR_RWDIR_CNT]; fio_fp64_t zipf_theta; fio_fp64_t pareto_h; @@ -169,6 +188,7 @@ struct thread_options { unsigned int numjobs; os_cpu_mask_t cpumask; os_cpu_mask_t verify_cpumask; + os_cpu_mask_t log_gz_cpumask; unsigned int cpus_allowed_policy; char *numa_cpunodes; unsigned short numa_mem_mode; @@ -216,6 +236,7 @@ struct thread_options { char *bw_log_file; char *lat_log_file; char *iops_log_file; + char *hist_log_file; char *replay_redirect; /* @@ -230,6 +251,7 @@ struct thread_options { unsigned int io_submit_mode; unsigned int rate_iops[DDIR_RWDIR_CNT]; unsigned int rate_iops_min[DDIR_RWDIR_CNT]; + unsigned int rate_process; char *ioscheduler; @@ -285,6 +307,7 @@ struct thread_options_pack { uint64_t set_options[NR_OPTS_SZ]; uint8_t description[FIO_TOP_STR_MAX]; uint8_t name[FIO_TOP_STR_MAX]; + uint8_t wait_for[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]; @@ -309,6 +332,7 @@ struct thread_options_pack { uint32_t size_percent; uint32_t fill_device; uint32_t file_append; + uint32_t unique_filename; uint64_t file_size_low; uint64_t file_size_high; uint64_t start_offset; @@ -356,6 +380,7 @@ struct thread_options_pack { uint32_t verify_state_save; uint32_t use_thread; uint32_t unlink; + uint32_t unlink_each_loop; uint32_t do_disk_util; uint32_t override_sync; uint32_t rand_repeatable; @@ -363,17 +388,25 @@ struct thread_options_pack { 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; + uint32_t log_max; uint32_t log_offset; uint32_t log_gz; uint32_t log_gz_store; + uint32_t log_unix_epoch; uint32_t norandommap; uint32_t softrandommap; uint32_t bs_unaligned; uint32_t fsync_on_close; uint32_t bs_is_seq_rand; + uint32_t pad1; uint32_t random_distribution; - uint32_t pad; + uint32_t exitall_error; + + struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX]; + uint32_t zone_split_nr[DDIR_RWDIR_CNT]; fio_fp64_t zipf_theta; fio_fp64_t pareto_h; @@ -411,8 +444,14 @@ struct thread_options_pack { uint32_t stonewall; uint32_t new_group; uint32_t numjobs; + /* + * We currently can't convert these, so don't enable them + */ +#if 0 uint8_t cpumask[FIO_TOP_STR_MAX]; uint8_t verify_cpumask[FIO_TOP_STR_MAX]; + uint8_t log_gz_cpumask[FIO_TOP_STR_MAX]; +#endif uint32_t cpus_allowed_policy; uint32_t iolog; uint32_t rwmixcycle; @@ -456,6 +495,7 @@ struct thread_options_pack { 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]; + uint8_t hist_log_file[FIO_TOP_STR_MAX]; uint8_t replay_redirect[FIO_TOP_STR_MAX]; /* @@ -470,6 +510,7 @@ struct thread_options_pack { uint32_t io_submit_mode; uint32_t rate_iops[DDIR_RWDIR_CNT]; uint32_t rate_iops_min[DDIR_RWDIR_CNT]; + uint32_t rate_process; uint8_t ioscheduler[FIO_TOP_STR_MAX]; @@ -502,6 +543,7 @@ struct thread_options_pack { uint64_t number_ios; uint32_t sync_file_range; + uint32_t pad2; uint64_t latency_target; uint64_t latency_window;