X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=a74fb108c7f6f79827ea793d9cc099b28ea2777b;hp=67663515ee9a939089b77141a703f6c3b20bf3ab;hb=cc0df00ad5076d4adbc439899f24d9b0db26075d;hpb=833491908a1afd67d27ce79257de3a4d80143d9f diff --git a/fio.h b/fio.h index 67663515..a74fb108 100644 --- a/fio.h +++ b/fio.h @@ -35,6 +35,8 @@ struct thread_data; #include "time.h" #include "lib/getopt.h" #include "lib/rand.h" +#include "server.h" +#include "stat.h" #ifdef FIO_HAVE_GUASI #include @@ -44,14 +46,6 @@ struct thread_data; #include #endif -struct group_run_stats { - unsigned long long max_run[2], min_run[2]; - unsigned long long max_bw[2], min_bw[2]; - unsigned long long io_kb[2]; - unsigned long long agg[2]; - unsigned int kb_base; -}; - /* * What type of allocation to use for io buffers */ @@ -71,172 +65,6 @@ enum { RW_SEQ_IDENT, }; -/* - * How many depth levels to log - */ -#define FIO_IO_U_MAP_NR 7 -#define FIO_IO_U_LAT_U_NR 10 -#define FIO_IO_U_LAT_M_NR 12 - -/* - * Aggregate clat samples to report percentile(s) of them. - * - * EXECUTIVE SUMMARY - * - * FIO_IO_U_PLAT_BITS determines the maximum statistical error on the - * value of resulting percentiles. The error will be approximately - * 1/2^(FIO_IO_U_PLAT_BITS+1) of the value. - * - * FIO_IO_U_PLAT_GROUP_NR and FIO_IO_U_PLAT_BITS determine the maximum - * range being tracked for latency samples. The maximum value tracked - * accurately will be 2^(GROUP_NR + PLAT_BITS -1) microseconds. - * - * FIO_IO_U_PLAT_GROUP_NR and FIO_IO_U_PLAT_BITS determine the memory - * requirement of storing those aggregate counts. The memory used will - * be (FIO_IO_U_PLAT_GROUP_NR * 2^FIO_IO_U_PLAT_BITS) * sizeof(int) - * bytes. - * - * FIO_IO_U_PLAT_NR is the total number of buckets. - * - * DETAILS - * - * Suppose the clat varies from 0 to 999 (usec), the straightforward - * method is to keep an array of (999 + 1) buckets, in which a counter - * keeps the count of samples which fall in the bucket, e.g., - * {[0],[1],...,[999]}. However this consumes a huge amount of space, - * and can be avoided if an approximation is acceptable. - * - * One such method is to let the range of the bucket to be greater - * than one. This method has low accuracy when the value is small. For - * example, let the buckets be {[0,99],[100,199],...,[900,999]}, and - * the represented value of each bucket be the mean of the range. Then - * a value 0 has an round-off error of 49.5. To improve on this, we - * use buckets with non-uniform ranges, while bounding the error of - * each bucket within a ratio of the sample value. A simple example - * would be when error_bound = 0.005, buckets are { - * {[0],[1],...,[99]}, {[100,101],[102,103],...,[198,199]},.., - * {[900,909],[910,919]...} }. The total range is partitioned into - * groups with different ranges, then buckets with uniform ranges. An - * upper bound of the error is (range_of_bucket/2)/value_of_bucket - * - * For better efficiency, we implement this using base two. We group - * samples by their Most Significant Bit (MSB), extract the next M bit - * of them as an index within the group, and discard the rest of the - * bits. - * - * E.g., assume a sample 'x' whose MSB is bit n (starting from bit 0), - * and use M bit for indexing - * - * | n | M bits | bit (n-M-1) ... bit 0 | - * - * Because x is at least 2^n, and bit 0 to bit (n-M-1) is at most - * (2^(n-M) - 1), discarding bit 0 to (n-M-1) makes the round-off - * error - * - * 2^(n-M)-1 2^(n-M) 1 - * e <= --------- <= ------- = --- - * 2^n 2^n 2^M - * - * Furthermore, we use "mean" of the range to represent the bucket, - * the error e can be lowered by half to 1 / 2^(M+1). By using M bits - * as the index, each group must contains 2^M buckets. - * - * E.g. Let M (FIO_IO_U_PLAT_BITS) be 6 - * Error bound is 1/2^(6+1) = 0.0078125 (< 1%) - * - * Group MSB #discarded range of #buckets - * error_bits value - * ---------------------------------------------------------------- - * 0* 0~5 0 [0,63] 64 - * 1* 6 0 [64,127] 64 - * 2 7 1 [128,255] 64 - * 3 8 2 [256,511] 64 - * 4 9 3 [512,1023] 64 - * ... ... ... [...,...] ... - * 18 23 17 [8838608,+inf]** 64 - * - * * Special cases: when n < (M-1) or when n == (M-1), in both cases, - * the value cannot be rounded off. Use all bits of the sample as - * index. - * - * ** If a sample's MSB is greater than 23, it will be counted as 23. - */ - -#define FIO_IO_U_PLAT_BITS 6 -#define FIO_IO_U_PLAT_VAL (1 << FIO_IO_U_PLAT_BITS) -#define FIO_IO_U_PLAT_GROUP_NR 19 -#define FIO_IO_U_PLAT_NR (FIO_IO_U_PLAT_GROUP_NR * FIO_IO_U_PLAT_VAL) -#define FIO_IO_U_LIST_MAX_LEN 20 /* The size of the default and user-specified - list of percentiles */ - -#define MAX_PATTERN_SIZE 512 - -struct thread_stat { - char *name; - char *verror; - int error; - int groupid; - pid_t pid; - char *description; - int members; - - struct io_log *slat_log; - struct io_log *clat_log; - struct io_log *lat_log; - struct io_log *bw_log; - - /* - * bandwidth and latency stats - */ - 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]; - struct timeval stat_sample_time[2]; - - /* - * fio system usage accounting - */ - struct rusage ru_start; - struct rusage ru_end; - unsigned long usr_time; - unsigned long sys_time; - unsigned long ctx; - unsigned long minf, majf; - - /* - * IO depth and latency stats - */ - unsigned int clat_percentiles; - double* percentile_list; - - unsigned int io_u_map[FIO_IO_U_MAP_NR]; - unsigned int io_u_submit[FIO_IO_U_MAP_NR]; - 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 int io_u_plat [2][FIO_IO_U_PLAT_NR]; - unsigned long total_io_u[3]; - unsigned long short_io_u[3]; - unsigned long total_submit; - unsigned long total_complete; - - unsigned long long io_bytes[2]; - unsigned long long runtime[2]; - unsigned long total_run_time; - - /* - * IO Error related stats - */ - unsigned continue_on_error; - unsigned long total_err_count; - int first_error; - - unsigned int kb_base; -}; - struct bssplit { unsigned int bs; unsigned char perc; @@ -254,6 +82,7 @@ struct thread_options { unsigned int rw_seq; unsigned int kb_base; unsigned int ddir_seq_nr; + long ddir_seq_add; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; @@ -347,6 +176,7 @@ struct thread_options { enum fio_fallocate_mode fallocate_mode; unsigned int zero_buffers; unsigned int refill_buffers; + unsigned int scramble_buffers; unsigned int time_based; unsigned int disable_lat; unsigned int disable_clat; @@ -412,9 +242,9 @@ struct thread_options { unsigned int gid; unsigned int sync_file_range; -}; -#define FIO_VERROR_SIZE 128 + unsigned int userspace_libaio_reap; +}; /* * This describes a single thread/process executing a fio job. @@ -426,6 +256,18 @@ struct thread_data { int thread_number; int groupid; struct thread_stat ts; + + struct io_log *slat_log; + struct io_log *clat_log; + struct io_log *lat_log; + struct io_log *bw_log; + + uint64_t stat_io_bytes[2]; + struct timeval stat_sample_time[2]; + + struct rusage ru_start; + struct rusage ru_end; + struct fio_file **files; unsigned int files_size; unsigned int files_index; @@ -457,7 +299,7 @@ struct thread_data { char *sysfs_root; - unsigned long rand_seeds[7]; + unsigned long rand_seeds[8]; union { os_random_state_t bsrange_state; @@ -472,6 +314,8 @@ struct thread_data { struct frand_state __trim_state; }; + struct frand_state buf_state; + unsigned int verify_batch; unsigned int trim_batch; @@ -643,6 +487,10 @@ extern int fio_gtod_offload; extern int fio_gtod_cpu; extern enum fio_cs fio_clock_source; extern int warnings_fatal; +extern int terse_version; +extern int is_backend; +extern int nr_clients; +extern int log_syslog; extern struct thread_data *threads; @@ -683,6 +531,9 @@ static inline int should_fsync(struct thread_data *td) * Init/option functions */ extern int __must_check parse_options(int, char **); +extern int parse_jobs_ini(char *, int, int); +extern int exec_run(void); +extern void reset_fio_state(void); 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 *); @@ -724,6 +575,8 @@ enum { }; extern void td_set_runstate(struct thread_data *, int); +#define TERMINATE_ALL (-1) +extern void fio_terminate_threads(int); /* * Memory helpers