From nobody Tue Oct 28 12:12:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514982307710920.0830848365617; Wed, 3 Jan 2018 04:25:07 -0800 (PST) Received: from localhost ([::1]:50633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWi6U-0001kf-SU for importer@patchew.org; Wed, 03 Jan 2018 07:25:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWi2C-0006kg-Sf for qemu-devel@nongnu.org; Wed, 03 Jan 2018 07:20:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWi2B-00029k-Ls for qemu-devel@nongnu.org; Wed, 03 Jan 2018 07:20:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40464) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eWi2B-00028u-FV for qemu-devel@nongnu.org; Wed, 03 Jan 2018 07:20:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AC217C0587DF for ; Wed, 3 Jan 2018 12:20:38 +0000 (UTC) Received: from xz-mi.nay.redhat.com (dhcp-14-131.nay.redhat.com [10.66.14.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFEDC6375A; Wed, 3 Jan 2018 12:20:36 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 20:20:11 +0800 Message-Id: <20180103122017.14794-8-peterx@redhat.com> In-Reply-To: <20180103122017.14794-1-peterx@redhat.com> References: <20180103122017.14794-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 03 Jan 2018 12:20:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 07/13] migration: introduce migrate_calculate_complete X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Generalize the calculation part when migration complete into a function to simplify migration_thread(). Signed-off-by: Peter Xu Reviewed-by: Juan Quintela --- 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]; } =20 +static void migration_calculate_complete(MigrationState *s) +{ + uint64_t bytes =3D qemu_ftell(s->to_dst_file); + int64_t end_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + + s->total_time =3D 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 =3D end_time - s->downtime_start; + } + + if (s->total_time) { + s->mbps =3D ((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 =3D 0; - int64_t end_time; bool entered_postcopy =3D false; /* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */ enum MigrationStatus current_active_state =3D 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 =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); =20 qemu_mutex_lock_iothread(); if (s->state =3D=3D MIGRATION_STATUS_COMPLETED) { - uint64_t transferred_bytes =3D qemu_ftell(s->to_dst_file); - s->total_time =3D end_time - s->start_time; - if (!entered_postcopy) { - s->downtime =3D end_time - s->downtime_start; - } - if (s->total_time) { - s->mbps =3D (((double) transferred_bytes * 8.0) / - ((double) s->total_time)) / 1000; - } + migration_calculate_complete(s); runstate_set(RUN_STATE_POSTMIGRATE); } else { if (s->state =3D=3D MIGRATION_STATUS_ACTIVE) { --=20 2.14.3