[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/12] qemu_file: Use a stat64 for qemu_file_transferred
From: |
Juan Quintela |
Subject: |
[PATCH 02/12] qemu_file: Use a stat64 for qemu_file_transferred |
Date: |
Tue, 24 Oct 2023 17:10:32 +0200 |
This way we can read it from any thread.
I checked that it gives the same value than the current one. We never
use to qemu_files at the same time.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration-stats.h | 4 ++++
migration/qemu-file.c | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/migration/migration-stats.h b/migration/migration-stats.h
index 2358caad63..b7795e7914 100644
--- a/migration/migration-stats.h
+++ b/migration/migration-stats.h
@@ -81,6 +81,10 @@ typedef struct {
* Number of bytes sent during precopy stage.
*/
Stat64 precopy_bytes;
+ /*
+ * Number of bytes transferred with QEMUFile.
+ */
+ Stat64 qemu_file_transferred;
/*
* Amount of transferred data at the start of current cycle.
*/
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 6814c562e6..384985f534 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -283,6 +283,7 @@ void qemu_fflush(QEMUFile *f)
} else {
uint64_t size = iov_size(f->iov, f->iovcnt);
f->total_transferred += size;
+ stat64_add(&mig_stats.qemu_file_transferred, size);
}
qemu_iovec_release_ram(f);
@@ -623,7 +624,7 @@ int coroutine_mixed_fn qemu_get_byte(QEMUFile *f)
uint64_t qemu_file_transferred_noflush(QEMUFile *f)
{
- uint64_t ret = f->total_transferred;
+ uint64_t ret = stat64_get(&mig_stats.qemu_file_transferred);
int i;
g_assert(qemu_file_is_writable(f));
@@ -639,7 +640,7 @@ uint64_t qemu_file_transferred(QEMUFile *f)
{
g_assert(qemu_file_is_writable(f));
qemu_fflush(f);
- return f->total_transferred;
+ return stat64_get(&mig_stats.qemu_file_transferred);
}
void qemu_put_be16(QEMUFile *f, unsigned int v)
--
2.41.0
- [PATCH 00/12] migration: Yet another round of atomic counters, Juan Quintela, 2023/10/24
- [PATCH 04/12] migration: Use the number of transferred bytes directly, Juan Quintela, 2023/10/24
- [PATCH 07/12] migration: migration_transferred_bytes() don't need the QEMUFile, Juan Quintela, 2023/10/24
- [PATCH 01/12] qemu-file: We only call qemu_file_transferred_* on the sending side, Juan Quintela, 2023/10/24
- [PATCH 09/12] qemu-file: Simplify qemu_file_get_error(), Juan Quintela, 2023/10/24
- [PATCH 02/12] qemu_file: Use a stat64 for qemu_file_transferred,
Juan Quintela <=
- [PATCH 05/12] qemu_file: Remove unused qemu_file_transferred(), Juan Quintela, 2023/10/24
- [PATCH 11/12] migration: Remove transferred atomic counter, Juan Quintela, 2023/10/24
- [PATCH 10/12] migration: Use migration_transferred_bytes(), Juan Quintela, 2023/10/24
- [PATCH 03/12] qemu_file: total_transferred is not used anymore, Juan Quintela, 2023/10/24