Abstract out the thread_options structure

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index a523d4d22767ec8cd80cd022d9ba96dad3e4c012..e790e7d6f1042c15cec42873eeb9feeeb13dcb14 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -1,7 +1,9 @@
 #ifndef FIO_IOLOG_H
 #define FIO_IOLOG_H
 
-#include "ieee754.h"
+#include "rbtree.h"
+#include "lib/ieee754.h"
+#include "ioengine.h"
 
 /*
  * Use for maintaining statistics
@@ -29,9 +31,20 @@ struct io_sample {
  * Dynamically growing data sample log
  */
 struct io_log {
+       /*
+        * Entries already logged
+        */
        unsigned long nr_samples;
        unsigned long max_samples;
        struct io_sample *log;
+
+       /*
+        * Windowed average, for logging single entries average over some
+        * period of time.
+        */
+       struct io_stat avg_window[2];
+       unsigned long avg_msec;
+       unsigned long avg_last;
 };
 
 enum {
@@ -97,7 +110,7 @@ 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 update_io_ticks(void);
-extern void setup_log(struct io_log **);
+extern void setup_log(struct io_log **, unsigned long);
 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 *);