X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=15ab308488c23b1f6608e1f682d70a4696adc506;hp=4733990918f96b284d04c1a1c7f7f875a7977df4;hb=e25839d4cb5fefcb5ffce76128a4faedb177e7af;hpb=068420271828b3b2426ffc3ccf64404cb9d340fb diff --git a/fio.h b/fio.h index 47339909..15ab3084 100644 --- a/fio.h +++ b/fio.h @@ -33,10 +33,13 @@ struct thread_data; #include "options.h" #include "profile.h" #include "time.h" +#include "gettime.h" #include "lib/getopt.h" #include "lib/rand.h" #include "server.h" #include "stat.h" +#include "flow.h" +#include "lib/zipf.h" #ifdef FIO_HAVE_GUASI #include @@ -46,6 +49,16 @@ struct thread_data; #include #endif +#ifdef FIO_HAVE_LIBNUMA +#include +#include + +/* + * "local" is pseudo-policy + */ +#define MPOL_LOCAL MPOL_MAX +#endif + /* * What type of allocation to use for io buffers */ @@ -68,11 +81,18 @@ enum { /* * What type of errors to continue on when continue_on_error is used */ +enum error_type_bit { + ERROR_TYPE_READ_BIT = 0, + ERROR_TYPE_WRITE_BIT = 1, + ERROR_TYPE_VERIFY_BIT = 2, + ERROR_TYPE_CNT = 3, +}; + enum error_type { ERROR_TYPE_NONE = 0, - ERROR_TYPE_READ = 1 << 0, - ERROR_TYPE_WRITE = 1 << 1, - ERROR_TYPE_VERIFY = 1 << 2, + ERROR_TYPE_READ = 1 << ERROR_TYPE_READ_BIT, + ERROR_TYPE_WRITE = 1 << ERROR_TYPE_WRITE_BIT, + ERROR_TYPE_VERIFY = 1 << ERROR_TYPE_VERIFY_BIT, ERROR_TYPE_ANY = 0xffff, }; @@ -106,12 +126,16 @@ struct thread_options { unsigned long long file_size_high; unsigned long long start_offset; - unsigned int bs[2]; - unsigned int ba[2]; - unsigned int min_bs[2]; - unsigned int max_bs[2]; - struct bssplit *bssplit[2]; - unsigned int bssplit_nr[2]; + unsigned int bs[DDIR_RWDIR_CNT]; + unsigned int ba[DDIR_RWDIR_CNT]; + unsigned int min_bs[DDIR_RWDIR_CNT]; + unsigned int max_bs[DDIR_RWDIR_CNT]; + struct bssplit *bssplit[DDIR_RWDIR_CNT]; + unsigned int bssplit_nr[DDIR_RWDIR_CNT]; + + int *ignore_error[ERROR_TYPE_CNT]; + unsigned int ignore_error_nr[ERROR_TYPE_CNT]; + unsigned int error_dump; unsigned int nr_files; unsigned int open_files; @@ -123,6 +147,7 @@ struct thread_options { unsigned int create_serialize; unsigned int create_fsync; unsigned int create_on_open; + unsigned int create_only; unsigned int end_fsync; unsigned int pre_read; unsigned int sync_io; @@ -147,11 +172,15 @@ struct thread_options { unsigned int write_lat_log; unsigned int write_bw_log; unsigned int write_iops_log; + unsigned int log_avg_msec; unsigned int norandommap; unsigned int softrandommap; unsigned int bs_unaligned; unsigned int fsync_on_close; + unsigned int random_distribution; + double zipf_theta; + unsigned int hugepage_size; unsigned int rw_min_bs; unsigned int thinktime; @@ -167,11 +196,14 @@ struct thread_options { unsigned int bw_avg_time; unsigned int iops_avg_time; unsigned int loops; + unsigned long long zone_range; unsigned long long zone_size; unsigned long long zone_skip; enum fio_memtype mem_type; unsigned int mem_align; + unsigned int max_latency; + unsigned int stonewall; unsigned int new_group; unsigned int numjobs; @@ -179,6 +211,14 @@ struct thread_options { unsigned int cpumask_set; os_cpu_mask_t verify_cpumask; unsigned int verify_cpumask_set; +#ifdef FIO_HAVE_LIBNUMA + struct bitmask *numa_cpunodesmask; + unsigned int numa_cpumask_set; + unsigned short numa_mem_mode; + unsigned int numa_mem_prefer_node; + struct bitmask *numa_memnodesmask; + unsigned int numa_memmask_set; +#endif unsigned int iolog; unsigned int rwmixcycle; unsigned int rwmix[2]; @@ -190,6 +230,8 @@ struct thread_options { unsigned int zero_buffers; unsigned int refill_buffers; unsigned int scramble_buffers; + unsigned int compress_percentage; + unsigned int compress_chunk; unsigned int time_based; unsigned int disable_lat; unsigned int disable_clat; @@ -221,11 +263,11 @@ struct thread_options { char *exec_prerun; char *exec_postrun; - unsigned int rate[2]; - unsigned int ratemin[2]; + unsigned int rate[DDIR_RWDIR_CNT]; + unsigned int ratemin[DDIR_RWDIR_CNT]; unsigned int ratecycle; - unsigned int rate_iops[2]; - unsigned int rate_iops_min[2]; + unsigned int rate_iops[DDIR_RWDIR_CNT]; + unsigned int rate_iops_min[DDIR_RWDIR_CNT]; char *ioscheduler; @@ -255,6 +297,13 @@ struct thread_options { unsigned int uid; unsigned int gid; + int flow_id; + int flow; + int flow_watermark; + unsigned int flow_sleep; + + unsigned long long offset_increment; + unsigned int sync_file_range; }; @@ -276,10 +325,10 @@ struct thread_data { struct io_log *bw_log; struct io_log *iops_log; - uint64_t stat_io_bytes[2]; + uint64_t stat_io_bytes[DDIR_RWDIR_CNT]; struct timeval bw_sample_time; - uint64_t stat_io_blocks[2]; + uint64_t stat_io_blocks[DDIR_RWDIR_CNT]; struct timeval iops_sample_time; struct rusage ru_start; @@ -297,6 +346,7 @@ struct thread_data { struct frand_state __next_file_state; }; int error; + int sig; int done; pid_t pid; char *orig_buffer; @@ -345,10 +395,23 @@ struct thread_data { struct ioengine_ops *io_ops; /* - * Current IO depth and list of free and busy io_u's. + * Queue depth of io_u's that fio MIGHT do */ unsigned int cur_depth; + + /* + * io_u's about to be committed + */ unsigned int io_u_queued; + + /* + * io_u's submitted but not completed yet + */ + unsigned int io_u_in_flight; + + /* + * List of free and busy io_u's + */ struct flist_head io_u_freelist; struct flist_head io_u_busylist; struct flist_head io_u_requeues; @@ -367,21 +430,21 @@ struct thread_data { /* * Rate state */ - unsigned long long rate_bps[2]; - long rate_pending_usleep[2]; - unsigned long rate_bytes[2]; - unsigned long rate_blocks[2]; - struct timeval lastrate[2]; + unsigned long long rate_bps[DDIR_RWDIR_CNT]; + long rate_pending_usleep[DDIR_RWDIR_CNT]; + unsigned long rate_bytes[DDIR_RWDIR_CNT]; + unsigned long rate_blocks[DDIR_RWDIR_CNT]; + struct timeval lastrate[DDIR_RWDIR_CNT]; unsigned long long total_io_size; unsigned long long fill_device_size; - unsigned long io_issues[2]; - unsigned long long io_blocks[2]; - unsigned long long this_io_blocks[2]; - unsigned long long io_bytes[2]; + unsigned long io_issues[DDIR_RWDIR_CNT]; + unsigned long long io_blocks[DDIR_RWDIR_CNT]; + unsigned long long this_io_blocks[DDIR_RWDIR_CNT]; + unsigned long long io_bytes[DDIR_RWDIR_CNT]; unsigned long long io_skip_bytes; - unsigned long long this_io_bytes[2]; + unsigned long long this_io_bytes[DDIR_RWDIR_CNT]; unsigned long long zone_bytes; struct fio_mutex *mutex; @@ -393,6 +456,11 @@ struct thread_data { struct frand_state __random_state; }; + /* + * Used for zipf random distribution + */ + struct zipf_state zipf; + struct timeval start; /* start of this loop */ struct timeval epoch; /* time job was started */ struct timeval last_issue; @@ -454,6 +522,8 @@ struct thread_data { unsigned int total_err_count; int first_error; + struct fio_flow *flow; + /* * Can be overloaded by profiles */ @@ -496,10 +566,10 @@ extern unsigned int thread_number; extern unsigned int nr_process, nr_thread; extern int shm_id; extern int groupid; -extern int terse_output; +extern int output_format; extern int temp_stall_ts; extern unsigned long long mlock_size; -extern unsigned long page_mask, page_size; +extern uintptr_t page_mask, page_size; extern int read_only; extern int eta_print; extern unsigned long done_secs; @@ -529,15 +599,32 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u) #define REAL_MAX_JOBS 2048 -#define td_non_fatal_error(e) ((e) == EIO || (e) == EILSEQ) - static inline enum error_type td_error_type(enum fio_ddir ddir, int err) { if (err == EILSEQ) - return ERROR_TYPE_VERIFY; + return ERROR_TYPE_VERIFY_BIT; if (ddir == DDIR_READ) - return ERROR_TYPE_READ; - return ERROR_TYPE_WRITE; + return ERROR_TYPE_READ_BIT; + return ERROR_TYPE_WRITE_BIT; +} + +static int __NON_FATAL_ERR[] = {EIO, EILSEQ}; +static inline int td_non_fatal_error(struct thread_data *td, + enum error_type_bit etype, int err) +{ + int i; + if (!td->o.ignore_error[etype]) { + td->o.ignore_error[etype] = __NON_FATAL_ERR; + td->o.ignore_error_nr[etype] = sizeof(__NON_FATAL_ERR) + / sizeof(int); + } + + if (!(td->o.continue_on_error & (1 << etype))) + return 0; + for (i = 0; i < td->o.ignore_error_nr[etype]; i++) + if (td->o.ignore_error[etype][i] == err) + return 1; + return 0; } static inline void update_error_count(struct thread_data *td, int err) @@ -565,8 +652,9 @@ static inline int should_fsync(struct thread_data *td) extern int __must_check parse_options(int, char **); extern int parse_jobs_ini(char *, int, int); extern int parse_cmd_line(int, char **); -extern int exec_run(void); +extern int fio_backend(void); extern void reset_fio_state(void); +extern void clear_io_state(struct thread_data *); 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 *); @@ -690,10 +778,12 @@ static inline int should_check_rate(struct thread_data *td, { int ret = 0; - if (bytes_done[0]) - ret |= __should_check_rate(td, 0); - if (bytes_done[1]) - ret |= __should_check_rate(td, 1); + if (bytes_done[DDIR_READ]) + ret |= __should_check_rate(td, DDIR_READ); + if (bytes_done[DDIR_WRITE]) + ret |= __should_check_rate(td, DDIR_WRITE); + if (bytes_done[DDIR_TRIM]) + ret |= __should_check_rate(td, DDIR_TRIM); return ret; } @@ -728,4 +818,15 @@ static inline void td_io_u_free_notify(struct thread_data *td) extern const char *fio_get_arch_string(int); extern const char *fio_get_os_string(int); +enum { + FIO_OUTPUT_TERSE = 0, + FIO_OUTPUT_JSON, + FIO_OUTPUT_NORMAL, +}; + +enum { + FIO_RAND_DIST_RANDOM = 0, + FIO_RAND_DIST_ZIPF, +}; + #endif