[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/65] ram: Move xbzrle_overflows into RAMState
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 24/65] ram: Move xbzrle_overflows into RAMState |
Date: |
Fri, 21 Apr 2017 13:56:05 +0200 |
Once there, remove the now unused AccountingInfo struct and var.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
migration/ram.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 09f9eff..88392e4 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -181,23 +181,13 @@ struct RAMState {
uint64_t xbzrle_cache_miss;
/* xbzrle miss rate */
double xbzrle_cache_miss_rate;
+ /* xbzrle number of overflows */
+ uint64_t xbzrle_overflows;
};
typedef struct RAMState RAMState;
static RAMState ram_state;
-/* accounting for migration statistics */
-typedef struct AccountingInfo {
- uint64_t xbzrle_overflows;
-} AccountingInfo;
-
-static AccountingInfo acct_info;
-
-static void acct_clear(void)
-{
- memset(&acct_info, 0, sizeof(acct_info));
-}
-
uint64_t dup_mig_pages_transferred(void)
{
return ram_state.zero_pages;
@@ -230,7 +220,7 @@ double xbzrle_mig_cache_miss_rate(void)
uint64_t xbzrle_mig_pages_overflow(void)
{
- return acct_info.xbzrle_overflows;
+ return ram_state.xbzrle_overflows;
}
static QemuMutex migration_bitmap_mutex;
@@ -528,7 +518,7 @@ static int save_xbzrle_page(RAMState *rs, QEMUFile *f,
uint8_t **current_data,
return 0;
} else if (encoded_len == -1) {
trace_save_xbzrle_page_overflow();
- acct_info.xbzrle_overflows++;
+ rs->xbzrle_overflows++;
/* update data in the cache */
if (!last_stage) {
memcpy(prev_cached_page, *current_data, TARGET_PAGE_SIZE);
@@ -2005,6 +1995,7 @@ static int ram_save_init_globals(RAMState *rs)
rs->xbzrle_pages = 0;
rs->xbzrle_cache_miss = 0;
rs->xbzrle_cache_miss_rate = 0;
+ rs->xbzrle_overflows = 0;
migration_bitmap_sync_init(rs);
qemu_mutex_init(&migration_bitmap_mutex);
@@ -2035,8 +2026,6 @@ static int ram_save_init_globals(RAMState *rs)
XBZRLE.encoded_buf = NULL;
return -1;
}
-
- acct_clear();
}
/* For memory_global_dirty_log_start below. */
--
2.9.3
- [Qemu-devel] [PULL 12/65] ram: Move xbzrle_cache_miss_prev into RAMState, (continued)
- [Qemu-devel] [PULL 12/65] ram: Move xbzrle_cache_miss_prev into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 14/65] ram: Move dup_pages into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 16/65] ram: Remove unused pages_skipped variable, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 15/65] ram: Remove unused dup_mig_bytes_transferred(), Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 17/65] ram: Move norm_pages to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 18/65] ram: Remove norm_mig_bytes_transferred, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 19/65] ram: Move iterations into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 20/65] ram: Move xbzrle_bytes into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 21/65] ram: Move xbzrle_pages into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 23/65] ram: Move xbzrle_cache_miss_rate into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 24/65] ram: Move xbzrle_overflows into RAMState,
Juan Quintela <=
- [Qemu-devel] [PULL 22/65] ram: Move xbzrle_cache_miss into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 25/65] ram: Move migration_dirty_pages to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 26/65] ram: Everything was init to zero, so use memset, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 27/65] ram: Move migration_bitmap_mutex into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 29/65] ram: Move bytes_transferred into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 28/65] ram: Move migration_bitmap_rcu into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 31/65] ram: Remove ram_save_remaining, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 30/65] ram: Use the RAMState bytes_transferred parameter, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 32/65] ram: Move last_req_rb to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 33/65] ram: Move src_page_req* to RAMState, Juan Quintela, 2017/04/21