X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=iolog.h;h=82edbfc916ac5a47868bac16469e8d7d605c55e4;hb=ab8286610c47a683e45a916cc3e1470b5fd4c530;hp=6a53de25c8554127106b7f7abbf4bbdb6f01baa4;hpb=8062f52754eb548cfd1de892a983fd5f0e63b347;p=fio.git

diff --git a/iolog.h b/iolog.h
index 6a53de25..82edbfc9 100644
--- a/iolog.h
+++ b/iolog.h
@@ -1,7 +1,7 @@
 #ifndef FIO_IOLOG_H
 #define FIO_IOLOG_H
 
-#include "rbtree.h"
+#include "lib/rbtree.h"
 #include "lib/ieee754.h"
 
 /*
@@ -20,10 +20,18 @@ struct io_stat {
  * A single data sample
  */
 struct io_sample {
-	unsigned long time;
-	unsigned long val;
-	enum fio_ddir ddir;
-	unsigned int bs;
+	uint64_t time;
+	uint64_t val;
+	uint32_t ddir;
+	uint32_t bs;
+};
+
+enum {
+	IO_LOG_TYPE_LAT = 1,
+	IO_LOG_TYPE_CLAT,
+	IO_LOG_TYPE_SLAT,
+	IO_LOG_TYPE_BW,
+	IO_LOG_TYPE_IOPS,
 };
 
 /*
@@ -37,6 +45,8 @@ struct io_log {
 	unsigned long max_samples;
 	struct io_sample *log;
 
+	unsigned int log_type;
+
 	/*
 	 * Windowed average, for logging single entries average over some
 	 * period of time.
@@ -109,7 +119,7 @@ extern void add_bw_sample(struct thread_data *, enum fio_ddir, unsigned int,
 extern void add_iops_sample(struct thread_data *, enum fio_ddir, struct timeval *);
 extern void init_disk_util(struct thread_data *);
 extern void update_rusage_stat(struct thread_data *);
-extern void setup_log(struct io_log **, unsigned long);
+extern void setup_log(struct io_log **, unsigned long, int);
 extern void finish_log(struct thread_data *, struct io_log *, const char *);
 extern void finish_log_named(struct thread_data *, struct io_log *, const char *, const char *);
 extern void __finish_log(struct io_log *, const char *);