openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration: introduce downtime_start 

Introduce MigrationState.downtime_start to replace the local variable
"start_time" in migration_thread to avoid passing things around.

Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Xu 2018-01-03 20:20:10 +08:00 committed by Juan Quintela
parent 7287cbd46e
commit 64909f9740
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/migration.c
View File

@ -2094,16 +2094,14 @@ static int migration_maybe_pause(MigrationState *s,
* *
* @s: Current migration state * @s: Current migration state
* @current_active_state: The migration state we expect to be in * @current_active_state: The migration state we expect to be in
* @*start_time: Pointer to time to update
*/ */
static void migration_completion(MigrationState *s, int current_active_state, static void migration_completion(MigrationState *s, int current_active_state)
int64_t *start_time)
{ {
int ret; int ret;
if (s->state == MIGRATION_STATUS_ACTIVE) { if (s->state == MIGRATION_STATUS_ACTIVE) {
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
*start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); s->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
s->vm_was_running = runstate_is_running(); s->vm_was_running = runstate_is_running();
ret = global_state_store(); ret = global_state_store();
@ -2209,7 +2207,6 @@ static void *migration_thread(void *opaque)
* measured bandwidth * measured bandwidth
*/ */
int64_t threshold_size = 0; int64_t threshold_size = 0;
int64_t start_time = initial_time;
int64_t end_time; int64_t end_time;
bool entered_postcopy = false; bool entered_postcopy = false;
/* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */ /* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */
@ -2280,8 +2277,7 @@ static void *migration_thread(void *opaque)
qemu_savevm_state_iterate(s->to_dst_file, entered_postcopy); qemu_savevm_state_iterate(s->to_dst_file, entered_postcopy);
} else { } else {
trace_migration_thread_low_pending(pending_size); trace_migration_thread_low_pending(pending_size);
migration_completion(s, current_active_state, migration_completion(s, current_active_state);
&start_time);
break; break;
} }
} }
@ -2332,7 +2328,7 @@ static void *migration_thread(void *opaque)
uint64_t transferred_bytes = qemu_ftell(s->to_dst_file); uint64_t transferred_bytes = qemu_ftell(s->to_dst_file);
s->total_time = end_time - s->start_time; s->total_time = end_time - s->start_time;
if (!entered_postcopy) { if (!entered_postcopy) {
s->downtime = end_time - start_time; s->downtime = end_time - s->downtime_start;
} }
if (s->total_time) { if (s->total_time) {
s->mbps = (((double) transferred_bytes * 8.0) / s->mbps = (((double) transferred_bytes * 8.0) /

2
migration/migration.h
View File

@ -119,6 +119,8 @@ struct MigrationState
int64_t start_time; int64_t start_time;
/* Total time used by latest migration (ms) */ /* Total time used by latest migration (ms) */
int64_t total_time; int64_t total_time;
/* Timestamp when VM is down (ms) to migrate the last stuff */
int64_t downtime_start;
int64_t downtime; int64_t downtime;
int64_t expected_downtime; int64_t expected_downtime;
bool enabled_capabilities[MIGRATION_CAPABILITY__MAX]; bool enabled_capabilities[MIGRATION_CAPABILITY__MAX];