iolog: use a define instead of a raw bit mask

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index b387f48d1600b651a47f7969e0ab3c9ea8ffe49b..fcd6794278edd6a39e1c6fd73997370e314b120b 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;
 };
 
@@ -48,10 +48,16 @@ struct io_log {
        /*
         * Entries already logged
         */
-       unsigned long nr_samples;
-       unsigned long max_samples;
+       uint64_t nr_samples;
+       uint64_t max_samples;
        void *log;
 
+       unsigned int log_ddir_mask;
+
+       char *filename;
+
+       struct thread_data *td;
+
        unsigned int log_type;
 
        /*
@@ -64,6 +70,16 @@ struct io_log {
         */
        unsigned int log_offset;
 
+       /*
+        * Max size of log entries before a chunk is compressed
+        */
+       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.
@@ -71,8 +87,25 @@ struct io_log {
        struct io_stat avg_window[DDIR_RWDIR_CNT];
        unsigned long avg_msec;
        unsigned long avg_last;
+
+       pthread_mutex_t chunk_lock;
+       unsigned int chunk_seq;
+       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)
@@ -151,9 +184,23 @@ 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 *);
 
+#ifdef CONFIG_ZLIB
+extern int iolog_file_inflate(const char *);
+#endif
+
 /*
  * Logging
  */
+struct log_params {
+       struct thread_data *td;
+       unsigned long avg_msec;
+       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);
@@ -167,12 +214,14 @@ 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, int);
-extern void __finish_log(struct io_log *, const char *);
+extern void setup_log(struct io_log **, struct log_params *, const char *);
+extern void flush_log(struct io_log *);
+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);
 
 static inline void init_ipo(struct io_piece *ipo)
 {