* Juan Quintela (quintela@redhat.com) wrote:
> 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)
> ---
> migration/ram.c | 22 ++++++++++++++++++++++
> migration/trace-events | 4 ++++
> 2 files changed, 26 insertions(+)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 54350db8b0..ab715cc148 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -563,6 +563,11 @@ typedef struct {
> uint32_t flags;
> /* global number of generated multifd packets */
> uint32_t seq;
> + /* thread local variables */
> + /* packets sent through this channel */
> + uint32_t num_packets;
> + /* pages sent through this channel */
> + uint32_t num_pages;
> } MultiFDSendParams;
>
> typedef struct {
> @@ -593,6 +598,11 @@ typedef struct {
> uint32_t flags;
> /* global number of generated multifd packets */
> uint32_t seq;
> + /* thread local variables */
> + /* packets sent through this channel */
> + uint32_t num_packets;
> + /* pages sent through this channel */
> + uint32_t num_pages;
> } MultiFDRecvParams;
>
> static int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp)
> @@ -849,9 +859,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);
> @@ -873,6 +887,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;
> }
>
> @@ -1000,6 +1016,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) {
> @@ -1022,6 +1040,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;
> }
>
> @@ -1087,6 +1107,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,
> diff --git a/migration/trace-events b/migration/trace-events
> index 3c798ddd11..3c7a9a8332 100644
> --- a/migration/trace-events
> +++ b/migration/trace-events
> @@ -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_end(uint64_t dirty_pages) "dirty_pages %" PRIu64
> migration_throttle(void) ""
> +multifd_recv_thread_end(uint8_t id, uint32_t packets, uint32_t pages) "channel %d packets %d pages %d"
> +multifd_recv_thread_start(uint8_t id) "%d"
> +multifd_send_thread_end(uint8_t id, uint32_t packets, uint32_t pages) "channel %d packets %d pages %d"
> +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_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"
> --
> 2.17.0
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK