[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/20] migration: Make precopy_bytes atomic
From: |
Juan Quintela |
Subject: |
[PULL 07/20] migration: Make precopy_bytes atomic |
Date: |
Thu, 20 Apr 2023 15:17:38 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 2 +-
migration/ram.c | 2 +-
migration/ram.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 66e5197b77..cbd6f6f235 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1155,7 +1155,7 @@ static void populate_ram_info(MigrationInfo *info,
MigrationState *s)
info->ram->page_size = page_size;
info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
info->ram->pages_per_second = s->pages_per_second;
- info->ram->precopy_bytes = ram_counters.precopy_bytes;
+ info->ram->precopy_bytes = stat64_get(&ram_counters.precopy_bytes);
info->ram->downtime_bytes = ram_counters.downtime_bytes;
info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes);
diff --git a/migration/ram.c b/migration/ram.c
index 93e0a48af4..0b4693215e 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -463,7 +463,7 @@ RAMStats ram_counters;
void ram_transferred_add(uint64_t bytes)
{
if (runstate_is_running()) {
- ram_counters.precopy_bytes += bytes;
+ stat64_add(&ram_counters.precopy_bytes, bytes);
} else if (migration_in_postcopy()) {
stat64_add(&ram_counters.postcopy_bytes, bytes);
} else {
diff --git a/migration/ram.h b/migration/ram.h
index 2170c55e67..a766b895fa 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -50,7 +50,7 @@ typedef struct {
Stat64 normal;
Stat64 postcopy_bytes;
int64_t postcopy_requests;
- uint64_t precopy_bytes;
+ Stat64 precopy_bytes;
int64_t remaining;
Stat64 transferred;
} RAMStats;
--
2.39.2
- [PULL 00/20] Migration 20230420 patches, Juan Quintela, 2023/04/20
- [PULL 01/20] migration: remove extra whitespace character for code style, Juan Quintela, 2023/04/20
- [PULL 09/20] migration: Make dirty_sync_count atomic, Juan Quintela, 2023/04/20
- [PULL 12/20] migration: Make dirty_bytes_last_sync atomic, Juan Quintela, 2023/04/20
- [PULL 06/20] migration: Make dirty_sync_missed_zero_copy atomic, Juan Quintela, 2023/04/20
- [PULL 11/20] migration: Make dirty_pages_rate atomic, Juan Quintela, 2023/04/20
- [PULL 04/20] migration: Update atomic stats out of the mutex, Juan Quintela, 2023/04/20
- [PULL 03/20] migration: Merge ram_counters and ram_atomic_counters, Juan Quintela, 2023/04/20
- [PULL 05/20] migration: Make multifd_bytes atomic, Juan Quintela, 2023/04/20
- [PULL 07/20] migration: Make precopy_bytes atomic,
Juan Quintela <=
- [PULL 13/20] migration: Rename duplicate to zero_pages, Juan Quintela, 2023/04/20
- [PULL 08/20] migration: Make downtime_bytes atomic, Juan Quintela, 2023/04/20
- [PULL 16/20] util/mmap-alloc: qemu_fd_getfs(), Juan Quintela, 2023/04/20
- [PULL 17/20] vl.c: Create late backends before migration object, Juan Quintela, 2023/04/20
- [PULL 18/20] migration/postcopy: Detect file system on dest host, Juan Quintela, 2023/04/20
- [PULL 19/20] migration: rename enabled_capabilities to capabilities, Juan Quintela, 2023/04/20
- [PULL 20/20] migration: Pass migrate_caps_check() the old and new caps, Juan Quintela, 2023/04/20
- [PULL 02/20] postcopy-ram: do not use qatomic_mb_read, Juan Quintela, 2023/04/20
- [PULL 14/20] migration: Rename normal to normal_pages, Juan Quintela, 2023/04/20
- [PULL 10/20] migration: Make postcopy_requests atomic, Juan Quintela, 2023/04/20