From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Leonardo Bras <leobras@redhat.com>,
Hailiang Zhang <zhanghailiang@xfusion.com>,
Fiona Ebner <f.ebner@proxmox.com>, Peter Xu <peterx@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
qemu-block@nongnu.org, Juan Quintela <quintela@redhat.com>,
Fam Zheng <fam@euphon.net>
Subject: [PATCH v2 05/20] qemu_file: Use a stat64 for qemu_file_transferred
Date: Tue, 30 May 2023 20:39:26 +0200 [thread overview]
Message-ID: <20230530183941.7223-6-quintela@redhat.com> (raw)
In-Reply-To: <20230530183941.7223-1-quintela@redhat.com>
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 be3dab85cb..eb0497e532 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -288,6 +288,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);
@@ -628,7 +629,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));
@@ -644,7 +645,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.40.1
next prev parent reply other threads:[~2023-05-30 18:41 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 18:39 [PATCH v2 00/20] Next round of migration atomic counters Juan Quintela
2023-05-30 18:39 ` [PATCH v2 01/20] qemu-file: Rename qemu_file_transferred_ fast -> noflush Juan Quintela
2023-05-30 18:39 ` [PATCH v2 02/20] migration: Change qemu_file_transferred to noflush Juan Quintela
2023-05-30 18:39 ` [PATCH v2 03/20] migration: Use qemu_file_transferred_noflush() for block migration Juan Quintela
2023-05-30 18:39 ` [PATCH v2 04/20] qemu-file: We only call qemu_file_transferred_* on the sending side Juan Quintela
2023-06-05 18:18 ` Peter Xu
2023-06-13 16:02 ` Juan Quintela
2023-06-14 13:36 ` Peter Xu
2023-06-21 22:20 ` Juan Quintela
2023-05-30 18:39 ` Juan Quintela [this message]
2023-06-05 18:22 ` [PATCH v2 05/20] qemu_file: Use a stat64 for qemu_file_transferred Peter Xu
2023-06-13 16:12 ` Juan Quintela
2023-05-30 18:39 ` [PATCH v2 06/20] qemu_file: total_transferred is not used anymore Juan Quintela
2023-06-14 14:52 ` Peter Xu
2023-06-21 23:05 ` Juan Quintela
2023-06-22 14:45 ` Peter Xu
2023-05-30 18:39 ` [PATCH v2 07/20] migration: Use the number of transferred bytes directly Juan Quintela
2023-05-30 18:39 ` [PATCH v2 08/20] qemu_file: Remove unused qemu_file_transferred() Juan Quintela
2023-05-30 18:39 ` [PATCH v2 09/20] qemu-file: Remove _noflush from qemu_file_transferred_noflush() Juan Quintela
2023-05-30 18:39 ` [PATCH v2 10/20] migration: migration_transferred_bytes() don't need the QEMUFile Juan Quintela
2023-05-30 18:39 ` [PATCH v2 11/20] migration: migration_rate_limit_reset() " Juan Quintela
2023-05-30 18:39 ` [PATCH v2 12/20] qemu-file: Simplify qemu_file_get_error() Juan Quintela
2023-05-30 18:39 ` [PATCH v2 13/20] migration: Use migration_transferred_bytes() Juan Quintela
2023-05-30 18:39 ` [PATCH v2 14/20] migration: Remove transferred atomic counter Juan Quintela
2023-05-30 18:39 ` [PATCH v2 15/20] qemu-file: Make qemu_fflush() return errors Juan Quintela
2023-05-30 18:39 ` [PATCH v2 16/20] migration/rdma: Split qemu_fopen_rdma() into input/output functions Juan Quintela
2023-06-14 15:07 ` Peter Xu
2023-05-30 18:39 ` [PATCH v2 17/20] qemu-file: Remove unused qemu_file_mode_is_not_valid() Juan Quintela
2023-05-30 18:39 ` [PATCH v2 18/20] qemu_file: Make qemu_file_is_writable() static Juan Quintela
2023-06-14 15:54 ` Peter Xu
2023-05-30 18:39 ` [PATCH v2 19/20] qemu-file: Simplify qemu_file_shutdown() Juan Quintela
2023-06-14 15:54 ` Peter Xu
2023-05-30 18:39 ` [PATCH v2 20/20] qemu-file: Make qemu_file_get_error_obj() static Juan Quintela
2023-06-14 15:54 ` Peter Xu
2023-05-31 9:10 ` [PATCH v2 00/20] Next round of migration atomic counters Fiona Ebner
2023-05-31 10:22 ` 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=20230530183941.7223-6-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=f.ebner@proxmox.com \
--cc=fam@euphon.net \
--cc=leobras@redhat.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).