Re: [Qemu-devel] [PATCH 07/11] migration: introduce migrate_calculate_complete

[Juan Quintela]

Peter Xu <address@hidden> wrote:
> Generalize the calculation part when migration complete into a
> function to simplify migration_thread().
>
> Signed-off-by: Peter Xu <address@hidden>



> ---
>  migration/migration.c | 25 ++++++++++++++-----------
>  1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 2d8b47197e..acef54748b 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -2151,6 +2151,19 @@ bool migrate_colo_enabled(void)
>      return s->enabled_capabilities[MIGRATION_CAPABILITY_X_COLO];
>  }
>  
> +static void migration_calculate_complete(MigrationState *s)
> +{
> +    uint64_t bytes = qemu_ftell(s->to_dst_file);
> +    int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
> +
> +    s->mig_total_time = end_time - s->mig_start_time;

Why have you remove the if (!entered_postcopy) for the following line?

I like the rest/idea of the patch.

Later, Juan.

> +    s->downtime = end_time - s->vm_down_start_time;
> +
> +    if (s->mig_total_time) {
> +        s->mbps = ((double) bytes * 8.0) / s->mig_total_time / 1000;
> +    }
> +}
> +
>  /*
>   * Master migration thread on the source VM.
>   * It drives the migration and pumps the data down the outgoing channel.
> @@ -2168,7 +2181,6 @@ static void *migration_thread(void *opaque)
>       * measured bandwidth
>       */
>      int64_t threshold_size = 0;
> -    int64_t end_time;
>      bool entered_postcopy = false;
>      /* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */
>      enum MigrationStatus current_active_state = MIGRATION_STATUS_ACTIVE;
> @@ -2282,19 +2294,10 @@ static void *migration_thread(void *opaque)
>      trace_migration_thread_after_loop();
>      /* If we enabled cpu throttling for auto-converge, turn it off. */
>      cpu_throttle_stop();
> -    end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
>  
>      qemu_mutex_lock_iothread();
>      if (s->state == MIGRATION_STATUS_COMPLETED) {
> -        uint64_t transferred_bytes = qemu_ftell(s->to_dst_file);
> -        s->mig_total_time = end_time - s->mig_start_time;
> -        if (!entered_postcopy) {
> -            s->downtime = end_time - s->vm_down_start_time;
> -        }
> -        if (s->mig_total_time) {
> -            s->mbps = (((double) transferred_bytes * 8.0) /
> -                       ((double) s->mig_total_time)) / 1000;
> -        }
> +        migration_calculate_complete(s);
>          runstate_set(RUN_STATE_POSTMIGRATE);
>      } else {
>          if (s->state == MIGRATION_STATUS_ACTIVE) {