X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.h;h=a1e32ae7335b0b439518f3e1940235c041158ab1;hp=66c596e92ff8bc77edde7c072f451156a46a5228;hb=03be65c96360db94cde247bd46f523dfe5e61d12;hpb=aee2ab6775d96609a4632703827c409a7f9abcca

diff --git a/iolog.h b/iolog.h
index 66c596e9..a1e32ae7 100644
--- 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;
 };
 
@@ -52,6 +52,8 @@ struct io_log {
 	uint64_t max_samples;
 	void *log;
 
+	unsigned int log_ddir_mask;
+
 	char *filename;
 
 	struct thread_data *td;
@@ -73,6 +75,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 +93,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)
@@ -154,16 +174,20 @@ 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 *);
 
+#ifdef CONFIG_ZLIB
+extern int iolog_file_inflate(const char *);
+#endif
+
 /*
  * Logging
  */
@@ -173,6 +197,7 @@ struct log_params {
 	int log_type;
 	int log_offset;
 	int log_gz;
+	int log_gz_store;
 	int log_compress;
 };