Add kb_base option to specify the base unit of a kilobyte

[fio.git] / options.c

diff --git a/options.c b/options.c
index 394472a4dadf61512e6c49f8495f97f248b357f5..c273da761457435fef000668e2167cc0e50418d0 100644 (file)
--- a/options.c
+++ b/options.c
@@ -303,14 +303,14 @@ static int str_cpumask_cb(void *data, unsigned int *val)
        return 0;
 }
 
-static int str_cpus_allowed_cb(void *data, const char *input)
+static int set_cpus_allowed(struct thread_data *td, os_cpu_mask_t *mask,
+                           const char *input)
 {
-       struct thread_data *td = data;
        char *cpu, *str, *p;
        long max_cpu;
        int ret = 0;
 
-       ret = fio_cpuset_init(&td->o.cpumask);
+       ret = fio_cpuset_init(mask);
        if (ret < 0) {
                log_err("fio: cpuset_init failed\n");
                td_verror(td, ret, "fio_cpuset_init");
@@ -358,7 +358,7 @@ static int str_cpus_allowed_cb(void *data, const char *input)
                        }
        
                        dprint(FD_PARSE, "set cpu allowed %d\n", icpu);
-                       fio_cpu_set(&td->o.cpumask, icpu);
+                       fio_cpu_set(mask, icpu);
                        icpu++;
                }
                if (ret)
@@ -370,6 +370,30 @@ static int str_cpus_allowed_cb(void *data, const char *input)
                td->o.cpumask_set = 1;
        return ret;
 }
+
+static int str_cpus_allowed_cb(void *data, const char *input)
+{
+       struct thread_data *td = data;
+       int ret;
+
+       ret = set_cpus_allowed(td, &td->o.cpumask, input);
+       if (!ret)
+               td->o.cpumask_set = 1;
+
+       return ret;
+}
+
+static int str_verify_cpus_allowed_cb(void *data, const char *input)
+{
+       struct thread_data *td = data;
+       int ret;
+
+       ret = set_cpus_allowed(td, &td->o.verify_cpumask, input);
+       if (!ret)
+               td->o.verify_cpumask_set = 1;
+
+       return ret;
+}
 #endif
 
 static int str_fst_cb(void *data, const char *str)
@@ -575,6 +599,47 @@ static int str_gtod_cpu_cb(void *data, int *il)
        return 0;
 }
 
+static int rw_verify(struct fio_option *o, void *data)
+{
+       struct thread_data *td = data;
+
+       if (read_only && td_write(td)) {
+               log_err("fio: job <%s> has write bit set, but fio is in"
+                       " read-only mode\n", td->o.name);
+               return 1;
+       }
+
+       return 0;
+}
+
+static int gtod_cpu_verify(struct fio_option *o, void *data)
+{
+#ifndef FIO_HAVE_CPU_AFFINITY
+       struct thread_data *td = data;
+
+       if (td->o.gtod_cpu) {
+               log_err("fio: platform must support CPU affinity for"
+                       "gettimeofday() offloading\n");
+               return 1;
+       }
+#endif
+
+       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;
+}
+
 #define __stringify_1(x)       #x
 #define __stringify(x)         __stringify_1(x)
 
@@ -609,6 +674,14 @@ static struct fio_option options[] = {
                .prio   = -1, /* must come after "directory" */
                .help   = "File(s) to use for the workload",
        },
+       {
+               .name   = "kb_base",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(kb_base),
+               .help   = "How many bytes per KB for reporting (1000 or 1024)",
+               .verify = kb_base_verify,
+               .def    = "1024",
+       },
        {
                .name   = "lockfile",
                .type   = FIO_OPT_STR,
@@ -648,6 +721,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(td_ddir),
                .help   = "IO direction",
                .def    = "read",
+               .verify = rw_verify,
                .posval = {
                          { .ival = "read",
                            .oval = TD_DDIR_READ,
@@ -1036,6 +1110,16 @@ static struct fio_option options[] = {
 #endif
                  },
        },
+       {
+               .name   = "iomem_align",
+               .alias  = "mem_align",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(mem_align),
+               .minval = 0,
+               .help   = "IO memory buffer offset alignment",
+               .def    = "0",
+               .parent = "iomem",
+       },
        {
                .name   = "verify",
                .type   = FIO_OPT_STR,
@@ -1141,6 +1225,23 @@ static struct fio_option options[] = {
                .help   = "Exit on a single verify failure, don't continue",
                .parent = "verify",
        },
+       {
+               .name   = "verify_async",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(verify_async),
+               .def    = "0",
+               .help   = "Number of async verifier threads to use",
+               .parent = "verify",
+       },
+#ifdef FIO_HAVE_CPU_AFFINITY
+       {
+               .name   = "verify_async_cpus",
+               .type   = FIO_OPT_STR,
+               .cb     = str_verify_cpus_allowed_cb,
+               .help   = "Set CPUs allowed for async verify threads",
+               .parent = "verify_async",
+       },
+#endif
        {
                .name   = "write_iolog",
                .type   = FIO_OPT_STR_STORE,
@@ -1510,6 +1611,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .cb     = str_gtod_cpu_cb,
                .help   = "Setup dedicated gettimeofday() thread on this CPU",
+               .verify = gtod_cpu_verify,
        },
        {
                .name   = "continue_on_error",