Re: [PATCH 11/21] migration: Move migration_total_bytes() to migration-stats.c

[Cédric Le Goater]

On 5/8/23 15:08, Juan Quintela wrote:
> Once there rename it to migration_transferred_bytes() and pass a
> QEMUFile instead of a migration object.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

C.


> ---
>   migration/migration-stats.c |  6 ++++++
>   migration/migration-stats.h |  9 +++++++++
>   migration/migration.c       | 13 +++----------
>   3 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/migration/migration-stats.c b/migration/migration-stats.c
> index e01842cabc..fba66c4577 100644
> --- a/migration/migration-stats.c
> +++ b/migration/migration-stats.c
> @@ -63,3 +63,9 @@ void migration_rate_limit_account(uint64_t len)
>   {
>       stat64_add(&mig_stats.rate_limit_used, len);
>   }
> +
> +uint64_t migration_transferred_bytes(QEMUFile *f)
> +{
> +    return qemu_file_transferred(f) + stat64_get(&mig_stats.multifd_bytes);
> +}
> +
> diff --git a/migration/migration-stats.h b/migration/migration-stats.h
> index 65f11ec7d1..c82fce9608 100644
> --- a/migration/migration-stats.h
> +++ b/migration/migration-stats.h
> @@ -137,4 +137,13 @@ void migration_rate_limit_reset(void);
>    */
>   void migration_rate_limit_set(uint64_t new_rate);
>   
> +/**
> + * migration_transferred_bytes: Return number of bytes transferred
> + *
> + * Returtns how many bytes have we transferred since the beginning of
> + * the migration.  It accounts for bytes sent through any migration
> + * channel, multifd, qemu_file, rdma, ....
> + */
> +uint64_t migration_transferred_bytes(QEMUFile *f);
> +
>   #endif
> diff --git a/migration/migration.c b/migration/migration.c
> index 370998600e..e6d262ffe1 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -2617,16 +2617,9 @@ static MigThrError migration_detect_error(MigrationState 
> *s)
>       }
>   }
>   
> -/* How many bytes have we transferred since the beginning of the migration */
> -static uint64_t migration_total_bytes(MigrationState *s)
> -{
> -    return qemu_file_transferred(s->to_dst_file) +
> -        stat64_get(&mig_stats.multifd_bytes);
> -}
> -
>   static void migration_calculate_complete(MigrationState *s)
>   {
> -    uint64_t bytes = migration_total_bytes(s);
> +    uint64_t bytes = migration_transferred_bytes(s->to_dst_file);
>       int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
>       int64_t transfer_time;
>   
> @@ -2652,7 +2645,7 @@ static void update_iteration_initial_status(MigrationState *s)
>        * wrong speed calculation.
>        */
>       s->iteration_start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
> -    s->iteration_initial_bytes = migration_total_bytes(s);
> +    s->iteration_initial_bytes = migration_transferred_bytes(s->to_dst_file);
>       s->iteration_initial_pages = ram_get_total_transferred_pages();
>   }
>   
> @@ -2667,7 +2660,7 @@ static void migration_update_counters(MigrationState *s,
>           return;
>       }
>   
> -    current_bytes = migration_total_bytes(s);
> +    current_bytes = migration_transferred_bytes(s->to_dst_file);
>       transferred = current_bytes - s->iteration_initial_bytes;
>       time_spent = current_time - s->iteration_start_time;
>       bandwidth = (double)transferred / time_spent;