X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=a86a58281c62981bc3625d70739f776c20acc055;hp=465053ac675372e8c9a854af4cb7edba974b1b73;hb=bac39e0e8807a1d52863ad8304e67221df2bc63b;hpb=7b4e4fe5e6fa26f82f9169c18ec70c08d0805ca9 diff --git a/fio.h b/fio.h index 465053ac..ec8d5935 100644 --- a/fio.h +++ b/fio.h @@ -11,22 +11,33 @@ #include #include #include - -#include "list.h" -#include "md5.h" -#include "crc32.h" -#include "arch.h" -#include "os.h" +#include +#include +#include + +#include "compiler/compiler.h" +#include "flist.h" +#include "fifo.h" +#include "rbtree.h" +#include "arch/arch.h" +#include "os/os.h" #include "mutex.h" +#include "log.h" +#include "debug.h" + +#ifdef FIO_HAVE_GUASI +#include +#endif -#ifdef FIO_HAVE_SYSLET -#include "syslet.h" +#ifdef FIO_HAVE_SOLARISAIO +#include #endif enum fio_ddir { DDIR_READ = 0, DDIR_WRITE, DDIR_SYNC, + DDIR_INVAL = -1, }; enum td_ddir { @@ -39,6 +50,12 @@ enum td_ddir { TD_DDIR_RANDRW = TD_DDIR_RW | TD_DDIR_RAND, }; +enum file_lock_mode { + FILE_LOCK_NONE, + FILE_LOCK_EXCLUSIVE, + FILE_LOCK_READWRITE, +}; + /* * Use for maintaining statistics */ @@ -73,26 +90,30 @@ struct io_log { * When logging io actions, this matches a single sent io_u */ struct io_piece { - struct list_head list; - struct fio_file *file; + union { + struct rb_node rb_node; + struct flist_head list; + }; + 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 -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, }; +struct thread_data; + /* * The io unit */ @@ -107,8 +128,11 @@ struct io_u { #ifdef FIO_HAVE_SGIO struct sg_io_hdr hdr; #endif -#ifdef FIO_HAVE_SYSLET - struct syslet_req req; +#ifdef FIO_HAVE_GUASI + guasi_req_t greq; +#endif +#ifdef FIO_HAVE_SOLARISAIO + aio_result_t resultp; #endif }; struct timeval start_time; @@ -120,6 +144,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 @@ -139,18 +164,19 @@ 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 */ - int (*end_io)(struct io_u *); + int (*end_io)(struct thread_data *, struct io_u *); }; /* @@ -167,20 +193,55 @@ 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_CRC32C, /* crc32c 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; - }; +}; + +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 { @@ -208,6 +269,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 { @@ -216,12 +278,18 @@ 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 */ + FIO_NOIO = 1 << 6, /* thread does only pseudo IO */ + FIO_SIGQUIT = 1 << 7, /* needs SIGQUIT to exit */ }; 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_CLOSING = 1 << 1, /* file being closed */ + FIO_FILE_EXTEND = 1 << 2, /* needs extend */ + FIO_FILE_DONE = 1 << 3, /* io completed to this file */ + FIO_SIZE_KNOWN = 1 << 4, /* size has been set */ + FIO_FILE_HASHED = 1 << 5, /* file is on hash */ }; /* @@ -229,6 +297,7 @@ enum fio_file_flags { * this structure holds state information for a single file. */ struct fio_file { + struct flist_head hash_list; enum fio_filetype filetype; /* @@ -238,18 +307,35 @@ struct fio_file { unsigned long file_data; int fd; }; + + /* + * filename and possible memory mapping + */ char *file_name; void *mmap; - unsigned long long file_size; + unsigned int major, minor; + + /* + * 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; + + /* + * if io is protected by a semaphore, this is set + */ + struct fio_mutex *lock; + void *lock_owner; + unsigned int lock_batch; + enum fio_ddir lock_ddir; /* * block map for random io */ - unsigned long *file_map; + unsigned int *file_map; unsigned int num_maps; unsigned int last_free_lookup; @@ -261,7 +347,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; @@ -294,52 +381,62 @@ struct thread_stat { unsigned long usr_time; unsigned long sys_time; unsigned long ctx; + unsigned long minf, majf; /* * 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_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]; unsigned long total_run_time; }; -/* - * This describes a single thread/process executing a fio job. - */ -struct thread_data { +struct bssplit { + unsigned int bs; + unsigned char perc; +}; + +struct thread_options { int pad; char *description; char *name; char *directory; char *filename; + char *opendir; char *ioengine; - char verror[128]; - pthread_t thread; - int thread_number; - int groupid; - struct thread_stat ts; - struct fio_file *files; - unsigned int files_index; - unsigned int nr_files; - unsigned int nr_open_files; - unsigned int nr_normal_files; - union { - unsigned int next_file; - os_random_state_t next_file_state; - }; - int error; - pid_t pid; - char *orig_buffer; - size_t orig_buffer_size; - volatile int terminate; - volatile int runstate; enum td_ddir td_ddir; - unsigned int ioprio; - unsigned int last_was_sync; + unsigned int ddir_nr; + unsigned int iodepth; + unsigned int iodepth_low; + unsigned int iodepth_batch; + unsigned int iodepth_batch_complete; + + 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; + + 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; + enum file_lock_mode file_lock_mode; + unsigned int lockfile_batch; unsigned int odirect; unsigned int invalidate_cache; @@ -348,6 +445,13 @@ struct thread_data { 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; @@ -356,11 +460,10 @@ struct thread_data { 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; - unsigned int bs[2]; - unsigned int min_bs[2]; - unsigned int max_bs[2]; unsigned int hugepage_size; unsigned int rw_min_bs; unsigned int thinktime; @@ -368,38 +471,93 @@ struct thread_data { 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; unsigned long long zone_size; unsigned long long zone_skip; enum fio_memtype mem_type; - char *mmapfile; - int mmapfd; + unsigned int stonewall; + unsigned int new_group; unsigned int numjobs; - unsigned int iodepth; - unsigned int iodepth_low; - unsigned int iodepth_batch; os_cpu_mask_t cpumask; + unsigned int cpumask_set; 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 open_files; + unsigned int fadvise_hint; + unsigned int zero_buffers; + unsigned int refill_buffers; + unsigned int time_based; char *read_iolog_file; char *write_iolog_file; + + /* + * Pre-run and post-run shell + */ + char *exec_prerun; + char *exec_postrun; + + unsigned int rate; + unsigned int ratemin; + unsigned int ratecycle; + unsigned int rate_iops; + unsigned int rate_iops_min; + + char *ioscheduler; + + /* + * CPU "io" cycle burner + */ + unsigned int cpuload; + 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[FIO_VERROR_SIZE]; + pthread_t thread; + int thread_number; + int groupid; + struct thread_stat ts; + 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; + volatile int terminate; + volatile int runstate; + unsigned int ioprio; + unsigned int ioprio_set; + unsigned int last_was_sync; + + char *mmapfile; + int mmapfd; + void *iolog_buf; FILE *iolog_f; char *sysfs_root; - char *ioscheduler; os_random_state_t bsrange_state; os_random_state_t verify_state; @@ -416,66 +574,60 @@ 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 */ - unsigned int rate; - unsigned int ratemin; - unsigned int ratecycle; unsigned long rate_usec_cycle; long rate_pending_usleep; unsigned long rate_bytes; + unsigned long rate_blocks; struct timeval lastrate; - unsigned long long io_size; - unsigned long long total_file_size; - unsigned long long start_offset; unsigned long long total_io_size; 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; + struct fio_mutex *mutex; /* * State for random io, a bitmap of blocks done vs not done */ os_random_state_t random_state; - /* - * CPU "io" cycle burner - */ - unsigned int cpuload; - unsigned int cpucycle; - 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]; /* * read/write mixed workload state */ os_random_state_t rwmix_state; - struct timeval rwmix_switch; + unsigned long rwmix_issues; enum fio_ddir rwmix_ddir; + unsigned int ddir_nr; /* - * Pre-run and post-run shell + * IO history logs for verification. We use a tree for sorting, + * if we are overwriting. Otherwise just use a fifo. */ - char *exec_prerun; - char *exec_postrun; + struct rb_root io_hist_tree; + struct flist_head io_hist_list; /* - * IO historic logs + * For IO replaying */ - struct list_head io_hist_list; - struct list_head io_log_list; + struct flist_head io_log_list; /* * timeout handling @@ -489,6 +641,11 @@ struct thread_data { unsigned int file_service_nr; unsigned int file_service_left; struct fio_file *file_service_file; + + /* + * For generating file sizes + */ + os_random_state_t file_size_state; }; /* @@ -499,6 +656,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. @@ -527,22 +693,31 @@ extern int nr_process, nr_thread; extern int shm_id; extern int groupid; extern int terse_output; -extern FILE *f_out; -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 unsigned long done_secs; +extern char *job_section; extern struct thread_data *threads; -#define td_read(td) ((td)->td_ddir & TD_DDIR_READ) -#define td_write(td) ((td)->td_ddir & TD_DDIR_WRITE) -#define td_rw(td) (((td)->td_ddir & TD_DDIR_RW) == TD_DDIR_RW) -#define td_random(td) ((td)->td_ddir & TD_DDIR_RAND) +#define td_read(td) ((td)->o.td_ddir & TD_DDIR_READ) +#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) - ((f)->file_offset / (td)->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)) +#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) @@ -550,9 +725,9 @@ static inline int should_fsync(struct thread_data *td) { if (td->last_was_sync) return 0; - if (td->odirect) + if (td->o.odirect) return 0; - if (td_write(td) || td_rw(td) || td->override_sync) + if (td_write(td) || td_rw(td) || td->o.override_sync) return 1; return 0; @@ -574,11 +749,12 @@ 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; char path[256]; - dev_t dev; + int major, minor; struct disk_util_stat dus; struct disk_util_stat last_dus; @@ -589,20 +765,22 @@ 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, + FIO_LOG_UNLINK_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 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 *); @@ -616,11 +794,9 @@ 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 *); -extern int setup_rate(struct thread_data *); extern struct io_log *agg_io_log[2]; extern int write_bw_log; extern void add_agg_sample(unsigned long, enum fio_ddir); @@ -628,8 +804,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 *); @@ -642,23 +818,40 @@ extern void fio_gettime(struct timeval *, void *); extern void set_genesis_time(void); /* - * Init functions + * Init/option functions */ extern int __must_check parse_options(int, char **); -extern int __must_check init_random_state(struct thread_data *); +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 *); +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 /* * File setup/shutdown */ extern void close_files(struct thread_data *); +extern void close_and_free_files(struct thread_data *); extern int __must_check setup_files(struct thread_data *); 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 __must_check generic_close_file(struct thread_data *, struct fio_file *); +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 __must_check put_file(struct thread_data *, struct fio_file *); +extern void lock_file(struct thread_data *, struct fio_file *, enum fio_ddir); +extern void unlock_file(struct thread_data *, struct fio_file *); +extern void unlock_file_all(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 @@ -666,6 +859,19 @@ extern void put_file(struct thread_data *, struct fio_file *); 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 init_disk_util(struct thread_data *); +extern void update_io_ticks(void); +#else +#define show_disk_util() +#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. @@ -688,7 +894,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 @@ -701,7 +907,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 *); @@ -712,7 +918,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 @@ -721,25 +930,21 @@ 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 *); +extern int td_io_close_file(struct thread_data *, struct fio_file *); /* - * If logging output to a file, stderr should go to both stderr and f_err + * blktrace support */ -#define log_err(args...) do { \ - fprintf(f_err, ##args); \ - if (f_err != stderr) \ - fprintf(stderr, ##args); \ - } while (0) - -FILE *get_f_out(void); -FILE *get_f_err(void); +#ifdef FIO_HAVE_BLKTRACE +extern int is_blktrace(const char *); +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; @@ -748,17 +953,17 @@ 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 *); int (*open_file)(struct thread_data *, struct fio_file *); - void (*close_file)(struct thread_data *, struct fio_file *); + int (*close_file)(struct thread_data *, struct fio_file *); void *data; void *dlhandle; }; -#define FIO_IOOPS_VERSION 6 +#define FIO_IOOPS_VERSION 9 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *); extern void register_ioengine(struct ioengine_ops *); @@ -775,9 +980,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)->open_files; (i)++, (f)++) -#define for_all_files(td, f, i) \ - for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->files_index; (i)++, (f)++) + 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)) { \ @@ -789,4 +995,35 @@ 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; + td->verror[0] = '\0'; +} + +#ifdef FIO_INC_DEBUG +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, + (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); + + log_info("\n"); + } +} +#else +#define dprint_io_u(io_u, p) +#endif + #endif