ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Add migration_downtime_start|end() helpers 

Unify the three users on recording downtimes with the same pair of helpers.

Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231030163346.765724-3-peterx@redhat.com>
This commit is contained in:
Peter Xu 2023-10-30 12:33:43 -04:00 committed by Juan Quintela
parent 62f5da7dd1
commit e22ffad03a
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
migration/migration.c
View File

@ -101,6 +101,24 @@ static int migration_maybe_pause(MigrationState *s,
static void migrate_fd_cancel(MigrationState *s); static void migrate_fd_cancel(MigrationState *s);
static int close_return_path_on_source(MigrationState *s); static int close_return_path_on_source(MigrationState *s);
static void migration_downtime_start(MigrationState *s)
{
s->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
}
static void migration_downtime_end(MigrationState *s)
{
int64_t now = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
/*
* If downtime already set, should mean that postcopy already set it,
* then that should be the real downtime already.
*/
if (!s->downtime) {
s->downtime = now - s->downtime_start;
}
}
static bool migration_needs_multiple_sockets(void) static bool migration_needs_multiple_sockets(void)
{ {
return migrate_multifd() || migrate_postcopy_preempt(); return migrate_multifd() || migrate_postcopy_preempt();
@ -2147,7 +2165,7 @@ static int postcopy_start(MigrationState *ms, Error **errp)
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
trace_postcopy_start_set_run(); trace_postcopy_start_set_run();
ms->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); migration_downtime_start(ms);
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
global_state_store(); global_state_store();
@ -2251,7 +2269,7 @@ static int postcopy_start(MigrationState *ms, Error **errp)
ms->postcopy_after_devices = true; ms->postcopy_after_devices = true;
migration_call_notifiers(ms); migration_call_notifiers(ms);
ms->downtime = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - ms->downtime_start; migration_downtime_end(ms);
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
@ -2347,7 +2365,7 @@ static int migration_completion_precopy(MigrationState *s,
int ret; int ret;
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
s->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); migration_downtime_start(s);
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
s->vm_old_state = runstate_get(); s->vm_old_state = runstate_get();
@ -2704,15 +2722,8 @@ static void migration_calculate_complete(MigrationState *s)
int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
int64_t transfer_time; int64_t transfer_time;
migration_downtime_end(s);
s->total_time = end_time - s->start_time; s->total_time = end_time - s->start_time;
if (!s->downtime) {
/*
* It's still not set, so we are precopy migration. For
* postcopy, downtime is calculated during postcopy_start().
*/
s->downtime = end_time - s->downtime_start;
}
transfer_time = s->total_time - s->setup_time; transfer_time = s->total_time - s->setup_time;
if (transfer_time) { if (transfer_time) {
s->mbps = ((double) bytes * 8.0) / transfer_time / 1000; s->mbps = ((double) bytes * 8.0) / transfer_time / 1000;
@ -3131,7 +3142,7 @@ static void bg_migration_vm_start_bh(void *opaque)
s->vm_start_bh = NULL; s->vm_start_bh = NULL;
vm_start(); vm_start();
s->downtime = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - s->downtime_start; migration_downtime_end(s);
} }
/** /**
@ -3198,7 +3209,7 @@ static void *bg_migration_thread(void *opaque)
s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start; s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
trace_migration_thread_setup_complete(); trace_migration_thread_setup_complete();
s->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); migration_downtime_start(s);
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();