X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=4f2dc8f6cfd322421b8ba09cda67480d7b10e96e;hp=63cfaa7ae3cf9f6cd52dba96b68ed35cc126e17a;hb=8172fe972f3a79d42f34d7f6e259ed3f7f800316;hpb=1e154bdbf14a1d352117aea057035235b66f0381 diff --git a/fio.h b/fio.h index 63cfaa7a..4f2dc8f6 100644 --- a/fio.h +++ b/fio.h @@ -12,23 +12,17 @@ #include #include #include +#include +#include #include "compiler/compiler.h" #include "list.h" #include "fifo.h" #include "rbtree.h" -#include "md5.h" -#include "crc32.h" -#include "crc16.h" -#include "crc7.h" #include "arch/arch.h" #include "os/os.h" #include "mutex.h" -#ifdef FIO_HAVE_SYSLET -#include "syslet.h" -#endif - #ifdef FIO_HAVE_GUASI #include #endif @@ -101,14 +95,6 @@ struct io_piece { }; }; -#ifdef FIO_HAVE_SYSLET -struct syslet_req { - struct syslet_uatom atom; /* the atom to submit */ - struct syslet_uatom *head; /* head of the sequence */ - long ret; /* syscall return value */ -}; -#endif - enum { IO_U_F_FREE = 1 << 0, IO_U_F_FLIGHT = 1 << 1, @@ -130,9 +116,6 @@ struct io_u { #ifdef FIO_HAVE_SGIO struct sg_io_hdr hdr; #endif -#ifdef FIO_HAVE_SYSLET - struct syslet_req req; -#endif #ifdef FIO_HAVE_GUASI guasi_req_t greq; #endif @@ -194,25 +177,54 @@ 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_META, /* block_num, timestamp etc. */ 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; - unsigned short crc16; - unsigned char crc7; - }; +}; + +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 vhdr_meta { + uint64_t offset; + unsigned char thread; + unsigned short numberio; + unsigned long time_sec; + unsigned long time_usec; }; struct group_run_stats { @@ -250,6 +262,7 @@ enum fio_ioengine_flags { 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 */ + FIO_NOIO = 1 << 6, /* thread does only pseudo IO */ }; enum fio_file_flags { @@ -343,6 +356,7 @@ struct thread_stat { unsigned long usr_time; unsigned long sys_time; unsigned long ctx; + unsigned long minf, majf; /* * IO depth and latency stats @@ -358,6 +372,11 @@ struct thread_stat { unsigned long total_run_time; }; +struct bssplit { + unsigned int bs; + unsigned char perc; +}; + struct thread_options { int pad; char *description; @@ -373,6 +392,7 @@ struct thread_options { unsigned int iodepth_batch; unsigned long long size; + unsigned int fill_device; unsigned long long file_size_low; unsigned long long file_size_high; unsigned long long start_offset; @@ -380,6 +400,8 @@ struct thread_options { unsigned int bs[2]; unsigned int min_bs[2]; unsigned int max_bs[2]; + struct bssplit *bssplit; + unsigned int bssplit_nr; unsigned int nr_files; unsigned int open_files; @@ -391,7 +413,13 @@ struct thread_options { unsigned int end_fsync; unsigned int sync_io; unsigned int verify; + unsigned int do_verify; unsigned int verifysort; + unsigned int verify_interval; + unsigned int verify_offset; + unsigned int verify_pattern; + unsigned int verify_pattern_bytes; + unsigned int verify_fatal; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -486,6 +514,7 @@ struct thread_data { volatile int terminate; volatile int runstate; unsigned int ioprio; + unsigned int ioprio_set; unsigned int last_was_sync; char *mmapfile; @@ -594,6 +623,15 @@ enum { FIO_FSERVICE_RR = 2, }; +/* + * when should interactive ETA output be generated + */ +enum { + FIO_ETA_AUTO, + FIO_ETA_ALWAYS, + FIO_ETA_NEVER, +}; + /* * 30 second per-io_u timeout, with 5 second intervals to avoid resetting * the timer on each queue operation. @@ -627,6 +665,8 @@ extern FILE *f_err; extern int temp_stall_ts; extern unsigned long long mlock_size; extern unsigned long page_mask, page_size; +extern int read_only; +extern int eta_print; extern struct thread_data *threads; @@ -635,8 +675,13 @@ extern struct thread_data *threads; #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) +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) - ((f)->file_offset / (td)->o.rw_min_bs)) +#define TO_MAP_BLOCK(td, f, b) ((b) - ((f)->file_offset / (unsigned long long) (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)) @@ -724,8 +769,8 @@ extern void add_agg_sample(unsigned long, enum fio_ddir); /* * Time functions */ -extern unsigned long utime_since(struct timeval *, struct timeval *); -extern unsigned long utime_since_now(struct timeval *); +extern unsigned long long utime_since(struct timeval *, struct timeval *); +extern unsigned long long utime_since_now(struct timeval *); extern unsigned long mtime_since(struct timeval *, struct timeval *); extern unsigned long mtime_since_now(struct timeval *); extern unsigned long time_since_now(struct timeval *); @@ -845,7 +890,7 @@ extern int __must_check td_io_init(struct thread_data *); extern int __must_check td_io_prep(struct thread_data *, struct io_u *); extern int __must_check td_io_queue(struct thread_data *, struct io_u *); extern int __must_check td_io_sync(struct thread_data *, struct fio_file *); -extern int __must_check td_io_getevents(struct thread_data *, int, int, struct timespec *); +extern int __must_check td_io_getevents(struct thread_data *, unsigned int, unsigned int, struct timespec *); 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 *); @@ -882,7 +927,7 @@ struct ioengine_ops { int (*prep)(struct thread_data *, struct io_u *); int (*queue)(struct thread_data *, struct io_u *); int (*commit)(struct thread_data *); - int (*getevents)(struct thread_data *, int, int, struct timespec *); + int (*getevents)(struct thread_data *, unsigned int, unsigned int, struct timespec *); struct io_u *(*event)(struct thread_data *, int); int (*cancel)(struct thread_data *, struct io_u *); void (*cleanup)(struct thread_data *); @@ -892,7 +937,7 @@ struct ioengine_ops { void *dlhandle; }; -#define FIO_IOOPS_VERSION 7 +#define FIO_IOOPS_VERSION 8 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *); extern void register_ioengine(struct ioengine_ops *); @@ -927,4 +972,44 @@ static inline void clear_error(struct thread_data *td) td->verror[0] = '\0'; } +enum { + FD_PROCESS = 0, + FD_FILE, + FD_IO, + FD_MEM, + FD_BLKTRACE, + FD_VERIFY, + FD_DEBUG_MAX, +}; + +struct debug_level { + const char *name; + unsigned long shift; +}; +extern struct debug_level debug_levels[]; + +extern unsigned long fio_debug; +#define dprint(type, str, args...) \ + do { \ + assert(type < FD_DEBUG_MAX); \ + if ((((1 << type)) & fio_debug) == 0) \ + break; \ + log_info("%-8s ", debug_levels[(type)].name); \ + log_info(str, ##args); \ + } while (0) + +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); + if (fio_debug & (1 << FD_IO)) { + if (f) + log_info("/%s", f->file_name); + + log_info("\n"); + } +} + #endif