From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coUQS-0004nP-GG for qemu-devel@nongnu.org; Thu, 16 Mar 2017 08:22:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coUQO-00054g-H6 for qemu-devel@nongnu.org; Thu, 16 Mar 2017 08:22:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54240) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coUQO-00054V-8L for qemu-devel@nongnu.org; Thu, 16 Mar 2017 08:22:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C47663142 for ; Thu, 16 Mar 2017 12:22:36 +0000 (UTC) Date: Thu, 16 Mar 2017 12:22:31 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20170316122231.GE2567@work-vm> References: <20170315135021.6978-1-quintela@redhat.com> <20170315135021.6978-6-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170315135021.6978-6-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 05/31] ram: Move bytes_xfer_prev into RAMState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, amit.shah@redhat.com * Juan Quintela (quintela@redhat.com) wrote: > Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > --- > migration/ram.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index f6ac503..2d288cc 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -151,6 +151,8 @@ struct RAMState { > /* this variables are used for bitmap sync */ > /* last time we did a full bitmap_sync */ > int64_t start_time; > + /* bytes transferred at start_time */ > + int64_t bytes_xfer_prev; > }; > typedef struct RAMState RAMState; > > @@ -597,7 +599,6 @@ static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) > } > > /* Fix me: there are too many global variables used in migration process. */ > -static int64_t bytes_xfer_prev; > static int64_t num_dirty_pages_period; > static uint64_t xbzrle_cache_miss_prev; > static uint64_t iterations_prev; > @@ -605,7 +606,7 @@ static uint64_t iterations_prev; > static void migration_bitmap_sync_init(RAMState *rs) > { > rs->start_time = 0; > - bytes_xfer_prev = 0; > + rs->bytes_xfer_prev = 0; > num_dirty_pages_period = 0; > xbzrle_cache_miss_prev = 0; > iterations_prev = 0; > @@ -638,8 +639,8 @@ static void migration_bitmap_sync(RAMState *rs) > > rs->bitmap_sync_count++; > > - if (!bytes_xfer_prev) { > - bytes_xfer_prev = ram_bytes_transferred(); > + if (!rs->bytes_xfer_prev) { > + rs->bytes_xfer_prev = ram_bytes_transferred(); > } > > if (!rs->start_time) { > @@ -674,13 +675,13 @@ static void migration_bitmap_sync(RAMState *rs) > > if (s->dirty_pages_rate && > (num_dirty_pages_period * TARGET_PAGE_SIZE > > - (bytes_xfer_now - bytes_xfer_prev)/2) && > + (bytes_xfer_now - rs->bytes_xfer_prev)/2) && > (rs->dirty_rate_high_cnt++ >= 2)) { > trace_migration_throttle(); > rs->dirty_rate_high_cnt = 0; > mig_throttle_guest_down(); > } > - bytes_xfer_prev = bytes_xfer_now; > + rs->bytes_xfer_prev = bytes_xfer_now; > } > > if (migrate_use_xbzrle()) { > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK