X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.h;h=739a7c8d02e0ac05b78e9007a53ef6af3d20ca3a;hp=95617fccb6891a92970c60cb0873e06b99d9782f;hb=a47591e4923fb8faef18e1cd5125a50429282089;hpb=99614958d743d0fdea9b1875d3a41a5a51e9769d diff --git a/iolog.h b/iolog.h index 95617fcc..739a7c8d 100644 --- a/iolog.h +++ b/iolog.h @@ -1,7 +1,10 @@ #ifndef FIO_IOLOG_H #define FIO_IOLOG_H +#include "lib/rbtree.h" #include "lib/ieee754.h" +#include "flist.h" +#include "ioengine.h" /* * Use for maintaining statistics @@ -19,12 +22,27 @@ struct io_stat { * A single data sample */ struct io_sample { - unsigned long time; - unsigned long val; - enum fio_ddir ddir; - unsigned int bs; + uint64_t time; + uint64_t val; + uint32_t __ddir; + uint32_t bs; +}; + +struct io_sample_offset { + struct io_sample s; + uint64_t offset; }; +enum { + IO_LOG_TYPE_LAT = 1, + IO_LOG_TYPE_CLAT, + IO_LOG_TYPE_SLAT, + IO_LOG_TYPE_BW, + IO_LOG_TYPE_IOPS, +}; + +#define DEF_LOG_ENTRIES 1024 + /* * Dynamically growing data sample log */ @@ -32,23 +50,95 @@ struct io_log { /* * Entries already logged */ - unsigned long nr_samples; - unsigned long max_samples; - struct io_sample *log; + 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; + + /* + * If we fail extending the log, stop collecting more entries. + */ + unsigned int disabled; + + /* + * Log offsets + */ + 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. */ - struct io_stat avg_window[2]; + 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) + return sizeof(struct io_sample_offset); + else + return sizeof(struct io_sample); +} + +static inline size_t log_entry_sz(struct io_log *log) +{ + return __log_entry_sz(log->log_offset); +} + +static inline struct io_sample *__get_sample(void *samples, int log_offset, + uint64_t sample) +{ + uint64_t sample_offset = sample * __log_entry_sz(log_offset); + return (struct io_sample *) ((char *) samples + sample_offset); +} + +static inline struct io_sample *get_sample(struct io_log *iolog, + uint64_t sample) +{ + return __get_sample(iolog->log, iolog->log_offset, sample); +} + enum { IP_F_ONRB = 1, IP_F_ONLIST = 2, IP_F_TRIMMED = 4, + IP_F_IN_FLIGHT = 8, }; /* @@ -65,6 +155,7 @@ struct io_piece { struct fio_file *file; }; unsigned long long offset; + unsigned short numberio; unsigned long len; unsigned int flags; enum fio_ddir ddir; @@ -84,37 +175,51 @@ enum file_log_act { FIO_LOG_UNLINK_FILE, }; +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 *, 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 */ -extern void add_lat_sample(struct thread_data *, enum fio_ddir, unsigned long, - unsigned int); -extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long, - unsigned int); -extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long, - unsigned int); -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, struct timeval *); -extern void init_disk_util(struct thread_data *); -extern void update_rusage_stat(struct thread_data *); -extern void update_io_ticks(void); -extern void setup_log(struct io_log **, unsigned long); -extern void finish_log(struct thread_data *, struct io_log *, const char *); -extern void finish_log_named(struct thread_data *, struct io_log *, const char *, const char *); -extern void __finish_log(struct io_log *, const char *); -extern struct io_log *agg_io_log[2]; -extern int write_bw_log; -extern void add_agg_sample(unsigned long, enum fio_ddir, unsigned int); +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; +}; + +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 *, int); +extern void flush_samples(FILE *, void *, uint64_t); +extern void free_log(struct io_log *); +extern void fio_writeout_logs(bool); +extern void td_writeout_logs(struct thread_data *, bool); +extern int iolog_flush(struct io_log *, int); static inline void init_ipo(struct io_piece *ipo) { @@ -122,4 +227,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