X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=036e62afe115316fed70751d5f2e3374da84485c;hp=6dbc4cd59c31a4cdf8c54e4e9c7d9110deaf32a5;hb=e4928662a8a1674debae803d5ec4dcbdce7a3ddc;hpb=01f06b63ba67d3bc7fa11766d9f13d229c4cec5c diff --git a/fio.h b/fio.h index 6dbc4cd5..036e62af 100644 --- a/fio.h +++ b/fio.h @@ -22,6 +22,8 @@ #include "arch/arch.h" #include "os/os.h" #include "mutex.h" +#include "log.h" +#include "debug.h" #ifdef FIO_HAVE_GUASI #include @@ -44,6 +46,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 */ @@ -263,16 +271,16 @@ enum fio_ioengine_flags { 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_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 */ + 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 */ }; /* @@ -280,6 +288,7 @@ enum fio_file_flags { * this structure holds state information for a single file. */ struct fio_file { + struct list_head hash_list; enum fio_filetype filetype; /* @@ -305,7 +314,14 @@ struct fio_file { 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 @@ -405,6 +421,8 @@ struct thread_options { 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; @@ -428,6 +446,7 @@ struct thread_options { 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; @@ -497,7 +516,7 @@ struct thread_data { int thread_number; int groupid; struct thread_stat ts; - struct fio_file *files; + struct fio_file **files; unsigned int files_index; unsigned int nr_open_files; unsigned int nr_done_files; @@ -562,7 +581,7 @@ struct thread_data { 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 @@ -579,8 +598,7 @@ struct thread_data { * read/write mixed workload state */ os_random_state_t rwmix_state; - unsigned long long rwmix_bytes; - struct timeval rwmix_switch; + unsigned long rwmix_issues; enum fio_ddir rwmix_ddir; unsigned int ddir_nr; @@ -660,13 +678,12 @@ 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; @@ -675,6 +692,7 @@ extern struct thread_data *threads; #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) { @@ -682,7 +700,7 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u) } #define BLOCKS_PER_MAP (8 * sizeof(long)) -#define TO_MAP_BLOCK(td, f, b) ((b) - ((f)->file_offset / (unsigned long long) (td)->o.rw_min_bs)) +#define TO_MAP_BLOCK(td, f, b) (b) #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)) @@ -739,6 +757,7 @@ 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 *); @@ -746,6 +765,7 @@ 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 *); @@ -801,14 +821,18 @@ extern void options_mem_free(struct thread_data *); * 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 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 *); @@ -894,7 +918,7 @@ extern int __must_check td_io_sync(struct thread_data *, struct fio_file *); 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 *); /* * blktrace support @@ -904,20 +928,6 @@ 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 - */ -#define log_err(args...) do { \ - fprintf(f_err, ##args); \ - if (f_err != stderr) \ - fprintf(stderr, ##args); \ - } while (0) - -#define log_info(args...) fprintf(f_out, ##args) - -FILE *get_f_out(void); -FILE *get_f_err(void); - struct ioengine_ops { struct list_head list; char name[16]; @@ -933,12 +943,12 @@ struct ioengine_ops { 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 8 +#define FIO_IOOPS_VERSION 9 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *); extern void register_ioengine(struct ioengine_ops *); @@ -955,7 +965,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)->o.nr_files; (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)) { \ @@ -973,34 +986,7 @@ 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, -}; - #ifdef FIO_INC_DEBUG -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; @@ -1015,7 +1001,6 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p) } } #else -#define dprint(type, str, args...) #define dprint_io_u(io_u, p) #endif