X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=43f48543ed63db3ab4afdabc9cb9a78dfbfcf515;hp=b2bbe93f5bf5b3c7f8d1463ecd00f08359034baf;hb=033ace1e7965ebf215f6fba2102de5b716ebfede;hpb=f3afa57e36550288340f1b6c694f354ae72654b9 diff --git a/fio.h b/fio.h index b2bbe93f..43f48543 100644 --- a/fio.h +++ b/fio.h @@ -40,12 +40,18 @@ struct thread_data; #include "stat.h" #include "flow.h" -#ifdef FIO_HAVE_GUASI -#include +#ifdef CONFIG_SOLARISAIO +#include #endif -#ifdef FIO_HAVE_SOLARISAIO -#include +#ifdef CONFIG_LIBNUMA +#include +#include + +/* + * "local" is pseudo-policy + */ +#define MPOL_LOCAL MPOL_MAX #endif /* @@ -70,11 +76,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, }; @@ -115,6 +128,10 @@ struct thread_options { 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; enum file_lock_mode file_lock_mode; @@ -132,6 +149,7 @@ struct thread_options { unsigned int verify; unsigned int do_verify; unsigned int verifysort; + unsigned int verifysort_nr; unsigned int verify_interval; unsigned int verify_offset; char verify_pattern[MAX_PATTERN_SIZE]; @@ -141,6 +159,7 @@ struct thread_options { unsigned int verify_async; unsigned long long verify_backlog; unsigned int verify_batch; + unsigned int experimental_verify; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -156,6 +175,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 +202,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 +211,14 @@ struct thread_options { unsigned int cpumask_set; os_cpu_mask_t verify_cpumask; unsigned int verify_cpumask_set; +#ifdef CONFIG_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]; @@ -202,6 +237,7 @@ struct thread_options { unsigned int disable_clat; unsigned int disable_slat; unsigned int disable_bw; + unsigned int unified_rw_rep; unsigned int gtod_reduce; unsigned int gtod_cpu; unsigned int gtod_offload; @@ -212,7 +248,7 @@ struct thread_options { unsigned int trim_zero; unsigned long long trim_backlog; unsigned int clat_percentiles; - unsigned int overwrite_plist; + unsigned int percentile_precision; /* digits after decimal for percentiles */ fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN]; char *read_iolog_file; @@ -272,11 +308,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; @@ -331,7 +390,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; @@ -459,6 +518,8 @@ struct thread_data { struct flist_head trim_list; unsigned long trim_entries; + struct flist_head next_rand_list; + /* * for fileservice, how often to switch to a new file */ @@ -507,7 +568,7 @@ enum { int e = (err); \ (td)->error = e; \ if (!(td)->first_error) \ - snprintf(td->verror, sizeof(td->verror) - 1, "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg)); \ + snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg)); \ } while (0) @@ -523,6 +584,7 @@ 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; @@ -537,13 +599,13 @@ 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; extern int nr_clients; extern int log_syslog; extern const char fio_version_string[]; -extern const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN]; extern struct thread_data *threads; @@ -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) @@ -581,8 +655,6 @@ static inline int should_fsync(struct thread_data *td) { if (td->last_was_sync) return 0; - if (td->o.odirect) - return 0; if (td_write(td) || td_rw(td) || td->o.override_sync) return 1; @@ -634,6 +706,7 @@ enum { TD_CREATED, TD_INITIALIZED, TD_RAMP, + TD_SETTING_UP, TD_RUNNING, TD_PRE_READING, TD_VERIFYING, @@ -717,7 +790,7 @@ static inline int __should_check_rate(struct thread_data *td, } static inline int should_check_rate(struct thread_data *td, - unsigned long *bytes_done) + uint64_t *bytes_done) { int ret = 0; @@ -767,4 +840,15 @@ enum { 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