[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/65] ram: Move norm_pages to RAMState
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 17/65] ram: Move norm_pages to RAMState |
Date: |
Fri, 21 Apr 2017 13:55:58 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
migration/ram.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 78c7f3d..587e2c7 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -168,6 +168,8 @@ struct RAMState {
/* Accounting fields */
/* number of zero pages. It used to be pages filled by the same char. */
uint64_t zero_pages;
+ /* number of normal transferred pages */
+ uint64_t norm_pages;
};
typedef struct RAMState RAMState;
@@ -175,7 +177,6 @@ static RAMState ram_state;
/* accounting for migration statistics */
typedef struct AccountingInfo {
- uint64_t norm_pages;
uint64_t iterations;
uint64_t xbzrle_bytes;
uint64_t xbzrle_pages;
@@ -198,12 +199,12 @@ uint64_t dup_mig_pages_transferred(void)
uint64_t norm_mig_bytes_transferred(void)
{
- return acct_info.norm_pages * TARGET_PAGE_SIZE;
+ return ram_state.norm_pages * TARGET_PAGE_SIZE;
}
uint64_t norm_mig_pages_transferred(void)
{
- return acct_info.norm_pages;
+ return ram_state.norm_pages;
}
uint64_t xbzrle_mig_bytes_transferred(void)
@@ -808,7 +809,7 @@ static int ram_save_page(RAMState *rs, MigrationState *ms,
QEMUFile *f,
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
if (ret != RAM_SAVE_CONTROL_DELAYED) {
if (bytes_xmit > 0) {
- acct_info.norm_pages++;
+ rs->norm_pages++;
} else if (bytes_xmit == 0) {
rs->zero_pages++;
}
@@ -847,7 +848,7 @@ static int ram_save_page(RAMState *rs, MigrationState *ms,
QEMUFile *f,
}
*bytes_transferred += TARGET_PAGE_SIZE;
pages = 1;
- acct_info.norm_pages++;
+ rs->norm_pages++;
}
XBZRLE_cache_unlock();
@@ -914,8 +915,8 @@ static inline void set_compress_params(CompressParam
*param, RAMBlock *block,
param->offset = offset;
}
-static int compress_page_with_multi_thread(QEMUFile *f, RAMBlock *block,
- ram_addr_t offset,
+static int compress_page_with_multi_thread(RAMState *rs, QEMUFile *f,
+ RAMBlock *block, ram_addr_t offset,
uint64_t *bytes_transferred)
{
int idx, thread_count, bytes_xmit = -1, pages = -1;
@@ -932,7 +933,7 @@ static int compress_page_with_multi_thread(QEMUFile *f,
RAMBlock *block,
qemu_cond_signal(&comp_param[idx].cond);
qemu_mutex_unlock(&comp_param[idx].mutex);
pages = 1;
- acct_info.norm_pages++;
+ rs->norm_pages++;
*bytes_transferred += bytes_xmit;
break;
}
@@ -984,7 +985,7 @@ static int ram_save_compressed_page(RAMState *rs,
MigrationState *ms,
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
if (ret != RAM_SAVE_CONTROL_DELAYED) {
if (bytes_xmit > 0) {
- acct_info.norm_pages++;
+ rs->norm_pages++;
} else if (bytes_xmit == 0) {
rs->zero_pages++;
}
@@ -1007,7 +1008,7 @@ static int ram_save_compressed_page(RAMState *rs,
MigrationState *ms,
migrate_compress_level());
if (blen > 0) {
*bytes_transferred += bytes_xmit + blen;
- acct_info.norm_pages++;
+ rs->norm_pages++;
pages = 1;
} else {
qemu_file_set_error(f, blen);
@@ -1021,7 +1022,7 @@ static int ram_save_compressed_page(RAMState *rs,
MigrationState *ms,
offset |= RAM_SAVE_FLAG_CONTINUE;
pages = save_zero_page(rs, f, block, offset, p, bytes_transferred);
if (pages == -1) {
- pages = compress_page_with_multi_thread(f, block, offset,
+ pages = compress_page_with_multi_thread(rs, f, block, offset,
bytes_transferred);
} else {
ram_release_pages(ms, block->idstr, pss->offset, pages);
@@ -1456,7 +1457,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool
zero)
if (zero) {
rs->zero_pages += pages;
} else {
- acct_info.norm_pages += pages;
+ rs->norm_pages += pages;
bytes_transferred += size;
qemu_update_position(f, size);
}
@@ -1997,6 +1998,7 @@ static int ram_save_init_globals(RAMState *rs)
rs->dirty_rate_high_cnt = 0;
rs->bitmap_sync_count = 0;
rs->zero_pages = 0;
+ rs->norm_pages = 0;
migration_bitmap_sync_init(rs);
qemu_mutex_init(&migration_bitmap_mutex);
--
2.9.3
- [Qemu-devel] [PULL 07/65] ram: Move start time into RAMState, (continued)
- [Qemu-devel] [PULL 07/65] ram: Move start time into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 08/65] ram: Move bytes_xfer_prev into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 11/65] ram: Change num_dirty_pages_period type to uint64_t, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 10/65] ram: Move num_dirty_pages_period into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 13/65] ram: Move iterations_prev into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 09/65] ram: Change byte_xfer_{prev, now} type to uint64_t, Juan Quintela, 2017/04/21
- [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 <=
- [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, 2017/04/21
- [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