[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/10] migration: introduce migration_update_rates
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 06/10] migration: introduce migration_update_rates |
Date: |
Fri, 15 Jun 2018 16:15:14 +0100 |
From: Xiao Guangrong <address@hidden>
It is used to slightly clean the code up, no logic is changed
Signed-off-by: Xiao Guangrong <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index d273a19699..77071a43ed 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1141,6 +1141,25 @@ uint64_t ram_pagesize_summary(void)
return summary;
}
+static void migration_update_rates(RAMState *rs, int64_t end_time)
+{
+ uint64_t iter_count = rs->iterations - rs->iterations_prev;
+
+ /* calculate period counters */
+ ram_counters.dirty_pages_rate = rs->num_dirty_pages_period * 1000
+ / (end_time - rs->time_last_bitmap_sync);
+
+ if (!iter_count) {
+ return;
+ }
+
+ if (migrate_use_xbzrle()) {
+ xbzrle_counters.cache_miss_rate = (double)(xbzrle_counters.cache_miss -
+ rs->xbzrle_cache_miss_prev) / iter_count;
+ rs->xbzrle_cache_miss_prev = xbzrle_counters.cache_miss;
+ }
+}
+
static void migration_bitmap_sync(RAMState *rs)
{
RAMBlock *block;
@@ -1170,9 +1189,6 @@ static void migration_bitmap_sync(RAMState *rs)
/* more than 1 second = 1000 millisecons */
if (end_time > rs->time_last_bitmap_sync + 1000) {
- /* calculate period counters */
- ram_counters.dirty_pages_rate = rs->num_dirty_pages_period * 1000
- / (end_time - rs->time_last_bitmap_sync);
bytes_xfer_now = ram_counters.transferred;
/* During block migration the auto-converge logic incorrectly detects
@@ -1194,16 +1210,9 @@ static void migration_bitmap_sync(RAMState *rs)
}
}
- if (migrate_use_xbzrle()) {
- if (rs->iterations_prev != rs->iterations) {
- xbzrle_counters.cache_miss_rate =
- (double)(xbzrle_counters.cache_miss -
- rs->xbzrle_cache_miss_prev) /
- (rs->iterations - rs->iterations_prev);
- rs->xbzrle_cache_miss_prev = xbzrle_counters.cache_miss;
- }
- rs->iterations_prev = rs->iterations;
- }
+ migration_update_rates(rs, end_time);
+
+ rs->iterations_prev = rs->iterations;
/* reset period counters */
rs->time_last_bitmap_sync = end_time;
--
2.17.1
- [Qemu-devel] [PULL 00/10] migration queue, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 01/10] typedefs: add QJSON, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 02/10] migration: Fixes for non-migratable RAMBlocks, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 03/10] migration: Poison ramblock loops in migration, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 04/10] migration/block-dirty-bitmap: fix dirty_bitmap_load, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 05/10] migration: fix counting xbzrle cache_miss_rate, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 06/10] migration: introduce migration_update_rates,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 09/10] migration/postcopy: Wake rate limit sleep on postcopy request, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 07/10] migration/postcopy: Add max-postcopy-bandwidth parameter, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 08/10] migration: Wake rate limiting for urgent requests, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 10/10] migration: calculate expected_downtime with ram_bytes_remaining(), Dr. David Alan Gilbert (git), 2018/06/15
- Re: [Qemu-devel] [PULL 00/10] migration queue, Peter Maydell, 2018/06/15