X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=2541c1a0777507423334704cdd9d50204398b738;hp=4f87fb775f01f161e96ccc25283825ef9989bc33;hb=e9b2a3fa90451c8390f8690f93d55fa0f52bf9d7;hpb=fc1a471326fb5248a74ed3a206d37884b812c853 diff --git a/fio.h b/fio.h index 4f87fb77..2541c1a0 100644 --- a/fio.h +++ b/fio.h @@ -94,13 +94,13 @@ struct verify_header { struct group_run_stats { unsigned long long max_run[2], min_run[2]; unsigned long long max_bw[2], min_bw[2]; - unsigned long long io_mb[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; @@ -151,8 +151,19 @@ struct thread_data { 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[256]; + char *iolog_file; + void *iolog_buf; + FILE *iolog_f; + + char *sysfs_root; + + char *ioscheduler; struct drand48_data bsrange_state; struct drand48_data verify_state; @@ -222,6 +233,16 @@ 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; };