From patchwork Wed Jan 3 05:40:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 10141715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E16B601A1 for ; Wed, 3 Jan 2018 05:47:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95B4D28F20 for ; Wed, 3 Jan 2018 05:47:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A99328F22; Wed, 3 Jan 2018 05:47:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3344F28F20 for ; Wed, 3 Jan 2018 05:47:05 +0000 (UTC) Received: from localhost ([::1]:40651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWbtI-0000Dw-EJ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Jan 2018 00:47:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWbnc-0003DI-Bz for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:41:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWbnZ-00015X-4A for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:41:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35518) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eWbnY-00014o-UF for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:41:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0C75F37E6E for ; Wed, 3 Jan 2018 05:41:08 +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 6B0FD619A3; Wed, 3 Jan 2018 05:41:03 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 13:40:39 +0800 Message-Id: <20180103054043.25719-8-peterx@redhat.com> In-Reply-To: <20180103054043.25719-1-peterx@redhat.com> References: <20180103054043.25719-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 03 Jan 2018 05:41:08 +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 07/11] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Generalize the calculation part when migration complete into a function to simplify migration_thread(). Signed-off-by: Peter Xu --- migration/migration.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 2d8b47197e..acef54748b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2151,6 +2151,19 @@ 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->mig_total_time = end_time - s->mig_start_time; + s->downtime = end_time - s->vm_down_start_time; + + if (s->mig_total_time) { + s->mbps = ((double) bytes * 8.0) / s->mig_total_time / 1000; + } +} + /* * Master migration thread on the source VM. * It drives the migration and pumps the data down the outgoing channel. @@ -2168,7 +2181,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 +2294,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->mig_total_time = end_time - s->mig_start_time; - if (!entered_postcopy) { - s->downtime = end_time - s->vm_down_start_time; - } - if (s->mig_total_time) { - s->mbps = (((double) transferred_bytes * 8.0) / - ((double) s->mig_total_time)) / 1000; - } + migration_calculate_complete(s); runstate_set(RUN_STATE_POSTMIGRATE); } else { if (s->state == MIGRATION_STATUS_ACTIVE) {