X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=9b8bed76172f8d9ccdcb29793929997370c3b095;hp=259166fca1b8e842a2c001bc1bdaabfb54cb9be3;hb=7ff1c14bfb97c170c9654c8db5696764779ec4c9;hpb=7e77dd026d85253936aef432ba8f3e89b96b805c diff --git a/fio.h b/fio.h index 259166fc..9b8bed76 100644 --- a/fio.h +++ b/fio.h @@ -28,6 +28,16 @@ enum fio_ddir { DDIR_SYNC, }; +enum td_ddir { + TD_DDIR_READ = 1 << 0, + TD_DDIR_WRITE = 1 << 1, + TD_DDIR_RAND = 1 << 2, + TD_DDIR_RW = TD_DDIR_READ | TD_DDIR_WRITE, + TD_DDIR_RANDREAD = TD_DDIR_READ | TD_DDIR_RAND, + TD_DDIR_RANDWRITE = TD_DDIR_WRITE | TD_DDIR_RAND, + TD_DDIR_RANDRW = TD_DDIR_RW | TD_DDIR_RAND, +}; + /* * Use for maintaining statistics */ @@ -71,11 +81,17 @@ struct io_piece { #ifdef FIO_HAVE_SYSLET struct syslet_req { - struct syslet_uatom atom; - long ret; + 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, +}; + /* * The io unit */ @@ -124,9 +140,16 @@ struct io_u { unsigned int seen; }; + unsigned int flags; + struct fio_file *file; struct list_head list; + + /* + * Callback for io completion + */ + int (*end_io)(struct io_u *); }; /* @@ -191,8 +214,8 @@ enum fio_ioengine_flags { FIO_CPUIO = 1 << 1, /* cpu burner, doesn't do real io */ FIO_MMAPIO = 1 << 2, /* uses memory mapped io */ FIO_RAWIO = 1 << 3, /* some sort of direct/raw io */ - FIO_NETIO = 1 << 4, /* networked io */ - FIO_NULLIO = 1 << 5, /* no real data transfer (cpu/null) */ + FIO_DISKLESSIO = 1 << 4, /* no disk involved */ + FIO_SELFOPEN = 1 << 5, /* opens its own devices */ }; /* @@ -225,6 +248,31 @@ struct fio_file { unsigned int unlink; }; +struct thread_stat { + struct io_log *slat_log; + struct io_log *clat_log; + struct io_log *bw_log; + + /* + * bandwidth and latency stats + */ + struct io_stat clat_stat[2]; /* completion latency */ + struct io_stat slat_stat[2]; /* submission latency */ + struct io_stat bw_stat[2]; /* bandwidth stats */ + + unsigned long long stat_io_bytes[2]; + struct timeval stat_sample_time[2]; + + /* + * fio system usage accounting + */ + struct rusage ru_start; + struct rusage ru_end; + unsigned long usr_time; + unsigned long sys_time; + unsigned long ctx; +}; + /* * How many depth levels to log */ @@ -235,31 +283,35 @@ struct fio_file { * This describes a single thread/process executing a fio job. */ struct thread_data { + int pad; char *description; char *name; char *directory; char *filename; - char verror[80]; + char verror[128]; pthread_t thread; int thread_number; int groupid; + struct thread_stat ts; enum fio_filetype filetype; struct fio_file *files; unsigned int nr_files; + unsigned int nr_open_files; unsigned int nr_uniq_files; - unsigned int next_file; + 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 fio_ddir ddir; - unsigned int iomix; + enum td_ddir td_ddir; unsigned int ioprio; unsigned int last_was_sync; - unsigned int sequential; unsigned int odirect; unsigned int invalidate_cache; unsigned int create_serialize; @@ -299,6 +351,8 @@ struct thread_data { unsigned int stonewall; unsigned int numjobs; unsigned int iodepth; + unsigned int iodepth_low; + unsigned int iodepth_batch; os_cpu_mask_t cpumask; unsigned int iolog; unsigned int read_iolog; @@ -306,6 +360,7 @@ struct thread_data { unsigned int rwmixread; unsigned int rwmixwrite; unsigned int nice; + unsigned int file_service_type; char *read_iolog_file; char *write_iolog_file; @@ -336,6 +391,7 @@ struct thread_data { struct list_head io_u_freelist; struct list_head io_u_busylist; struct list_head io_u_requeues; + unsigned int io_u_queued; /* * Rate state @@ -357,8 +413,8 @@ struct thread_data { unsigned long io_issues[2]; unsigned long long io_blocks[2]; unsigned long long io_bytes[2]; - unsigned long long zone_bytes; unsigned long long this_io_bytes[2]; + unsigned long long zone_bytes; volatile int mutex; /* @@ -372,33 +428,10 @@ struct thread_data { unsigned int cpuload; unsigned int cpucycle; - /* - * bandwidth and latency stats - */ - struct io_stat clat_stat[2]; /* completion latency */ - struct io_stat slat_stat[2]; /* submission latency */ - struct io_stat bw_stat[2]; /* bandwidth stats */ - - unsigned long long stat_io_bytes[2]; - struct timeval stat_sample_time[2]; - - struct io_log *slat_log; - struct io_log *clat_log; - struct io_log *bw_log; - struct timeval start; /* start of this loop */ struct timeval epoch; /* time job was started */ struct timeval end_time;/* time job ended */ - /* - * fio system usage accounting - */ - struct rusage ru_start; - struct rusage ru_end; - unsigned long usr_time; - unsigned long sys_time; - unsigned long ctx; - /* * read/write mixed workload state */ @@ -417,18 +450,43 @@ struct thread_data { */ struct list_head io_hist_list; struct list_head io_log_list; + + /* + * timeout handling + */ + struct timeval timeout_end; + struct itimerval timer; }; -#define __td_verror(td, err, msg) \ +/* + * roundrobin available files, or choose one at random. + */ +enum { + FIO_FSERVICE_RANDOM = 1, + FIO_FSERVICE_RR = 2, +}; + +/* + * 30 second per-io_u timeout, with 5 second intervals to avoid resetting + * the timer on each queue operation. + */ +#define IO_U_TIMEOUT_INC 5 +#define IO_U_TIMEOUT 30 + +#define __td_verror(td, err, msg, func) \ do { \ + if ((td)->error) \ + break; \ int e = (err); \ (td)->error = e; \ - snprintf(td->verror, sizeof(td->verror) - 1, "file:%s:%d, error=%s", __FILE__, __LINE__, (msg)); \ + snprintf(td->verror, sizeof(td->verror) - 1, "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg)); \ } while (0) -#define td_verror(td, err) __td_verror((td), (err), strerror((err))) -#define td_vmsg(td, err, msg) __td_verror((td), (err), (msg)) +#define td_verror(td, err, func) \ + __td_verror((td), (err), strerror((err)), (func)) +#define td_vmsg(td, err, msg, func) \ + __td_verror((td), (err), (msg), (func)) extern int exitall_on_terminate; extern int thread_number; @@ -442,9 +500,10 @@ extern unsigned long long mlock_size; extern struct thread_data *threads; -#define td_read(td) ((td)->ddir == DDIR_READ) -#define td_write(td) ((td)->ddir == DDIR_WRITE) -#define td_rw(td) ((td)->iomix != 0) +#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 BLOCKS_PER_MAP (8 * sizeof(long)) #define TO_MAP_BLOCK(td, f, b) ((b) - ((f)->file_offset / (td)->rw_min_bs)) @@ -494,11 +553,6 @@ struct disk_util { struct timeval time; }; -/* - * Callback for io completion - */ -typedef int (endio_handler)(struct io_u *); - #define DISK_UTIL_MSEC (250) #ifndef min @@ -511,9 +565,9 @@ typedef int (endio_handler)(struct io_u *); /* * Log exports */ -extern int read_iolog_get(struct thread_data *, struct io_u *); +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 int init_iolog(struct thread_data *td); +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 *); extern void write_iolog_close(struct thread_data *); @@ -548,23 +602,26 @@ extern unsigned long time_since_now(struct timeval *); extern unsigned long mtime_since_genesis(void); extern void __usec_sleep(unsigned int); extern void usec_sleep(struct thread_data *, unsigned long); -extern void rate_throttle(struct thread_data *, unsigned long, unsigned int, int); +extern void rate_throttle(struct thread_data *, unsigned long, unsigned int); extern void fill_start_time(struct timeval *); extern void fio_gettime(struct timeval *, void *); +extern void set_genesis_time(void); /* * Init functions */ -extern int parse_options(int, char **); -extern int init_random_state(struct thread_data *); +extern int __must_check parse_options(int, char **); +extern int __must_check init_random_state(struct thread_data *); /* * File setup/shutdown */ extern void close_files(struct thread_data *); -extern int setup_files(struct thread_data *); -extern int open_files(struct thread_data *); -extern int file_invalidate_cache(struct thread_data *, struct fio_file *); +extern int __must_check setup_files(struct thread_data *); +extern int __must_check open_files(struct thread_data *); +extern int open_file(struct thread_data *, struct fio_file *, int, int); +extern void close_file(struct thread_data *, struct fio_file *); +extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *); /* * ETA/status stuff @@ -593,15 +650,15 @@ enum { * Verify helpers */ extern void populate_verify_io_u(struct thread_data *, struct io_u *); -extern int get_next_verify(struct thread_data *td, struct io_u *); -extern int verify_io_u(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 *); /* * Memory helpers */ -extern int fio_pin_memory(void); +extern int __must_check fio_pin_memory(void); extern void fio_unpin_memory(void); -extern int allocate_io_mem(struct thread_data *); +extern int __must_check allocate_io_mem(struct thread_data *); extern void free_io_mem(struct thread_data *); /* @@ -612,19 +669,21 @@ 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 *); extern void requeue_io_u(struct thread_data *, struct io_u **); -extern long io_u_sync_complete(struct thread_data *, struct io_u *, endio_handler *); -extern long io_u_queued_complete(struct thread_data *, int, endio_handler *); +extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *); +extern long __must_check io_u_queued_complete(struct thread_data *, int); extern void io_u_queued(struct thread_data *, struct io_u *); +extern void io_u_init_timeout(void); +extern void io_u_set_timeout(struct thread_data *); /* * io engine entry points */ -extern int td_io_init(struct thread_data *); -extern int td_io_prep(struct thread_data *, struct io_u *); -extern int td_io_queue(struct thread_data *, struct io_u *); -extern int td_io_sync(struct thread_data *, struct fio_file *); -extern int td_io_getevents(struct thread_data *, int, int, struct timespec *); -extern int td_io_commit(struct thread_data *); +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_commit(struct thread_data *); /* * This is a pretty crappy semaphore implementation, but with the use that fio @@ -659,6 +718,9 @@ static inline void fio_sem_up(volatile int *sem) fprintf(stderr, ##args); \ } while (0) +FILE *get_f_out(void); +FILE *get_f_err(void); + struct ioengine_ops { struct list_head list; char name[16]; @@ -681,7 +743,7 @@ struct ioengine_ops { #define FIO_IOOPS_VERSION 5 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *); -extern int register_ioengine(struct ioengine_ops *); +extern void register_ioengine(struct ioengine_ops *); extern void unregister_ioengine(struct ioengine_ops *); extern void close_ioengine(struct thread_data *);