X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_ddir.h;h=eb25c5002a8f623c9d63db8458120fb26d10c22c;hp=fa3b1434662415196bb7266cf098fd5b2fb9cfc3;hb=d219028de7fe8038b018c1e84dced8576e939f5d;hpb=6eaf09d6e9ca1f8accb057cdb18620b7e53ae33f

diff --git a/io_ddir.h b/io_ddir.h
index fa3b1434..eb25c500 100644
--- 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,18 @@ 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)	\
+	((arr)[DDIR_READ] + (arr)[DDIR_WRITE] + (arr)[DDIR_TRIM])
+
 #endif