mutex: clear mutex when removed

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index 93e970e5f294e7185068bca259613d77f0108171..de641d54e191979595a9dbfaf142168e2c5dce69 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -21,6 +21,7 @@ struct io_stat {
 struct io_hist {
        uint64_t samples;
        unsigned long hist_last;
+       struct flist_head list;
 };
 
 /*
@@ -28,7 +29,10 @@ struct io_hist {
  */
 struct io_sample {
        uint64_t time;
-       uint64_t val;
+       union {
+               uint64_t val;
+               struct io_u_plat_entry *plat_entry;
+       };
        uint32_t __ddir;
        uint32_t bs;
 };
@@ -116,7 +120,7 @@ struct io_log {
         */
        struct io_hist hist_window[DDIR_RWDIR_CNT];
        unsigned long hist_msec;
-       int hist_coarseness;
+       unsigned int hist_coarseness;
 
        pthread_mutex_t chunk_lock;
        unsigned int chunk_seq;
@@ -149,6 +153,11 @@ static inline size_t log_entry_sz(struct io_log *log)
        return __log_entry_sz(log->log_offset);
 }
 
+static inline size_t log_sample_sz(struct io_log *log, struct io_logs *cur_log)
+{
+       return cur_log->nr_samples * log_entry_sz(log);
+}
+
 static inline struct io_sample *__get_sample(void *samples, int log_offset,
                                             uint64_t sample)
 {
@@ -258,6 +267,7 @@ 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 void free_log(struct io_log *);
 extern void fio_writeout_logs(bool);
 extern void td_writeout_logs(struct thread_data *, bool);