From: Bart Van Assche <bvanassche@acm.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: fio@vger.kernel.org, Damien Le Moal <damien.lemoal@wdc.com>,
Bart Van Assche <bvanassche@acm.org>
Subject: [PATCH 4/5] Revert "eta: Fix compiler warning"
Date: Mon, 12 Aug 2019 19:01:35 -0700 [thread overview]
Message-ID: <20190813020136.15798-5-bvanassche@acm.org> (raw)
In-Reply-To: <20190813020136.15798-1-bvanassche@acm.org>
This reverts commit df0ca15ce2ffac0df3e9dcf4bfe4121333c4aa27. Due to
the previous patch it is no longer necessary to confuse the compiler
about accesses of the 'rate' and 'iops' members in struct jobs_eta.
Cc: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
eta.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/eta.c b/eta.c
index 99c537d189a3..77c3dd5f0453 100644
--- a/eta.c
+++ b/eta.c
@@ -392,9 +392,6 @@ bool calc_thread_status(struct jobs_eta *je, int force)
static unsigned long long disp_io_iops[DDIR_RWDIR_CNT];
static struct timespec rate_prev_time, disp_prev_time;
- void *je_rate = (void *) je->rate;
- void *je_iops = (void *) je->iops;
-
if (!force) {
if (!(output_format & FIO_OUTPUT_NORMAL) &&
f_out == stdout)
@@ -510,7 +507,7 @@ bool calc_thread_status(struct jobs_eta *je, int force)
if (write_bw_log && rate_time > bw_avg_time && !in_ramp_time(td)) {
calc_rate(unified_rw_rep, rate_time, io_bytes, rate_io_bytes,
- je_rate);
+ je->rate);
memcpy(&rate_prev_time, &now, sizeof(now));
add_agg_sample(sample_val(je->rate[DDIR_READ]), DDIR_READ, 0);
add_agg_sample(sample_val(je->rate[DDIR_WRITE]), DDIR_WRITE, 0);
@@ -522,8 +519,8 @@ bool calc_thread_status(struct jobs_eta *je, int force)
if (!force && !eta_time_within_slack(disp_time))
return false;
- calc_rate(unified_rw_rep, disp_time, io_bytes, disp_io_bytes, je_rate);
- calc_iops(unified_rw_rep, disp_time, io_iops, disp_io_iops, je_iops);
+ calc_rate(unified_rw_rep, disp_time, io_bytes, disp_io_bytes, je->rate);
+ calc_iops(unified_rw_rep, disp_time, io_iops, disp_io_iops, je->iops);
memcpy(&disp_prev_time, &now, sizeof(now));
--
2.22.0
next prev parent reply other threads:[~2019-08-13 2:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 2:01 [PATCH 0/5] Five fio patches Bart Van Assche
2019-08-13 2:01 ` [PATCH 1/5] Optimize the code that copies strings Bart Van Assche
2019-08-13 2:01 ` [PATCH 2/5] Verify the size of struct jobs_eta at compile time Bart Van Assche
2019-08-13 2:01 ` [PATCH 3/5] Refine packed annotations in stat.h Bart Van Assche
2019-08-13 2:53 ` Jens Axboe
2019-08-13 15:12 ` Bart Van Assche
2019-08-13 20:25 ` Jens Axboe
2019-08-13 20:51 ` Bart Van Assche
2019-08-13 21:04 ` Jens Axboe
2019-08-13 21:46 ` Bart Van Assche
2019-08-13 2:01 ` Bart Van Assche [this message]
2019-08-13 2:01 ` [PATCH 5/5] make test: Also run zbd tests Bart Van Assche
2019-08-13 4:39 ` Sitsofe Wheeler
2019-08-13 15:06 ` Bart Van Assche
2019-08-13 20:10 ` Sitsofe Wheeler
2019-08-13 20:22 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190813020136.15798-5-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=axboe@kernel.dk \
--cc=damien.lemoal@wdc.com \
--cc=fio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.