X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=ba6806757df21601a02eee747a506335e5bdb1f6;hp=ab0d6a49f63b453224a854925405373895d24e33;hb=89cf1480594858ad4e02499834c04fe48ff0a89d;hpb=b1d1b239d2a3299a4d7b7b3de185923c655d0a48

diff --git a/fio.h b/fio.h
index ab0d6a49..ba680675 100644
--- a/fio.h
+++ b/fio.h
@@ -16,10 +16,6 @@
 
 struct thread_data;
 
-#define FIO_MAJOR	1
-#define FIO_MINOR	99
-#define FIO_PATCH	0
-
 #include "compiler/compiler.h"
 #include "flist.h"
 #include "fifo.h"
@@ -139,6 +135,7 @@ struct thread_options {
 	unsigned int use_os_rand;
 	unsigned int write_lat_log;
 	unsigned int write_bw_log;
+	unsigned int write_iops_log;
 	unsigned int norandommap;
 	unsigned int softrandommap;
 	unsigned int bs_unaligned;
@@ -157,6 +154,7 @@ struct thread_options {
 	unsigned long long ramp_time;
 	unsigned int overwrite;
 	unsigned int bw_avg_time;
+	unsigned int iops_avg_time;
 	unsigned int loops;
 	unsigned long long zone_size;
 	unsigned long long zone_skip;
@@ -203,6 +201,7 @@ struct thread_options {
 	char *write_iolog_file;
 	char *bw_log_file;
 	char *lat_log_file;
+	char *iops_log_file;
 	char *replay_redirect;
 
 	/*
@@ -265,9 +264,13 @@ struct thread_data {
 	struct io_log *clat_log;
 	struct io_log *lat_log;
 	struct io_log *bw_log;
+	struct io_log *iops_log;
 
 	uint64_t stat_io_bytes[2];
-	struct timeval stat_sample_time[2];
+	struct timeval bw_sample_time;
+
+	uint64_t stat_io_blocks[2];
+	struct timeval iops_sample_time;
 
 	struct rusage ru_start;
 	struct rusage ru_end;
@@ -365,6 +368,7 @@ struct thread_data {
 
 	unsigned long io_issues[2];
 	unsigned long long io_blocks[2];
+	unsigned long long this_io_blocks[2];
 	unsigned long long io_bytes[2];
 	unsigned long long io_skip_bytes;
 	unsigned long long this_io_bytes[2];