From: Jens Axboe Date: Fri, 26 Apr 2013 18:06:06 +0000 (-0600) Subject: Get rid of td->o.perc_seq X-Git-Tag: fio-2.1~10 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=5971116e9e3714d830dcb4bebf7b10e3803cbefd;hp=211c9b8948b43ed47aedf1227e0444a58db015e4 Get rid of td->o.perc_seq No point in tracking both perc_seq and perc_rand, when we know that perc_seq + perc_rand == 100. Signed-off-by: Jens Axboe --- diff --git a/cconv.c b/cconv.c index c2b27938..b06f60f4 100644 --- a/cconv.c +++ b/cconv.c @@ -126,7 +126,6 @@ void convert_thread_options_to_cpu(struct thread_options *o, o->pareto_h.u.f = fio_uint64_to_double(le64_to_cpu(top->pareto_h.u.i)); o->random_generator = le32_to_cpu(top->random_generator); o->perc_rand = le32_to_cpu(top->perc_rand); - o->perc_seq = le32_to_cpu(top->perc_seq); o->hugepage_size = le32_to_cpu(top->hugepage_size); o->rw_min_bs = le32_to_cpu(top->rw_min_bs); o->thinktime = le32_to_cpu(top->thinktime); @@ -286,7 +285,6 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->pareto_h.u.i = __cpu_to_le64(fio_double_to_uint64(o->pareto_h.u.f)); top->random_generator = cpu_to_le32(o->random_generator); top->perc_rand = cpu_to_le32(o->perc_rand); - top->perc_seq = cpu_to_le32(o->perc_seq); top->hugepage_size = cpu_to_le32(o->hugepage_size); top->rw_min_bs = cpu_to_le32(o->rw_min_bs); top->thinktime = cpu_to_le32(o->thinktime); diff --git a/options.c b/options.c index 97c5b6f9..7a4e7b57 100644 --- a/options.c +++ b/options.c @@ -381,7 +381,6 @@ static int str_perc_rand_cb(void *data, unsigned long long *val) struct thread_data *td = data; td->o.perc_rand = *val; - td->o.perc_seq = 100 - *val; return 0; } @@ -389,7 +388,6 @@ static int str_perc_seq_cb(void *data, unsigned long long *val) { struct thread_data *td = data; - td->o.perc_seq = *val; td->o.perc_rand = 100 - *val; return 0; } diff --git a/thread_options.h b/thread_options.h index 138d0265..45e22ae4 100644 --- a/thread_options.h +++ b/thread_options.h @@ -114,7 +114,6 @@ struct thread_options { unsigned int random_generator; unsigned int perc_rand; - unsigned int perc_seq; unsigned int hugepage_size; unsigned int rw_min_bs; @@ -326,7 +325,6 @@ struct thread_options_pack { uint32_t random_generator; uint32_t perc_rand; - uint32_t perc_seq; uint32_t hugepage_size; uint32_t rw_min_bs;