[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/51] ram: Move iterations_prev into RAMState
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/51] ram: Move iterations_prev into RAMState |
Date: |
Thu, 23 Mar 2017 21:45:03 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
migration/ram.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 826ba6d..d8428c1 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -163,6 +163,8 @@ struct RAMState {
int64_t num_dirty_pages_period;
/* xbzrle misses since the beginning of the period */
uint64_t xbzrle_cache_miss_prev;
+ /* number of iterations at the beginning of period */
+ uint64_t iterations_prev;
};
typedef struct RAMState RAMState;
@@ -625,16 +627,13 @@ static void migration_bitmap_sync_range(RAMState *rs,
ram_addr_t start,
start, length, &rs->num_dirty_pages_period);
}
-/* Fix me: there are too many global variables used in migration process. */
-static uint64_t iterations_prev;
-
static void migration_bitmap_sync_init(RAMState *rs)
{
rs->start_time = 0;
rs->bytes_xfer_prev = 0;
rs->num_dirty_pages_period = 0;
rs->xbzrle_cache_miss_prev = 0;
- iterations_prev = 0;
+ rs->iterations_prev = 0;
}
/**
@@ -712,13 +711,13 @@ static void migration_bitmap_sync(RAMState *rs)
}
if (migrate_use_xbzrle()) {
- if (iterations_prev != acct_info.iterations) {
+ if (rs->iterations_prev != acct_info.iterations) {
acct_info.xbzrle_cache_miss_rate =
(double)(acct_info.xbzrle_cache_miss -
rs->xbzrle_cache_miss_prev) /
- (acct_info.iterations - iterations_prev);
+ (acct_info.iterations - rs->iterations_prev);
}
- iterations_prev = acct_info.iterations;
+ rs->iterations_prev = acct_info.iterations;
rs->xbzrle_cache_miss_prev = acct_info.xbzrle_cache_miss;
}
s->dirty_pages_rate = rs->num_dirty_pages_period * 1000
--
2.9.3
- Re: [Qemu-devel] [PATCH 05/51] ram: Move bitmap_sync_count into RAMState, (continued)
[Qemu-devel] [PATCH 04/51] ram: Add dirty_rate_high_cnt to RAMState, Juan Quintela, 2017/03/23
[Qemu-devel] [PATCH 07/51] ram: Move bytes_xfer_prev into RAMState, Juan Quintela, 2017/03/23
[Qemu-devel] [PATCH 08/51] ram: Move num_dirty_pages_period into RAMState, Juan Quintela, 2017/03/23
[Qemu-devel] [PATCH 09/51] ram: Move xbzrle_cache_miss_prev into RAMState, Juan Quintela, 2017/03/23
[Qemu-devel] [PATCH 10/51] ram: Move iterations_prev into RAMState,
Juan Quintela <=
[Qemu-devel] [PATCH 13/51] ram: Remove unused pages_skipped variable, Juan Quintela, 2017/03/23
[Qemu-devel] [PATCH 12/51] ram: Remove unused dup_mig_bytes_transferred(), Juan Quintela, 2017/03/23
[Qemu-devel] [PATCH 11/51] ram: Move dup_pages into RAMState, Juan Quintela, 2017/03/23