public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

migration: We don't need the field rate_limit_used anymore

Browse source 
Since previous commit, we calculate how much data we have send with
migration_transferred_bytes() so no need to maintain this counter and
remember to always update it.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230515195709.63843-10-quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-05-15 21:57:02 +02:00
parent 813cd61669
commit bd7ceaf6d5
4 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
migration/migration-stats.c
View file

@ -55,15 +55,9 @@ void migration_rate_set(uint64_t limit)
void migration_rate_reset(QEMUFile *f)
{
stat64_set(&mig_stats.rate_limit_used, 0);
stat64_set(&mig_stats.rate_limit_start, migration_transferred_bytes(f));
}
void migration_rate_account(uint64_t len)
{
stat64_add(&mig_stats.rate_limit_used, len);
}
uint64_t migration_transferred_bytes(QEMUFile *f)
{
uint64_t multifd = stat64_get(&mig_stats.multifd_bytes);

14
migration/migration-stats.h
View file

@ -89,10 +89,6 @@ typedef struct {
* Maximum amount of data we can send in a cycle.
*/
Stat64 rate_limit_max;
/*
* Amount of data we have sent in the current cycle.
*/
Stat64 rate_limit_used;
/*
* Total number of bytes transferred.
*/
@ -105,16 +101,6 @@ typedef struct {
extern MigrationAtomicStats mig_stats;
/**
* migration_rate_account: Increase the number of bytes transferred.
*
* Report on a number of bytes the have been transferred that need to
* be applied to the rate limiting calcuations.
*
* @len: amount of bytes transferred
*/
void migration_rate_account(uint64_t len);
/**
* migration_rate_get: Get the maximum amount that can be transferred.
*

1
migration/multifd.c
View file

@ -431,7 +431,6 @@ static int multifd_send_pages(QEMUFile *f)
multifd_send_state->pages = p->pages;
p->pages = pages;
transferred = ((uint64_t) pages->num) * p->page_size + p->packet_len;
migration_rate_account(transferred);
qemu_mutex_unlock(&p->mutex);
stat64_add(&mig_stats.transferred, transferred);
stat64_add(&mig_stats.multifd_bytes, transferred);

4
migration/qemu-file.c
View file

@ -292,7 +292,6 @@ void qemu_fflush(QEMUFile *f)
qemu_file_set_error_obj(f, -EIO, local_error);
} else {
uint64_t size = iov_size(f->iov, f->iovcnt);
migration_rate_account(size);
f->total_transferred += size;
}
@ -344,9 +343,6 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
if (f->hooks && f->hooks->save_page) {
int ret = f->hooks->save_page(f, block_offset,
offset, size, bytes_sent);
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
migration_rate_account(size);
}
if (ret != RAM_SAVE_CONTROL_DELAYED &&
ret != RAM_SAVE_CONTROL_NOT_SUPP) {