[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/19] block: split BlockAcctStats creation and setu
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 18/19] block: split BlockAcctStats creation and setup |
Date: |
Mon, 5 Jun 2017 14:39:07 +0200 |
block_acct_destroy is called unconditionally in blk_delete, but there is
no BlockAcctStats function that is called unconditionally in blk_new.
Split block_acct_init in two, so that it will be possible to create a
QemuMutex in block_acct_init and destroy it in block_acct_cleanup.
Cc: Alberto Garcia <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/accounting.c | 13 ++++++++-----
block/block-backend.c | 1 +
blockdev.c | 2 +-
include/block/accounting.h | 3 ++-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/block/accounting.c b/block/accounting.c
index a279e0b124..ce6dbf7760 100644
--- a/block/accounting.c
+++ b/block/accounting.c
@@ -32,17 +32,20 @@
static QEMUClockType clock_type = QEMU_CLOCK_REALTIME;
static const int qtest_latency_ns = NANOSECONDS_PER_SECOND / 1000;
-void block_acct_init(BlockAcctStats *stats, bool account_invalid,
- bool account_failed)
+void block_acct_init(BlockAcctStats *stats)
{
- stats->account_invalid = account_invalid;
- stats->account_failed = account_failed;
-
if (qtest_enabled()) {
clock_type = QEMU_CLOCK_VIRTUAL;
}
}
+void block_acct_setup(BlockAcctStats *stats, bool account_invalid,
+ bool account_failed)
+{
+ stats->account_invalid = account_invalid;
+ stats->account_failed = account_failed;
+}
+
void block_acct_cleanup(BlockAcctStats *stats)
{
BlockAcctTimedStats *s, *next;
diff --git a/block/block-backend.c b/block/block-backend.c
index be2ddf173a..828497e27a 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -219,6 +219,7 @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm)
qemu_co_mutex_init(&blk->public.throttled_reqs_lock);
qemu_co_queue_init(&blk->public.throttled_reqs[0]);
qemu_co_queue_init(&blk->public.throttled_reqs[1]);
+ block_acct_init(&blk->stats);
notifier_list_init(&blk->remove_bs_notifiers);
notifier_list_init(&blk->insert_bs_notifiers);
diff --git a/blockdev.c b/blockdev.c
index 6e7c8a678c..0fa2e7e571 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -595,7 +595,7 @@ static BlockBackend *blockdev_init(const char *file, QDict
*bs_opts,
autostart = 0;
}
- block_acct_init(blk_get_stats(blk), account_invalid, account_failed);
+ block_acct_setup(blk_get_stats(blk), account_invalid, account_failed);
if (!parse_stats_intervals(blk_get_stats(blk), interval_list, errp)) {
blk_unref(blk);
diff --git a/include/block/accounting.h b/include/block/accounting.h
index 20891639d5..55cb06fdb6 100644
--- a/include/block/accounting.h
+++ b/include/block/accounting.h
@@ -61,7 +61,8 @@ typedef struct BlockAcctCookie {
enum BlockAcctType type;
} BlockAcctCookie;
-void block_acct_init(BlockAcctStats *stats, bool account_invalid,
+void block_acct_init(BlockAcctStats *stats);
+void block_acct_setup(BlockAcctStats *stats, bool account_invalid,
bool account_failed);
void block_acct_cleanup(BlockAcctStats *stats);
void block_acct_add_interval(BlockAcctStats *stats, unsigned interval_length);
--
2.13.0
- [Qemu-devel] [PATCH 08/19] throttle-groups: do not use qemu_co_enter_next, (continued)
- [Qemu-devel] [PATCH 08/19] throttle-groups: do not use qemu_co_enter_next, Paolo Bonzini, 2017/06/05
- [Qemu-devel] [PATCH 12/19] block: access write_gen with atomics, Paolo Bonzini, 2017/06/05
- [Qemu-devel] [PATCH 13/19] block: protect tracked_requests and flush_queue with reqs_lock, Paolo Bonzini, 2017/06/05
- [Qemu-devel] [PATCH 10/19] util: add stats64 module, Paolo Bonzini, 2017/06/05
- [Qemu-devel] [PATCH 14/19] block: introduce dirty_bitmap_mutex, Paolo Bonzini, 2017/06/05
- [Qemu-devel] [PATCH 17/19] block: introduce block_account_one_io, Paolo Bonzini, 2017/06/05
- [Qemu-devel] [PATCH 16/19] block: protect modification of dirty bitmaps with a mutex, Paolo Bonzini, 2017/06/05
- [Qemu-devel] [PATCH 15/19] migration/block: reset dirty bitmap before reading, Paolo Bonzini, 2017/06/05
- [Qemu-devel] [PATCH 18/19] block: split BlockAcctStats creation and setup,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 19/19] block: make accounting thread-safe, Paolo Bonzini, 2017/06/05
- Re: [Qemu-devel] [PATCH v4 00/19] Block layer thread safety, part 1, no-reply, 2017/06/05
- Re: [Qemu-devel] [PATCH v4 00/19] Block layer thread safety, part 1, Fam Zheng, 2017/06/06