Merge branch 'master' into gfio
Conflicts:
options.c
parse.c
server.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/options.c b/options.c
index c838ee0..688d28b 100644
--- a/options.c
+++ b/options.c
@@ -936,19 +936,6 @@
return 0;
}
-static int kb_base_verify(struct fio_option *o, void *data)
-{
- struct thread_data *td = data;
-
- if (td->o.kb_base != 1024 && td->o.kb_base != 1000) {
- log_err("fio: kb_base set to nonsensical value: %u\n",
- td->o.kb_base);
- return 1;
- }
-
- return 0;
-}
-
/*
* Option grouping
*/
@@ -1154,8 +1141,6 @@
.prio = -1, /* must come after "directory" */
.help = "Override default $jobname.$jobnum.$filenum naming",
.def = "$jobname.$jobnum.$filenum",
- .category = FIO_OPT_C_FILE,
- .group = FIO_OPT_G_FILENAME,
},
{
.name = "lockfile",
@@ -3072,15 +3057,25 @@
.lname = "KB Base",
.type = FIO_OPT_INT,
.off1 = td_var_offset(kb_base),
- .verify = kb_base_verify,
.prio = 1,
.def = "1024",
+ .posval = {
+ { .ival = "1024",
+ .oval = 1024,
+ .help = "Use 1024 as the K base",
+ },
+ { .ival = "1000",
+ .oval = 1000,
+ .help = "Use 1000 as the K base",
+ },
+ },
.help = "How many bytes per KB for reporting (1000 or 1024)",
.category = FIO_OPT_C_GENERAL,
.group = FIO_OPT_G_INVALID,
},
{
.name = "unit_base",
+ .lname = "Base unit for reporting (Bits or Bytes)",
.type = FIO_OPT_INT,
.off1 = td_var_offset(unit_base),
.prio = 1,
diff --git a/parse.c b/parse.c
index 8885f59..e8ad0a5 100644
--- a/parse.c
+++ b/parse.c
@@ -478,7 +478,8 @@
}
}
if (ret) {
- log_err("value %d not in allowed range\n",ull);
+ log_err("fio: value %llu not allowed:\n", ull);
+ show_option_values(o);
return 1;
}
}