X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=profiles%2Ftiobench.c;h=bdb5985da006b11a4c611c48fc5e4e9e93f9b912;hb=47c7c1f526f1038abe7df350d02231220b3eecb9;hp=517d9377b8083dedda0780c015bfe0d2edfb2a54;hpb=9746fdbbd89cb202ecf2ee402b79ef215390eaea;p=fio.git diff --git a/profiles/tiobench.c b/profiles/tiobench.c index 517d9377..bdb5985d 100644 --- 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", @@ -23,39 +24,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_G_IO, + .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_G_IO, + .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_G_JOB, + .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_G_FILE, + .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_G_JOB, + .category = FIO_OPT_C_PROFILE, + .group = FIO_OPT_G_TIOBENCH, }, { .name = NULL, @@ -65,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 */ @@ -86,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 = {