fio: HOWTO update

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 2daeb2a63067ab4d85df59c9228cf4ae3ec2584e..67f0badf8cb690d0b2940038157d19745b7075f0 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -973,18 +973,49 @@ static inline void clear_error(struct thread_data *td)
 }
 
 enum {
-       FD_PROCESS      = 1 << 0,
-       FD_FILE         = 1 << 1,
-       FD_IO           = 1 << 2,
-       FD_MEM          = 1 << 3,
+       FD_PROCESS      = 0,
+       FD_FILE,
+       FD_IO,
+       FD_MEM,
+       FD_BLKTRACE,
+       FD_VERIFY,
+       FD_DEBUG_MAX,
 };
 
+#ifdef FIO_INC_DEBUG
+struct debug_level {
+       const char *name;
+       unsigned long shift;
+};
+extern struct debug_level debug_levels[];
+
 extern unsigned long fio_debug;
-#define dprint(type, str, args...)             \
-       do {                                    \
-               if (((type) & fio_debug) == 0)  \
-                       break;                  \
-               printf(str, ##args);            \
+
+#define dprint(type, str, args...)                             \
+       do {                                                    \
+               assert(type < FD_DEBUG_MAX);                    \
+               if ((((1 << type)) & fio_debug) == 0)           \
+                       break;                                  \
+               log_info("%-8s ", debug_levels[(type)].name);   \
+               log_info(str, ##args);                          \
        } while (0)
 
+static inline void dprint_io_u(struct io_u *io_u, const char *p)
+{
+       struct fio_file *f = io_u->file;
+
+       dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
+                                       io_u->offset, io_u->buflen, io_u->ddir);
+       if (fio_debug & (1 << FD_IO)) {
+               if (f)
+                       log_info("/%s", f->file_name);
+
+               log_info("\n");
+       }
+}
+#else
+#define dprint(type, str, args...)
+#define dprint_io_u(io_u, p)
+#endif
+
 #endif