Refactor #includes and headers

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index de641d54e191979595a9dbfaf142168e2c5dce69..f70eb61e6eae92edb324ed5dbea35c9e6dcb11dc 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -1,10 +1,12 @@
 #ifndef FIO_IOLOG_H
 #define FIO_IOLOG_H
 
+#include <stdio.h>
+
 #include "lib/rbtree.h"
 #include "lib/ieee754.h"
 #include "flist.h"
-#include "ioengine.h"
+#include "ioengines.h"
 
 /*
  * Use for maintaining statistics
@@ -24,15 +26,21 @@ struct io_hist {
        struct flist_head list;
 };
 
+
+union io_sample_data {
+       uint64_t val;
+       struct io_u_plat_entry *plat_entry;
+};
+
+#define sample_val(value) ((union io_sample_data) { .val = value })
+#define sample_plat(plat) ((union io_sample_data) { .plat_entry = plat })
+
 /*
  * A single data sample
  */
 struct io_sample {
        uint64_t time;
-       union {
-               uint64_t val;
-               struct io_u_plat_entry *plat_entry;
-       };
+       union io_sample_data data;
        uint32_t __ddir;
        uint32_t bs;
 };
@@ -111,7 +119,7 @@ struct io_log {
         */
        struct io_stat avg_window[DDIR_RWDIR_CNT];
        unsigned long avg_msec;
-       unsigned long avg_last;
+       unsigned long avg_last[DDIR_RWDIR_CNT];
 
        /*
         * Windowed latency histograms, for keeping track of when we need to
@@ -125,6 +133,11 @@ struct io_log {
        pthread_mutex_t chunk_lock;
        unsigned int chunk_seq;
        struct flist_head chunk_list;
+
+       pthread_mutex_t deferred_free_lock;
+#define IOLOG_MAX_DEFER        8
+       void *deferred_items[IOLOG_MAX_DEFER];
+       unsigned int deferred;
 };
 
 /*
@@ -188,7 +201,7 @@ enum {
  */
 struct io_piece {
        union {
-               struct rb_node rb_node;
+               struct fio_rb_node rb_node;
                struct flist_head list;
        };
        struct flist_head trim_list;
@@ -253,7 +266,7 @@ struct log_params {
 
 static inline bool per_unit_log(struct io_log *log)
 {
-       return log && !log->avg_msec;
+       return log && (!log->avg_msec || log->log_gz || log->log_gz_store);
 }
 
 static inline bool inline_log(struct io_log *log)
@@ -263,11 +276,19 @@ static inline bool inline_log(struct io_log *log)
                log->log_type == IO_LOG_TYPE_SLAT;
 }
 
+static inline void ipo_bytes_align(unsigned int replay_align, struct io_piece *ipo)
+{
+       if (!replay_align)
+               return;
+
+       ipo->offset &= ~(replay_align - (uint64_t)1);
+}
+
 extern void finalize_logs(struct thread_data *td, bool);
 extern void setup_log(struct io_log **, struct log_params *, const char *);
 extern void flush_log(struct io_log *, bool);
 extern void flush_samples(FILE *, void *, uint64_t);
-extern unsigned long hist_sum(int, int, unsigned int *, unsigned int *);
+extern uint64_t hist_sum(int, int, uint64_t *, uint64_t *);
 extern void free_log(struct io_log *);
 extern void fio_writeout_logs(bool);
 extern void td_writeout_logs(struct thread_data *, bool);