Abstract out the thread_options structure

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index c59e6aa0eea4018d1874bb78b53574e354799e2a..e790e7d6f1042c15cec42873eeb9feeeb13dcb14 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -1,16 +1,20 @@
 #ifndef FIO_IOLOG_H
 #define FIO_IOLOG_H
 
+#include "rbtree.h"
+#include "lib/ieee754.h"
+#include "ioengine.h"
+
 /*
  * Use for maintaining statistics
  */
 struct io_stat {
-       unsigned long max_val;
-       unsigned long min_val;
-       unsigned long samples;
+       uint64_t max_val;
+       uint64_t min_val;
+       uint64_t samples;
 
-       double mean;
-       double S;
+       fio_fp64_t mean;
+       fio_fp64_t S;
 };
 
 /*
@@ -27,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 {
@@ -53,7 +68,7 @@ struct io_piece {
        };
        unsigned long long offset;
        unsigned long len;
-       unsigned long flags;
+       unsigned int flags;
        enum fio_ddir ddir;
        union {
                unsigned long delay;
@@ -91,11 +106,11 @@ extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long,
                                unsigned int);
 extern void add_bw_sample(struct thread_data *, enum fio_ddir, unsigned int,
                                struct timeval *);
-extern void show_run_stats(void);
+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 *);