X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=a74fb108c7f6f79827ea793d9cc099b28ea2777b;hp=6ad186f0e6a87cc4ff5ec20dda35c598df0aaf8c;hb=cc0df00ad5076d4adbc439899f24d9b0db26075d;hpb=ac18ea38de2a23018f9f953c3028d519df3a1177 diff --git a/fio.h b/fio.h index 6ad186f0..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,77 +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 - -#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 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 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; @@ -159,12 +82,14 @@ 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; unsigned int iodepth_batch_complete; unsigned long long size; + unsigned int size_percent; unsigned int fill_device; unsigned long long file_size_low; unsigned long long file_size_high; @@ -223,7 +148,7 @@ struct thread_options { unsigned int fsync_blocks; unsigned int fdatasync_blocks; unsigned int barrier_blocks; - unsigned long start_delay; + unsigned long long start_delay; unsigned long long timeout; unsigned long long ramp_time; unsigned int overwrite; @@ -248,9 +173,10 @@ struct thread_options { unsigned int file_service_type; unsigned int group_reporting; unsigned int fadvise_hint; - unsigned int fallocate; + 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; @@ -265,6 +191,9 @@ struct thread_options { unsigned int trim_batch; unsigned int trim_zero; unsigned long long trim_backlog; + unsigned int clat_percentiles; + unsigned int overwrite_plist; + double percentile_list[FIO_IO_U_LIST_MAX_LEN]; char *read_iolog_file; char *write_iolog_file; @@ -313,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. @@ -327,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; @@ -358,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; @@ -373,6 +314,8 @@ struct thread_data { struct frand_state __trim_state; }; + struct frand_state buf_state; + unsigned int verify_batch; unsigned int trim_batch; @@ -544,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; @@ -557,7 +504,7 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u) #define RAND_MAP_IDX(f, b) (TO_MAP_BLOCK(f, b) / BLOCKS_PER_MAP) #define RAND_MAP_BIT(f, b) (TO_MAP_BLOCK(f, b) & (BLOCKS_PER_MAP - 1)) -#define MAX_JOBS (2048) +#define REAL_MAX_JOBS 2048 #define td_non_fatal_error(e) ((e) == EIO || (e) == EILSEQ) @@ -584,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 *); @@ -625,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