X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=6f5f29fb3a979fdceb4649aba90ad15d663c8143;hp=c8c8b7abdd46db6e4743b2262f9047bffc7cceed;hb=c2acfbac7e9eb8ac5407ac024c0fd000614c77e2;hpb=ba9c7219eefcc04e84a4fb4970f4b5caeaf48aa6 diff --git a/fio.h b/fio.h index c8c8b7ab..6f5f29fb 100644 --- a/fio.h +++ b/fio.h @@ -14,13 +14,10 @@ #include #include -struct thread_data; - #include "compiler/compiler.h" #include "thread_options.h" #include "flist.h" #include "fifo.h" -#include "lib/rbtree.h" #include "arch/arch.h" #include "os/os.h" #include "mutex.h" @@ -37,10 +34,12 @@ struct thread_data; #include "gettime.h" #include "lib/getopt.h" #include "lib/rand.h" +#include "lib/rbtree.h" #include "client.h" #include "server.h" #include "stat.h" #include "flow.h" +#include "io_u_queue.h" #ifdef CONFIG_SOLARISAIO #include @@ -83,6 +82,10 @@ enum { FIO_RAND_FILE_SIZE_OFF, FIO_RAND_TRIM_OFF, FIO_RAND_BUF_OFF, + 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, }; @@ -162,6 +165,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; @@ -194,9 +201,9 @@ struct thread_data { /* * List of free and busy io_u's */ - struct flist_head io_u_freelist; - struct flist_head io_u_busylist; - struct flist_head io_u_requeues; + struct io_u_ring io_u_requeues; + struct io_u_queue io_u_freelist; + struct io_u_queue io_u_all; pthread_mutex_t io_u_lock; pthread_cond_t free_cond; @@ -246,6 +253,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 */ @@ -257,6 +275,14 @@ struct thread_data { enum fio_ddir rwmix_ddir; unsigned int ddir_seq_nr; + /* + * rand/seq mixed workload state + */ + union { + os_random_state_t seq_rand_state[DDIR_RWDIR_CNT]; + struct frand_state __seq_rand_state[DDIR_RWDIR_CNT]; + }; + /* * IO history logs for verification. We use a tree for sorting, * if we are overwriting. Otherwise just use a fifo. @@ -323,10 +349,10 @@ enum { #define __td_verror(td, err, msg, func) \ do { \ + int ____e = (err); \ if ((td)->error) \ break; \ - int e = (err); \ - (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) @@ -348,6 +374,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; @@ -364,6 +391,7 @@ extern int terse_version; extern int is_backend; extern int nr_clients; extern int log_syslog; +extern int status_interval; extern const char fio_version_string[]; extern struct thread_data *threads; @@ -375,41 +403,6 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u) #define REAL_MAX_JOBS 2048 -static inline enum error_type_bit td_error_type(enum fio_ddir ddir, int err) -{ - if (err == EILSEQ) - return ERROR_TYPE_VERIFY_BIT; - if (ddir == DDIR_READ) - return ERROR_TYPE_READ_BIT; - return ERROR_TYPE_WRITE_BIT; -} - -static int __NON_FATAL_ERR[] = {EIO, EILSEQ}; -static inline int td_non_fatal_error(struct thread_data *td, - enum error_type_bit etype, int err) -{ - int i; - if (!td->o.ignore_error[etype]) { - td->o.ignore_error[etype] = __NON_FATAL_ERR; - td->o.ignore_error_nr[etype] = sizeof(__NON_FATAL_ERR) - / sizeof(int); - } - - if (!(td->o.continue_on_error & (1 << etype))) - return 0; - for (i = 0; i < td->o.ignore_error_nr[etype]; i++) - if (td->o.ignore_error[etype][i] == err) - return 1; - return 0; -} - -static inline void update_error_count(struct thread_data *td, int err) -{ - td->total_err_count++; - if (td->total_err_count == 1) - td->first_error = err; -} - static inline int should_fsync(struct thread_data *td) { if (td->last_was_sync) @@ -430,7 +423,7 @@ 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 int fio_options_parse(struct thread_data *, char **, int); +extern int fio_options_parse(struct thread_data *, char **, int, int); extern void fio_keywords_init(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 *); @@ -444,9 +437,10 @@ extern void td_fill_rand_seeds(struct thread_data *); 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 unsigned long page_mask; -extern unsigned long page_size; +extern uintptr_t page_mask; +extern uintptr_t page_size; extern int initialize_fio(char *envp[]); #define FIO_GETOPT_JOB 0x89000000 @@ -502,16 +496,16 @@ extern void reset_all_stats(struct thread_data *); * blktrace support */ #ifdef FIO_HAVE_BLKTRACE -extern int is_blktrace(const char *); -extern int load_blktrace(struct thread_data *, const char *); +extern int is_blktrace(const char *, int *); +extern int load_blktrace(struct thread_data *, const char *, int); #endif /* - * Mark unused variables passed to ops functions as unused, to silence gcc + * Latency target helpers */ -#define fio_unused __attribute((__unused__)) -#define fio_init __attribute__((constructor)) -#define fio_exit __attribute__((destructor)) +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)++) @@ -578,6 +572,14 @@ static inline unsigned int td_max_bs(struct thread_data *td) return max(td->o.max_bs[DDIR_TRIM], max_bs); } +static inline unsigned int td_min_bs(struct thread_data *td) +{ + unsigned int min_bs; + + min_bs = min(td->o.min_bs[DDIR_READ], td->o.min_bs[DDIR_WRITE]); + return min(td->o.min_bs[DDIR_TRIM], min_bs); +} + static inline int is_power_of_2(unsigned int val) { return (val != 0 && ((val & (val - 1)) == 0)); @@ -627,4 +629,9 @@ enum { FIO_RAND_GEN_LFSR, }; +enum { + FIO_CPUS_SHARED = 0, + FIO_CPUS_SPLIT, +}; + #endif