ioengine: import whitespace changes

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index a523d4d22767ec8cd80cd022d9ba96dad3e4c012..3d140a20070dd1638f9144f53b0604a97a34982c 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -1,7 +1,8 @@
 #ifndef FIO_IOLOG_H
 #define FIO_IOLOG_H
 
-#include "ieee754.h"
+#include "lib/rbtree.h"
+#include "lib/ieee754.h"
 
 /*
  * Use for maintaining statistics
@@ -29,9 +30,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[DDIR_RWDIR_CNT];
+       unsigned long avg_msec;
+       unsigned long avg_last;
 };
 
 enum {
@@ -73,6 +85,7 @@ enum file_log_act {
        FIO_LOG_UNLINK_FILE,
 };
 
+struct io_u;
 extern int __must_check read_iolog_get(struct thread_data *, struct io_u *);
 extern void log_io_u(struct thread_data *, struct io_u *);
 extern void log_file(struct thread_data *, struct fio_file *, enum file_log_act);
@@ -96,12 +109,11 @@ 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 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 *);
-extern struct io_log *agg_io_log[2];
+extern struct io_log *agg_io_log[DDIR_RWDIR_CNT];
 extern int write_bw_log;
 extern void add_agg_sample(unsigned long, enum fio_ddir, unsigned int);