X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=4ed8cb1b0480c2e717848564fd2167a82dd29809;hp=56d3101d94f1d7cf9e720abaf4a700dba83f309b;hb=1ef2b6be973eded12827990ae1a9eb28b7b20be7;hpb=86375e3446fdeb6c4dd1406cc0e4c456af954a2c diff --git a/fio.h b/fio.h index 56d3101d..4ed8cb1b 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 @@ -56,13 +60,23 @@ 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 */ -#define FIO_IO_U_MAP_NR 8 +#define FIO_IO_U_MAP_NR 7 #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; @@ -74,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; /* @@ -81,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]; @@ -104,8 +120,8 @@ struct thread_stat { unsigned int io_u_complete[FIO_IO_U_MAP_NR]; unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR]; unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR]; - unsigned long total_io_u[2]; - unsigned long short_io_u[2]; + unsigned long total_io_u[3]; + unsigned long short_io_u[3]; unsigned long total_submit; unsigned long total_complete; @@ -137,8 +153,9 @@ struct thread_options { char *opendir; char *ioengine; enum td_ddir td_ddir; + unsigned int rw_seq; unsigned int kb_base; - unsigned int ddir_nr; + unsigned int ddir_seq_nr; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; @@ -175,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; @@ -198,7 +217,8 @@ struct thread_options { unsigned int thinktime_blocks; unsigned int fsync_blocks; unsigned int fdatasync_blocks; - unsigned int start_delay; + unsigned int barrier_blocks; + unsigned long start_delay; unsigned long long timeout; unsigned long long ramp_time; unsigned int overwrite; @@ -223,20 +243,29 @@ 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; + unsigned int trim_percentage; + unsigned int trim_batch; + unsigned int trim_zero; + unsigned long long trim_backlog; 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 @@ -262,6 +291,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 @@ -296,6 +342,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; @@ -305,10 +352,14 @@ struct thread_data { char *sysfs_root; - unsigned long rand_seeds[6]; + unsigned long rand_seeds[7]; os_random_state_t bsrange_state; os_random_state_t verify_state; + os_random_state_t trim_state; + + unsigned int verify_batch; + unsigned int trim_batch; int shm_id; @@ -341,13 +392,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]; @@ -376,7 +428,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, @@ -384,12 +436,19 @@ struct thread_data { */ struct rb_root io_hist_tree; struct flist_head io_hist_list; + unsigned long io_hist_len; /* * For IO replaying */ struct flist_head io_log_list; + /* + * For tracking/handling discards + */ + struct flist_head trim_list; + unsigned long trim_entries; + /* * for fileservice, how often to switch to a new file */ @@ -397,6 +456,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 */ @@ -407,6 +468,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; }; /* @@ -451,6 +518,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; @@ -487,30 +555,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 *); @@ -518,8 +568,11 @@ 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 **); +extern char *num2str(unsigned long, int, int, int); + #define FIO_GETOPT_JOB 0x89988998 -#define FIO_NR_OPTIONS 128 +#define FIO_NR_OPTIONS (FIO_MAX_OPTS + 128) /* * ETA/status stuff @@ -603,49 +656,6 @@ static inline int fio_fill_issue_time(struct thread_data *td) return 0; } -/* - * Cheesy number->string conversion, complete with carry rounding error. - */ -static inline char *num2str(unsigned long num, int maxlen, int base, int pow2) -{ - char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' }; - unsigned int thousand; - char *buf; - int i; - - if (pow2) - thousand = 1024; - else - thousand = 1000; - - buf = malloc(128); - - for (i = 0; base > 1; i++) - base /= thousand; - - do { - int len, carry = 0; - - len = sprintf(buf, "%'lu", num); - if (len <= maxlen) { - if (i >= 1) { - buf[len] = postfix[i]; - buf[len + 1] = '\0'; - } - return buf; - } - - if ((num % thousand) >= (thousand / 2)) - carry = 1; - - num /= thousand; - num += carry; - i++; - } while (i <= 5); - - return buf; -} - static inline int __should_check_rate(struct thread_data *td, enum fio_ddir ddir) {