From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cw7Ac-0005my-Sk for qemu-devel@nongnu.org; Thu, 06 Apr 2017 09:09:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cw7Ab-0008C3-Qx for qemu-devel@nongnu.org; Thu, 06 Apr 2017 09:09:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53446) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cw7Ab-0008Bh-Ks for qemu-devel@nongnu.org; Thu, 06 Apr 2017 09:09:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C48A3627C3 for ; Thu, 6 Apr 2017 13:09:48 +0000 (UTC) From: Juan Quintela Date: Thu, 6 Apr 2017 15:08:42 +0200 Message-Id: <20170406130913.2232-24-quintela@redhat.com> In-Reply-To: <20170406130913.2232-1-quintela@redhat.com> References: <20170406130913.2232-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 23/54] ram: Move xbzrle_cache_miss_rate into RAMState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/ram.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index b70db68..09f9eff 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -179,6 +179,8 @@ struct RAMState { uint64_t xbzrle_pages; /* xbzrle number of cache miss */ uint64_t xbzrle_cache_miss; + /* xbzrle miss rate */ + double xbzrle_cache_miss_rate; }; typedef struct RAMState RAMState; @@ -186,7 +188,6 @@ static RAMState ram_state; /* accounting for migration statistics */ typedef struct AccountingInfo { - double xbzrle_cache_miss_rate; uint64_t xbzrle_overflows; } AccountingInfo; @@ -224,7 +225,7 @@ uint64_t xbzrle_mig_pages_cache_miss(void) double xbzrle_mig_cache_miss_rate(void) { - return acct_info.xbzrle_cache_miss_rate; + return ram_state.xbzrle_cache_miss_rate; } uint64_t xbzrle_mig_pages_overflow(void) @@ -699,7 +700,7 @@ static void migration_bitmap_sync(RAMState *rs) if (migrate_use_xbzrle()) { if (rs->iterations_prev != rs->iterations) { - acct_info.xbzrle_cache_miss_rate = + rs->xbzrle_cache_miss_rate = (double)(rs->xbzrle_cache_miss - rs->xbzrle_cache_miss_prev) / (rs->iterations - rs->iterations_prev); @@ -2003,6 +2004,7 @@ static int ram_save_init_globals(RAMState *rs) rs->xbzrle_bytes = 0; rs->xbzrle_pages = 0; rs->xbzrle_cache_miss = 0; + rs->xbzrle_cache_miss_rate = 0; migration_bitmap_sync_init(rs); qemu_mutex_init(&migration_bitmap_mutex); -- 2.9.3