Merge branch 'master' of https://github.com/ben-ihelputech/fio

[fio.git] / io_ddir.h

diff --git a/io_ddir.h b/io_ddir.h
index 763e82659e3ce414827da9919a2339d32967f88c..296a9d04ac53cc1c44585ee736f8ea424375615d 100644 (file)
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -5,22 +5,26 @@ 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,
 };
 
+#define for_each_rw_ddir(ddir) for (enum fio_ddir ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++)
+
 static inline const char *io_ddir_name(enum fio_ddir ddir)
 {
        static const char *name[] = { "read", "write", "trim", "sync",
                                        "datasync", "sync_file_range",
                                        "wait", };
 
-       if (ddir < DDIR_LAST)
+       if (ddir >= 0 && ddir < DDIR_LAST)
                return name[ddir];
 
        return "invalid";
@@ -61,9 +65,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];
 }