migration: consolidate time info into populate_time_info
PATCH 1/1 migration: consolidate time info into populate_time_info
Consolidate time information fill up into its function for better readability.
Signed-off-by Wei Yang <[email protected]>
--- migration/migration.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-)
migration/migration.c +22 -18
@@ -822,6 +822,25 @@ bool migration_is_setup_or_active(int state) } } +static void populate_time_info (MigrationInfo *info,MigrationState *s) +{ + info->has_status = true; + info->has_setup_time = true; + info->setup_time = s->setup_time; +if (s->state ==MIGRATION_STATUS_COMPLETED ) { + info->has_total_time = true; + info->total_time = s->total_time; + info->has_downtime = true; + info->downtime = s->downtime; + }else { + info->has_total_time = true; + info->total_time =qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) - + s->start_time; + info->has_expected_downtime = true; + info->expected_downtime = s->expected_downtime; + } +} +static void populate_ram_info (MigrationInfo *info,MigrationState *s) { info->has_ram = true;
@@ -907,16 +926,8 @@ static void fill_source_migration_info(MigrationInfo *info)case MIGRATION_STATUS_DEVICE :case MIGRATION_STATUS_POSTCOPY_PAUSED :case MIGRATION_STATUS_POSTCOPY_RECOVER : -/* TODO add some postcopy stats */ - info->has_status = true; - info->has_total_time = true; - info->total_time =qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) - - s->start_time; - info->has_expected_downtime = true; - info->expected_downtime = s->expected_downtime; - info->has_setup_time = true; - info->setup_time = s->setup_time; - +/* TODO add some postcopy stats */ +populate_time_info (info, s);populate_ram_info (info, s);populate_disk_info (info);break ;
@@ -925,14 +936,7 @@ static void fill_source_migration_info(MigrationInfo *info)/* TODO: display COLO specific information (checkpoint info etc.) */ break ;case MIGRATION_STATUS_COMPLETED : - info->has_status = true; - info->has_total_time = true; - info->total_time = s->total_time; - info->has_downtime = true; - info->downtime = s->downtime; - info->has_setup_time = true; - info->setup_time = s->setup_time; - +populate_time_info (info, s);populate_ram_info (info, s);break ;case MIGRATION_STATUS_FAILED :
Signature · 1 line
2.17.1
Quoted 4 lines · * Wei Yang ([email protected]) wrote:
Consolidate time information fill up into its function for better readability.
Signed-off-by Wei Yang <[email protected]>
Reviewed-by Dr. David Alan Gilbert <[email protected]>
Quoted 72 lines
--- migration/migration.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-)migration/migration.c +22
-18@@ -822,6 +822,25 @@ bool migration_is_setup_or_active(int state) } } +static void populate_time_info (MigrationInfo *info,MigrationState *s) +{ + info->has_status = true; + info->has_setup_time = true; + info->setup_time = s->setup_time; +if (s->state ==MIGRATION_STATUS_COMPLETED ) { + info->has_total_time = true; + info->total_time = s->total_time; + info->has_downtime = true; + info->downtime = s->downtime; + }else { + info->has_total_time = true; + info->total_time =qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) - + s->start_time; + info->has_expected_downtime = true; + info->expected_downtime = s->expected_downtime; + } +} +static void populate_ram_info (MigrationInfo *info,MigrationState *s) { info->has_ram = true;@@ -907,16 +926,8 @@ static void fill_source_migration_info(MigrationInfo *info)case MIGRATION_STATUS_DEVICE :case MIGRATION_STATUS_POSTCOPY_PAUSED :case MIGRATION_STATUS_POSTCOPY_RECOVER : -/* TODO add some postcopy stats */ - info->has_status = true; - info->has_total_time = true; - info->total_time =qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) - - s->start_time; - info->has_expected_downtime = true; - info->expected_downtime = s->expected_downtime; - info->has_setup_time = true; - info->setup_time = s->setup_time; - +/* TODO add some postcopy stats */ +populate_time_info (info, s);populate_ram_info (info, s);populate_disk_info (info);break ;@@ -925,14 +936,7 @@ static void fill_source_migration_info(MigrationInfo *info)/* TODO: display COLO specific information (checkpoint info etc.) */ break ;case MIGRATION_STATUS_COMPLETED : - info->has_status = true; - info->has_total_time = true; - info->total_time = s->total_time; - info->has_downtime = true; - info->downtime = s->downtime; - info->has_setup_time = true; - info->setup_time = s->setup_time; - +populate_time_info (info, s);populate_ram_info (info, s);break ;case MIGRATION_STATUS_FAILED :Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 4 lines · * Wei Yang ([email protected]) wrote:
Consolidate time information fill up into its function for better readability.
Signed-off-by Wei Yang <[email protected]>
Queued
Quoted 73 lines
--- migration/migration.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-)migration/migration.c +22
-18@@ -822,6 +822,25 @@ bool migration_is_setup_or_active(int state) } } +static void populate_time_info (MigrationInfo *info,MigrationState *s) +{ + info->has_status = true; + info->has_setup_time = true; + info->setup_time = s->setup_time; +if (s->state ==MIGRATION_STATUS_COMPLETED ) { + info->has_total_time = true; + info->total_time = s->total_time; + info->has_downtime = true; + info->downtime = s->downtime; + }else { + info->has_total_time = true; + info->total_time =qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) - + s->start_time; + info->has_expected_downtime = true; + info->expected_downtime = s->expected_downtime; + } +} +static void populate_ram_info (MigrationInfo *info,MigrationState *s) { info->has_ram = true;@@ -907,16 +926,8 @@ static void fill_source_migration_info(MigrationInfo *info)case MIGRATION_STATUS_DEVICE :case MIGRATION_STATUS_POSTCOPY_PAUSED :case MIGRATION_STATUS_POSTCOPY_RECOVER : -/* TODO add some postcopy stats */ - info->has_status = true; - info->has_total_time = true; - info->total_time =qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) - - s->start_time; - info->has_expected_downtime = true; - info->expected_downtime = s->expected_downtime; - info->has_setup_time = true; - info->setup_time = s->setup_time; - +/* TODO add some postcopy stats */ +populate_time_info (info, s);populate_ram_info (info, s);populate_disk_info (info);break ;@@ -925,14 +936,7 @@ static void fill_source_migration_info(MigrationInfo *info)/* TODO: display COLO specific information (checkpoint info etc.) */ break ;case MIGRATION_STATUS_COMPLETED : - info->has_status = true; - info->has_total_time = true; - info->total_time = s->total_time; - info->has_downtime = true; - info->downtime = s->downtime; - info->has_setup_time = true; - info->setup_time = s->setup_time; - +populate_time_info (info, s);populate_ram_info (info, s);break ;case MIGRATION_STATUS_FAILED :Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK