Re: [Qemu-devel] [PATCH 20/51] ram: Move xbzrle_cache_miss_rate into RAMState

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  migration/ram.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index cc19406..c398ff9 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -178,6 +178,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;
>  
> @@ -185,7 +187,6 @@ static RAMState ram_state;
>  
>  /* accounting for migration statistics */
>  typedef struct AccountingInfo {
> -    double xbzrle_cache_miss_rate;
>      uint64_t xbzrle_overflows;
>  } AccountingInfo;
>  
> @@ -223,7 +224,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)
> @@ -698,7 +699,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);
> @@ -2001,6 +2002,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
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK