mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Add multifd traces for start/end thread

Browse Source 
We want to know how many pages/packets each channel has sent.  Add
counters for those.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

--
sort trace-events (dave)
This commit is contained in:
Juan Quintela 2018-04-06 18:28:59 +02:00
parent 0c8f0efdd4
commit 408ea6ae4c
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
migration/ram.c
View File

@ -570,6 +570,11 @@ typedef struct {
uint32_t flags; uint32_t flags;
/* global number of generated multifd packets */ /* global number of generated multifd packets */
uint64_t packet_num; uint64_t packet_num;
/* thread local variables */
/* packets sent through this channel */
uint64_t num_packets;
/* pages sent through this channel */
uint64_t num_pages;
} MultiFDSendParams; } MultiFDSendParams;
typedef struct { typedef struct {
@ -600,6 +605,11 @@ typedef struct {
uint32_t flags; uint32_t flags;
/* global number of generated multifd packets */ /* global number of generated multifd packets */
uint64_t packet_num; uint64_t packet_num;
/* thread local variables */
/* packets sent through this channel */
uint64_t num_packets;
/* pages sent through this channel */
uint64_t num_pages;
} MultiFDRecvParams; } MultiFDRecvParams;
static int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp) static int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp)
@ -856,9 +866,13 @@ static void *multifd_send_thread(void *opaque)
MultiFDSendParams *p = opaque; MultiFDSendParams *p = opaque;
Error *local_err = NULL; Error *local_err = NULL;
trace_multifd_send_thread_start(p->id);
if (multifd_send_initial_packet(p, &local_err) < 0) { if (multifd_send_initial_packet(p, &local_err) < 0) {
goto out; goto out;
} }
/* initial packet */
p->num_packets = 1;
while (true) { while (true) {
qemu_mutex_lock(&p->mutex); qemu_mutex_lock(&p->mutex);
@ -880,6 +894,8 @@ out:
p->running = false; p->running = false;
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
trace_multifd_send_thread_end(p->id, p->num_packets, p->num_pages);
return NULL; return NULL;
} }
@ -1007,6 +1023,8 @@ static void *multifd_recv_thread(void *opaque)
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
trace_multifd_recv_thread_start(p->id);
while (true) { while (true) {
qemu_mutex_lock(&p->mutex); qemu_mutex_lock(&p->mutex);
if (false) { if (false) {
@ -1029,6 +1047,8 @@ static void *multifd_recv_thread(void *opaque)
p->running = false; p->running = false;
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
trace_multifd_recv_thread_end(p->id, p->num_packets, p->num_pages);
return NULL; return NULL;
} }
@ -1094,6 +1114,8 @@ void multifd_recv_new_channel(QIOChannel *ioc)
} }
p->c = ioc; p->c = ioc;
object_ref(OBJECT(ioc)); object_ref(OBJECT(ioc));
/* initial packet */
p->num_packets = 1;
p->running = true; p->running = true;
qemu_thread_create(&p->thread, p->name, multifd_recv_thread, p, qemu_thread_create(&p->thread, p->name, multifd_recv_thread, p,

4
migration/trace-events
View File

@ -76,6 +76,10 @@ get_queued_page_not_dirty(const char *block_name, uint64_t tmp_offset, unsigned
migration_bitmap_sync_start(void) "" migration_bitmap_sync_start(void) ""
migration_bitmap_sync_end(uint64_t dirty_pages) "dirty_pages %" PRIu64 migration_bitmap_sync_end(uint64_t dirty_pages) "dirty_pages %" PRIu64
migration_throttle(void) "" migration_throttle(void) ""
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_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" ram_discard_range(const char *rbname, uint64_t start, size_t len) "%s: start: %" PRIx64 " %zx"
ram_load_loop(const char *rbname, uint64_t addr, int flags, void *host) "%s: addr: 0x%" PRIx64 " flags: 0x%x host: %p" ram_load_loop(const char *rbname, uint64_t addr, int flags, void *host) "%s: addr: 0x%" PRIx64 " flags: 0x%x host: %p"
ram_load_postcopy_loop(uint64_t addr, int flags) "@%" PRIx64 " %x" ram_load_postcopy_loop(uint64_t addr, int flags) "@%" PRIx64 " %x"