X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=d0629ece3fe6d3f2463a22fbc4dd16628c1ce2ae;hp=5bf8c43d3f9b0736422cf9fa3bb9973eaeafd81a;hb=d2f3ac3592a5674fefa082cb439cc72355d2fed0;hpb=0ad920e7f85db1fdc26649be6bc7e584e8c7fdc9 diff --git a/fio.h b/fio.h index 5bf8c43d..d0629ece 100644 --- a/fio.h +++ b/fio.h @@ -11,6 +11,7 @@ #include #include #include +#include #include "list.h" #include "md5.h" @@ -23,6 +24,10 @@ #include "syslet.h" #endif +#ifdef FIO_HAVE_GUASI +#include +#endif + enum fio_ddir { DDIR_READ = 0, DDIR_WRITE, @@ -109,6 +114,9 @@ struct io_u { #endif #ifdef FIO_HAVE_SYSLET struct syslet_req req; +#endif +#ifdef FIO_HAVE_GUASI + guasi_req_t greq; #endif }; struct timeval start_time; @@ -222,6 +230,7 @@ enum fio_file_flags { FIO_FILE_OPEN = 1 << 0, /* file is open */ FIO_FILE_UNLINK = 1 << 1, /* unlink on close */ FIO_FILE_CLOSING = 1 << 2, /* file being closed */ + FIO_FILE_EXISTS = 1 << 3, /* no need to create */ }; /* @@ -238,7 +247,7 @@ struct fio_file { unsigned long file_data; int fd; }; - const char *file_name; + char *file_name; void *mmap; unsigned long long file_size; unsigned long long real_file_size; @@ -307,38 +316,31 @@ struct thread_stat { unsigned long total_run_time; }; -/* - * This describes a single thread/process executing a fio job. - */ -struct thread_data { +struct thread_options { int pad; char *description; char *name; char *directory; char *filename; + char *opendir; char *ioengine; - char verror[128]; - pthread_t thread; - int thread_number; - int groupid; - struct thread_stat ts; - struct fio_file *files; - unsigned int nr_files; - unsigned int nr_open_files; - unsigned int nr_uniq_files; - union { - unsigned int next_file; - os_random_state_t next_file_state; - }; - int error; - pid_t pid; - char *orig_buffer; - size_t orig_buffer_size; - volatile int terminate; - volatile int runstate; enum td_ddir td_ddir; - unsigned int ioprio; - unsigned int last_was_sync; + unsigned int ddir_nr; + unsigned int iodepth; + unsigned int iodepth_low; + unsigned int iodepth_batch; + + unsigned long long size; + unsigned long long file_size_low; + unsigned long long file_size_high; + unsigned long long start_offset; + + unsigned int bs[2]; + unsigned int min_bs[2]; + unsigned int max_bs[2]; + + unsigned int nr_files; + unsigned int open_files; unsigned int odirect; unsigned int invalidate_cache; @@ -356,10 +358,8 @@ struct thread_data { unsigned int write_bw_log; unsigned int norandommap; unsigned int bs_unaligned; + unsigned int fsync_on_close; - unsigned int bs[2]; - unsigned int min_bs[2]; - unsigned int max_bs[2]; unsigned int hugepage_size; unsigned int rw_min_bs; unsigned int thinktime; @@ -374,31 +374,80 @@ struct thread_data { unsigned long long zone_size; unsigned long long zone_skip; enum fio_memtype mem_type; - char *mmapfile; - int mmapfd; + unsigned int stonewall; + unsigned int new_group; unsigned int numjobs; - unsigned int iodepth; - unsigned int iodepth_low; - unsigned int iodepth_batch; os_cpu_mask_t cpumask; unsigned int iolog; unsigned int read_iolog; unsigned int rwmixcycle; - unsigned int rwmixread; - unsigned int rwmixwrite; + unsigned int rwmix[2]; unsigned int nice; unsigned int file_service_type; unsigned int group_reporting; - unsigned int open_files; + unsigned int fadvise_hint; char *read_iolog_file; char *write_iolog_file; + + /* + * Pre-run and post-run shell + */ + char *exec_prerun; + char *exec_postrun; + + unsigned int rate; + unsigned int ratemin; + unsigned int ratecycle; + unsigned int rate_iops; + unsigned int rate_iops_min; + + char *ioscheduler; + + /* + * CPU "io" cycle burner + */ + unsigned int cpuload; + unsigned int cpucycle; +}; + +#define FIO_VERROR_SIZE 128 + +/* + * This describes a single thread/process executing a fio job. + */ +struct thread_data { + struct thread_options o; + char verror[FIO_VERROR_SIZE]; + pthread_t thread; + int thread_number; + int groupid; + struct thread_stat ts; + struct fio_file *files; + unsigned int files_index; + unsigned int nr_open_files; + unsigned int nr_normal_files; + union { + unsigned int next_file; + os_random_state_t next_file_state; + }; + int error; + pid_t pid; + char *orig_buffer; + size_t orig_buffer_size; + volatile int terminate; + volatile int runstate; + unsigned int ioprio; + unsigned int last_was_sync; + + char *mmapfile; + int mmapfd; + void *iolog_buf; FILE *iolog_f; char *sysfs_root; - char *ioscheduler; os_random_state_t bsrange_state; os_random_state_t verify_state; @@ -423,17 +472,13 @@ struct thread_data { /* * Rate state */ - unsigned int rate; - unsigned int ratemin; - unsigned int ratecycle; unsigned long rate_usec_cycle; long rate_pending_usleep; unsigned long rate_bytes; + unsigned long rate_blocks; struct timeval lastrate; unsigned long long io_size; - unsigned long long total_file_size; - unsigned long long start_offset; unsigned long long total_io_size; unsigned long io_issues[2]; @@ -448,27 +493,19 @@ struct thread_data { */ os_random_state_t random_state; - /* - * CPU "io" cycle burner - */ - unsigned int cpuload; - unsigned int cpucycle; - struct timeval start; /* start of this loop */ struct timeval epoch; /* time job was started */ + struct timeval rw_end[2]; + unsigned int rw_end_set[2]; /* * read/write mixed workload state */ os_random_state_t rwmix_state; + unsigned long long rwmix_bytes; struct timeval rwmix_switch; enum fio_ddir rwmix_ddir; - - /* - * Pre-run and post-run shell - */ - char *exec_prerun; - char *exec_postrun; + unsigned int ddir_nr; /* * IO historic logs @@ -488,6 +525,11 @@ struct thread_data { unsigned int file_service_nr; unsigned int file_service_left; struct fio_file *file_service_file; + + /* + * For generating file sizes + */ + os_random_state_t file_size_state; }; /* @@ -530,16 +572,17 @@ extern FILE *f_out; extern FILE *f_err; extern int temp_stall_ts; extern unsigned long long mlock_size; +extern unsigned long page_mask, page_size; extern struct thread_data *threads; -#define td_read(td) ((td)->td_ddir & TD_DDIR_READ) -#define td_write(td) ((td)->td_ddir & TD_DDIR_WRITE) -#define td_rw(td) (((td)->td_ddir & TD_DDIR_RW) == TD_DDIR_RW) -#define td_random(td) ((td)->td_ddir & TD_DDIR_RAND) +#define td_read(td) ((td)->o.td_ddir & TD_DDIR_READ) +#define td_write(td) ((td)->o.td_ddir & TD_DDIR_WRITE) +#define td_rw(td) (((td)->o.td_ddir & TD_DDIR_RW) == TD_DDIR_RW) +#define td_random(td) ((td)->o.td_ddir & TD_DDIR_RAND) #define BLOCKS_PER_MAP (8 * sizeof(long)) -#define TO_MAP_BLOCK(td, f, b) ((b) - ((f)->file_offset / (td)->rw_min_bs)) +#define TO_MAP_BLOCK(td, f, b) ((b) - ((f)->file_offset / (td)->o.rw_min_bs)) #define RAND_MAP_IDX(td, f, b) (TO_MAP_BLOCK(td, f, b) / BLOCKS_PER_MAP) #define RAND_MAP_BIT(td, f, b) (TO_MAP_BLOCK(td, f, b) & (BLOCKS_PER_MAP - 1)) @@ -549,9 +592,9 @@ static inline int should_fsync(struct thread_data *td) { if (td->last_was_sync) return 0; - if (td->odirect) + if (td->o.odirect) return 0; - if (td_write(td) || td_rw(td) || td->override_sync) + if (td_write(td) || td_rw(td) || td->o.override_sync) return 1; return 0; @@ -619,7 +662,6 @@ extern void disk_util_timer_arm(void); extern void setup_log(struct io_log **); extern void finish_log(struct thread_data *, struct io_log *, const char *); extern void __finish_log(struct io_log *, const char *); -extern int setup_rate(struct thread_data *); extern struct io_log *agg_io_log[2]; extern int write_bw_log; extern void add_agg_sample(unsigned long, enum fio_ddir); @@ -641,10 +683,16 @@ extern void fio_gettime(struct timeval *, void *); extern void set_genesis_time(void); /* - * Init functions + * Init/option functions */ extern int __must_check parse_options(int, char **); -extern int __must_check init_random_state(struct thread_data *); +extern int fio_option_parse(struct thread_data *, const char *); +extern int fio_cmd_option_parse(struct thread_data *, const char *, char *); +extern void fio_fill_default_options(struct thread_data *); +extern int fio_show_option_help(const char *); +extern void fio_options_dup_and_init(struct option *); +#define FIO_GETOPT_JOB 0x89988998 +#define FIO_NR_OPTIONS 128 /* * File setup/shutdown @@ -658,6 +706,8 @@ extern void generic_close_file(struct thread_data *, struct fio_file *); extern void add_file(struct thread_data *, const char *); extern void get_file(struct fio_file *); extern void put_file(struct thread_data *, struct fio_file *); +extern int add_dir_files(struct thread_data *, const char *); +extern int init_random_map(struct thread_data *); /* * ETA/status stuff @@ -734,6 +784,8 @@ extern void td_io_close_file(struct thread_data *, struct fio_file *); fprintf(stderr, ##args); \ } while (0) +#define log_info(args...) fprintf(f_out, ##args) + FILE *get_f_out(void); FILE *get_f_err(void); @@ -774,7 +826,7 @@ extern void close_ioengine(struct thread_data *); #define for_each_td(td, i) \ for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++) #define for_each_file(td, f, i) \ - for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->open_files; (i)++, (f)++) + for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->o.nr_files; (i)++, (f)++) #define fio_assert(td, cond) do { \ if (!(cond)) { \