Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

[fio.git] / profiles / tiobench.c

diff --git a/profiles/tiobench.c b/profiles/tiobench.c
index 5ab602af75e5c4c4db67fa1aa1fa983f49e70c8e..bdb5985da006b11a4c611c48fc5e4e9e93f9b912 100644 (file)
--- a/profiles/tiobench.c
+++ b/profiles/tiobench.c
@@ -14,6 +14,7 @@ static const char *tb_opts[] = {
        "buffered=0", sz_idx, bs_idx, loop_idx, dir_idx, t_idx,
        "timeout=600", "group_reporting", "thread", "overwrite=1",
        "filename=.fio.tio.1:.fio.tio.2:.fio.tio.3:.fio.tio.4",
+       "ioengine=sync",
        "name=seqwrite", "rw=write", "end_fsync=1",
        "name=randwrite", "stonewall", "rw=randwrite", "end_fsync=1",
        "name=seqread", "stonewall", "rw=read",
@@ -27,7 +28,8 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_STR_VAL,
                .roff1  = &size,
                .help   = "Size in MB",
-               .category = FIO_OPT_C_IO,
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = "block",
@@ -36,7 +38,8 @@ static struct fio_option options[] = {
                .roff1  = &bs,
                .help   = "Block size in bytes",
                .def    = "4k",
-               .category = FIO_OPT_C_IO,
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = "numruns",
@@ -44,7 +47,8 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .roff1  = &loops,
                .help   = "Number of runs",
-               .category = FIO_OPT_C_GENERAL,
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = "dir",
@@ -52,7 +56,8 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_STR_STORE,
                .roff1  = &dir,
                .help   = "Test directory",
-               .category = FIO_OPT_C_FILE,
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = "threads",
@@ -60,7 +65,8 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .roff1  = &nthreads,
                .help   = "Number of Threads",
-               .category = FIO_OPT_C_GENERAL,
+               .category = FIO_OPT_C_PROFILE,
+               .group  = FIO_OPT_G_TIOBENCH,
        },
        {
                .name   = NULL,
@@ -70,9 +76,8 @@ static struct fio_option options[] = {
 /*
  * Fill our private options into the command line
  */
-static void tb_prep_cmdline(void)
+static int tb_prep_cmdline(void)
 {
-
        /*
         * tiobench uses size as MB, so multiply up
         */
@@ -91,6 +96,7 @@ static void tb_prep_cmdline(void)
                sprintf(dir_idx, "directory=./");
 
        sprintf(t_idx, "numjobs=%u", nthreads);
+       return 0;
 }
 
 static struct profile_ops tiobench_profile = {