[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/13] migration: introduce migrate_calculate_com
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v2 07/13] migration: introduce migrate_calculate_complete |
Date: |
Wed, 3 Jan 2018 20:20:11 +0800 |
Generalize the calculation part when migration complete into a
function to simplify migration_thread().
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index bfe1a76254..72f0b586f7 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2151,6 +2151,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.
@@ -2168,7 +2187,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;
@@ -2282,19 +2300,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] [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, 2018/01/03
- [Qemu-devel] [PATCH v2 07/13] migration: introduce migrate_calculate_complete,
Peter Xu <=
- [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
- [Qemu-devel] [PATCH v2 13/13] migration: remove notify in fd_error, Peter Xu, 2018/01/03