X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=045fd012127e6b6ebd50f6520095f5cb2b462e00;hp=da0e1fd26730b6a6ad310ec09a50abbde5ea3dd5;hb=6796209a7e3d39522b0f5599aba277809786335e;hpb=20dc95c47087d486b5d4608fc15b1c2021761923 diff --git a/fio.h b/fio.h index da0e1fd2..045fd012 100644 --- a/fio.h +++ b/fio.h @@ -7,6 +7,9 @@ #include #include #include +#include +#include +#include #include "list.h" #include "md5.h" @@ -38,6 +41,7 @@ struct io_piece { struct list_head list; unsigned long long offset; unsigned int len; + int ddir; }; /* @@ -61,6 +65,7 @@ struct io_u { char *buf; unsigned int buflen; unsigned long long offset; + unsigned int index; unsigned int resid; unsigned int error; @@ -90,15 +95,15 @@ struct verify_header { }; struct group_run_stats { - unsigned long max_run[2], min_run[2]; - unsigned long max_bw[2], min_bw[2]; - unsigned long io_mb[2]; - unsigned long agg[2]; + unsigned long long max_run[2], min_run[2]; + unsigned long long max_bw[2], min_bw[2]; + unsigned long long io_kb[2]; + unsigned long long agg[2]; }; struct thread_data { char file_name[256]; - char directory[256]; + char *directory; char verror[80]; pthread_t thread; int thread_number; @@ -114,6 +119,7 @@ struct thread_data { volatile int runstate; volatile int old_runstate; unsigned int ddir; + unsigned int iomix; unsigned int ioprio; unsigned int sequential; unsigned int bs; @@ -131,8 +137,10 @@ struct thread_data { unsigned int bw_avg_time; unsigned int create_serialize; unsigned int create_fsync; + unsigned int end_fsync; unsigned int loops; unsigned long long file_size; + unsigned long long real_file_size; unsigned long long file_offset; unsigned long long zone_size; unsigned long long zone_skip; @@ -144,6 +152,21 @@ struct thread_data { unsigned int use_thread; unsigned int iodepth; os_cpu_mask_t cpumask; + unsigned int jobnum; + unsigned int iolog; + unsigned int read_iolog; + unsigned int write_iolog; + unsigned int rwmixcycle; + unsigned int rwmixread; + unsigned int nice; + + char *iolog_file; + void *iolog_buf; + FILE *iolog_f; + + char *sysfs_root; + + char *ioscheduler; struct drand48_data bsrange_state; struct drand48_data verify_state; @@ -176,10 +199,10 @@ struct thread_data { unsigned long long io_size; unsigned long long total_io_size; - unsigned long io_blocks[2]; - unsigned long io_bytes[2]; - unsigned long zone_bytes; - unsigned long this_io_bytes[2]; + unsigned long long io_blocks[2]; + unsigned long long io_bytes[2]; + unsigned long long zone_bytes; + unsigned long long this_io_bytes[2]; unsigned long long last_pos; sem_t mutex; @@ -194,7 +217,7 @@ struct thread_data { struct io_stat slat_stat[2]; /* submission latency */ struct io_stat bw_stat[2]; /* bandwidth stats */ - unsigned long stat_io_bytes[2]; + unsigned long long stat_io_bytes[2]; struct timeval stat_sample_time[2]; struct io_log *slat_log; @@ -213,7 +236,18 @@ struct thread_data { unsigned int do_disk_util; unsigned int override_sync; + struct drand48_data rwmix_state; + struct timeval rwmix_switch; + int rwmix_ddir; + + /* + * Pre-run and post-run shell + */ + char *exec_prerun; + char *exec_postrun; + struct list_head io_hist_list; + struct list_head io_log_list; }; #define td_verror(td, err) \ @@ -227,6 +261,8 @@ extern int parse_jobs_ini(char *); extern int parse_options(int, char **); extern void finish_log(struct thread_data *, struct io_log *, const char *); extern int init_random_state(struct thread_data *); +extern struct io_u *__get_io_u(struct thread_data *); +extern void put_io_u(struct thread_data *, struct io_u *); extern int rate_quit; extern int write_lat_log; @@ -258,6 +294,7 @@ enum { enum { FIO_TYPE_FILE = 1, FIO_TYPE_BD, + FIO_TYPE_CHAR, }; enum { @@ -266,10 +303,12 @@ enum { FIO_LIBAIO = 1 << 2, FIO_POSIXAIO = 1 << 3, FIO_SGIO = 1 << 4, + FIO_SPLICEIO = 1 << 5 | FIO_SYNCIO, }; #define td_read(td) ((td)->ddir == DDIR_READ) #define td_write(td) ((td)->ddir == DDIR_WRITE) +#define td_rw(td) ((td)->iomix != 0) #define BLOCKS_PER_MAP (8 * sizeof(long)) #define TO_MAP_BLOCK(td, b) ((b) - ((td)->file_offset / (td)->min_bs)) @@ -310,4 +349,40 @@ struct io_completion_data { #define DISK_UTIL_MSEC (250) +#ifndef min +#define min(a, b) ((a) < (b) ? (a) : (b)) +#endif + +/* + * Log exports + */ +extern int read_iolog_get(struct thread_data *, struct io_u *); +extern void write_iolog_put(struct thread_data *, struct io_u *); +extern int init_iolog(struct thread_data *td); +extern void log_io_piece(struct thread_data *, struct io_u *); +extern void prune_io_piece_log(struct thread_data *); +extern void write_iolog_close(struct thread_data *); + +/* + * Logging + */ +extern void add_clat_sample(struct thread_data *, int, unsigned long); +extern void add_slat_sample(struct thread_data *, int, unsigned long); +extern void add_bw_sample(struct thread_data *, int); +extern void show_run_stats(void); +extern void init_disk_util(struct thread_data *); +extern void update_rusage_stat(struct thread_data *); +extern void update_io_ticks(void); +extern void disk_util_timer_arm(void); + +/* + * Time functions + */ +extern unsigned long utime_since(struct timeval *, 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 void usec_sleep(struct thread_data *, unsigned long); +extern void rate_throttle(struct thread_data *, unsigned long, unsigned int); + #endif