output_buffer: only realloc once, and memset just what we need

[fio.git] / io_ddir.h

diff --git a/io_ddir.h b/io_ddir.h
index d2ee40ceefa5db7aaf93f10bacd6c0c29e6dc7ad..e5eff687d95d1b6ed91788804d14c32b5d67893f 100644 (file)
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -3,25 +3,71 @@
 
 enum fio_ddir {
        DDIR_READ = 0,
-       DDIR_WRITE,
-       DDIR_SYNC,
+       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,
 };
 
+static inline const char *io_ddir_name(enum fio_ddir ddir)
+{
+       const char *name[] = { "read", "write", "trim", "sync", "datasync",
+                               "sync_file_range", "write", };
+
+       if (ddir < DDIR_LAST)
+               return name[ddir];
+
+       return "invalid";
+}
+
 enum td_ddir {
        TD_DDIR_READ            = 1 << 0,
        TD_DDIR_WRITE           = 1 << 1,
        TD_DDIR_RAND            = 1 << 2,
+       TD_DDIR_TRIM            = 1 << 3,
        TD_DDIR_RW              = TD_DDIR_READ | TD_DDIR_WRITE,
        TD_DDIR_RANDREAD        = TD_DDIR_READ | TD_DDIR_RAND,
        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)
 #define td_write(td)           ((td)->o.td_ddir & TD_DDIR_WRITE)
+#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 && 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)
+{
+       return ddir == DDIR_SYNC || ddir == DDIR_DATASYNC ||
+              ddir == DDIR_SYNC_FILE_RANGE;
+}
+
+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 *__str[] = { NULL, "read", "write", "rw", NULL,
+                               "randread", "randwrite", "randrw",
+                               "trim", NULL, NULL, NULL, "randtrim" };
+
+       return __str[ddir];
+}
+
+#define ddir_rw_sum(arr)       \
+       ((arr)[DDIR_READ] + (arr)[DDIR_WRITE] + (arr)[DDIR_TRIM])
 
 #endif