X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=df0d020089dede57b7c5ea700e6ea1b658f04e3d;hp=d0fe83a5ca6e8a62e2eb74b082e35063cdbd1039;hb=fd771971384a5ff2c59921617f3d59e26490ec06;hpb=292cc475b1f26ae4c94c3028fc33dee96b22655b diff --git a/fio.h b/fio.h index d0fe83a5..df0d0200 100644 --- a/fio.h +++ b/fio.h @@ -30,7 +30,7 @@ #include "helpers.h" #include "options.h" #include "profile.h" -#include "time.h" +#include "fio_time.h" #include "gettime.h" #include "lib/getopt.h" #include "lib/rand.h" @@ -71,6 +71,9 @@ enum { 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, }; enum { @@ -85,6 +88,7 @@ enum { FIO_RAND_SEQ_RAND_READ_OFF, FIO_RAND_SEQ_RAND_WRITE_OFF, FIO_RAND_SEQ_RAND_TRIM_OFF, + FIO_RAND_START_DELAY, FIO_RAND_NR_OFFS, }; @@ -109,6 +113,8 @@ struct thread_data { struct io_log *bw_log; struct io_log *iops_log; + struct tp_data *tp_data; + uint64_t stat_io_bytes[DDIR_RWDIR_CNT]; struct timeval bw_sample_time; @@ -164,6 +170,10 @@ struct thread_data { os_random_state_t trim_state; struct frand_state __trim_state; }; + union { + os_random_state_t delay_state; + struct frand_state __delay_state; + }; struct frand_state buf_state; @@ -248,6 +258,17 @@ struct thread_data { unsigned int tv_cache_mask; unsigned int ramp_time_over; + /* + * Time since last latency_window was started + */ + struct timeval latency_ts; + unsigned int latency_qd; + unsigned int latency_qd_high; + unsigned int latency_qd_low; + unsigned int latency_failed; + uint64_t latency_ios; + int latency_end_run; + /* * read/write mixed workload state */ @@ -333,10 +354,10 @@ enum { #define __td_verror(td, err, msg, func) \ do { \ - int e = (err); \ + unsigned int ____e = (err); \ if ((td)->error) \ break; \ - (td)->error = e; \ + (td)->error = ____e; \ if (!(td)->first_error) \ snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg)); \ } while (0) @@ -358,6 +379,7 @@ extern unsigned int stat_number; extern int shm_id; extern int groupid; extern int output_format; +extern int append_terse_output; extern int temp_stall_ts; extern uintptr_t page_mask, page_size; extern int read_only; @@ -421,6 +443,8 @@ extern void add_job_opts(const char **, int); extern char *num2str(unsigned long, int, int, int, int); 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 uintptr_t page_mask; extern uintptr_t page_size; @@ -453,11 +477,15 @@ enum { TD_PRE_READING, TD_VERIFYING, TD_FSYNCING, + TD_FINISHING, TD_EXITED, TD_REAPED, }; extern void td_set_runstate(struct thread_data *, int); +extern int td_bump_runstate(struct thread_data *, int); +extern void td_restore_runstate(struct thread_data *, int); + #define TERMINATE_ALL (-1) extern void fio_terminate_threads(int); @@ -483,6 +511,13 @@ extern int is_blktrace(const char *, int *); extern int load_blktrace(struct thread_data *, const char *, int); #endif +/* + * Latency target helpers + */ +extern void lat_target_check(struct thread_data *); +extern void lat_target_init(struct thread_data *); +extern void lat_target_reset(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) \ @@ -556,7 +591,7 @@ 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(unsigned int val) +static inline int is_power_of_2(unsigned long val) { return (val != 0 && ((val & (val - 1)) == 0)); } @@ -586,7 +621,9 @@ static inline void td_io_u_free_notify(struct thread_data *td) 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]))) +#endif enum { FIO_OUTPUT_TERSE = 0, @@ -605,4 +642,9 @@ enum { FIO_RAND_GEN_LFSR, }; +enum { + FIO_CPUS_SHARED = 0, + FIO_CPUS_SPLIT, +}; + #endif