Commit 4af246a3 authored by Peter Xu's avatar Peter Xu Committed by Juan Quintela
Browse files

migration: split use of MigrationState.total_time 



It was used either to:

1. store initial timestamp of migration start, and
2. store total time used by last migration

Let's provide two parameters for each of them.  Mix use of the two is
slightly misleading.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent deb74fb6

migration/migration.c

+4 −3
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static void fill_source_migration_info(MigrationInfo *info) 
        info->has_status = true;

        info->has_total_time = true;

        info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME)

            - s->total_time;

            - s->start_time;

        info->has_expected_downtime = true;

        info->expected_downtime = s->expected_downtime;

        info->has_setup_time = true;
@@ -1300,7 +1300,8 @@ MigrationState *migrate_init(void) 


    migrate_set_state(&s->state, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP);



    s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);

    s->start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);

    s->total_time = 0;

    return s;

}
@@ -2332,7 +2333,7 @@ static void *migration_thread(void *opaque) 
    qemu_mutex_lock_iothread();

    if (s->state == MIGRATION_STATUS_COMPLETED) {

        uint64_t transferred_bytes = qemu_ftell(s->to_dst_file);

        s->total_time = end_time - s->total_time;

        s->total_time = end_time - s->start_time;

        if (!entered_postcopy) {

            s->downtime = end_time - start_time;

        }

migration/migration.h

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ struct MigrationState 
    } rp_state;



    double mbps;

    /* Timestamp when recent migration starts (ms) */

    int64_t start_time;

    /* Total time used by latest migration (ms) */

    int64_t total_time;

    int64_t downtime;

    int64_t expected_downtime;