[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 33/33] migration: add some multifd traces
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 33/33] migration: add some multifd traces |
Date: |
Thu, 15 Aug 2019 17:35:04 +0100 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 3 +++
migration/trace-events | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/migration/ram.c b/migration/ram.c
index c7aa3d9a2c..35552c090b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1170,6 +1170,7 @@ static void *multifd_send_thread(void *opaque)
out:
if (local_err) {
+ trace_multifd_send_error(p->id);
multifd_send_terminate_threads(local_err);
}
@@ -1200,6 +1201,7 @@ static void multifd_new_send_channel_async(QIOTask *task,
gpointer opaque)
QIOChannel *sioc = QIO_CHANNEL(qio_task_get_source(task));
Error *local_err = NULL;
+ trace_multifd_new_send_channel_async(p->id);
if (qio_task_propagate_error(task, &local_err)) {
migrate_set_error(migrate_get_current(), local_err);
multifd_save_cleanup();
@@ -1486,6 +1488,7 @@ bool multifd_recv_new_channel(QIOChannel *ioc, Error
**errp)
atomic_read(&multifd_recv_state->count));
return false;
}
+ trace_multifd_recv_new_channel(id);
p = &multifd_recv_state->params[id];
if (p->c != NULL) {
diff --git a/migration/trace-events b/migration/trace-events
index 886ce70ca0..00ffcd5930 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -81,14 +81,18 @@ migration_bitmap_sync_start(void) ""
migration_bitmap_sync_end(uint64_t dirty_pages) "dirty_pages %" PRIu64
migration_bitmap_clear_dirty(char *str, uint64_t start, uint64_t size,
unsigned long page) "rb %s start 0x%"PRIx64" size 0x%"PRIx64" page 0x%lx"
migration_throttle(void) ""
+multifd_new_send_channel_async(uint8_t id) "channel %d"
multifd_recv(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_recv_new_channel(uint8_t id) "channel %d"
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_save_setup_wait(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_error(uint8_t id) "channel %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"
--
2.21.0
- [Qemu-devel] [PULL 23/33] migration: remove unused field bytes_xfer, (continued)
- [Qemu-devel] [PULL 23/33] migration: remove unused field bytes_xfer, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 24/33] migration: always initialise ram_counters for a new migration, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 25/33] migration: add qemu_file_update_transfer interface, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 26/33] migration: add speed limit for multifd migration, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 27/33] migration: update ram_counters for multifd sync packet, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 28/33] migration: rename migration_bitmap_sync_range to ramblock_sync_dirty_bitmap, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 30/33] qemu-file: move qemu_{get, put}_counted_string() declarations, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 29/33] migration/postcopy: use mis->bh instead of allocating a QEMUBH, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 31/33] migration: Add traces for multifd terminate threads, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 32/33] migration: Make global sem_sync semaphore by channel, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 33/33] migration: add some multifd traces,
Dr. David Alan Gilbert (git) <=
- Re: [Qemu-devel] [PULL 00/33] migration queue, Peter Maydell, 2019/08/16