X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=6f85266c2f695432cb405a6bc260f974a2ced2ea;hp=0fb86eaed442324832700d61b70d7123bbecc482;hb=155f2f027b34321f6f5abe79c09ece8ecca25046;hpb=50d795a5b72ea43ee125012a2aec7e4cfad20de9 diff --git a/fio.h b/fio.h index 0fb86eae..6f85266c 100644 --- a/fio.h +++ b/fio.h @@ -40,6 +40,7 @@ #include "stat.h" #include "flow.h" #include "io_u_queue.h" +#include "workqueue.h" #ifdef CONFIG_SOLARISAIO #include @@ -64,17 +65,20 @@ enum { }; enum { - TD_F_VER_BACKLOG = 1, - TD_F_TRIM_BACKLOG = 2, - TD_F_READ_IOLOG = 4, - TD_F_REFILL_BUFFERS = 8, - TD_F_SCRAMBLE_BUFFERS = 16, - TD_F_VER_NONE = 32, - TD_F_PROFILE_OPS = 64, - TD_F_COMPRESS = 128, - TD_F_NOIO = 256, - TD_F_COMPRESS_LOG = 512, - TD_F_VSTATE_SAVED = 1024, + TD_F_VER_BACKLOG = 1U << 0, + TD_F_TRIM_BACKLOG = 1U << 1, + TD_F_READ_IOLOG = 1U << 2, + TD_F_REFILL_BUFFERS = 1U << 3, + TD_F_SCRAMBLE_BUFFERS = 1U << 4, + TD_F_VER_NONE = 1U << 5, + TD_F_PROFILE_OPS = 1U << 6, + TD_F_COMPRESS = 1U << 7, + TD_F_NOIO = 1U << 8, + TD_F_COMPRESS_LOG = 1U << 9, + TD_F_VSTATE_SAVED = 1U << 10, + TD_F_NEED_LOCK = 1U << 11, + TD_F_CHILD = 1U << 12, + TD_F_NO_PROGRESS = 1U << 13, }; enum { @@ -91,9 +95,18 @@ enum { FIO_RAND_SEQ_RAND_TRIM_OFF, FIO_RAND_START_DELAY, FIO_DEDUPE_OFF, + FIO_RAND_POISSON_OFF, FIO_RAND_NR_OFFS, }; +enum { + IO_MODE_INLINE = 0, + IO_MODE_OFFLOAD = 1, + + RATE_PROCESS_LINEAR = 0, + RATE_PROCESS_POISSON = 1, +}; + /* * This describes a single thread/process executing a fio job. */ @@ -116,7 +129,9 @@ struct thread_data { struct io_log *bw_log; struct io_log *iops_log; - struct tp_data *tp_data; + struct workqueue log_compress_wq; + + struct thread_data *parent; uint64_t stat_io_bytes[DDIR_RWDIR_CNT]; struct timeval bw_sample_time; @@ -227,10 +242,18 @@ struct thread_data { * Rate state */ uint64_t rate_bps[DDIR_RWDIR_CNT]; - long rate_pending_usleep[DDIR_RWDIR_CNT]; + unsigned long rate_next_io_time[DDIR_RWDIR_CNT]; unsigned long rate_bytes[DDIR_RWDIR_CNT]; unsigned long rate_blocks[DDIR_RWDIR_CNT]; + unsigned long rate_io_issue_bytes[DDIR_RWDIR_CNT]; struct timeval lastrate[DDIR_RWDIR_CNT]; + int64_t last_usec; + struct frand_state poisson_state; + + /* + * Enforced rate submission/completion workqueue + */ + struct workqueue io_wq; uint64_t total_io_size; uint64_t fill_device_size; @@ -248,10 +271,11 @@ struct thread_data { uint64_t io_blocks[DDIR_RWDIR_CNT]; uint64_t this_io_blocks[DDIR_RWDIR_CNT]; uint64_t io_bytes[DDIR_RWDIR_CNT]; - uint64_t io_skip_bytes; uint64_t this_io_bytes[DDIR_RWDIR_CNT]; + uint64_t io_skip_bytes; uint64_t zone_bytes; struct fio_mutex *mutex; + uint64_t bytes_done[DDIR_RWDIR_CNT]; /* * State for random io, a bitmap of blocks done vs not done @@ -364,12 +388,23 @@ enum { } while (0) -#define td_clear_error(td) \ - (td)->error = 0; -#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)) +#define td_clear_error(td) do { \ + (td)->error = 0; \ + if ((td)->parent) \ + (td)->parent->error = 0; \ +} while (0) + +#define td_verror(td, err, func) do { \ + __td_verror((td), (err), strerror((err)), (func)); \ + if ((td)->parent) \ + __td_verror((td)->parent, (err), strerror((err)), (func)); \ +} while (0) + +#define td_vmsg(td, err, msg, func) do { \ + __td_verror((td), (err), (msg), (func)); \ + if ((td)->parent) \ + __td_verror((td)->parent, (err), (msg), (func)); \ +} while (0) #define __fio_stringify_1(x) #x #define __fio_stringify(x) __fio_stringify_1(x) @@ -405,6 +440,7 @@ extern char *trigger_file; extern char *trigger_cmd; extern char *trigger_remote_cmd; extern long long trigger_timeout; +extern char *aux_path; extern struct thread_data *threads; @@ -434,9 +470,10 @@ extern int parse_jobs_ini(char *, int, int, int); extern int parse_cmd_line(int, char **, int); extern int fio_backend(void); extern void reset_fio_state(void); -extern void clear_io_state(struct thread_data *); +extern void clear_io_state(struct thread_data *, int); extern int fio_options_parse(struct thread_data *, char **, int, int); extern void fio_keywords_init(void); +extern void fio_keywords_exit(void); extern int fio_cmd_option_parse(struct thread_data *, const char *, char *); extern int fio_cmd_ioengine_option_parse(struct thread_data *, const char *, char *); extern void fio_fill_default_options(struct thread_data *); @@ -452,10 +489,12 @@ extern int ioengine_load(struct thread_data *); extern int parse_dryrun(void); extern int fio_running_or_pending_io_threads(void); extern int fio_set_fd_nonblocking(int, const char *); +extern void sig_show_status(int sig); extern uintptr_t page_mask; extern uintptr_t page_size; extern int initialize_fio(char *envp[]); +extern void deinitialize_fio(void); #define FIO_GETOPT_JOB 0x89000000 #define FIO_GETOPT_IOENGINE 0x98000000 @@ -487,6 +526,7 @@ enum { TD_FINISHING, TD_EXITED, TD_REAPED, + TD_LAST, }; extern void td_set_runstate(struct thread_data *, int); @@ -499,8 +539,8 @@ extern void td_restore_runstate(struct thread_data *, int); */ #define FIO_REAP_TIMEOUT 60 -#define TERMINATE_ALL (-1) -extern void fio_terminate_threads(int); +#define TERMINATE_ALL (-1U) +extern void fio_terminate_threads(unsigned int); extern void fio_mark_td_terminate(struct thread_data *); /* @@ -525,6 +565,10 @@ extern int is_blktrace(const char *, int *); extern int load_blktrace(struct thread_data *, const char *, int); #endif +extern int io_queue_event(struct thread_data *td, struct io_u *io_u, int *ret, + enum fio_ddir ddir, uint64_t *bytes_issued, int from_verify, + struct timeval *comp_time); + /* * Latency target helpers */ @@ -574,16 +618,15 @@ static inline int __should_check_rate(struct thread_data *td, return 0; } -static inline int should_check_rate(struct thread_data *td, - uint64_t *bytes_done) +static inline int should_check_rate(struct thread_data *td) { int ret = 0; - if (bytes_done[DDIR_READ]) + if (td->bytes_done[DDIR_READ]) ret |= __should_check_rate(td, DDIR_READ); - if (bytes_done[DDIR_WRITE]) + if (td->bytes_done[DDIR_WRITE]) ret |= __should_check_rate(td, DDIR_WRITE); - if (bytes_done[DDIR_TRIM]) + if (td->bytes_done[DDIR_TRIM]) ret |= __should_check_rate(td, DDIR_TRIM); return ret; @@ -605,9 +648,9 @@ static inline unsigned int td_min_bs(struct thread_data *td) return min(td->o.min_bs[DDIR_TRIM], min_bs); } -static inline int is_power_of_2(uint64_t val) +static inline int td_async_processing(struct thread_data *td) { - return (val != 0 && ((val & (val - 1)) == 0)); + return (td->flags & TD_F_NEED_LOCK) != 0; } /* @@ -616,19 +659,19 @@ static inline int is_power_of_2(uint64_t val) */ static inline void td_io_u_lock(struct thread_data *td) { - if (td->o.verify_async) + if (td_async_processing(td)) pthread_mutex_lock(&td->io_u_lock); } static inline void td_io_u_unlock(struct thread_data *td) { - if (td->o.verify_async) + if (td_async_processing(td)) pthread_mutex_unlock(&td->io_u_lock); } static inline void td_io_u_free_notify(struct thread_data *td) { - if (td->o.verify_async) + if (td_async_processing(td)) pthread_cond_signal(&td->free_cond); } @@ -636,13 +679,21 @@ extern const char *fio_get_arch_string(int); extern const char *fio_get_os_string(int); #ifdef FIO_INTERNAL -#define ARRAY_SIZE(x) (sizeof((x)) / (sizeof((x)[0]))) +#define ARRAY_SIZE(x) (sizeof((x)) / (sizeof((x)[0]))) +#define FIELD_SIZE(s, f) (sizeof(((typeof(s))0)->f)) #endif enum { - FIO_OUTPUT_TERSE = 0, - FIO_OUTPUT_JSON, - FIO_OUTPUT_NORMAL, + __FIO_OUTPUT_TERSE = 0, + __FIO_OUTPUT_JSON = 1, + __FIO_OUTPUT_NORMAL = 2, + __FIO_OUTPUT_JSON_PLUS = 3, + FIO_OUTPUT_NR = 4, + + FIO_OUTPUT_TERSE = 1U << __FIO_OUTPUT_TERSE, + FIO_OUTPUT_JSON = 1U << __FIO_OUTPUT_JSON, + FIO_OUTPUT_NORMAL = 1U << __FIO_OUTPUT_NORMAL, + FIO_OUTPUT_JSON_PLUS = 1U << __FIO_OUTPUT_JSON_PLUS, }; enum { @@ -658,6 +709,7 @@ enum { enum { FIO_RAND_GEN_TAUSWORTHE = 0, FIO_RAND_GEN_LFSR, + FIO_RAND_GEN_TAUSWORTHE64, }; enum {