projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 3.34
[fio.git]
/
io_ddir.h
diff --git
a/io_ddir.h
b/io_ddir.h
index b16a6b9bade95ce0e0822b5728021d5fae149f7d..217eb62862efb74938193da9e2f4b786282a6cf1 100644
(file)
--- a/
io_ddir.h
+++ b/
io_ddir.h
@@
-5,21
+5,26
@@
enum fio_ddir {
DDIR_READ = 0,
DDIR_WRITE = 1,
DDIR_TRIM = 2,
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_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 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)
+ if (ddir
>= 0 && ddir
< DDIR_LAST)
return name[ddir];
return "invalid";
return name[ddir];
return "invalid";
@@
-35,6
+40,8
@@
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,
+ TD_DDIR_RANDTRIMWRITE = TD_DDIR_RANDTRIM | 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)
@@
-43,6
+50,10
@@
enum td_ddir {
#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 && fio_file_axmap((f)))
#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 && fio_file_axmap((f)))
+#define td_trimwrite(td) (((td)->o.td_ddir & TD_DDIR_TRIMWRITE) \
+ == TD_DDIR_TRIMWRITE)
+#define td_randtrimwrite(td) (((td)->o.td_ddir & TD_DDIR_RANDTRIMWRITE) \
+ == TD_DDIR_RANDTRIMWRITE)
static inline int ddir_sync(enum fio_ddir ddir)
{
static inline int ddir_sync(enum fio_ddir ddir)
{
@@
-57,9
+68,10
@@
static inline int ddir_rw(enum fio_ddir ddir)
static inline const char *ddir_str(enum td_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",
"randread", "randwrite", "randrw",
- "trim", NULL, NULL, NULL, "randtrim" };
+ "trim", NULL, "trimwrite", NULL, "randtrim",
+ NULL, "randtrimwrite" };
return __str[ddir];
}
return __str[ddir];
}