X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=8c67fccb8d3dcea029ea3710874efb9c63e2876c;hp=67d13c261f98cd1a55854ba212f26777ce58756d;hb=fdc0f3b646e417497849d4398029f780b0e5262f;hpb=3a5f6bde1d14faa9e60cde1c8b45c101bc462f34 diff --git a/fio.h b/fio.h index 67d13c26..8c67fccb 100644 --- a/fio.h +++ b/fio.h @@ -14,8 +14,6 @@ #include #include -struct thread_data; - #include "compiler/compiler.h" #include "thread_options.h" #include "flist.h" @@ -37,9 +35,11 @@ struct thread_data; #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 @@ -82,6 +82,7 @@ enum { FIO_RAND_FILE_SIZE_OFF, FIO_RAND_TRIM_OFF, FIO_RAND_BUF_OFF, + FIO_RAND_SEQ_RAND_OFF, FIO_RAND_NR_OFFS, }; @@ -94,10 +95,12 @@ struct thread_data { void *eo; char verror[FIO_VERROR_SIZE]; pthread_t thread; - int thread_number; - int groupid; + unsigned int thread_number; + unsigned int groupid; struct thread_stat ts; + int client_type; + struct io_log *slat_log; struct io_log *clat_log; struct io_log *lat_log; @@ -135,12 +138,9 @@ struct thread_data { size_t orig_buffer_size; volatile int terminate; volatile int runstate; - unsigned int ioprio; - unsigned int ioprio_set; unsigned int last_was_sync; enum fio_ddir last_ddir; - char *mmapfile; int mmapfd; void *iolog_buf; @@ -194,9 +194,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; @@ -257,6 +257,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; + struct frand_state __seq_rand_state; + }; + /* * IO history logs for verification. We use a tree for sorting, * if we are overwriting. Otherwise just use a fifo. @@ -323,9 +331,9 @@ enum { #define __td_verror(td, err, msg, func) \ do { \ + int e = (err); \ if ((td)->error) \ break; \ - int e = (err); \ (td)->error = e; \ if (!(td)->first_error) \ snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg)); \ @@ -364,6 +372,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 +384,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) @@ -423,9 +397,10 @@ static inline int should_fsync(struct thread_data *td) /* * Init/option functions */ +extern int __must_check fio_init_options(void); extern int __must_check parse_options(int, char **); -extern int parse_jobs_ini(char *, int, int); -extern int parse_cmd_line(int, char **); +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 *); @@ -440,7 +415,7 @@ extern void fio_options_dup_and_init(struct option *); extern void fio_options_mem_dupe(struct thread_data *); extern void options_mem_dupe(void *data, struct fio_option *options); extern void td_fill_rand_seeds(struct thread_data *); -extern void add_job_opts(const char **); +extern void add_job_opts(const char **, int); extern char *num2str(unsigned long, int, int, int, int); extern int ioengine_load(struct thread_data *); @@ -457,6 +432,7 @@ extern int initialize_fio(char *envp[]); */ extern void print_thread_status(void); extern void print_status_init(int); +extern char *fio_uint_to_kmg(unsigned int val); /* * Thread life cycle. Once a thread has a runstate beyond TD_INITIALIZED, it @@ -489,6 +465,7 @@ extern int __must_check fio_pin_memory(struct thread_data *); extern void fio_unpin_memory(struct thread_data *); extern int __must_check allocate_io_mem(struct thread_data *); extern void free_io_mem(struct thread_data *); +extern void free_threads_shm(void); /* * Reset stats after ramp time completes @@ -503,13 +480,6 @@ extern int is_blktrace(const char *); extern int load_blktrace(struct thread_data *, const char *); #endif -/* - * Mark unused variables passed to ops functions as unused, to silence gcc - */ -#define fio_unused __attribute((__unused__)) -#define fio_init __attribute__((constructor)) -#define fio_exit __attribute__((destructor)) - #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) \ @@ -575,6 +545,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)); @@ -605,6 +583,8 @@ 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); +#define ARRAY_SIZE(x) (sizeof((x)) / (sizeof((x)[0]))) + enum { FIO_OUTPUT_TERSE = 0, FIO_OUTPUT_JSON,