X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=a0c1109ab97a8a9d4bb96c8ad9910408a9615266;hp=0cf5334ba8ef518a60356d9176646cbc5a8662f8;hb=721938ae7fae0f6d470a7e32e177ea5dce480229;hpb=58f9f0495ae8de5bc221e4afaa543132bc149bc4 diff --git a/fio.h b/fio.h index 0cf5334b..a0c1109a 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,6 +494,7 @@ struct thread_options { unsigned int group_reporting; unsigned int fadvise_hint; unsigned int zero_buffers; + unsigned int refill_buffers; unsigned int time_based; char *read_iolog_file; @@ -558,10 +576,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 @@ -592,13 +610,13 @@ struct thread_data { struct timeval rw_end[2]; struct timeval last_issue; 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,12 +625,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; + struct flist_head io_log_list; /* * timeout handling @@ -683,6 +701,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; @@ -691,16 +710,17 @@ extern struct thread_data *threads; #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 file_randommap(td, f) (!(td)->o.norandommap && (f)->file_map) 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) @@ -732,7 +752,7 @@ struct disk_util_stat { * Per-device disk util management */ struct disk_util { - struct list_head list; + struct flist_head list; char *name; char *sysfs_root; @@ -755,6 +775,7 @@ enum file_log_act { FIO_LOG_ADD_FILE, FIO_LOG_OPEN_FILE, FIO_LOG_CLOSE_FILE, + FIO_LOG_UNLINK_FILE, }; extern int __must_check read_iolog_get(struct thread_data *, struct io_u *); @@ -762,6 +783,7 @@ extern void log_io_u(struct thread_data *, struct io_u *); extern void log_file(struct thread_data *, struct fio_file *, enum file_log_act); extern int __must_check init_iolog(struct thread_data *td); extern void log_io_piece(struct thread_data *, struct io_u *); +extern void queue_io_piece(struct thread_data *, struct io_piece *); extern void prune_io_piece_log(struct thread_data *); extern void write_iolog_close(struct thread_data *); @@ -775,7 +797,6 @@ 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(struct io_log *, const char *); @@ -798,12 +819,13 @@ 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 *); /* * 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 *); @@ -846,12 +868,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 @@ -891,7 +911,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 *); @@ -902,7 +922,10 @@ 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); /* * io engine entry points @@ -925,7 +948,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; @@ -961,9 +984,10 @@ 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)->o.nr_files && ((f) = (td)->files[i]) != NULL; \ - (i)++) + if ((td)->files_index) \ + for ((i) = 0, (f) = (td)->files[0]; \ + (i) < (td)->o.nr_files && ((f) = (td)->files[i]) != NULL; \ + (i)++) #define fio_assert(td, cond) do { \ if (!(cond)) { \ @@ -975,6 +999,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; @@ -987,7 +1017,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);