glusterfs: update for new API

[fio.git] / blktrace.h

diff --git a/blktrace.h b/blktrace.h
index 8656a957d27feac47710a40ce2c25298155de6f5..a0e82faa05eed81bb3e8819a200208089a6009d7 100644 (file)
--- a/blktrace.h
+++ b/blktrace.h
@@ -1,22 +1,44 @@
 #ifndef FIO_BLKTRACE_H
 #define FIO_BLKTRACE_H
 
+
 #ifdef FIO_HAVE_BLKTRACE
 
-int is_blktrace(const char *, int *);
-int load_blktrace(struct thread_data *, const char *, int);
+#include <asm/types.h>
+
+#include "blktrace_api.h"
+
+struct blktrace_cursor {
+       struct fifo             *fifo;  // fifo queue for reading
+       int                     fd;     // blktrace file
+       __u64                   length; // length of trace
+       struct blk_io_trace     t;      // current io trace
+       int                     swap;   // bitwise reverse required
+       int                     scalar; // scale percentage
+       int                     iter;   // current iteration
+       int                     nr_iter; // number of iterations to run
+};
+
+bool is_blktrace(const char *, int *);
+bool load_blktrace(struct thread_data *, const char *, int);
+int merge_blktrace_iologs(struct thread_data *td);
 
 #else
 
-static inline int is_blktrace(const char *fname, int *need_swap)
+static inline bool is_blktrace(const char *fname, int *need_swap)
+{
+       return false;
+}
+
+static inline bool load_blktrace(struct thread_data *td, const char *fname,
+                                int need_swap)
 {
-       return 0;
+       return false;
 }
 
-static inline int load_blktrace(struct thread_data *td, const char *fname,
-                               int need_swap)
+static inline int merge_blktrace_iologs(struct thread_data *td)
 {
-       return 1;
+       return false;
 }
 
 #endif