X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=a86a58281c62981bc3625d70739f776c20acc055;hp=2b4b3c65e1974926386f987b0f1aa462ed2fcdc5;hb=07e5b2646f673a56c05a53c6a84bf5d0c949d290;hpb=609342ff4b7e5ada29d348079ec343d07fae6727 diff --git a/fio.h b/fio.h index 2b4b3c65..a86a5828 100644 --- a/fio.h +++ b/fio.h @@ -13,7 +13,9 @@ #include #include +#include "compiler.h" #include "list.h" +#include "rbtree.h" #include "md5.h" #include "crc32.h" #include "arch.h" @@ -78,7 +80,10 @@ struct io_log { * When logging io actions, this matches a single sent io_u */ struct io_piece { - struct list_head list; + union { + struct rb_node rb_node; + struct list_head list; + }; struct fio_file *file; unsigned long long offset; unsigned long len; @@ -98,6 +103,8 @@ enum { IO_U_F_FLIGHT = 1 << 1, }; +struct thread_data; + /* * The io unit */ @@ -158,7 +165,7 @@ struct io_u { /* * Callback for io completion */ - int (*end_io)(struct io_u *); + int (*end_io)(struct thread_data *, struct io_u *); }; /* @@ -176,6 +183,7 @@ enum { VERIFY_NONE = 0, /* no verification */ VERIFY_MD5, /* md5 sum data blocks */ VERIFY_CRC32, /* crc32 sum data blocks */ + VERIFY_NULL, /* pretend to verify */ }; /* @@ -230,7 +238,11 @@ 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, /* no need to create */ + 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 */ }; /* @@ -247,11 +259,20 @@ struct fio_file { unsigned long file_data; int fd; }; + + /* + * filename and possible memory mapping + */ char *file_name; void *mmap; - unsigned long long file_size; + + /* + * size of the file, offset into file, and io size from that offset + */ unsigned long long real_file_size; unsigned long long file_offset; + unsigned long long io_size; + unsigned long long last_pos; unsigned long long last_completed_pos; @@ -325,6 +346,7 @@ struct thread_options { char *opendir; char *ioengine; enum td_ddir td_ddir; + unsigned int ddir_nr; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; @@ -348,6 +370,7 @@ struct thread_options { unsigned int end_fsync; unsigned int sync_io; unsigned int verify; + unsigned int verifysort; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -381,11 +404,11 @@ struct thread_options { unsigned int iolog; unsigned int read_iolog; unsigned int rwmixcycle; - unsigned int rwmixread; - unsigned int rwmixwrite; + unsigned int rwmix[2]; unsigned int nice; unsigned int file_service_type; unsigned int group_reporting; + unsigned int fadvise_hint; char *read_iolog_file; char *write_iolog_file; @@ -411,12 +434,14 @@ struct thread_options { unsigned int cpucycle; }; +#define FIO_VERROR_SIZE 128 + /* * This describes a single thread/process executing a fio job. */ struct thread_data { struct thread_options o; - char verror[128]; + char verror[FIO_VERROR_SIZE]; pthread_t thread; int thread_number; int groupid; @@ -424,6 +449,7 @@ 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; @@ -475,7 +501,6 @@ struct thread_data { unsigned long rate_blocks; struct timeval lastrate; - unsigned long long io_size; unsigned long long total_io_size; unsigned long io_issues[2]; @@ -492,6 +517,8 @@ struct thread_data { struct timeval start; /* start of this loop */ struct timeval epoch; /* time job was started */ + struct timeval rw_end[2]; + unsigned int rw_end_set[2]; /* * read/write mixed workload state @@ -500,11 +527,18 @@ struct thread_data { unsigned long long rwmix_bytes; struct timeval rwmix_switch; enum fio_ddir rwmix_ddir; + unsigned int ddir_nr; /* - * IO historic logs + * IO history logs for verification. We use a tree for sorting, + * if we are overwriting. Otherwise just use a fifo. */ + struct rb_root io_hist_tree; struct list_head io_hist_list; + + /* + * For IO replaying + */ struct list_head io_log_list; /* @@ -614,7 +648,7 @@ struct disk_util { char *name; char path[256]; - dev_t dev; + int major, minor; struct disk_util_stat dus; struct disk_util_stat last_dus; @@ -685,6 +719,8 @@ 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 *); extern void fio_options_dup_and_init(struct option *); +extern void options_mem_dupe(struct thread_data *); +extern void options_mem_free(struct thread_data *); #define FIO_GETOPT_JOB 0x89988998 #define FIO_NR_OPTIONS 128 @@ -702,6 +738,7 @@ 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 *); /* * ETA/status stuff @@ -731,7 +768,7 @@ enum { */ extern void populate_verify_io_u(struct thread_data *, struct io_u *); extern int __must_check get_next_verify(struct thread_data *td, struct io_u *); -extern int __must_check verify_io_u(struct io_u *); +extern int __must_check verify_io_u(struct thread_data *, struct io_u *); /* * Memory helpers @@ -803,7 +840,7 @@ struct ioengine_ops { void *dlhandle; }; -#define FIO_IOOPS_VERSION 6 +#define FIO_IOOPS_VERSION 7 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *); extern void register_ioengine(struct ioengine_ops *); @@ -832,4 +869,10 @@ extern void close_ioengine(struct thread_data *); } \ } while (0) +static inline void clear_error(struct thread_data *td) +{ + td->error = 0; + td->verror[0] = '\0'; +} + #endif