X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=dfd8695779ef320480ade345c4e2db0f0970808a;hp=751fc3d18ecc8d59c1de03fac09501de6c8c53ef;hb=ef5249d5e5f0bb5f0adfb182b1dbc988aee976de;hpb=15dc1934435dc84d66547c4fc92d936224d7238f diff --git a/fio.h b/fio.h index 751fc3d1..dfd86957 100644 --- a/fio.h +++ b/fio.h @@ -11,7 +11,6 @@ #include #include #include -#include #include #include @@ -30,6 +29,9 @@ #include "iolog.h" #include "helpers.h" #include "options.h" +#include "profile.h" +#include "time.h" +#include "lib/getopt.h" #ifdef FIO_HAVE_GUASI #include @@ -58,6 +60,14 @@ enum fio_memtype { MEM_MMAPHUGE, /* memory mapped huge file */ }; +/* + * offset generator types + */ +enum { + RW_SEQ_SEQ = 0, + RW_SEQ_IDENT, +}; + /* * How many depth levels to log */ @@ -78,6 +88,7 @@ struct thread_stat { struct io_log *slat_log; struct io_log *clat_log; + struct io_log *lat_log; struct io_log *bw_log; /* @@ -85,6 +96,7 @@ struct thread_stat { */ struct io_stat clat_stat[2]; /* completion latency */ struct io_stat slat_stat[2]; /* submission latency */ + struct io_stat lat_stat[2]; /* total latency */ struct io_stat bw_stat[2]; /* bandwidth stats */ unsigned long long stat_io_bytes[2]; @@ -108,8 +120,8 @@ struct thread_stat { unsigned int io_u_complete[FIO_IO_U_MAP_NR]; unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR]; unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR]; - unsigned long total_io_u[2]; - unsigned long short_io_u[2]; + unsigned long total_io_u[3]; + unsigned long short_io_u[3]; unsigned long total_submit; unsigned long total_complete; @@ -141,8 +153,9 @@ struct thread_options { char *opendir; char *ioengine; enum td_ddir td_ddir; + unsigned int rw_seq; unsigned int kb_base; - unsigned int ddir_nr; + unsigned int ddir_seq_nr; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; @@ -183,6 +196,8 @@ struct thread_options { unsigned int verify_pattern_bytes; unsigned int verify_fatal; unsigned int verify_async; + unsigned long long verify_backlog; + unsigned int verify_batch; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -202,7 +217,7 @@ struct thread_options { unsigned int thinktime_blocks; unsigned int fsync_blocks; unsigned int fdatasync_blocks; - unsigned int start_delay; + unsigned long start_delay; unsigned long long timeout; unsigned long long ramp_time; unsigned int overwrite; @@ -231,17 +246,25 @@ struct thread_options { unsigned int zero_buffers; unsigned int refill_buffers; unsigned int time_based; + unsigned int disable_lat; unsigned int disable_clat; unsigned int disable_slat; unsigned int disable_bw; unsigned int gtod_reduce; unsigned int gtod_cpu; unsigned int gtod_offload; + enum fio_cs clocksource; + unsigned int no_stall; + unsigned int trim_percentage; + unsigned int trim_batch; + unsigned int trim_zero; + unsigned long long trim_backlog; char *read_iolog_file; char *write_iolog_file; char *bw_log_file; char *lat_log_file; + char *replay_redirect; /* * Pre-run and post-run shell @@ -278,9 +301,12 @@ struct thread_options { */ char *cgroup; unsigned int cgroup_weight; + unsigned int cgroup_nodelete; unsigned int uid; unsigned int gid; + + unsigned int sync_file_range; }; #define FIO_VERROR_SIZE 128 @@ -315,6 +341,7 @@ struct thread_data { unsigned int ioprio; unsigned int ioprio_set; unsigned int last_was_sync; + enum fio_ddir last_ddir; char *mmapfile; int mmapfd; @@ -324,10 +351,14 @@ struct thread_data { char *sysfs_root; - unsigned long rand_seeds[6]; + unsigned long rand_seeds[7]; os_random_state_t bsrange_state; os_random_state_t verify_state; + os_random_state_t trim_state; + + unsigned int verify_batch; + unsigned int trim_batch; int shm_id; @@ -367,6 +398,7 @@ struct thread_data { struct timeval lastrate[2]; unsigned long long total_io_size; + unsigned long long fill_device_size; unsigned long io_issues[2]; unsigned long long io_blocks[2]; @@ -395,7 +427,7 @@ struct thread_data { os_random_state_t rwmix_state; unsigned long rwmix_issues; enum fio_ddir rwmix_ddir; - unsigned int ddir_nr; + unsigned int ddir_seq_nr; /* * IO history logs for verification. We use a tree for sorting, @@ -403,12 +435,19 @@ struct thread_data { */ struct rb_root io_hist_tree; struct flist_head io_hist_list; + unsigned long io_hist_len; /* * For IO replaying */ struct flist_head io_log_list; + /* + * For tracking/handling discards + */ + struct flist_head trim_list; + unsigned long trim_entries; + /* * for fileservice, how often to switch to a new file */ @@ -416,6 +455,8 @@ struct thread_data { unsigned int file_service_left; struct fio_file *file_service_file; + unsigned int sync_file_range_nr; + /* * For generating file sizes */ @@ -430,8 +471,8 @@ struct thread_data { /* * Can be overloaded by profiles */ - int (*fill_io_u_off)(struct thread_data *, struct io_u *); - int (*fill_io_u_size)(struct thread_data *, struct io_u *); + struct prof_io_ops prof_io_ops; + void *prof_data; }; /* @@ -476,6 +517,7 @@ extern unsigned long done_secs; extern char *job_section; extern int fio_gtod_offload; extern int fio_gtod_cpu; +extern enum fio_cs fio_clock_source; extern struct thread_data *threads; @@ -512,25 +554,6 @@ static inline int should_fsync(struct thread_data *td) return 0; } -/* - * Time functions - */ -extern unsigned long long utime_since(struct timeval *, struct timeval *); -extern unsigned long long utime_since_now(struct timeval *); -extern unsigned long mtime_since(struct timeval *, struct timeval *); -extern unsigned long mtime_since_now(struct timeval *); -extern unsigned long time_since_now(struct timeval *); -extern unsigned long mtime_since_genesis(void); -extern void usec_spin(unsigned int); -extern void usec_sleep(struct thread_data *, unsigned long); -extern void fill_start_time(struct timeval *); -extern void fio_gettime(struct timeval *, void *); -extern void fio_gtod_init(void); -extern void fio_gtod_update(void); -extern void set_genesis_time(void); -extern int ramp_time_over(struct thread_data *); -extern int in_ramp_time(struct thread_data *); - /* * Init/option functions */ @@ -638,7 +661,7 @@ static inline char *num2str(unsigned long num, int maxlen, int base, int pow2) char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' }; unsigned int thousand; char *buf; - int i; + int i, mod = 0; if (pow2) thousand = 1024; @@ -656,6 +679,19 @@ static inline char *num2str(unsigned long num, int maxlen, int base, int pow2) len = sprintf(buf, "%'lu", num); if (len <= maxlen) { if (i >= 1) { + char dec[4]; + int j = 0; + + sprintf(dec, "%u", mod); + if (maxlen - len >= 2) { + buf[len++] = '.'; + while (maxlen - len) { + buf[len++] = dec[j++]; + if (j == sizeof(dec) - 1) + break; + } + } + buf[len] = postfix[i]; buf[len + 1] = '\0'; } @@ -665,6 +701,7 @@ static inline char *num2str(unsigned long num, int maxlen, int base, int pow2) if ((num % thousand) >= (thousand / 2)) carry = 1; + mod = num % thousand; num /= thousand; num += carry; i++;