[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/13] migration: introduce downtime_start
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v2 06/13] migration: introduce downtime_start |
Date: |
Wed, 3 Jan 2018 20:20:10 +0800 |
Introduce MigrationState.downtime_start to replace the local variable
"start_time" in migration_thread to avoid passing things around.
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 12 ++++--------
migration/migration.h | 2 ++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index ca0c600178..bfe1a76254 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2055,16 +2055,14 @@ static int migration_maybe_pause(MigrationState *s,
*
* @s: Current migration state
* @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,
- int64_t *start_time)
+static void migration_completion(MigrationState *s, int current_active_state)
{
int ret;
if (s->state == MIGRATION_STATUS_ACTIVE) {
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);
s->vm_was_running = runstate_is_running();
ret = global_state_store();
@@ -2170,7 +2168,6 @@ static void *migration_thread(void *opaque)
* measured bandwidth
*/
int64_t threshold_size = 0;
- int64_t start_time = initial_time;
int64_t end_time;
bool entered_postcopy = false;
/* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */
@@ -2241,8 +2238,7 @@ static void *migration_thread(void *opaque)
qemu_savevm_state_iterate(s->to_dst_file, entered_postcopy);
} else {
trace_migration_thread_low_pending(pending_size);
- migration_completion(s, current_active_state,
- &start_time);
+ migration_completion(s, current_active_state);
break;
}
}
@@ -2293,7 +2289,7 @@ static void *migration_thread(void *opaque)
uint64_t transferred_bytes = qemu_ftell(s->to_dst_file);
s->total_time = end_time - s->start_time;
if (!entered_postcopy) {
- s->downtime = end_time - start_time;
+ s->downtime = end_time - s->downtime_start;
}
if (s->total_time) {
s->mbps = (((double) transferred_bytes * 8.0) /
diff --git a/migration/migration.h b/migration/migration.h
index 45053ae8c5..867383f18d 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -107,6 +107,8 @@ struct MigrationState
int64_t start_time;
/* Total time used by latest migration (ms) */
int64_t total_time;
+ /* Timestamp when VM is down (ms) to migrate the last stuff */
+ int64_t downtime_start;
int64_t downtime;
int64_t expected_downtime;
bool enabled_capabilities[MIGRATION_CAPABILITY__MAX];
--
2.14.3
- [Qemu-devel] [PATCH v2 00/13] migration: cleanup migration_thread(), Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 01/13] migration: assert colo instead of check, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 02/13] migration: qemu_savevm_state_cleanup() in cleanup, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 03/13] migration: remove "enable_colo" var, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 04/13] migration: split use of MigrationState.total_time, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 05/13] migration: move vm_old_running into global state, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 06/13] migration: introduce downtime_start,
Peter Xu <=
- [Qemu-devel] [PATCH v2 07/13] migration: introduce migrate_calculate_complete, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 08/13] migration: use switch at the end of migration, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 09/13] migration: cleanup stats update into function, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 10/13] migration: major cleanup for migrate iterations, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 11/13] migration: put the finish part into a new function, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 12/13] migration: remove some block_cleanup_parameters(), Peter Xu, 2018/01/03