projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arch: add ffs64 and ffz64
[fio.git]
/
io_ddir.h
diff --git
a/io_ddir.h
b/io_ddir.h
index df5abbbc1c45322e0625f0e77bf614ca25f8424d..e5eff687d95d1b6ed91788804d14c32b5d67893f 100644
(file)
--- a/
io_ddir.h
+++ b/
io_ddir.h
@@
-10,9
+10,21
@@
enum fio_ddir {
DDIR_DATASYNC,
DDIR_SYNC_FILE_RANGE,
DDIR_WAIT,
DDIR_DATASYNC,
DDIR_SYNC_FILE_RANGE,
DDIR_WAIT,
+ DDIR_LAST,
DDIR_INVAL = -1,
};
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,
enum td_ddir {
TD_DDIR_READ = 1 << 0,
TD_DDIR_WRITE = 1 << 1,
@@
-23,6
+35,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_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_read(td) ((td)->o.td_ddir & TD_DDIR_READ)
@@
-30,7
+43,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 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)
{
static inline int ddir_sync(enum fio_ddir ddir)
{
@@
-43,7
+58,14
@@
static inline int ddir_rw(enum fio_ddir ddir)
return ddir == DDIR_READ || ddir == DDIR_WRITE || ddir == DDIR_TRIM;
}
return ddir == DDIR_READ || ddir == DDIR_WRITE || ddir == DDIR_TRIM;
}
-#define ddir_trim(ddir) ((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])
#define ddir_rw_sum(arr) \
((arr)[DDIR_READ] + (arr)[DDIR_WRITE] + (arr)[DDIR_TRIM])