btrace2fio: cleanups and inflight hashing

[fio.git] / io_ddir.h

diff --git a/io_ddir.h b/io_ddir.h
index df5abbbc1c45322e0625f0e77bf614ca25f8424d..eb25c5002a8f623c9d63db8458120fb26d10c22c 100644 (file)
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -30,7 +30,7 @@ enum td_ddir {
 #define td_trim(td)            ((td)->o.td_ddir & TD_DDIR_TRIM)
 #define td_rw(td)              (((td)->o.td_ddir & TD_DDIR_RW) == TD_DDIR_RW)
 #define td_random(td)          ((td)->o.td_ddir & TD_DDIR_RAND)
-#define file_randommap(td, f)  (!(td)->o.norandommap && (f)->file_map)
+#define file_randommap(td, f)  (!(td)->o.norandommap && (f)->io_axmap)
 
 static inline int ddir_sync(enum fio_ddir ddir)
 {
@@ -43,6 +43,15 @@ static inline int ddir_rw(enum fio_ddir ddir)
        return ddir == DDIR_READ || ddir == DDIR_WRITE || ddir == DDIR_TRIM;
 }
 
+static inline const char *ddir_str(enum td_ddir ddir)
+{
+       const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
+                                  "randread", "randwrite", "randrw",
+                                  "trim", NULL, NULL, NULL, "randtrim" };
+
+       return ddir_str[ddir];
+}
+
 #define ddir_trim(ddir) ((ddir) == DDIR_TRIM)
 
 #define ddir_rw_sum(arr)       \