projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 2.9
[fio.git]
/
io_ddir.h
diff --git
a/io_ddir.h
b/io_ddir.h
index 269768ecac9e1b3da452d3279b17e5b8de496385..763e82659e3ce414827da9919a2339d32967f88c 100644
(file)
--- a/
io_ddir.h
+++ b/
io_ddir.h
@@
-16,8
+16,9
@@
enum fio_ddir {
static inline const char *io_ddir_name(enum fio_ddir ddir)
{
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];
if (ddir < DDIR_LAST)
return name[ddir];
@@
-35,6
+36,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)
@@
-42,7
+44,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)->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)
{
static inline int ddir_sync(enum fio_ddir ddir)
{