ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Rename normal to normal_pages 

Rest of counters that refer to pages has a _pages suffix.
And historically, this showed the number of full pages transferred.
The name "normal" refered to the fact that they were sent without any
optimization (compression, xbzrle, zero_page, ...).

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Juan Quintela 2023-04-19 18:19:45 +02:00
parent 1a386e8de5
commit 8c0cda8fa0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/migration.c
View File

@ -1145,7 +1145,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
info->ram->duplicate = stat64_get(&ram_counters.zero_pages); info->ram->duplicate = stat64_get(&ram_counters.zero_pages);
/* legacy value. It is not used anymore */ /* legacy value. It is not used anymore */
info->ram->skipped = 0; info->ram->skipped = 0;
info->ram->normal = stat64_get(&ram_counters.normal); info->ram->normal = stat64_get(&ram_counters.normal_pages);
info->ram->normal_bytes = info->ram->normal * page_size; info->ram->normal_bytes = info->ram->normal * page_size;
info->ram->mbps = s->mbps; info->ram->mbps = s->mbps;
info->ram->dirty_sync_count = info->ram->dirty_sync_count =

10
migration/ram.c
View File

@ -1118,7 +1118,7 @@ uint64_t ram_pagesize_summary(void)
uint64_t ram_get_total_transferred_pages(void) uint64_t ram_get_total_transferred_pages(void)
{ {
return stat64_get(&ram_counters.normal) + return stat64_get(&ram_counters.normal_pages) +
stat64_get(&ram_counters.zero_pages) + stat64_get(&ram_counters.zero_pages) +
compression_counters.pages + xbzrle_counters.pages; compression_counters.pages + xbzrle_counters.pages;
} }
@ -1357,7 +1357,7 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
} }
if (bytes_xmit > 0) { if (bytes_xmit > 0) {
stat64_add(&ram_counters.normal, 1); stat64_add(&ram_counters.normal_pages, 1);
} else if (bytes_xmit == 0) { } else if (bytes_xmit == 0) {
stat64_add(&ram_counters.zero_pages, 1); stat64_add(&ram_counters.zero_pages, 1);
} }
@ -1391,7 +1391,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block,
qemu_put_buffer(file, buf, TARGET_PAGE_SIZE); qemu_put_buffer(file, buf, TARGET_PAGE_SIZE);
} }
ram_transferred_add(TARGET_PAGE_SIZE); ram_transferred_add(TARGET_PAGE_SIZE);
stat64_add(&ram_counters.normal, 1); stat64_add(&ram_counters.normal_pages, 1);
return 1; return 1;
} }
@ -1447,7 +1447,7 @@ static int ram_save_multifd_page(QEMUFile *file, RAMBlock *block,
if (multifd_queue_page(file, block, offset) < 0) { if (multifd_queue_page(file, block, offset) < 0) {
return -1; return -1;
} }
stat64_add(&ram_counters.normal, 1); stat64_add(&ram_counters.normal_pages, 1);
return 1; return 1;
} }
@ -2623,7 +2623,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero)
if (zero) { if (zero) {
stat64_add(&ram_counters.zero_pages, pages); stat64_add(&ram_counters.zero_pages, pages);
} else { } else {
stat64_add(&ram_counters.normal, pages); stat64_add(&ram_counters.normal_pages, pages);
ram_transferred_add(size); ram_transferred_add(size);
qemu_file_credit_transfer(f, size); qemu_file_credit_transfer(f, size);
} }

2
migration/ram.h
View File

@ -47,7 +47,7 @@ typedef struct {
Stat64 downtime_bytes; Stat64 downtime_bytes;
Stat64 zero_pages; Stat64 zero_pages;
Stat64 multifd_bytes; Stat64 multifd_bytes;
Stat64 normal; Stat64 normal_pages;
Stat64 postcopy_bytes; Stat64 postcopy_bytes;
Stat64 postcopy_requests; Stat64 postcopy_requests;
Stat64 precopy_bytes; Stat64 precopy_bytes;