[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/17] migration: Rename duplicate to zero_pages
From: |
Juan Quintela |
Subject: |
[PULL 10/17] migration: Rename duplicate to zero_pages |
Date: |
Mon, 24 Apr 2023 13:01:12 +0200 |
Rest of counters that refer to pages has a _pages suffix.
And historically, this showed the number of pages composed of the same
character, here comes the name "duplicated". But since years ago, it
refers to the number of zero_pages.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 2 +-
migration/ram.c | 10 +++++-----
migration/ram.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 09b37a6603..c8b360a2df 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1142,7 +1142,7 @@ static void populate_ram_info(MigrationInfo *info,
MigrationState *s)
info->ram = g_malloc0(sizeof(*info->ram));
info->ram->transferred = stat64_get(&ram_counters.transferred);
info->ram->total = ram_bytes_total();
- info->ram->duplicate = stat64_get(&ram_counters.duplicate);
+ info->ram->duplicate = stat64_get(&ram_counters.zero_pages);
/* legacy value. It is not used anymore */
info->ram->skipped = 0;
info->ram->normal = stat64_get(&ram_counters.normal);
diff --git a/migration/ram.c b/migration/ram.c
index fe69ecaef4..19d345a030 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1119,7 +1119,7 @@ uint64_t ram_pagesize_summary(void)
uint64_t ram_get_total_transferred_pages(void)
{
return stat64_get(&ram_counters.normal) +
- stat64_get(&ram_counters.duplicate) +
+ stat64_get(&ram_counters.zero_pages) +
compression_counters.pages + xbzrle_counters.pages;
}
@@ -1320,7 +1320,7 @@ static int save_zero_page(PageSearchStatus *pss, QEMUFile
*f, RAMBlock *block,
int len = save_zero_page_to_file(pss, f, block, offset);
if (len) {
- stat64_add(&ram_counters.duplicate, 1);
+ stat64_add(&ram_counters.zero_pages, 1);
ram_transferred_add(len);
return 1;
}
@@ -1359,7 +1359,7 @@ static bool control_save_page(PageSearchStatus *pss,
RAMBlock *block,
if (bytes_xmit > 0) {
stat64_add(&ram_counters.normal, 1);
} else if (bytes_xmit == 0) {
- stat64_add(&ram_counters.duplicate, 1);
+ stat64_add(&ram_counters.zero_pages, 1);
}
return true;
@@ -1486,7 +1486,7 @@ update_compress_thread_counts(const CompressParam *param,
int bytes_xmit)
ram_transferred_add(bytes_xmit);
if (param->zero_page) {
- stat64_add(&ram_counters.duplicate, 1);
+ stat64_add(&ram_counters.zero_pages, 1);
return;
}
@@ -2621,7 +2621,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool
zero)
uint64_t pages = size / TARGET_PAGE_SIZE;
if (zero) {
- stat64_add(&ram_counters.duplicate, pages);
+ stat64_add(&ram_counters.zero_pages, pages);
} else {
stat64_add(&ram_counters.normal, pages);
ram_transferred_add(size);
diff --git a/migration/ram.h b/migration/ram.h
index afa68521d7..55258334fe 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -45,7 +45,7 @@ typedef struct {
Stat64 dirty_sync_count;
Stat64 dirty_sync_missed_zero_copy;
Stat64 downtime_bytes;
- Stat64 duplicate;
+ Stat64 zero_pages;
Stat64 multifd_bytes;
Stat64 normal;
Stat64 postcopy_bytes;
--
2.39.2
- [PULL 03/17] migration: Update atomic stats out of the mutex, (continued)
- [PULL 03/17] migration: Update atomic stats out of the mutex, Juan Quintela, 2023/04/24
- [PULL 06/17] migration: Make precopy_bytes atomic, Juan Quintela, 2023/04/24
- [PULL 02/17] migration: Merge ram_counters and ram_atomic_counters, Juan Quintela, 2023/04/24
- [PULL 07/17] migration: Make downtime_bytes atomic, Juan Quintela, 2023/04/24
- [PULL 05/17] migration: Make dirty_sync_missed_zero_copy atomic, Juan Quintela, 2023/04/24
- [PULL 12/17] migration: Handle block device inactivation failures better, Juan Quintela, 2023/04/24
- [PULL 01/17] migration: remove extra whitespace character for code style, Juan Quintela, 2023/04/24
- [PULL 09/17] migration: Make postcopy_requests atomic, Juan Quintela, 2023/04/24
- [PULL 08/17] migration: Make dirty_sync_count atomic, Juan Quintela, 2023/04/24
- [PULL 13/17] util/mmap-alloc: qemu_fd_getfs(), Juan Quintela, 2023/04/24
- [PULL 10/17] migration: Rename duplicate to zero_pages,
Juan Quintela <=
- [PULL 04/17] migration: Make multifd_bytes atomic, Juan Quintela, 2023/04/24
- [PULL 11/17] migration: Rename normal to normal_pages, Juan Quintela, 2023/04/24
- [PULL 15/17] migration/postcopy: Detect file system on dest host, Juan Quintela, 2023/04/24
- [PULL 14/17] vl.c: Create late backends before migration object, Juan Quintela, 2023/04/24
- [PULL 17/17] migration: Pass migrate_caps_check() the old and new caps, Juan Quintela, 2023/04/24
- [PULL 16/17] migration: rename enabled_capabilities to capabilities, Juan Quintela, 2023/04/24
- Re: [PULL 00/17] Migration 20230420 patches, Richard Henderson, 2023/04/24