qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel Henrique Barboza" <danielhb413@gmail.com>,
	"Leonardo Bras" <leobras@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Christian Borntraeger" <borntraeger@linux.ibm.com>,
	qemu-s390x@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Eric Farman" <farman@linux.ibm.com>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Ilya Leoshkevich" <iii@linux.ibm.com>,
	"Fam Zheng" <fam@euphon.net>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Greg Kurz" <groug@kaod.org>,
	"Juan Quintela" <quintela@redhat.com>,
	"Halil Pasic" <pasic@linux.ibm.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	qemu-ppc@nongnu.org, "Peter Xu" <peterx@redhat.com>,
	"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
	"Hailiang Zhang" <zhanghailiang@xfusion.com>,
	"John Snow" <jsnow@redhat.com>, "Cédric Le Goater" <clg@kaod.org>,
	qemu-block@nongnu.org, "Eric Blake" <eblake@redhat.com>,
	"Jason Wang" <jasowang@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PULL 08/12] migration: Add a trace for migration_transferred_bytes
Date: Thu, 18 May 2023 19:13:00 +0200	[thread overview]
Message-ID: <20230518171304.95006-9-quintela@redhat.com> (raw)
In-Reply-To: <20230518171304.95006-1-quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230515195709.63843-8-quintela@redhat.com>
---
 migration/migration-stats.c | 7 ++++++-
 migration/trace-events      | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/migration/migration-stats.c b/migration/migration-stats.c
index 39e98d6fa9..feec7d7369 100644
--- a/migration/migration-stats.c
+++ b/migration/migration-stats.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "qemu/stats64.h"
 #include "qemu-file.h"
+#include "trace.h"
 #include "migration-stats.h"
 
 MigrationAtomicStats mig_stats;
@@ -62,5 +63,9 @@ void migration_rate_account(uint64_t len)
 
 uint64_t migration_transferred_bytes(QEMUFile *f)
 {
-    return qemu_file_transferred(f) + stat64_get(&mig_stats.multifd_bytes);
+    uint64_t multifd = stat64_get(&mig_stats.multifd_bytes);
+    uint64_t qemu_file = qemu_file_transferred(f);
+
+    trace_migration_transferred_bytes(qemu_file, multifd);
+    return qemu_file + multifd;
 }
diff --git a/migration/trace-events b/migration/trace-events
index f39818c329..cdaef7a1ea 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -186,6 +186,9 @@ process_incoming_migration_co_end(int ret, int ps) "ret=%d postcopy-state=%d"
 process_incoming_migration_co_postcopy_end_main(void) ""
 postcopy_preempt_enabled(bool value) "%d"
 
+# migration-stats
+migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd) "qemu_file %" PRIu64 " multifd %" PRIu64
+
 # channel.c
 migration_set_incoming_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
 migration_set_outgoing_channel(void *ioc, const char *ioctype, const char *hostname, void *err)  "ioc=%p ioctype=%s hostname=%s err=%p"
-- 
2.40.1



  parent reply	other threads:[~2023-05-18 17:15 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-18 17:12 [PULL 00/12] Migration 20230518 patches Juan Quintela
2023-05-18 17:12 ` [PULL 01/12] configure: add --disable-colo-proxy option Juan Quintela
2023-05-18 17:12 ` [PULL 02/12] migration: split migration_incoming_co Juan Quintela
2023-05-18 17:12 ` [PULL 03/12] migration: process_incoming_migration_co(): move colo part to colo Juan Quintela
2023-05-18 17:12 ` [PULL 04/12] migration: Don't use INT64_MAX for unlimited rate Juan Quintela
2023-05-18 17:12 ` [PULL 05/12] qemu-file: Account for rate_limit usage on qemu_fflush() Juan Quintela
2023-05-18 17:12 ` [PULL 06/12] migration: Move rate_limit_max and rate_limit_used to migration_stats Juan Quintela
2023-05-18 17:12 ` [PULL 07/12] migration: Move migration_total_bytes() to migration-stats.c Juan Quintela
2023-05-18 17:13 ` Juan Quintela [this message]
2023-05-18 17:13 ` [PULL 09/12] migration: Use migration_transferred_bytes() to calculate rate_limit Juan Quintela
2023-05-23 12:31   ` Fiona Ebner
2023-05-26  8:55     ` Juan Quintela
2023-05-26 11:37       ` Fiona Ebner
2023-07-28 11:48     ` Fiona Ebner
2023-05-18 17:13 ` [PULL 10/12] migration: We don't need the field rate_limit_used anymore Juan Quintela
2023-05-18 17:13 ` [PULL 11/12] migration/multifd: Compute transferred bytes correctly Juan Quintela
2023-05-18 17:13 ` [PULL 12/12] migration: Fix duplicated included in meson.build Juan Quintela
2023-05-19  3:42 ` [PULL 00/12] Migration 20230518 patches Richard Henderson

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=20230518171304.95006-9-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=berrange@redhat.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=clg@kaod.org \
    --cc=danielhb413@gmail.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=david@redhat.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=farman@linux.ibm.com \
    --cc=groug@kaod.org \
    --cc=harshpb@linux.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=jasowang@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=leobras@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pasic@linux.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    --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).