io_ddir: revert separate ddir count change

[fio.git] / io_ddir.h

diff --git a/io_ddir.h b/io_ddir.h
index 269768ecac9e1b3da452d3279b17e5b8de496385..deaa8b5a3705e3c99e435a64b7b44da6c9b4574b 100644 (file)
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -5,19 +5,22 @@ enum fio_ddir {
        DDIR_READ = 0,
        DDIR_WRITE = 1,
        DDIR_TRIM = 2,
-       DDIR_RWDIR_CNT = 3,
        DDIR_SYNC = 3,
        DDIR_DATASYNC,
        DDIR_SYNC_FILE_RANGE,
        DDIR_WAIT,
        DDIR_LAST,
        DDIR_INVAL = -1,
+
+       DDIR_RWDIR_CNT = 3,
+       DDIR_RWDIR_SYNC_CNT = 4,
 };
 
 static inline const char *io_ddir_name(enum fio_ddir ddir)
 {
-       const char *name[] = { "read", "write", "trim", "sync", "datasync",
-                               "sync_file_range", "write", };
+       static const char *name[] = { "read", "write", "trim", "sync",
+                                       "datasync", "sync_file_range",
+                                       "wait", };
 
        if (ddir < DDIR_LAST)
                return name[ddir];
@@ -35,6 +38,7 @@ enum td_ddir {
        TD_DDIR_RANDWRITE       = TD_DDIR_WRITE | TD_DDIR_RAND,
        TD_DDIR_RANDRW          = TD_DDIR_RW | TD_DDIR_RAND,
        TD_DDIR_RANDTRIM        = TD_DDIR_TRIM | TD_DDIR_RAND,
+       TD_DDIR_TRIMWRITE       = TD_DDIR_TRIM | TD_DDIR_WRITE,
 };
 
 #define td_read(td)            ((td)->o.td_ddir & TD_DDIR_READ)
@@ -42,7 +46,9 @@ 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)->io_axmap)
+#define file_randommap(td, f)  (!(td)->o.norandommap && fio_file_axmap((f)))
+#define td_trimwrite(td)       (((td)->o.td_ddir & TD_DDIR_TRIMWRITE) \
+                                       == TD_DDIR_TRIMWRITE)
 
 static inline int ddir_sync(enum fio_ddir ddir)
 {
@@ -57,9 +63,9 @@ static inline int ddir_rw(enum fio_ddir ddir)
 
 static inline const char *ddir_str(enum td_ddir ddir)
 {
-       const char *__str[] = { NULL, "read", "write", "rw", NULL,
+       static const char *__str[] = { NULL, "read", "write", "rw", "rand",
                                "randread", "randwrite", "randrw",
-                               "trim", NULL, NULL, NULL, "randtrim" };
+                               "trim", NULL, "trimwrite", NULL, "randtrim" };
 
        return __str[ddir];
 }