X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=e55413a95dcb8fccc92019fd8cfa245b84be1f0c;hp=3de3f000983a5621ee65c2e8d975e250d0ace7cf;hb=7fb6d4530b2018064f8011f7ff9e4f673002f615;hpb=d24945f0f0538bea41704cbd9b593b350ca9bb0d diff --git a/fio.h b/fio.h index 3de3f000..e55413a9 100644 --- a/fio.h +++ b/fio.h @@ -17,9 +17,9 @@ struct thread_data; #include "compiler/compiler.h" +#include "thread_options.h" #include "flist.h" #include "fifo.h" -#include "rbtree.h" #include "arch/arch.h" #include "os/os.h" #include "mutex.h" @@ -36,19 +36,16 @@ struct thread_data; #include "gettime.h" #include "lib/getopt.h" #include "lib/rand.h" +#include "lib/rbtree.h" #include "server.h" #include "stat.h" #include "flow.h" -#ifdef FIO_HAVE_GUASI -#include -#endif - -#ifdef FIO_HAVE_SOLARISAIO +#ifdef CONFIG_SOLARISAIO #include #endif -#ifdef FIO_HAVE_LIBNUMA +#ifdef CONFIG_LIBNUMA #include #include @@ -58,17 +55,6 @@ struct thread_data; #define MPOL_LOCAL MPOL_MAX #endif -/* - * What type of allocation to use for io buffers - */ -enum fio_memtype { - MEM_MALLOC = 0, /* ordinary malloc */ - MEM_SHM, /* use shared memory segments */ - MEM_SHMHUGE, /* use shared memory segments with huge pages */ - MEM_MMAP, /* use anonynomous mmap */ - MEM_MMAPHUGE, /* memory mapped huge file */ -}; - /* * offset generator types */ @@ -77,238 +63,6 @@ enum { RW_SEQ_IDENT, }; -/* - * 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 << ERROR_TYPE_READ_BIT, - ERROR_TYPE_WRITE = 1 << ERROR_TYPE_WRITE_BIT, - ERROR_TYPE_VERIFY = 1 << ERROR_TYPE_VERIFY_BIT, - ERROR_TYPE_ANY = 0xffff, -}; - -struct bssplit { - unsigned int bs; - unsigned char perc; -}; - -struct thread_options { - int pad; - char *description; - char *name; - char *directory; - char *filename; - char *opendir; - char *ioengine; - enum td_ddir td_ddir; - 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; - unsigned long long start_offset; - - 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; - enum file_lock_mode file_lock_mode; - unsigned int lockfile_batch; - - unsigned int odirect; - unsigned int invalidate_cache; - 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; - unsigned int verify; - unsigned int do_verify; - unsigned int verifysort; - unsigned int verify_interval; - unsigned int verify_offset; - char verify_pattern[MAX_PATTERN_SIZE]; - unsigned int verify_pattern_bytes; - unsigned int verify_fatal; - unsigned int verify_dump; - unsigned int verify_async; - unsigned long long verify_backlog; - unsigned int verify_batch; - unsigned int use_thread; - unsigned int unlink; - unsigned int do_disk_util; - unsigned int override_sync; - unsigned int rand_repeatable; - unsigned int use_os_rand; - 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; - double pareto_h; - - unsigned int random_generator; - - unsigned int hugepage_size; - unsigned int rw_min_bs; - unsigned int thinktime; - unsigned int thinktime_spin; - unsigned int thinktime_blocks; - unsigned int fsync_blocks; - unsigned int fdatasync_blocks; - unsigned int barrier_blocks; - unsigned long long start_delay; - unsigned long long timeout; - unsigned long long ramp_time; - unsigned int overwrite; - 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; - os_cpu_mask_t cpumask; - 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]; - unsigned int nice; - unsigned int file_service_type; - unsigned int group_reporting; - unsigned int fadvise_hint; - enum fio_fallocate_mode fallocate_mode; - 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; - unsigned int disable_slat; - unsigned int disable_bw; - unsigned int gtod_reduce; - unsigned int gtod_cpu; - unsigned int gtod_offload; - enum fio_cs clocksource; - unsigned int no_stall; - unsigned int trim_percentage; - unsigned int trim_batch; - unsigned int trim_zero; - unsigned long long trim_backlog; - unsigned int clat_percentiles; - unsigned int overwrite_plist; - fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN]; - - char *read_iolog_file; - char *write_iolog_file; - char *bw_log_file; - char *lat_log_file; - char *iops_log_file; - char *replay_redirect; - - /* - * Pre-run and post-run shell - */ - char *exec_prerun; - char *exec_postrun; - - unsigned int rate[DDIR_RWDIR_CNT]; - unsigned int ratemin[DDIR_RWDIR_CNT]; - unsigned int ratecycle; - unsigned int rate_iops[DDIR_RWDIR_CNT]; - unsigned int rate_iops_min[DDIR_RWDIR_CNT]; - - char *ioscheduler; - - /* - * CPU "io" cycle burner - */ - unsigned int cpuload; - unsigned int cpucycle; - - /* - * I/O Error handling - */ - enum error_type continue_on_error; - - /* - * Benchmark profile type - */ - char *profile; - - /* - * blkio cgroup support - */ - char *cgroup; - unsigned int cgroup_weight; - unsigned int cgroup_nodelete; - - 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; -}; - enum { TD_F_VER_BACKLOG = 1, TD_F_TRIM_BACKLOG = 2, @@ -356,10 +110,13 @@ struct thread_data { uint64_t stat_io_blocks[DDIR_RWDIR_CNT]; struct timeval iops_sample_time; + volatile int update_rusage; + struct fio_mutex *rusage_sem; struct rusage ru_start; struct rusage ru_end; struct fio_file **files; + unsigned char *file_locks; unsigned int files_size; unsigned int files_index; unsigned int nr_open_files; @@ -455,22 +212,22 @@ struct thread_data { /* * Rate state */ - unsigned long long rate_bps[DDIR_RWDIR_CNT]; + uint64_t 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; + uint64_t total_io_size; + uint64_t fill_device_size; 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[DDIR_RWDIR_CNT]; - unsigned long long zone_bytes; + uint64_t io_blocks[DDIR_RWDIR_CNT]; + uint64_t this_io_blocks[DDIR_RWDIR_CNT]; + uint64_t io_bytes[DDIR_RWDIR_CNT]; + uint64_t io_skip_bytes; + uint64_t this_io_bytes[DDIR_RWDIR_CNT]; + uint64_t zone_bytes; struct fio_mutex *mutex; /* @@ -519,6 +276,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 */ @@ -567,7 +326,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) @@ -593,18 +352,19 @@ extern unsigned long long mlock_size; extern uintptr_t page_mask, page_size; extern int read_only; extern int eta_print; +extern int eta_new_line; extern unsigned long done_secs; 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; @@ -654,8 +414,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; @@ -683,7 +441,7 @@ extern void fio_options_mem_dupe(struct thread_data *); extern void options_mem_dupe(void *data, struct fio_option *options); extern void td_fill_rand_seeds(struct thread_data *); extern void add_job_opts(const char **); -extern char *num2str(unsigned long, int, int, int); +extern char *num2str(unsigned long, int, int, int, int); extern int ioengine_load(struct thread_data *); #define FIO_GETOPT_JOB 0x89000000 @@ -791,7 +549,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; @@ -805,6 +563,14 @@ static inline int should_check_rate(struct thread_data *td, return ret; } +static inline unsigned int td_max_bs(struct thread_data *td) +{ + unsigned int max_bs; + + max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]); + return max(td->o.max_bs[DDIR_TRIM], max_bs); +} + static inline int is_power_of_2(unsigned int val) { return (val != 0 && ((val & (val - 1)) == 0));