X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=e97caf18bc1bdbea46751be177639bd66cd44919;hp=870b6704a7852a938d47830e85f5753165d45de1;hb=546a9142511875524850ac92776184fd9fb7196e;hpb=8c1fdf044083522504685e3009e356c70d003ef0 diff --git a/fio.h b/fio.h index 870b6704..e97caf18 100644 --- a/fio.h +++ b/fio.h @@ -15,9 +15,13 @@ #include "compiler/compiler.h" #include "list.h" +#include "fifo.h" #include "rbtree.h" #include "md5.h" +#include "crc64.h" #include "crc32.h" +#include "crc16.h" +#include "crc7.h" #include "arch/arch.h" #include "os/os.h" #include "mutex.h" @@ -34,6 +38,7 @@ enum fio_ddir { DDIR_READ = 0, DDIR_WRITE, DDIR_SYNC, + DDIR_INVAL = -1, }; enum td_ddir { @@ -84,11 +89,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; - unsigned long delay; + union { + unsigned long delay; + unsigned int file_action; + }; }; #ifdef FIO_HAVE_SYSLET @@ -184,7 +195,10 @@ 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_NULL, /* pretend to verify */ }; @@ -197,7 +211,10 @@ struct verify_header { unsigned int verify_type; union { char md5_digest[MD5_HASH_WORDS * 4]; + unsigned long long crc64; unsigned long crc32; + unsigned short crc16; + unsigned char crc7; }; }; @@ -235,6 +252,7 @@ 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 { @@ -267,6 +285,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 @@ -293,7 +312,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; @@ -331,7 +351,8 @@ 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]; @@ -374,6 +395,8 @@ struct thread_options { unsigned int sync_io; unsigned int verify; unsigned int verifysort; + unsigned int header_interval; + unsigned int header_offset; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -392,7 +415,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; @@ -404,6 +427,7 @@ struct thread_options { unsigned int new_group; unsigned int numjobs; os_cpu_mask_t cpumask; + unsigned int cpumask_set; unsigned int iolog; unsigned int rwmixcycle; unsigned int rwmix[2]; @@ -460,6 +484,7 @@ struct thread_data { os_random_state_t next_file_state; }; int error; + int done; pid_t pid; char *orig_buffer; size_t orig_buffer_size; @@ -510,6 +535,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; @@ -522,6 +548,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]; /* @@ -664,18 +691,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 *); @@ -738,12 +765,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 @@ -829,8 +858,10 @@ 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