[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/38] qemu_file: Use a stat64 for qemu_file_transferred
From: |
Juan Quintela |
Subject: |
[PULL 28/38] qemu_file: Use a stat64 for qemu_file_transferred |
Date: |
Tue, 31 Oct 2023 10:01:32 +0100 |
This way we can read it from any thread.
I checked that it gives the same value as the current one. We never
use two qemu_files at the same time.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231025091117.6342-3-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
- [PULL 21/38] qemu-iotests: Filter warnings about block migration being deprecated, (continued)
- [PULL 21/38] qemu-iotests: Filter warnings about block migration being deprecated, Juan Quintela, 2023/10/31
- [PULL 16/38] migration: Merge flush_compressed_data() and compress_flush_data(), Juan Quintela, 2023/10/31
- [PULL 17/38] migration: Rename ram_compressed_pages() to compress_ram_pages(), Juan Quintela, 2023/10/31
- [PULL 22/38] migration: migrate 'inc' command option is deprecated., Juan Quintela, 2023/10/31
- [PULL 23/38] migration: migrate 'blk' command option is deprecated., Juan Quintela, 2023/10/31
- [PULL 26/38] migration: Stop migration immediately in RDMA error paths, Juan Quintela, 2023/10/31
- [PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer, Juan Quintela, 2023/10/31
- [PULL 29/38] qemu_file: total_transferred is not used anymore, Juan Quintela, 2023/10/31
- [PULL 25/38] migration: Deprecate old compression method, Juan Quintela, 2023/10/31
- [PULL 24/38] migration: Deprecate block migration, Juan Quintela, 2023/10/31
- [PULL 28/38] qemu_file: Use a stat64 for qemu_file_transferred,
Juan Quintela <=
- [PULL 32/38] qemu-file: Remove _noflush from qemu_file_transferred_noflush(), Juan Quintela, 2023/10/31
- [PULL 34/38] migration: migration_rate_limit_reset() don't need the QEMUFile, Juan Quintela, 2023/10/31
- [PULL 30/38] migration: Use the number of transferred bytes directly, Juan Quintela, 2023/10/31
- [PULL 33/38] migration: migration_transferred_bytes() don't need the QEMUFile, Juan Quintela, 2023/10/31
- [PULL 36/38] migration: Use migration_transferred_bytes(), Juan Quintela, 2023/10/31
- [PULL 31/38] qemu_file: Remove unused qemu_file_transferred(), Juan Quintela, 2023/10/31
- [PULL 37/38] migration: Remove transferred atomic counter, Juan Quintela, 2023/10/31
- [PULL 38/38] qemu-file: Make qemu_fflush() return errors, Juan Quintela, 2023/10/31
- [PULL 35/38] qemu-file: Simplify qemu_file_get_error(), Juan Quintela, 2023/10/31
- Re: [PULL 00/38] Migration 20231031 patches, Stefan Hajnoczi, 2023/10/31