From 5736c10dccc4124d99178b94e6759386420e5251 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 20 Jul 2010 12:03:25 -0600 Subject: [PATCH] Rename ddir_nr -> ddir_seq_nr Another mode will be added, so lets rename this one internally to make the distinction clear. Signed-off-by: Jens Axboe --- fio.h | 4 ++-- init.c | 2 +- io_u.c | 6 +++--- options.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fio.h b/fio.h index e05d95a5..e9fdc68f 100644 --- a/fio.h +++ b/fio.h @@ -146,7 +146,7 @@ struct thread_options { char *ioengine; enum td_ddir td_ddir; unsigned int kb_base; - unsigned int ddir_nr; + unsigned int ddir_seq_nr; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; @@ -410,7 +410,7 @@ struct thread_data { os_random_state_t rwmix_state; unsigned long rwmix_issues; enum fio_ddir rwmix_ddir; - unsigned int ddir_nr; + unsigned int ddir_seq_nr; /* * IO history logs for verification. We use a tree for sorting, diff --git a/init.c b/init.c index bb645b0b..bc1bb933 100644 --- a/init.c +++ b/init.c @@ -557,7 +557,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX; td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX; td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX; - td->ddir_nr = td->o.ddir_nr; + td->ddir_seq_nr = td->o.ddir_seq_nr; if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) { prev_group_jobs = 0; diff --git a/io_u.c b/io_u.c index f27cddac..bb00559c 100644 --- a/io_u.c +++ b/io_u.c @@ -54,7 +54,7 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u) * If we have a mixed random workload, we may * encounter blocks we already did IO to. */ - if ((td->o.ddir_nr == 1) && !random_map_free(f, block)) + if ((td->o.ddir_seq_nr == 1) && !random_map_free(f, block)) break; idx = RAND_MAP_IDX(f, block); @@ -201,8 +201,8 @@ static int __get_next_offset(struct thread_data *td, struct io_u *io_u) unsigned long long b; enum fio_ddir ddir = io_u->ddir; - if (td_random(td) && (td->o.ddir_nr && !--td->ddir_nr)) { - td->ddir_nr = td->o.ddir_nr; + if (td_random(td) && (td->o.ddir_seq_nr && !--td->ddir_seq_nr)) { + td->ddir_seq_nr = td->o.ddir_seq_nr; if (get_next_rand_offset(td, f, ddir, &b)) { dprint(FD_IO, "%s: getting rand offset failed\n", diff --git a/options.c b/options.c index 92307675..c9fb8862 100644 --- a/options.c +++ b/options.c @@ -203,9 +203,9 @@ static int str_rw_cb(void *data, const char *str) struct thread_data *td = data; char *nr = get_opt_postfix(str); - td->o.ddir_nr = 1; + td->o.ddir_seq_nr = 1; if (nr) { - td->o.ddir_nr = atoi(nr); + td->o.ddir_seq_nr = atoi(nr); free(nr); } -- 2.25.1