summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-03-04 14:30:02 +0100
committerJens Axboe <jens.axboe@oracle.com>2010-03-04 14:30:02 +0100
commit2363d8df7c0c6fe0613dc8e7ae2fa6f098cbc0d8 (patch)
tree4e01a556596c3ed2112cebefc23304abfc5fd753 /profiles
parente2de69dac799a1eecac1b52085f908729591ef5a (diff)
More progress on per-profile options support
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'profiles')
-rw-r--r--profiles/tiobench.c51
1 files changed, 43 insertions, 8 deletions
diff --git a/profiles/tiobench.c b/profiles/tiobench.c
index 873be99..4bdcfa2 100644
--- a/profiles/tiobench.c
+++ b/profiles/tiobench.c
@@ -2,14 +2,17 @@
#include "../profile.h"
#include "../parse.h"
-static unsigned long size;
-static unsigned long loops;
-static unsigned long bs;
+static unsigned long long size;
+static unsigned int loops = 1;
+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 const char *tb_opts[] = {
- "buffered=0", "size=4*1024*$mb_memory", "bs=4k", "timeout=600",
- "numjobs=4", "group_reporting", "thread", "overwrite=1",
+ "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",
"name=seqwrite", "rw=write", "end_fsync=1",
"name=randwrite", "stonewall", "rw=randwrite", "end_fsync=1",
@@ -20,7 +23,7 @@ static const char *tb_opts[] = {
static struct fio_option options[] = {
{
.name = "size",
- .type = FIO_OPT_INT,
+ .type = FIO_OPT_STR_VAL,
.roff1 = &size,
.help = "Size in MB",
},
@@ -44,15 +47,47 @@ static struct fio_option options[] = {
.help = "Test directory",
},
{
+ .name = "threads",
+ .type = FIO_OPT_INT,
+ .roff1 = &nthreads,
+ .help = "Number of Threads",
+ },
+ {
.name = NULL,
},
};
+/*
+ * Fill our private options into the command line
+ */
+static void tb_prep_cmdline(void)
+{
+
+ /*
+ * tiobench uses size as MB, so multiply up
+ */
+ size *= 1024 * 1024ULL;
+ if (size)
+ sprintf(sz_idx, "size=%llu", size);
+ else
+ strcpy(sz_idx, "size=4*1024*$mb_memory");
+
+ sprintf(bs_idx, "bs=%u", bs);
+ sprintf(loop_idx, "loops=%u", loops);
+
+ if (dir)
+ sprintf(dir_idx, "directory=%s", dir);
+ else
+ sprintf(dir_idx, "directory=./");
+
+ sprintf(t_idx, "numjobs=%u", nthreads);
+}
+
static struct profile_ops tiobench_profile = {
.name = "tiobench",
- .version = FIO_PROFILE_VERSION,
- .def_ops = tb_opts,
.options = options,
+ .prep_cmd = tb_prep_cmdline,
+ .cmdline = tb_opts,
};
static void fio_init tiobench_register(void)