From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>,
Peter Xu <peterx@redhat.com>,
Hailiang Zhang <zhanghailiang@xfusion.com>,
Fabiano Rosas <farosas@suse.de>,
Li Zhijian <lizhijian@fujitsu.com>,
qemu-block@nongnu.org, Juan Quintela <quintela@redhat.com>,
Leonardo Bras <leobras@redhat.com>
Subject: [PATCH v2 02/12] qemu_file: Use a stat64 for qemu_file_transferred
Date: Wed, 25 Oct 2023 11:11:07 +0200 [thread overview]
Message-ID: <20231025091117.6342-3-quintela@redhat.com> (raw)
In-Reply-To: <20231025091117.6342-1-quintela@redhat.com>
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>
---
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
next prev parent reply other threads:[~2023-10-25 9:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 9:11 [PATCH v2 00/12] migration: Yet another round of atomic counters Juan Quintela
2023-10-25 9:11 ` [PATCH v2 01/12] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer Juan Quintela
2023-10-25 13:14 ` Fabiano Rosas
2023-10-25 9:11 ` Juan Quintela [this message]
2023-10-25 9:11 ` [PATCH v2 03/12] qemu_file: total_transferred is not used anymore Juan Quintela
2023-10-25 9:11 ` [PATCH v2 04/12] migration: Use the number of transferred bytes directly Juan Quintela
2023-10-25 9:11 ` [PATCH v2 05/12] qemu_file: Remove unused qemu_file_transferred() Juan Quintela
2023-10-25 9:11 ` [PATCH v2 06/12] qemu-file: Remove _noflush from qemu_file_transferred_noflush() Juan Quintela
2023-10-25 9:11 ` [PATCH v2 07/12] migration: migration_transferred_bytes() don't need the QEMUFile Juan Quintela
2023-10-25 9:11 ` [PATCH v2 08/12] migration: migration_rate_limit_reset() " Juan Quintela
2023-10-25 9:11 ` [PATCH v2 09/12] qemu-file: Simplify qemu_file_get_error() Juan Quintela
2023-10-25 9:11 ` [PATCH v2 10/12] migration: Use migration_transferred_bytes() Juan Quintela
2023-10-25 9:11 ` [PATCH v2 11/12] migration: Remove transferred atomic counter Juan Quintela
2023-10-25 9:11 ` [PATCH v2 12/12] qemu-file: Make qemu_fflush() return errors 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=20231025091117.6342-3-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=fam@euphon.net \
--cc=farosas@suse.de \
--cc=leobras@redhat.com \
--cc=lizhijian@fujitsu.com \
--cc=peterx@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=zhanghailiang@xfusion.com \
/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).