IO_LOG_TYPE_IOPS,
};
+#define DEF_LOG_ENTRIES 1024
+#define MAX_LOG_ENTRIES (1024 * DEF_LOG_ENTRIES)
+
+struct io_logs {
+ struct flist_head list;
+ uint64_t nr_samples;
+ uint64_t max_samples;
+ void *log;
+};
+
/*
* Dynamically growing data sample log
*/
/*
* Entries already logged
*/
- uint64_t nr_samples;
- uint64_t max_samples;
- void *log;
+ struct flist_head io_logs;
+ uint32_t cur_log_max;
+
+ /*
+ * When the current log runs out of space, store events here until
+ * we have a chance to regrow
+ */
+ struct io_logs *pending;
unsigned int log_ddir_mask;
/*
* If we fail extending the log, stop collecting more entries.
*/
- unsigned int disabled;
+ bool disabled;
/*
* Log offsets
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 *);
+void regrow_logs(struct thread_data *);
+
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 {
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 *);
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;
+}
+
+static inline bool inline_log(struct io_log *log)
+{
+ return log->log_type == IO_LOG_TYPE_LAT ||
+ log->log_type == IO_LOG_TYPE_CLAT ||
+ log->log_type == IO_LOG_TYPE_SLAT;
+}
+
+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 *, int);
+extern void flush_log(struct io_log *, bool);
+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)
{
INIT_FLIST_HEAD(&ipo->trim_list);
}
+struct iolog_compress {
+ struct flist_head list;
+ void *buf;
+ size_t len;
+ unsigned int seq;
+};
+
#endif