[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/59] ram: Move xbzrle_pages into RAMState
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 21/59] ram: Move xbzrle_pages into RAMState |
Date: |
Wed, 19 Apr 2017 22:58:45 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
--
Comment why we need bytes and pages
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 4dc7869..cf6681c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -172,8 +172,11 @@ struct RAMState {
uint64_t norm_pages;
/* Iterations since start */
uint64_t iterations;
- /* xbzrle transmitted bytes */
+ /* xbzrle transmitted bytes. Notice that this is with
+ * compression, they can't be calculated from the pages */
uint64_t xbzrle_bytes;
+ /* xbzrle transmmited pages */
+ uint64_t xbzrle_pages;
};
typedef struct RAMState RAMState;
@@ -181,7 +184,6 @@ static RAMState ram_state;
/* accounting for migration statistics */
typedef struct AccountingInfo {
- uint64_t xbzrle_pages;
uint64_t xbzrle_cache_miss;
double xbzrle_cache_miss_rate;
uint64_t xbzrle_overflows;
@@ -211,7 +213,7 @@ uint64_t xbzrle_mig_bytes_transferred(void)
uint64_t xbzrle_mig_pages_transferred(void)
{
- return acct_info.xbzrle_pages;
+ return ram_state.xbzrle_pages;
}
uint64_t xbzrle_mig_pages_cache_miss(void)
@@ -544,7 +546,7 @@ static int save_xbzrle_page(RAMState *rs, QEMUFile *f,
uint8_t **current_data,
qemu_put_be16(f, encoded_len);
qemu_put_buffer(f, XBZRLE.encoded_buf, encoded_len);
bytes_xbzrle += encoded_len + 1 + 2;
- acct_info.xbzrle_pages++;
+ rs->xbzrle_pages++;
rs->xbzrle_bytes += bytes_xbzrle;
*bytes_transferred += bytes_xbzrle;
@@ -1998,6 +2000,7 @@ static int ram_save_init_globals(RAMState *rs)
rs->norm_pages = 0;
rs->iterations = 0;
rs->xbzrle_bytes = 0;
+ rs->xbzrle_pages = 0;
migration_bitmap_sync_init(rs);
qemu_mutex_init(&migration_bitmap_mutex);
--
2.9.3
- [Qemu-devel] [PATCH 09/59] ram: Change byte_xfer_{prev, now} type to uint64_t, (continued)
- [Qemu-devel] [PATCH 09/59] ram: Change byte_xfer_{prev, now} type to uint64_t, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 12/59] ram: Move xbzrle_cache_miss_prev into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 14/59] ram: Move dup_pages into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 11/59] ram: Change num_dirty_pages_period type to uint64_t, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 10/59] ram: Move num_dirty_pages_period into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 13/59] ram: Move iterations_prev into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 16/59] ram: Remove unused pages_skipped variable, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 17/59] ram: Move norm_pages to RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 19/59] ram: Move iterations into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 20/59] ram: Move xbzrle_bytes into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 21/59] ram: Move xbzrle_pages into RAMState,
Juan Quintela <=
- [Qemu-devel] [PATCH 18/59] ram: Remove norm_mig_bytes_transferred, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 22/59] ram: Move xbzrle_cache_miss into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 23/59] ram: Move xbzrle_cache_miss_rate into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 26/59] ram: Everything was init to zero, so use memset, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 27/59] ram: Move migration_bitmap_mutex into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 24/59] ram: Move xbzrle_overflows into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 29/59] ram: Move bytes_transferred into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 28/59] ram: Move migration_bitmap_rcu into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 25/59] ram: Move migration_dirty_pages to RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 30/59] ram: Use the RAMState bytes_transferred parameter, Juan Quintela, 2017/04/19