[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 21/23] block: introduce block_account_one_io
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL v3 21/23] block: introduce block_account_one_io |
Date: |
Thu, 8 Jun 2017 19:56:41 +0800 |
From: Paolo Bonzini <address@hidden>
This is the common code to account operations that produced actual I/O.
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
block/accounting.c | 51 ++++++++++++++++++++++-----------------------------
1 file changed, 22 insertions(+), 29 deletions(-)
diff --git a/block/accounting.c b/block/accounting.c
index 3f457c4..a279e0b 100644
--- a/block/accounting.c
+++ b/block/accounting.c
@@ -86,7 +86,8 @@ void block_acct_start(BlockAcctStats *stats, BlockAcctCookie
*cookie,
cookie->type = type;
}
-void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie)
+static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie
*cookie,
+ bool failed)
{
BlockAcctTimedStats *s;
int64_t time_ns = qemu_clock_get_ns(clock_type);
@@ -98,31 +99,14 @@ void block_acct_done(BlockAcctStats *stats, BlockAcctCookie
*cookie)
assert(cookie->type < BLOCK_MAX_IOTYPE);
- stats->nr_bytes[cookie->type] += cookie->bytes;
- stats->nr_ops[cookie->type]++;
- stats->total_time_ns[cookie->type] += latency_ns;
- stats->last_access_time_ns = time_ns;
-
- QSLIST_FOREACH(s, &stats->intervals, entries) {
- timed_average_account(&s->latency[cookie->type], latency_ns);
+ if (failed) {
+ stats->failed_ops[cookie->type]++;
+ } else {
+ stats->nr_bytes[cookie->type] += cookie->bytes;
+ stats->nr_ops[cookie->type]++;
}
-}
-
-void block_acct_failed(BlockAcctStats *stats, BlockAcctCookie *cookie)
-{
- assert(cookie->type < BLOCK_MAX_IOTYPE);
-
- stats->failed_ops[cookie->type]++;
-
- if (stats->account_failed) {
- BlockAcctTimedStats *s;
- int64_t time_ns = qemu_clock_get_ns(clock_type);
- int64_t latency_ns = time_ns - cookie->start_time_ns;
-
- if (qtest_enabled()) {
- latency_ns = qtest_latency_ns;
- }
+ if (!failed || stats->account_failed) {
stats->total_time_ns[cookie->type] += latency_ns;
stats->last_access_time_ns = time_ns;
@@ -132,15 +116,24 @@ void block_acct_failed(BlockAcctStats *stats,
BlockAcctCookie *cookie)
}
}
+void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie)
+{
+ block_account_one_io(stats, cookie, false);
+}
+
+void block_acct_failed(BlockAcctStats *stats, BlockAcctCookie *cookie)
+{
+ block_account_one_io(stats, cookie, true);
+}
+
void block_acct_invalid(BlockAcctStats *stats, enum BlockAcctType type)
{
assert(type < BLOCK_MAX_IOTYPE);
- /* block_acct_done() and block_acct_failed() update
- * total_time_ns[], but this one does not. The reason is that
- * invalid requests are accounted during their submission,
- * therefore there's no actual I/O involved. */
-
+ /* block_account_one_io() updates total_time_ns[], but this one does
+ * not. The reason is that invalid requests are accounted during their
+ * submission, therefore there's no actual I/O involved.
+ */
stats->invalid_ops[type]++;
if (stats->account_invalid) {
--
2.9.4
- [Qemu-devel] [PULL v3 12/23] throttle-groups: do not use qemu_co_enter_next, (continued)
- [Qemu-devel] [PULL v3 12/23] throttle-groups: do not use qemu_co_enter_next, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 13/23] throttle-groups: protect throttled requests with a CoMutex, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 10/23] block: access io_plugged with atomic ops, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 14/23] util: add stats64 module, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 15/23] block: use Stat64 for wr_highest_offset, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 16/23] block: access write_gen with atomics, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 19/23] migration/block: reset dirty bitmap before reading, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 17/23] block: protect tracked_requests and flush_queue with reqs_lock, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 18/23] block: introduce dirty_bitmap_mutex, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 20/23] block: protect modification of dirty bitmaps with a mutex, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 21/23] block: introduce block_account_one_io,
Fam Zheng <=
- [Qemu-devel] [PULL v3 22/23] block: split BlockAcctStats creation and setup, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 23/23] block: make accounting thread-safe, Fam Zheng, 2017/06/08
- Re: [Qemu-devel] [PULL v3 00/23] Docker and block patches, Peter Maydell, 2017/06/12