projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'winfio'
[fio.git]
/
options.c
diff --git
a/options.c
b/options.c
index bdf358204197b7ad1ed40bf6c2a749c2403c229c..ae5bcc5bca06f409132b474e11555dce5c0f8c1f 100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-922,7
+922,7
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.help = "Use pread/pwrite",
},
{ .ival = "vsync",
.help = "Use pread/pwrite",
},
{ .ival = "vsync",
-
.help = "Use readv/writev",
+ .help = "Use readv/writev",
},
#ifdef FIO_HAVE_LIBAIO
{ .ival = "libaio",
},
#ifdef FIO_HAVE_LIBAIO
{ .ival = "libaio",
@@
-939,9
+939,14
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.help = "Solaris native asynchronous IO",
},
#endif
.help = "Solaris native asynchronous IO",
},
#endif
+#ifdef FIO_HAVE_WINDOWSAIO
+ { .ival = "windowsaio",
+ .help = "Windows native asynchronous IO"
+ },
{ .ival = "mmap",
{ .ival = "mmap",
- .help = "Memory mapped IO"
,
+ .help = "Memory mapped IO"
},
},
+#endif
#ifdef FIO_HAVE_SPLICE
{ .ival = "splice",
.help = "splice/vmsplice based IO",
#ifdef FIO_HAVE_SPLICE
{ .ival = "splice",
.help = "splice/vmsplice based IO",
@@
-967,7
+972,7
@@
static struct fio_option options[FIO_MAX_OPTS] = {
},
#endif
{ .ival = "cpuio",
},
#endif
{ .ival = "cpuio",
- .help = "CPU cycle
r
burner engine",
+ .help = "CPU cycle burner engine",
},
#ifdef FIO_HAVE_GUASI
{ .ival = "guasi",
},
#ifdef FIO_HAVE_GUASI
{ .ival = "guasi",
@@
-988,7
+993,7
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.name = "iodepth",
.type = FIO_OPT_INT,
.off1 = td_var_offset(iodepth),
.name = "iodepth",
.type = FIO_OPT_INT,
.off1 = td_var_offset(iodepth),
- .help = "
Amount
of IO buffers to keep in flight",
+ .help = "
Number
of IO buffers to keep in flight",
.minval = 1,
.def = "1",
},
.minval = 1,
.def = "1",
},
@@
-1121,6
+1126,7
@@
static struct fio_option options[FIO_MAX_OPTS] = {
},
{
.name = "nrfiles",
},
{
.name = "nrfiles",
+ .alias = "nr_files",
.type = FIO_OPT_INT,
.off1 = td_var_offset(nr_files),
.help = "Split job workload between this number of files",
.type = FIO_OPT_INT,
.off1 = td_var_offset(nr_files),
.help = "Split job workload between this number of files",
@@
-1185,6
+1191,13
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.help = "Issue fdatasync for writes every given number of blocks",
.def = "0",
},
.help = "Issue fdatasync for writes every given number of blocks",
.def = "0",
},
+ {
+ .name = "write_barrier",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(barrier_blocks),
+ .help = "Make every Nth write a barrier write",
+ .def = "0",
+ },
#ifdef FIO_HAVE_SYNC_FILE_RANGE
{
.name = "sync_file_range",
#ifdef FIO_HAVE_SYNC_FILE_RANGE
{
.name = "sync_file_range",
@@
-1682,7
+1695,7
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.type = FIO_OPT_INT,
.off1 = td_var_offset(rate_iops_min[0]),
.off2 = td_var_offset(rate_iops_min[1]),
.type = FIO_OPT_INT,
.off1 = td_var_offset(rate_iops_min[0]),
.off2 = td_var_offset(rate_iops_min[1]),
- .help = "Job must meet this rate or it will be shutdown",
+ .help = "Job must meet this rate or it will be shut
down",
.parent = "rate_iops",
},
{
.parent = "rate_iops",
},
{
@@
-1727,7
+1740,7
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.name = "create_fsync",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(create_fsync),
.name = "create_fsync",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(create_fsync),
- .help = "
F
sync file after creation",
+ .help = "
f
sync file after creation",
.def = "1",
},
{
.def = "1",
},
{
@@
-1741,7
+1754,7
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.name = "pre_read",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(pre_read),
.name = "pre_read",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(pre_read),
- .help = "Preread files before starting official testing",
+ .help = "Pre
-
read files before starting official testing",
.def = "0",
},
{
.def = "0",
},
{
@@
-1892,7
+1905,7
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.name = "disable_slat",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(disable_slat),
.name = "disable_slat",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(disable_slat),
- .help = "Disable submission
n
latency numbers",
+ .help = "Disable submission latency numbers",
.parent = "gtod_reduce",
.def = "0",
},
.parent = "gtod_reduce",
.def = "0",
},
@@
-1908,14
+1921,14
@@
static struct fio_option options[FIO_MAX_OPTS] = {
.name = "gtod_cpu",
.type = FIO_OPT_INT,
.cb = str_gtod_cpu_cb,
.name = "gtod_cpu",
.type = FIO_OPT_INT,
.cb = str_gtod_cpu_cb,
- .help = "Setup dedicated gettimeofday() thread on this CPU",
+ .help = "Set
up dedicated gettimeofday() thread on this CPU",
.verify = gtod_cpu_verify,
},
{
.name = "continue_on_error",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(continue_on_error),
.verify = gtod_cpu_verify,
},
{
.name = "continue_on_error",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(continue_on_error),
- .help = "Continue on non-fatal errors during I
/
O",
+ .help = "Continue on non-fatal errors during IO",
.def = "0",
},
{
.def = "0",
},
{