X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=de4ca4daefa2ebc6bceb770e345be87a8d2389aa;hp=f2a5a1f1ee70b91353734c9c5f8f8308ca10d338;hb=539e9a14f8c734a5a0264309dca96cfc5d71abda;hpb=25460cf6350fb90b8a7943bb649a51d81bac13a4 diff --git a/fio.h b/fio.h index f2a5a1f1..de4ca4da 100644 --- a/fio.h +++ b/fio.h @@ -48,6 +48,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 */ @@ -70,11 +80,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, }; @@ -108,12 +125,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; @@ -156,6 +177,12 @@ struct thread_options { unsigned int bs_unaligned; unsigned int fsync_on_close; + unsigned int random_distribution; + double zipf_theta; + double pareto_h; + + unsigned int random_generator; + unsigned int hugepage_size; unsigned int rw_min_bs; unsigned int thinktime; @@ -177,6 +204,8 @@ struct thread_options { enum fio_memtype mem_type; unsigned int mem_align; + unsigned int max_latency; + unsigned int stonewall; unsigned int new_group; unsigned int numjobs; @@ -184,6 +213,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]; @@ -228,11 +265,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; @@ -272,11 +309,34 @@ struct thread_options { unsigned int sync_file_range; }; +enum { + TD_F_VER_BACKLOG = 1, + TD_F_TRIM_BACKLOG = 2, + TD_F_READ_IOLOG = 4, + TD_F_REFILL_BUFFERS = 8, + TD_F_SCRAMBLE_BUFFERS = 16, + TD_F_VER_NONE = 32, + TD_F_PROFILE_OPS = 64, +}; + +enum { + FIO_RAND_BS_OFF = 0, + FIO_RAND_VER_OFF, + FIO_RAND_MIX_OFF, + FIO_RAND_FILE_OFF, + FIO_RAND_BLOCK_OFF, + FIO_RAND_FILE_SIZE_OFF, + FIO_RAND_TRIM_OFF, + FIO_RAND_BUF_OFF, + FIO_RAND_NR_OFFS, +}; + /* * This describes a single thread/process executing a fio job. */ struct thread_data { struct thread_options o; + unsigned long flags; void *eo; char verror[FIO_VERROR_SIZE]; pthread_t thread; @@ -290,10 +350,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; @@ -331,7 +391,7 @@ struct thread_data { char *sysfs_root; - unsigned long rand_seeds[8]; + unsigned long rand_seeds[FIO_RAND_NR_OFFS]; union { os_random_state_t bsrange_state; @@ -395,21 +455,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; @@ -523,10 +583,11 @@ enum { extern int exitall_on_terminate; extern unsigned int thread_number; +extern unsigned int stat_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 uintptr_t page_mask, page_size; @@ -537,6 +598,7 @@ extern char *job_section; extern int fio_gtod_offload; extern int fio_gtod_cpu; extern enum fio_cs fio_clock_source; +extern int fio_clock_source_set; extern int warnings_fatal; extern int terse_version; extern int is_backend; @@ -552,22 +614,34 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u) assert(!(io_u->ddir == DDIR_WRITE && !td_write(td))); } -#define BLOCKS_PER_MAP (8 * sizeof(unsigned long)) -#define TO_MAP_BLOCK(f, b) (b) -#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 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) +static inline enum error_type_bit 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) @@ -634,6 +708,7 @@ enum { TD_CREATED, TD_INITIALIZED, TD_RAMP, + TD_SETTING_UP, TD_RUNNING, TD_PRE_READING, TD_VERIFYING, @@ -721,10 +796,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; } @@ -759,4 +836,21 @@ 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, + FIO_RAND_DIST_PARETO, +}; + +enum { + FIO_RAND_GEN_TAUSWORTHE = 0, + FIO_RAND_GEN_LFSR, +}; + #endif