summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2017-07-12 16:32:24 -0600
committerJens Axboe <axboe@kernel.dk>2017-07-12 16:32:24 -0600
commitdae887f3e2ac761886980cd3197522f3be46082d (patch)
tree840df82511d0c6e76e7f052c73485ca9d02ece00 /profiles
parentef2f4a50c25b3315d8825eb5e6fdfd6d57a47b74 (diff)
downloadfio-dae887f3e2ac761886980cd3197522f3be46082d.tar.gz
fio-dae887f3e2ac761886980cd3197522f3be46082d.tar.bz2
profiles/act: use the right options
We have a double set - one we actually set, and then one we check. Oops, fix that up. Fixes: 7b504eddc4b0 ("parse: get rid of raw option offsets") Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'profiles')
-rw-r--r--profiles/act.c34
1 files changed, 14 insertions, 20 deletions
diff --git a/profiles/act.c b/profiles/act.c
index 59e50052..cc1455db 100644
--- a/profiles/act.c
+++ b/profiles/act.c
@@ -53,14 +53,6 @@ struct act_prof_data {
unsigned int nr_slices;
};
-static char *device_names;
-static unsigned int load;
-static unsigned int prep;
-static unsigned int threads_per_queue;
-static unsigned int num_read_blocks;
-static unsigned int write_size;
-static unsigned long long test_duration;
-
#define ACT_MAX_OPTS 128
static const char *act_opts[ACT_MAX_OPTS] = {
"direct=1",
@@ -185,6 +177,8 @@ static int act_add_opt(const char *str, ...)
static int act_add_rw(const char *dev, int reads)
{
+ struct act_options *ao = &act_options;
+
if (act_add_opt("name=act-%s-%s", reads ? "read" : "write", dev))
return 1;
if (act_add_opt("filename=%s", dev))
@@ -192,21 +186,21 @@ static int act_add_rw(const char *dev, int reads)
if (act_add_opt("rw=%s", reads ? "randread" : "randwrite"))
return 1;
if (reads) {
- int rload = load * R_LOAD / threads_per_queue;
+ int rload = ao->load * R_LOAD / ao->threads_per_queue;
- if (act_add_opt("numjobs=%u", threads_per_queue))
+ if (act_add_opt("numjobs=%u", ao->threads_per_queue))
return 1;
if (act_add_opt("rate_iops=%u", rload))
return 1;
- if (act_add_opt("bs=%u", num_read_blocks * 512))
+ if (act_add_opt("bs=%u", ao->num_read_blocks * 512))
return 1;
} else {
- const int rsize = write_size / (num_read_blocks * 512);
- int wload = (load * W_LOAD + rsize - 1) / rsize;
+ const int rsize = ao->write_size / (ao->num_read_blocks * 512);
+ int wload = (ao->load * W_LOAD + rsize - 1) / rsize;
if (act_add_opt("rate_iops=%u", wload))
return 1;
- if (act_add_opt("bs=%u", write_size))
+ if (act_add_opt("bs=%u", ao->write_size))
return 1;
}
@@ -248,10 +242,10 @@ static int act_add_dev_prep(const char *dev)
static int act_add_dev(const char *dev)
{
- if (prep)
+ if (act_options.prep)
return act_add_dev_prep(dev);
- if (act_add_opt("runtime=%llus", test_duration))
+ if (act_add_opt("runtime=%llus", act_options.test_duration))
return 1;
if (act_add_opt("time_based=1"))
return 1;
@@ -269,7 +263,7 @@ static int act_add_dev(const char *dev)
*/
static int act_prep_cmdline(void)
{
- if (!device_names) {
+ if (!act_options.device_names) {
log_err("act: you need to set IO target(s) with the "
"device-names option.\n");
return 1;
@@ -280,7 +274,7 @@ static int act_prep_cmdline(void)
do {
char *dev;
- dev = strsep(&device_names, ",");
+ dev = strsep(&act_options.device_names, ",");
if (!dev)
break;
@@ -300,7 +294,7 @@ static int act_io_u_lat(struct thread_data *td, uint64_t usec)
int i, ret = 0;
double perm;
- if (prep)
+ if (act_options.prep)
return 0;
/*
@@ -431,7 +425,7 @@ static int act_td_init(struct thread_data *td)
get_act_ref();
apd = calloc(1, sizeof(*apd));
- nr_slices = (test_duration + SAMPLE_SEC - 1) / SAMPLE_SEC;
+ nr_slices = (act_options.test_duration + SAMPLE_SEC - 1) / SAMPLE_SEC;
apd->slices = calloc(nr_slices, sizeof(struct act_slice));
apd->nr_slices = nr_slices;
fio_gettime(&apd->sample_tv, NULL);