X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=729604d321bbf0911f6b40378d6ac3878dcb4f77;hp=fb70b465bec4e1da83a9359b8d2dbe39d84d5c24;hb=d1c46c049cfba2028abc45246e2609bcee52d0f3;hpb=e8462bd8250cf3ff2d41f17e1a4d4cefc70b6b37 diff --git a/fio.h b/fio.h index fb70b465..729604d3 100644 --- a/fio.h +++ b/fio.h @@ -11,7 +11,6 @@ #include #include #include -#include #include #include @@ -28,6 +27,11 @@ #include "io_ddir.h" #include "ioengine.h" #include "iolog.h" +#include "helpers.h" +#include "options.h" +#include "profile.h" +#include "time.h" +#include "lib/getopt.h" #ifdef FIO_HAVE_GUASI #include @@ -42,6 +46,7 @@ struct group_run_stats { unsigned long long max_bw[2], min_bw[2]; unsigned long long io_kb[2]; unsigned long long agg[2]; + unsigned int kb_base; }; /* @@ -55,6 +60,14 @@ enum fio_memtype { MEM_MMAPHUGE, /* memory mapped huge file */ }; +/* + * offset generator types + */ +enum { + RW_SEQ_SEQ = 0, + RW_SEQ_IDENT, +}; + /* * How many depth levels to log */ @@ -62,6 +75,8 @@ enum fio_memtype { #define FIO_IO_U_LAT_U_NR 10 #define FIO_IO_U_LAT_M_NR 12 +#define MAX_PATTERN_SIZE 512 + struct thread_stat { char *name; char *verror; @@ -73,6 +88,7 @@ struct thread_stat { struct io_log *slat_log; struct io_log *clat_log; + struct io_log *lat_log; struct io_log *bw_log; /* @@ -80,6 +96,7 @@ struct thread_stat { */ struct io_stat clat_stat[2]; /* completion latency */ struct io_stat slat_stat[2]; /* submission latency */ + struct io_stat lat_stat[2]; /* total latency */ struct io_stat bw_stat[2]; /* bandwidth stats */ unsigned long long stat_io_bytes[2]; @@ -118,6 +135,8 @@ struct thread_stat { unsigned continue_on_error; unsigned long total_err_count; int first_error; + + unsigned int kb_base; }; struct bssplit { @@ -134,7 +153,9 @@ struct thread_options { char *opendir; char *ioengine; enum td_ddir td_ddir; - unsigned int ddir_nr; + unsigned int rw_seq; + unsigned int kb_base; + unsigned int ddir_seq_nr; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; @@ -171,10 +192,12 @@ struct thread_options { unsigned int verifysort; unsigned int verify_interval; unsigned int verify_offset; - unsigned int verify_pattern; + char verify_pattern[MAX_PATTERN_SIZE]; unsigned int verify_pattern_bytes; unsigned int verify_fatal; unsigned int verify_async; + unsigned long long verify_backlog; + unsigned int verify_batch; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -194,7 +217,7 @@ struct thread_options { unsigned int thinktime_blocks; unsigned int fsync_blocks; unsigned int fdatasync_blocks; - unsigned int start_delay; + unsigned long start_delay; unsigned long long timeout; unsigned long long ramp_time; unsigned int overwrite; @@ -219,20 +242,25 @@ struct thread_options { unsigned int file_service_type; unsigned int group_reporting; unsigned int fadvise_hint; + unsigned int fallocate; unsigned int zero_buffers; unsigned int refill_buffers; unsigned int time_based; + unsigned int disable_lat; unsigned int disable_clat; unsigned int disable_slat; unsigned int disable_bw; unsigned int gtod_reduce; unsigned int gtod_cpu; unsigned int gtod_offload; + enum fio_cs clocksource; + unsigned int no_stall; char *read_iolog_file; char *write_iolog_file; char *bw_log_file; char *lat_log_file; + char *replay_redirect; /* * Pre-run and post-run shell @@ -258,6 +286,23 @@ struct thread_options { * I/O Error handling */ unsigned int continue_on_error; + + /* + * Benchmark profile type + */ + char *profile; + + /* + * blkio cgroup support + */ + char *cgroup; + unsigned int cgroup_weight; + unsigned int cgroup_nodelete; + + unsigned int uid; + unsigned int gid; + + unsigned int sync_file_range; }; #define FIO_VERROR_SIZE 128 @@ -292,6 +337,7 @@ struct thread_data { unsigned int ioprio; unsigned int ioprio_set; unsigned int last_was_sync; + enum fio_ddir last_ddir; char *mmapfile; int mmapfd; @@ -306,6 +352,8 @@ struct thread_data { os_random_state_t bsrange_state; os_random_state_t verify_state; + unsigned int verify_batch; + int shm_id; /* @@ -337,13 +385,14 @@ struct thread_data { /* * Rate state */ - unsigned long rate_usec_cycle[2]; + unsigned long rate_nsec_cycle[2]; long rate_pending_usleep[2]; unsigned long rate_bytes[2]; unsigned long rate_blocks[2]; struct timeval lastrate[2]; unsigned long long total_io_size; + unsigned long long fill_device_size; unsigned long io_issues[2]; unsigned long long io_blocks[2]; @@ -372,7 +421,7 @@ struct thread_data { os_random_state_t rwmix_state; unsigned long rwmix_issues; enum fio_ddir rwmix_ddir; - unsigned int ddir_nr; + unsigned int ddir_seq_nr; /* * IO history logs for verification. We use a tree for sorting, @@ -380,6 +429,7 @@ struct thread_data { */ struct rb_root io_hist_tree; struct flist_head io_hist_list; + unsigned long io_hist_len; /* * For IO replaying @@ -393,6 +443,8 @@ struct thread_data { unsigned int file_service_left; struct fio_file *file_service_file; + unsigned int sync_file_range_nr; + /* * For generating file sizes */ @@ -403,6 +455,12 @@ struct thread_data { */ unsigned int total_err_count; int first_error; + + /* + * Can be overloaded by profiles + */ + struct prof_io_ops prof_io_ops; + void *prof_data; }; /* @@ -447,6 +505,7 @@ extern unsigned long done_secs; extern char *job_section; extern int fio_gtod_offload; extern int fio_gtod_cpu; +extern enum fio_cs fio_clock_source; extern struct thread_data *threads; @@ -483,30 +542,12 @@ static inline int should_fsync(struct thread_data *td) return 0; } -/* - * Time functions - */ -extern unsigned long long utime_since(struct timeval *, struct timeval *); -extern unsigned long long utime_since_now(struct timeval *); -extern unsigned long mtime_since(struct timeval *, struct timeval *); -extern unsigned long mtime_since_now(struct timeval *); -extern unsigned long time_since_now(struct timeval *); -extern unsigned long mtime_since_genesis(void); -extern void usec_spin(unsigned int); -extern void usec_sleep(struct thread_data *, unsigned long); -extern void fill_start_time(struct timeval *); -extern void fio_gettime(struct timeval *, void *); -extern void fio_gtod_init(void); -extern void fio_gtod_update(void); -extern void set_genesis_time(void); -extern int ramp_time_over(struct thread_data *); -extern int in_ramp_time(struct thread_data *); - /* * Init/option functions */ extern int __must_check parse_options(int, char **); extern int fio_options_parse(struct thread_data *, char **, int); +extern void fio_keywords_init(void); extern int fio_cmd_option_parse(struct thread_data *, const char *, char *); extern void fio_fill_default_options(struct thread_data *); extern int fio_show_option_help(const char *); @@ -514,8 +555,9 @@ extern void fio_options_dup_and_init(struct option *); extern void options_mem_dupe(struct thread_data *); extern void options_mem_free(struct thread_data *); extern void td_fill_rand_seeds(struct thread_data *); +extern void add_job_opts(const char **); #define FIO_GETOPT_JOB 0x89988998 -#define FIO_NR_OPTIONS 128 +#define FIO_NR_OPTIONS (FIO_MAX_OPTS + 128) /* * ETA/status stuff