iolog: switch to list based scheme

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index 66c596e92ff8bc77edde7c072f451156a46a5228..2b7813b91f22095d135d96be444fc12809c97cd6 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -24,7 +24,7 @@ struct io_stat {
 struct io_sample {
        uint64_t time;
        uint64_t val;
-       uint32_t ddir;
+       uint32_t __ddir;
        uint32_t bs;
 };
 
@@ -41,6 +41,18 @@ enum {
        IO_LOG_TYPE_IOPS,
 };
 
+#define DEF_LOG_ENTRIES                1024
+#define MAX_LOG_ENTRIES                (1024 * DEF_LOG_ENTRIES)
+
+#define LOG_QUIESCE_SZ         (64 * 1024 * 1024)
+
+struct io_logs {
+       struct flist_head list;
+       uint64_t nr_samples;
+       uint64_t max_samples;
+       void *log;
+};
+
 /*
  * Dynamically growing data sample log
  */
@@ -48,9 +60,10 @@ struct io_log {
        /*
         * Entries already logged
         */
-       uint64_t nr_samples;
-       uint64_t max_samples;
-       void *log;
+       struct flist_head io_logs;
+       uint32_t cur_log_max;
+
+       unsigned int log_ddir_mask;
 
        char *filename;
 
@@ -61,7 +74,7 @@ struct io_log {
        /*
         * If we fail extending the log, stop collecting more entries.
         */
-       unsigned int disabled;
+       bool disabled;
 
        /*
         * Log offsets
@@ -73,6 +86,11 @@ struct io_log {
         */
        unsigned int log_gz;
 
+       /*
+        * Don't deflate for storing, just store the compressed bits
+        */
+       unsigned int log_gz_store;
+
        /*
         * Windowed average, for logging single entries average over some
         * period of time.
@@ -86,6 +104,19 @@ struct io_log {
        struct flist_head chunk_list;
 };
 
+/*
+ * If the upper bit is set, then we have the offset as well
+ */
+#define LOG_OFFSET_SAMPLE_BIT  0x80000000U
+#define io_sample_ddir(io)     ((io)->__ddir & ~LOG_OFFSET_SAMPLE_BIT)
+
+static inline void io_sample_set_ddir(struct io_log *log,
+                                     struct io_sample *io,
+                                     enum fio_ddir ddir)
+{
+       io->__ddir = ddir | log->log_ddir_mask;
+}
+
 static inline size_t __log_entry_sz(int log_offset)
 {
        if (log_offset)
@@ -102,13 +133,18 @@ static inline size_t log_entry_sz(struct io_log *log)
 static inline struct io_sample *__get_sample(void *samples, int log_offset,
                                             uint64_t sample)
 {
-       return samples + sample * __log_entry_sz(log_offset);
+       uint64_t sample_offset = sample * __log_entry_sz(log_offset);
+       return (struct io_sample *) ((char *) samples + sample_offset);
 }
 
+struct io_logs *iolog_cur_log(struct io_log *);
+uint64_t iolog_nr_samples(struct io_log *);
+
 static inline struct io_sample *get_sample(struct io_log *iolog,
+                                          struct io_logs *cur_log,
                                           uint64_t sample)
 {
-       return __get_sample(iolog->log, iolog->log_offset, sample);
+       return __get_sample(cur_log->log, iolog->log_offset, sample);
 }
 
 enum {
@@ -154,15 +190,22 @@ enum file_log_act {
 
 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_io_u(const struct thread_data *, const struct io_u *);
 extern void log_file(struct thread_data *, struct fio_file *, enum file_log_act);
 extern int __must_check init_iolog(struct thread_data *td);
 extern void log_io_piece(struct thread_data *, struct io_u *);
 extern void unlog_io_piece(struct thread_data *, struct io_u *);
-extern void trim_io_piece(struct thread_data *, struct io_u *);
+extern void trim_io_piece(struct thread_data *, const struct io_u *);
 extern void queue_io_piece(struct thread_data *, struct io_piece *);
 extern void prune_io_piece_log(struct thread_data *);
 extern void write_iolog_close(struct thread_data *);
+extern int iolog_compress_init(struct thread_data *, struct sk_out *);
+extern void iolog_compress_exit(struct thread_data *);
+extern size_t log_chunk_sizes(struct io_log *);
+
+#ifdef CONFIG_ZLIB
+extern int iolog_file_inflate(const char *);
+#endif
 
 /*
  * Logging
@@ -173,30 +216,23 @@ struct log_params {
        int log_type;
        int log_offset;
        int log_gz;
+       int log_gz_store;
        int log_compress;
 };
 
-extern void finalize_logs(struct thread_data *td);
-extern void add_lat_sample(struct thread_data *, enum fio_ddir, unsigned long,
-                               unsigned int, uint64_t);
-extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long,
-                               unsigned int, uint64_t);
-extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long,
-                               unsigned int, uint64_t);
-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, unsigned int,
-                               struct timeval *);
-extern void init_disk_util(struct thread_data *);
-extern void update_rusage_stat(struct thread_data *);
+static inline bool per_unit_log(struct io_log *log)
+{
+       return log && !log->avg_msec;
+}
+
+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 *);
+extern void flush_log(struct io_log *, int);
+extern void flush_samples(FILE *, void *, uint64_t);
 extern void free_log(struct io_log *);
-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);
-extern void fio_writeout_logs(struct thread_data *);
-extern int iolog_flush(struct io_log *, int);
+extern void fio_writeout_logs(bool);
+extern void td_writeout_logs(struct thread_data *, bool);
+extern int iolog_cur_flush(struct io_log *, struct io_logs *);
 
 static inline void init_ipo(struct io_piece *ipo)
 {
@@ -204,4 +240,11 @@ static inline void init_ipo(struct io_piece *ipo)
        INIT_FLIST_HEAD(&ipo->trim_list);
 }
 
+struct iolog_compress {
+       struct flist_head list;
+       void *buf;
+       size_t len;
+       unsigned int seq;
+};
+
 #endif