init: typo, remove -> remote.

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index 2a97e2855c2e11455a508947f594d20316f184c0..d8140f28c2f8a59de00bc32731edefc7d720cf97 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -1,16 +1,18 @@
 #ifndef FIO_IOLOG_H
 #define FIO_IOLOG_H
 
+#include "ieee754.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;
 };
 
 /*
@@ -32,6 +34,12 @@ struct io_log {
        struct io_sample *log;
 };
 
+enum {
+       IP_F_ONRB       = 1,
+       IP_F_ONLIST     = 2,
+       IP_F_TRIMMED    = 4,
+};
+
 /*
  * When logging io actions, this matches a single sent io_u
  */
@@ -40,12 +48,14 @@ struct io_piece {
                struct rb_node rb_node;
                struct flist_head list;
        };
+       struct flist_head trim_list;
        union {
                int fileno;
                struct fio_file *file;
        };
        unsigned long long offset;
        unsigned long len;
+       unsigned int flags;
        enum fio_ddir ddir;
        union {
                unsigned long delay;
@@ -83,6 +93,7 @@ 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 add_iops_sample(struct thread_data *, enum fio_ddir, struct timeval *);
 extern void show_run_stats(void);
 extern void init_disk_util(struct thread_data *);
 extern void update_rusage_stat(struct thread_data *);
@@ -95,4 +106,10 @@ extern struct io_log *agg_io_log[2];
 extern int write_bw_log;
 extern void add_agg_sample(unsigned long, enum fio_ddir, unsigned int);
 
+static inline void init_ipo(struct io_piece *ipo)
+{
+       memset(ipo, 0, sizeof(*ipo));
+       INIT_FLIST_HEAD(&ipo->trim_list);
+}
+
 #endif