X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=5f813009f26f414d81a263af6858b9ef02fd467a;hp=d8911ef5db8d19ef92804287a3f726cab0f82203;hb=546dfd9ff99eec4af5d1c6c2ca702b7cf9656334;hpb=409b3417e46cc3ce7041f042bcc26c3feb46e9e9 diff --git a/fio.h b/fio.h index d8911ef5..5f813009 100644 --- a/fio.h +++ b/fio.h @@ -12,13 +12,14 @@ #include #include #include +#include +#include "compiler/compiler.h" #include "list.h" +#include "fifo.h" #include "rbtree.h" -#include "md5.h" -#include "crc32.h" -#include "arch.h" -#include "os.h" +#include "arch/arch.h" +#include "os/os.h" #include "mutex.h" #ifdef FIO_HAVE_SYSLET @@ -33,6 +34,7 @@ enum fio_ddir { DDIR_READ = 0, DDIR_WRITE, DDIR_SYNC, + DDIR_INVAL = -1, }; enum td_ddir { @@ -83,10 +85,17 @@ struct io_piece { struct rb_node rb_node; struct list_head list; }; - struct fio_file *file; + union { + int fileno; + struct fio_file *file; + }; unsigned long long offset; unsigned long len; enum fio_ddir ddir; + union { + unsigned long delay; + unsigned int file_action; + }; }; #ifdef FIO_HAVE_SYSLET @@ -134,6 +143,7 @@ struct io_u { void *buf; unsigned long buflen; unsigned long long offset; + unsigned long long endpos; /* * IO engine state, may be different from above when we get @@ -181,21 +191,46 @@ enum { enum { VERIFY_NONE = 0, /* no verification */ VERIFY_MD5, /* md5 sum data blocks */ + VERIFY_CRC64, /* crc64 sum data blocks */ VERIFY_CRC32, /* crc32 sum data blocks */ + VERIFY_CRC16, /* crc16 sum data blocks */ + VERIFY_CRC7, /* crc7 sum data blocks */ + VERIFY_SHA256, /* sha256 sum data blocks */ + VERIFY_SHA512, /* sha512 sum data blocks */ VERIFY_NULL, /* pretend to verify */ }; /* - * A header structure associated with each checksummed data block + * A header structure associated with each checksummed data block. It is + * followed by a checksum specific header that contains the verification + * data. */ struct verify_header { unsigned int fio_magic; unsigned int len; unsigned int verify_type; - union { - char md5_digest[MD5_HASH_WORDS * 4]; - unsigned long crc32; - }; +}; + +struct vhdr_md5 { + uint32_t md5_digest[16]; +}; +struct vhdr_sha512 { + uint8_t sha512[128]; +}; +struct vhdr_sha256 { + uint8_t sha256[128]; +}; +struct vhdr_crc64 { + uint64_t crc64; +}; +struct vhdr_crc32 { + uint32_t crc32; +}; +struct vhdr_crc16 { + uint16_t crc16; +}; +struct vhdr_crc7 { + uint8_t crc7; }; struct group_run_stats { @@ -223,6 +258,7 @@ enum fio_filetype { FIO_TYPE_FILE = 1, /* plain file */ FIO_TYPE_BD, /* block device */ FIO_TYPE_CHAR, /* character device */ + FIO_TYPE_PIPE, /* pipe */ }; enum fio_ioengine_flags { @@ -231,17 +267,17 @@ enum fio_ioengine_flags { FIO_DISKLESSIO = 1 << 2, /* no disk involved */ FIO_NOEXTEND = 1 << 3, /* engine can't extend file */ FIO_NODISKUTIL = 1 << 4, /* diskutil can't handle filename */ + FIO_UNIDIR = 1 << 5, /* engine is uni-directional */ }; 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, /* file there */ - FIO_FILE_EXTEND = 1 << 4, /* needs extend */ - FIO_FILE_NOSORT = 1 << 5, /* don't sort verify blocks */ - FIO_FILE_DONE = 1 << 6, /* io completed to this file */ - FIO_SIZE_KNOWN = 1 << 7, /* size has been set */ + FIO_FILE_CLOSING = 1 << 1, /* file being closed */ + FIO_FILE_EXISTS = 1 << 2, /* file there */ + FIO_FILE_EXTEND = 1 << 3, /* needs extend */ + FIO_FILE_NOSORT = 1 << 4, /* don't sort verify blocks */ + FIO_FILE_DONE = 1 << 5, /* io completed to this file */ + FIO_SIZE_KNOWN = 1 << 6, /* size has been set */ }; /* @@ -264,6 +300,7 @@ struct fio_file { */ char *file_name; void *mmap; + unsigned int major, minor; /* * size of the file, offset into file, and io size from that offset @@ -290,7 +327,8 @@ struct fio_file { * How many depth levels to log */ #define FIO_IO_U_MAP_NR 8 -#define FIO_IO_U_LAT_NR 12 +#define FIO_IO_U_LAT_U_NR 10 +#define FIO_IO_U_LAT_M_NR 12 struct thread_stat { char *name; @@ -328,8 +366,10 @@ struct thread_stat { * IO depth and latency stats */ unsigned int io_u_map[FIO_IO_U_MAP_NR]; - unsigned int io_u_lat[FIO_IO_U_LAT_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 long io_bytes[2]; unsigned long runtime[2]; @@ -370,6 +410,10 @@ struct thread_options { unsigned int sync_io; unsigned int verify; unsigned int verifysort; + unsigned int verify_interval; + unsigned int verify_offset; + unsigned int verify_pattern; + unsigned int verify_pattern_bytes; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -388,7 +432,7 @@ struct thread_options { unsigned int thinktime_blocks; unsigned int fsync_blocks; unsigned int start_delay; - unsigned long timeout; + unsigned long long timeout; unsigned int overwrite; unsigned int bw_avg_time; unsigned int loops; @@ -400,14 +444,16 @@ struct thread_options { unsigned int new_group; unsigned int numjobs; os_cpu_mask_t cpumask; + unsigned int cpumask_set; unsigned int iolog; - unsigned int read_iolog; unsigned int rwmixcycle; unsigned int rwmix[2]; unsigned int nice; unsigned int file_service_type; unsigned int group_reporting; unsigned int fadvise_hint; + unsigned int zero_buffers; + unsigned int time_based; char *read_iolog_file; char *write_iolog_file; @@ -448,12 +494,14 @@ struct thread_data { struct fio_file *files; unsigned int files_index; unsigned int nr_open_files; + unsigned int nr_done_files; unsigned int nr_normal_files; union { unsigned int next_file; os_random_state_t next_file_state; }; int error; + int done; pid_t pid; char *orig_buffer; size_t orig_buffer_size; @@ -504,6 +552,7 @@ struct thread_data { unsigned long io_issues[2]; unsigned long long io_blocks[2]; unsigned long long io_bytes[2]; + unsigned long long io_skip_bytes; unsigned long long this_io_bytes[2]; unsigned long long zone_bytes; struct fio_sem *mutex; @@ -516,6 +565,7 @@ struct thread_data { struct timeval start; /* start of this loop */ struct timeval epoch; /* time job was started */ struct timeval rw_end[2]; + struct timeval last_issue; unsigned int rw_end_set[2]; /* @@ -645,8 +695,9 @@ struct disk_util { struct list_head list; char *name; + char *sysfs_root; char path[256]; - dev_t dev; + int major, minor; struct disk_util_stat dus; struct disk_util_stat last_dus; @@ -657,18 +708,18 @@ struct disk_util { #define DISK_UTIL_MSEC (250) -#ifndef min -#define min(a, b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef max -#define max(a, b) ((a) > (b) ? (a) : (b)) -#endif - /* * Log exports */ +enum file_log_act { + FIO_LOG_ADD_FILE, + FIO_LOG_OPEN_FILE, + FIO_LOG_CLOSE_FILE, +}; + extern int __must_check read_iolog_get(struct thread_data *, struct io_u *); -extern void write_iolog_put(struct thread_data *, struct io_u *); +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 prune_io_piece_log(struct thread_data *); @@ -731,12 +782,14 @@ extern int __must_check open_files(struct thread_data *); extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *); extern int __must_check generic_open_file(struct thread_data *, struct fio_file *); extern void generic_close_file(struct thread_data *, struct fio_file *); -extern void add_file(struct thread_data *, const char *); +extern int 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 *); extern void dup_files(struct thread_data *, struct thread_data *); +extern int get_fileno(struct thread_data *, const char *); +extern void free_release_files(struct thread_data *); /* * ETA/status stuff @@ -744,6 +797,21 @@ extern void dup_files(struct thread_data *, struct thread_data *); extern void print_thread_status(void); extern void print_status_init(int); +/* + * disk util stuff + */ +#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 + /* * Thread life cycle. Once a thread has a runstate beyond TD_INITIALIZED, it * will never back again. It may cycle between running/verififying/fsyncing. @@ -804,6 +872,14 @@ extern int __must_check td_io_commit(struct thread_data *); extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *); extern void td_io_close_file(struct thread_data *, struct fio_file *); +/* + * blktrace support + */ +#ifdef FIO_HAVE_BLKTRACE +extern int is_blktrace(const char *); +extern int load_blktrace(struct thread_data *, const char *); +#endif + /* * If logging output to a file, stderr should go to both stderr and f_err */