Re: [PATCH v2 07/11] migration: Create compress_update_rates()

[Juan Quintela]

Fabiano Rosas <faro...@suse.de> wrote:
> Juan Quintela <quint...@redhat.com> writes:
>
>> So we can move more compression_counters stuff to ram-compress.c.
>> Create compression_counters struct to add the stuff that was on
>> MigrationState.
>>
>> Reviewed-by: Lukas Straub <lukasstra...@web.de>
>> Signed-off-by: Juan Quintela <quint...@redhat.com>
>> ---
>>  migration/ram-compress.h |  1 +
>>  migration/ram.h          |  1 -
>>  migration/ram-compress.c | 42 +++++++++++++++++++++++++++++++++++++++-
>>  migration/ram.c          | 29 +--------------------------
>>  4 files changed, 43 insertions(+), 30 deletions(-)
>>
>> diff --git a/migration/ram-compress.h b/migration/ram-compress.h
>> index b228640092..76dacd3ec7 100644
>> --- a/migration/ram-compress.h
>> +++ b/migration/ram-compress.h
>> @@ -71,5 +71,6 @@ void decompress_data_with_multi_threads(QEMUFile *f, void 
>> *host, int len);
>>  void populate_compress(MigrationInfo *info);
>>  uint64_t ram_compressed_pages(void);
>>  void update_compress_thread_counts(const CompressParam *param, int 
>> bytes_xmit);
>> +void compress_update_rates(uint64_t page_count);
>>  
>>  #endif
>> diff --git a/migration/ram.h b/migration/ram.h
>> index 145c915ca7..9cf8f58e97 100644
>> --- a/migration/ram.h
>> +++ b/migration/ram.h
>> @@ -34,7 +34,6 @@
>>  #include "io/channel.h"
>>  
>>  extern XBZRLECacheStats xbzrle_counters;
>> -extern CompressionStats compression_counters;
>>  
>>  /* Should be holding either ram_list.mutex, or the RCU lock. */
>>  #define RAMBLOCK_FOREACH_NOT_IGNORED(block)            \
>> diff --git a/migration/ram-compress.c b/migration/ram-compress.c
>> index f56e1f8e69..af42cab0fe 100644
>> --- a/migration/ram-compress.c
>> +++ b/migration/ram-compress.c
>> @@ -41,7 +41,20 @@
>>  #include "ram.h"
>>  #include "migration-stats.h"
>>  
>> -CompressionStats compression_counters;
>
> Could we remove CompressionStats from migration.json now?

No.

void populate_compress(MigrationInfo *info)
{
    if (!migrate_compress()) {
        return;
    }
    info->compression = g_malloc0(sizeof(*info->compression));
    info->compression->pages = compression_counters.pages;
    info->compression->busy = compression_counters.busy;
    info->compression->busy_rate = compression_counters.busy_rate;
    info->compression->compressed_size = compression_counters.compressed_size;
    info->compression->compression_rate = compression_counters.compression_rate;
}

I know that at this point you hate backwards compatibility O:-)

> Anyway:
> Reviewed-by: Fabiano Rosas <faro...@suse.de>

Thanks.