qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, yury-kotov@yandex-team.ru,
	richardw.yang@linux.intel.com, marcandre.lureau@redhat.com,
	ivanren@tencent.com
Subject: [Qemu-devel] [PULL 31/33] migration: Add traces for multifd terminate threads
Date: Thu, 15 Aug 2019 17:35:02 +0100	[thread overview]
Message-ID: <20190815163504.18937-32-dgilbert@redhat.com> (raw)
In-Reply-To: <20190815163504.18937-1-dgilbert@redhat.com>

From: Juan Quintela <quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20190814020218.1868-2-quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/ram.c        | 4 ++++
 migration/trace-events | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/migration/ram.c b/migration/ram.c
index 9e6cc1e685..b542929a7c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -997,6 +997,8 @@ static void multifd_send_terminate_threads(Error *err)
 {
     int i;
 
+    trace_multifd_send_terminate_threads(err != NULL);
+
     if (err) {
         MigrationState *s = migrate_get_current();
         migrate_set_error(s, err);
@@ -1258,6 +1260,8 @@ static void multifd_recv_terminate_threads(Error *err)
 {
     int i;
 
+    trace_multifd_recv_terminate_threads(err != NULL);
+
     if (err) {
         MigrationState *s = migrate_get_current();
         migrate_set_error(s, err);
diff --git a/migration/trace-events b/migration/trace-events
index d8e54c367a..886ce70ca0 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -85,12 +85,14 @@ multifd_recv(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flags, uin
 multifd_recv_sync_main(long packet_num) "packet num %ld"
 multifd_recv_sync_main_signal(uint8_t id) "channel %d"
 multifd_recv_sync_main_wait(uint8_t id) "channel %d"
+multifd_recv_terminate_threads(bool error) "error %d"
 multifd_recv_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "channel %d packets %" PRIu64 " pages %" PRIu64
 multifd_recv_thread_start(uint8_t id) "%d"
 multifd_send(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flags, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " pages %d flags 0x%x next packet size %d"
 multifd_send_sync_main(long packet_num) "packet num %ld"
 multifd_send_sync_main_signal(uint8_t id) "channel %d"
 multifd_send_sync_main_wait(uint8_t id) "channel %d"
+multifd_send_terminate_threads(bool error) "error %d"
 multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "channel %d packets %" PRIu64 " pages %"  PRIu64
 multifd_send_thread_start(uint8_t id) "%d"
 ram_discard_range(const char *rbname, uint64_t start, size_t len) "%s: start: %" PRIx64 " %zx"
-- 
2.21.0



  parent reply	other threads:[~2019-08-15 17:04 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-15 16:34 [Qemu-devel] [PULL 00/33] migration queue Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 01/33] migration: Add error_desc for file channel errors Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 02/33] hw/net: fix vmxnet3 live migration Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 03/33] migration: consolidate time info into populate_time_info Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 04/33] migration/postcopy: the valid condition is one less then end Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 05/33] migration/postcopy: break the loop when there is no more page to discard Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 06/33] migration/postcopy: discard_length must not be 0 Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 07/33] migration/postcopy: reduce one operation to calculate fixup_start_addr Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 08/33] migration/postcopy: do_fixup is true when host_offset is non-zero Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 09/33] migration/savevm: flush file for iterable_only case Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 10/33] migration/savevm: split qemu_savevm_state_complete_precopy() into two parts Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 11/33] migration/savevm: move non SaveStateEntry condition check out of iteration Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 12/33] migration/postcopy: PostcopyState is already set in loadvm_postcopy_handle_advise() Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 13/33] migration/postcopy: start_postcopy could be true only when migrate_postcopy() return true Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 14/33] migration: use migration_in_postcopy() to check POSTCOPY_ACTIVE Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 15/33] migration: just pass RAMBlock is enough Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 16/33] migration: equation is more proper than and to check LOADVM_QUIT Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 17/33] migration: return -EINVAL directly when version_id mismatch Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 18/33] migration: extract ram_load_precopy Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 19/33] migration/postcopy: make PostcopyDiscardState a static variable Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 20/33] migration/postcopy: simplify calculation of run_start and fixup_start_addr Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 21/33] migration/postcopy: use QEMU_IS_ALIGNED to replace host_offset Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 22/33] hmp: Remove migration capabilities from "info migrate" Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 23/33] migration: remove unused field bytes_xfer Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 24/33] migration: always initialise ram_counters for a new migration Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 25/33] migration: add qemu_file_update_transfer interface Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 26/33] migration: add speed limit for multifd migration Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 27/33] migration: update ram_counters for multifd sync packet Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 28/33] migration: rename migration_bitmap_sync_range to ramblock_sync_dirty_bitmap Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` [Qemu-devel] [PULL 29/33] migration/postcopy: use mis->bh instead of allocating a QEMUBH Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` [Qemu-devel] [PULL 30/33] qemu-file: move qemu_{get, put}_counted_string() declarations Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` Dr. David Alan Gilbert (git) [this message]
2019-08-15 16:35 ` [Qemu-devel] [PULL 32/33] migration: Make global sem_sync semaphore by channel Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` [Qemu-devel] [PULL 33/33] migration: add some multifd traces Dr. David Alan Gilbert (git)
2019-08-16 12:58 ` [Qemu-devel] [PULL 00/33] migration queue Peter Maydell

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=20190815163504.18937-32-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=ivanren@tencent.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=richardw.yang@linux.intel.com \
    --cc=yury-kotov@yandex-team.ru \
    /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).