From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgel-0006ZV-PZ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 05:52:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWgeh-00075Z-Q7 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 05:52:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eWgeh-00074A-H7 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 05:52:19 -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 9A58C2DACF2 for ; Wed, 3 Jan 2018 10:52:18 +0000 (UTC) Date: Wed, 3 Jan 2018 18:52:15 +0800 From: Peter Xu Message-ID: <20180103105215.GL2557@xz-mi> References: <20180103054043.25719-1-peterx@redhat.com> <20180103054043.25719-8-peterx@redhat.com> <87k1wz2tn9.fsf@secure.laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <87k1wz2tn9.fsf@secure.laptop> Subject: Re: [Qemu-devel] [PATCH 07/11] migration: introduce migrate_calculate_complete List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, Laurent Vivier , "Dr . David Alan Gilbert" On Wed, Jan 03, 2018 at 10:12:10AM +0100, Juan Quintela wrote: > Peter Xu wrote: > > 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; > > Why have you remove the if (!entered_postcopy) for the following line? Ah good catch... I'll do this: if (!s->downtime) { /* It is precopy migration */ ... } Thanks, > > I like the rest/idea of the patch. > > Later, Juan. > > > + 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) { -- Peter Xu