From 3db9c05a9006550da3a73600cec89bb995420325 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 15 May 2023 21:57:00 +0200 Subject: [PATCH] migration: Add a trace for migration_transferred_bytes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Quintela Reviewed-by: Cédric Le Goater 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"