Merge branch 'master' into gfio

[fio.git] / profiles / tiobench.c

diff --git a/profiles/tiobench.c b/profiles/tiobench.c
index 4bdcfa24396580109aba6c4eab4590db6c703a18..0279e1cafbec95d286f802889ec8045729a2c3cc 100644 (file)
--- a/profiles/tiobench.c
+++ b/profiles/tiobench.c
@@ -23,34 +23,49 @@ static const char *tb_opts[] = {
 static struct fio_option options[] = {
        {
                .name   = "size",
+               .lname  = "Tiobench size",
                .type   = FIO_OPT_STR_VAL,
                .roff1  = &size,
                .help   = "Size in MB",
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = "block",
+               .lname  = "Tiobench block",
                .type   = FIO_OPT_INT,
                .roff1  = &bs,
                .help   = "Block size in bytes",
                .def    = "4k",
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = "numruns",
+               .lname  = "Tiobench numruns",
                .type   = FIO_OPT_INT,
                .roff1  = &loops,
                .help   = "Number of runs",
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = "dir",
+               .lname  = "Tiobench directory",
                .type   = FIO_OPT_STR_STORE,
                .roff1  = &dir,
                .help   = "Test directory",
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = "threads",
+               .lname  = "Tiobench threads",
                .type   = FIO_OPT_INT,
                .roff1  = &nthreads,
                .help   = "Number of Threads",
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = NULL,
@@ -85,6 +100,7 @@ static void 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,
@@ -92,7 +108,8 @@ static struct profile_ops tiobench_profile = {
 
 static void fio_init tiobench_register(void)
 {
-       register_profile(&tiobench_profile);
+       if (register_profile(&tiobench_profile))
+               log_err("fio: failed to register profile 'tiobench'\n");
 }
 
 static void fio_exit tiobench_unregister(void)