From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fY72F-0008U4-TW for qemu-devel@nongnu.org; Wed, 27 Jun 2018 05:46:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fY72C-00052e-00 for qemu-devel@nongnu.org; Wed, 27 Jun 2018 05:46:47 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43198 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fY72B-000523-Qf for qemu-devel@nongnu.org; Wed, 27 Jun 2018 05:46:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0DBF781A4EA9 for ; Wed, 27 Jun 2018 09:46:43 +0000 (UTC) Date: Wed, 27 Jun 2018 10:46:39 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20180627094639.GB2423@work-vm> References: <20180626181932.11909-1-quintela@redhat.com> <20180626181932.11909-4-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180626181932.11909-4-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH v16 04/14] migration: Abstract the number of bytes sent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, lvivier@redhat.com, peterx@redhat.com * Juan Quintela (quintela@redhat.com) wrote: > Right now we use the "position" inside the QEMUFile, but things like > RDMA already do weird things to be able to maintain that counter > right, and multifd will have some similar problems. > > Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > --- > migration/migration.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index d3e6da9bfe..264f3ce84e 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -2704,9 +2704,15 @@ static MigThrError migration_detect_error(MigrationState *s) > } > } > > +/* How many bytes have we transferred since the beggining of the migration */ > +static uint64_t migration_total_bytes(MigrationState *s) > +{ > + return qemu_ftell(s->to_dst_file); > +} > + > static void migration_calculate_complete(MigrationState *s) > { > - uint64_t bytes = qemu_ftell(s->to_dst_file); > + uint64_t bytes = migration_total_bytes(s); > int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); > int64_t transfer_time; > > @@ -2729,13 +2735,15 @@ static void migration_update_counters(MigrationState *s, > int64_t current_time) > { > uint64_t transferred, time_spent; > + uint64_t current_bytes; /* bytes transferred since the beginning */ > double bandwidth; > > if (current_time < s->iteration_start_time + BUFFER_DELAY) { > return; > } > > - transferred = qemu_ftell(s->to_dst_file) - s->iteration_initial_bytes; > + current_bytes = migration_total_bytes(s); > + transferred = current_bytes - s->iteration_initial_bytes; > time_spent = current_time - s->iteration_start_time; > bandwidth = (double)transferred / time_spent; > s->threshold_size = bandwidth * s->parameters.downtime_limit; > @@ -2754,7 +2762,7 @@ static void migration_update_counters(MigrationState *s, > qemu_file_reset_rate_limit(s->to_dst_file); > > s->iteration_start_time = current_time; > - s->iteration_initial_bytes = qemu_ftell(s->to_dst_file); > + s->iteration_initial_bytes = current_bytes; > > trace_migrate_transferred(transferred, time_spent, > bandwidth, s->threshold_size); > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK