Honor ./configure --cc= option

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index 6068384386af40373c36fc27b7667b6ca2bc8387..07163916585baea680eb14604b3020c2d300e20b 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -3,6 +3,8 @@
 
 #include "lib/rbtree.h"
 #include "lib/ieee754.h"
+#include "flist.h"
+#include "ioengine.h"
 
 /*
  * Use for maintaining statistics
@@ -20,10 +22,10 @@ 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 {
@@ -45,7 +47,12 @@ struct io_log {
        unsigned long max_samples;
        struct io_sample *log;
 
-       int log_type;
+       unsigned int log_type;
+
+       /*
+        * If we fail extending the log, stop collecting more entries.
+        */
+       unsigned int disabled;
 
        /*
         * Windowed average, for logging single entries average over some
@@ -60,6 +67,7 @@ enum {
        IP_F_ONRB       = 1,
        IP_F_ONLIST     = 2,
        IP_F_TRIMMED    = 4,
+       IP_F_IN_FLIGHT  = 8,
 };
 
 /*
@@ -76,6 +84,7 @@ struct io_piece {
                struct fio_file *file;
        };
        unsigned long long offset;
+       unsigned short numberio;
        unsigned long len;
        unsigned int flags;
        enum fio_ddir ddir;
@@ -108,6 +117,7 @@ extern void write_iolog_close(struct thread_data *);
 /*
  * Logging
  */
+extern void finalize_logs(struct thread_data *td);
 extern void add_lat_sample(struct thread_data *, enum fio_ddir, unsigned long,
                                unsigned int);
 extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long,
@@ -116,7 +126,8 @@ 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 add_iops_sample(struct thread_data *, enum fio_ddir, unsigned int,
+                               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, int);