diff options
author | Juan Quintela <quintela@redhat.com> | 2018-04-06 18:28:59 +0200 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2018-06-27 13:28:11 +0200 |
commit | 408ea6ae4c8f94621dff64d69c7fa3f6e84ef2fb (patch) | |
tree | 56a096d409aa9322948c2fa4dc2eaafdc2e4a7b6 /migration/ram.c | |
parent | 0c8f0efdd461b26f64fdf8785c333558315bc297 (diff) | |
download | qemu-408ea6ae4c8f94621dff64d69c7fa3f6e84ef2fb.zip qemu-408ea6ae4c8f94621dff64d69c7fa3f6e84ef2fb.tar.gz qemu-408ea6ae4c8f94621dff64d69c7fa3f6e84ef2fb.tar.bz2 |
migration: Add multifd traces for start/end thread
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)
Diffstat (limited to 'migration/ram.c')
-rw-r--r-- | migration/ram.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/migration/ram.c b/migration/ram.c index fd144fd..5c040e3 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -570,6 +570,11 @@ typedef struct { uint32_t flags; /* global number of generated multifd packets */ 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; typedef struct { @@ -600,6 +605,11 @@ typedef struct { uint32_t flags; /* global number of generated multifd packets */ 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; static int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp) @@ -856,9 +866,13 @@ static void *multifd_send_thread(void *opaque) MultiFDSendParams *p = opaque; Error *local_err = NULL; + trace_multifd_send_thread_start(p->id); + if (multifd_send_initial_packet(p, &local_err) < 0) { goto out; } + /* initial packet */ + p->num_packets = 1; while (true) { qemu_mutex_lock(&p->mutex); @@ -880,6 +894,8 @@ out: p->running = false; qemu_mutex_unlock(&p->mutex); + trace_multifd_send_thread_end(p->id, p->num_packets, p->num_pages); + return NULL; } @@ -1007,6 +1023,8 @@ static void *multifd_recv_thread(void *opaque) Error *local_err = NULL; int ret; + trace_multifd_recv_thread_start(p->id); + while (true) { qemu_mutex_lock(&p->mutex); if (false) { @@ -1029,6 +1047,8 @@ static void *multifd_recv_thread(void *opaque) p->running = false; qemu_mutex_unlock(&p->mutex); + trace_multifd_recv_thread_end(p->id, p->num_packets, p->num_pages); + return NULL; } @@ -1094,6 +1114,8 @@ void multifd_recv_new_channel(QIOChannel *ioc) } p->c = ioc; object_ref(OBJECT(ioc)); + /* initial packet */ + p->num_packets = 1; p->running = true; qemu_thread_create(&p->thread, p->name, multifd_recv_thread, p, |