parse: enable options to be marked dont-free

[fio.git] / profiles / tiobench.c

diff --git a/profiles/tiobench.c b/profiles/tiobench.c
index 99c88c4507006176707804fc133aa8d45080169d..f19a08577bb2450f0597cc9202e8c00c9eb495a6 100644 (file)
--- a/profiles/tiobench.c
+++ b/profiles/tiobench.c
@@ -1,6 +1,7 @@
 #include "../fio.h"
 #include "../profile.h"
 #include "../parse.h"
+#include "../optgroup.h"
 
 static unsigned long long size;
 static unsigned int loops = 1;
@@ -8,7 +9,7 @@ static unsigned int bs = 4096;
 static unsigned int nthreads = 1;
 static char *dir;
 
-char sz_idx[80], bs_idx[80], loop_idx[80], dir_idx[80], t_idx[80];
+static char sz_idx[80], bs_idx[80], loop_idx[80], dir_idx[80], t_idx[80];
 
 static const char *tb_opts[] = {
        "buffered=0", sz_idx, bs_idx, loop_idx, dir_idx, t_idx,
@@ -38,7 +39,7 @@ static struct fio_option options[] = {
                .lname  = "Tiobench size",
                .type   = FIO_OPT_STR_VAL,
                .off1   = offsetof(struct tiobench_options, size),
-               .help   = "Size in MB",
+               .help   = "Size in MiB",
                .category = FIO_OPT_C_PROFILE,
                .group  = FIO_OPT_G_TIOBENCH,
        },
@@ -48,7 +49,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = offsetof(struct tiobench_options, bs),
                .help   = "Block size in bytes",
-               .def    = "4k",
+               .def    = "4096",
                .category = FIO_OPT_C_PROFILE,
                .group  = FIO_OPT_G_TIOBENCH,
        },
@@ -69,6 +70,7 @@ static struct fio_option options[] = {
                .help   = "Test directory",
                .category = FIO_OPT_C_PROFILE,
                .group  = FIO_OPT_G_TIOBENCH,
+               .no_free = true,
        },
        {
                .name   = "threads",
@@ -90,7 +92,7 @@ static struct fio_option options[] = {
 static int tb_prep_cmdline(void)
 {
        /*
-        * tiobench uses size as MB, so multiply up
+        * tiobench uses size as MiB, so multiply up
         */
        size *= 1024 * 1024ULL;
        if (size)
@@ -113,7 +115,6 @@ static int tb_prep_cmdline(void)
 static struct profile_ops tiobench_profile = {
        .name           = "tiobench",
        .desc           = "tiotest/tiobench benchmark",
-       .options        = options,
        .prep_cmd       = tb_prep_cmdline,
        .cmdline        = tb_opts,
        .options        = options,