X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=f8e6a4a066c346eb3aa693150b385eadab8b4f31;hp=55717c798a08c9192bb8eae8533a97d92d7122dd;hb=e3cedca76d9fc104eb4f6f869606fb5bf4c0d59c;hpb=303032ae4e13c7ac10b8198c40df98d95a4524a6 diff --git a/fio.h b/fio.h index 55717c79..f8e6a4a0 100644 --- a/fio.h +++ b/fio.h @@ -16,7 +16,7 @@ #include #include "compiler/compiler.h" -#include "list.h" +#include "flist.h" #include "fifo.h" #include "rbtree.h" #include "arch/arch.h" @@ -29,6 +29,10 @@ #include #endif +#ifdef FIO_HAVE_SOLARISAIO +#include +#endif + enum fio_ddir { DDIR_READ = 0, DDIR_WRITE, @@ -88,7 +92,7 @@ struct io_log { struct io_piece { union { struct rb_node rb_node; - struct list_head list; + struct flist_head list; }; union { int fileno; @@ -126,6 +130,9 @@ struct io_u { #endif #ifdef FIO_HAVE_GUASI guasi_req_t greq; +#endif +#ifdef FIO_HAVE_SOLARISAIO + aio_result_t resultp; #endif }; struct timeval start_time; @@ -157,13 +164,14 @@ struct io_u { union { unsigned int index; unsigned int seen; + void *engine_data; }; unsigned int flags; struct fio_file *file; - struct list_head list; + struct flist_head list; /* * Callback for io completion @@ -187,6 +195,8 @@ enum { VERIFY_MD5, /* md5 sum data blocks */ VERIFY_CRC64, /* crc64 sum data blocks */ VERIFY_CRC32, /* crc32 sum data blocks */ + VERIFY_CRC32C, /* crc32c sum data blocks */ + VERIFY_CRC32C_INTEL, /* crc32c sum data blocks with hw */ VERIFY_CRC16, /* crc16 sum data blocks */ VERIFY_CRC7, /* crc7 sum data blocks */ VERIFY_SHA256, /* sha256 sum data blocks */ @@ -288,7 +298,7 @@ enum fio_file_flags { * this structure holds state information for a single file. */ struct fio_file { - struct list_head hash_list; + struct flist_head hash_list; enum fio_filetype filetype; /* @@ -326,7 +336,7 @@ struct fio_file { /* * block map for random io */ - unsigned long *file_map; + unsigned int *file_map; unsigned int num_maps; unsigned int last_free_lookup; @@ -378,10 +388,14 @@ struct thread_stat { * IO depth and latency stats */ unsigned int io_u_map[FIO_IO_U_MAP_NR]; + unsigned int io_u_submit[FIO_IO_U_MAP_NR]; + unsigned int io_u_complete[FIO_IO_U_MAP_NR]; unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR]; unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR]; unsigned long total_io_u[2]; unsigned long short_io_u[2]; + unsigned long total_submit; + unsigned long total_complete; unsigned long long io_bytes[2]; unsigned long runtime[2]; @@ -406,6 +420,7 @@ struct thread_options { unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; + unsigned int iodepth_batch_complete; unsigned long long size; unsigned int fill_device; @@ -446,6 +461,7 @@ struct thread_options { unsigned int write_lat_log; unsigned int write_bw_log; unsigned int norandommap; + unsigned int softrandommap; unsigned int bs_unaligned; unsigned int fsync_on_close; @@ -457,6 +473,7 @@ struct thread_options { unsigned int fsync_blocks; unsigned int start_delay; unsigned long long timeout; + unsigned long long ramp_time; unsigned int overwrite; unsigned int bw_avg_time; unsigned int loops; @@ -477,10 +494,17 @@ struct thread_options { unsigned int group_reporting; unsigned int fadvise_hint; unsigned int zero_buffers; + unsigned int refill_buffers; unsigned int time_based; + unsigned int disable_clat; + unsigned int disable_slat; + unsigned int disable_bw; + unsigned int gtod_reduce; char *read_iolog_file; char *write_iolog_file; + char *bw_log_file; + char *lat_log_file; /* * Pre-run and post-run shell @@ -558,10 +582,10 @@ struct thread_data { * Current IO depth and list of free and busy io_u's. */ unsigned int cur_depth; - struct list_head io_u_freelist; - struct list_head io_u_busylist; - struct list_head io_u_requeues; unsigned int io_u_queued; + struct flist_head io_u_freelist; + struct flist_head io_u_busylist; + struct flist_head io_u_requeues; /* * Rate state @@ -591,14 +615,17 @@ struct thread_data { struct timeval epoch; /* time job was started */ struct timeval rw_end[2]; struct timeval last_issue; + struct timeval tv_cache; + unsigned int tv_cache_nr; + unsigned int tv_cache_mask; unsigned int rw_end_set[2]; + unsigned int ramp_time_over; /* * read/write mixed workload state */ os_random_state_t rwmix_state; - unsigned long long rwmix_bytes; - struct timeval rwmix_switch; + unsigned long rwmix_issues; enum fio_ddir rwmix_ddir; unsigned int ddir_nr; @@ -607,18 +634,12 @@ struct thread_data { * if we are overwriting. Otherwise just use a fifo. */ struct rb_root io_hist_tree; - struct list_head io_hist_list; + struct flist_head io_hist_list; /* * For IO replaying */ - struct list_head io_log_list; - - /* - * timeout handling - */ - struct timeval timeout_end; - struct itimerval timer; + struct flist_head io_log_list; /* * for fileservice, how often to switch to a new file @@ -650,13 +671,6 @@ enum { FIO_ETA_NEVER, }; -/* - * 30 second per-io_u timeout, with 5 second intervals to avoid resetting - * the timer on each queue operation. - */ -#define IO_U_TIMEOUT_INC 5 -#define IO_U_TIMEOUT 30 - #define __td_verror(td, err, msg, func) \ do { \ if ((td)->error) \ @@ -683,6 +697,7 @@ extern unsigned long long mlock_size; extern unsigned long page_mask, page_size; extern int read_only; extern int eta_print; +extern unsigned long done_secs; extern char *job_section; extern struct thread_data *threads; @@ -698,10 +713,10 @@ 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(long)) -#define TO_MAP_BLOCK(td, f, b) (b) -#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)) +#define BLOCKS_PER_MAP (8 * sizeof(int)) +#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 MAX_JOBS (1024) @@ -733,7 +748,11 @@ struct disk_util_stat { * Per-device disk util management */ struct disk_util { - struct list_head list; + struct flist_head list; + /* If this disk is a slave, hook it into the master's + * list using this head. + */ + struct flist_head slavelist; char *name; char *sysfs_root; @@ -743,6 +762,15 @@ struct disk_util { struct disk_util_stat dus; struct disk_util_stat last_dus; + /* For software raids, this entry maintains pointers to the + * entries for the slave devices. The disk_util entries for + * the slaves devices should primarily be maintained through + * the disk_list list, i.e. for memory allocation and + * de-allocation, etc. Whereas this list should be used only + * for aggregating a software RAID's disk util figures. + */ + struct flist_head slaves; + unsigned long msec; struct timeval time; }; @@ -778,9 +806,9 @@ extern void show_run_stats(void); extern void init_disk_util(struct thread_data *); extern void update_rusage_stat(struct thread_data *); extern void update_io_ticks(void); -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_named(struct thread_data *, struct io_log *, const char *, const char *); extern void __finish_log(struct io_log *, const char *); extern struct io_log *agg_io_log[2]; extern int write_bw_log; @@ -801,12 +829,14 @@ extern void rate_throttle(struct thread_data *, unsigned long, unsigned int); extern void fill_start_time(struct timeval *); extern void fio_gettime(struct timeval *, void *); extern void set_genesis_time(void); +extern int ramp_time_over(struct thread_data *); +extern int in_ramp_time(struct thread_data *); /* * Init/option functions */ extern int __must_check parse_options(int, char **); -extern int fio_option_parse(struct thread_data *, const char *); +extern int fio_options_parse(struct thread_data *, char **, int); 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 *); @@ -849,12 +879,10 @@ extern void print_status_init(int); */ #ifdef FIO_HAVE_DISK_UTIL extern void show_disk_util(void); -extern void disk_util_timer_arm(void); extern void init_disk_util(struct thread_data *); extern void update_io_ticks(void); #else #define show_disk_util() -#define disk_util_timer_arm() #define init_disk_util(td) #define update_io_ticks() #endif @@ -869,6 +897,7 @@ enum { TD_NOT_CREATED = 0, TD_CREATED, TD_INITIALIZED, + TD_RAMP, TD_RUNNING, TD_VERIFYING, TD_FSYNCING, @@ -876,6 +905,8 @@ enum { TD_REAPED, }; +extern void td_set_runstate(struct thread_data *, int); + /* * Verify helpers */ @@ -894,7 +925,7 @@ extern void free_io_mem(struct thread_data *); /* * io unit handling */ -#define queue_full(td) list_empty(&(td)->io_u_freelist) +#define queue_full(td) flist_empty(&(td)->io_u_freelist) extern struct io_u *__get_io_u(struct thread_data *); extern struct io_u *get_io_u(struct thread_data *); extern void put_io_u(struct thread_data *, struct io_u *); @@ -903,9 +934,15 @@ extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *) extern long __must_check io_u_queued_complete(struct thread_data *, int); extern void io_u_queued(struct thread_data *, struct io_u *); extern void io_u_log_error(struct thread_data *, struct io_u *); -extern void io_u_init_timeout(void); -extern void io_u_set_timeout(struct thread_data *); -extern void io_u_mark_depth(struct thread_data *, struct io_u *); +extern void io_u_mark_depth(struct thread_data *, unsigned int); +extern void io_u_fill_buffer(struct thread_data *td, struct io_u *, unsigned int); +void io_u_mark_complete(struct thread_data *, unsigned int); +void io_u_mark_submit(struct thread_data *, unsigned int); + +/* + * Reset stats after ramp time completes + */ +extern void reset_all_stats(struct thread_data *); /* * io engine entry points @@ -928,7 +965,7 @@ extern int load_blktrace(struct thread_data *, const char *); #endif struct ioengine_ops { - struct list_head list; + struct flist_head list; char name[16]; int version; int flags; @@ -979,6 +1016,12 @@ extern void close_ioengine(struct thread_data *); } \ } while (0) +static inline void fio_file_reset(struct fio_file *f) +{ + f->last_free_lookup = 0; + f->last_pos = f->file_offset; +} + static inline void clear_error(struct thread_data *td) { td->error = 0; @@ -991,7 +1034,8 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p) struct fio_file *f = io_u->file; dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u, - io_u->offset, io_u->buflen, io_u->ddir); + (unsigned long long) io_u->offset, + io_u->buflen, io_u->ddir); if (fio_debug & (1 << FD_IO)) { if (f) log_info("/%s", f->file_name); @@ -1003,4 +1047,13 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p) #define dprint_io_u(io_u, p) #endif +static inline int fio_fill_issue_time(struct thread_data *td) +{ + if (td->o.read_iolog_file || + !td->o.disable_clat || !td->o.disable_slat || !td->o.disable_bw) + return 1; + + return 0; +} + #endif