From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>, Juan Quintela <quintela@redhat.com>,
Leonardo Bras <leobras@redhat.com>
Subject: [PATCH v3 11/12] migration: Rename duplicate to zero_pages
Date: Wed, 19 Apr 2023 18:24:14 +0200 [thread overview]
Message-ID: <20230419162415.16260-12-quintela@redhat.com> (raw)
In-Reply-To: <20230419162415.16260-1-quintela@redhat.com>
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>
---
migration/ram.h | 2 +-
migration/migration.c | 2 +-
migration/ram.c | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/migration/ram.h b/migration/ram.h
index 8093ebc210..b27ce01f2e 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -46,7 +46,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;
diff --git a/migration/migration.c b/migration/migration.c
index 83d3bfbf62..20ef5b683b 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 771596d377..34126f0274 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;
}
@@ -1322,7 +1322,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;
}
@@ -1361,7 +1361,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;
@@ -1488,7 +1488,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;
}
@@ -2623,7 +2623,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);
--
2.39.2
next prev parent reply other threads:[~2023-04-19 16:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-19 16:24 [PATCH v3 00/12] Migration: Make more ram_counters atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 01/12] migration: Merge ram_counters and ram_atomic_counters Juan Quintela
2023-04-19 16:24 ` [PATCH v3 02/12] migration: Update atomic stats out of the mutex Juan Quintela
2023-04-19 16:24 ` [PATCH v3 03/12] migration: Make multifd_bytes atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 04/12] migration: Make dirty_sync_missed_zero_copy atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 05/12] migration: Make precopy_bytes atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 06/12] migration: Make downtime_bytes atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 07/12] migration: Make dirty_sync_count atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 08/12] migration: Make postcopy_requests atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 09/12] migration: Make dirty_pages_rate atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 10/12] migration: Make dirty_bytes_last_sync atomic Juan Quintela
2023-04-19 16:24 ` Juan Quintela [this message]
2023-04-19 16:24 ` [PATCH v3 12/12] migration: Rename normal to full_pages Juan Quintela
2023-04-19 19:29 ` [PATCH v3 00/12] Migration: Make more ram_counters atomic Peter Xu
2023-04-19 19:54 ` Juan Quintela
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230419162415.16260-12-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=leobras@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).