[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/27] migration: introduce migrate_calculate_complet
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 21/27] migration: introduce migrate_calculate_complete |
Date: |
Mon, 15 Jan 2018 12:53:03 +0100 |
From: Peter Xu <address@hidden>
Generalize the calculation part when migration complete into a
function to simplify migration_thread().
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index fff2823ad5..c1de46a101 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2190,6 +2190,25 @@ bool migrate_colo_enabled(void)
return s->enabled_capabilities[MIGRATION_CAPABILITY_X_COLO];
}
+static void migration_calculate_complete(MigrationState *s)
+{
+ uint64_t bytes = qemu_ftell(s->to_dst_file);
+ int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
+
+ 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;
+ }
+
+ if (s->total_time) {
+ s->mbps = ((double) bytes * 8.0) / s->total_time / 1000;
+ }
+}
+
/*
* Master migration thread on the source VM.
* It drives the migration and pumps the data down the outgoing channel.
@@ -2207,7 +2226,6 @@ static void *migration_thread(void *opaque)
* measured bandwidth
*/
int64_t threshold_size = 0;
- int64_t end_time;
bool entered_postcopy = false;
/* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */
enum MigrationStatus current_active_state = MIGRATION_STATUS_ACTIVE;
@@ -2321,19 +2339,10 @@ static void *migration_thread(void *opaque)
trace_migration_thread_after_loop();
/* If we enabled cpu throttling for auto-converge, turn it off. */
cpu_throttle_stop();
- end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
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->start_time;
- if (!entered_postcopy) {
- s->downtime = end_time - s->downtime_start;
- }
- if (s->total_time) {
- s->mbps = (((double) transferred_bytes * 8.0) /
- ((double) s->total_time)) / 1000;
- }
+ migration_calculate_complete(s);
runstate_set(RUN_STATE_POSTMIGRATE);
} else {
if (s->state == MIGRATION_STATUS_ACTIVE) {
--
2.14.3
- [Qemu-devel] [PULL 11/27] migration: add blocktime calculation into migration-test, (continued)
- [Qemu-devel] [PULL 11/27] migration: add blocktime calculation into migration-test, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 12/27] migration: add postcopy total blocktime into query-migrate, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 13/27] migration: Guard ram_bytes_remaining against early call, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 14/27] migration: finalize current_migration object, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 16/27] migration: qemu_savevm_state_cleanup() in cleanup, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 15/27] migration: assert colo instead of check, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 17/27] migration: remove "enable_colo" var, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 18/27] migration: split use of MigrationState.total_time, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 19/27] migration: move vm_old_running into global state, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 20/27] migration: introduce downtime_start, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 21/27] migration: introduce migrate_calculate_complete,
Juan Quintela <=
- [Qemu-devel] [PULL 23/27] migration: cleanup stats update into function, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 22/27] migration: use switch at the end of migration, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 24/27] migration: major cleanup for migrate iterations, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 26/27] migration: remove some block_cleanup_parameters(), Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 25/27] migration: put the finish part into a new function, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 27/27] migration: remove notify in fd_error, Juan Quintela, 2018/01/15
- Re: [Qemu-devel] [PULL 00/27] Migration pull, Peter Maydell, 2018/01/15