OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit

Browse Source 
The qemu_file_update_transfer name doesn't give a clear guide on what
its purpose is, and how it differs from the qemu_file_credit_transfer
method. The latter is specifically for accumulating for total migration
traffic, while the former is specifically for accounting in thue rate
limit calculations. The new name give better guidance on its usage.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-06-20 12:01:52 +01:00 committed by Dr. David Alan Gilbert
parent 1a93bd2f60
commit bc698c367d
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/multifd.c
View File

@ -435,7 +435,7 @@ static int multifd_send_pages(QEMUFile *f)
p->pages = pages; p->pages = pages;
transferred = ((uint64_t) pages->num) * qemu_target_page_size() transferred = ((uint64_t) pages->num) * qemu_target_page_size()
+ p->packet_len; + p->packet_len;
qemu_file_update_transfer(f, transferred); qemu_file_acct_rate_limit(f, transferred);
ram_counters.multifd_bytes += transferred; ram_counters.multifd_bytes += transferred;
ram_counters.transferred += transferred; ram_counters.transferred += transferred;
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
@ -610,7 +610,7 @@ int multifd_send_sync_main(QEMUFile *f)
p->packet_num = multifd_send_state->packet_num++; p->packet_num = multifd_send_state->packet_num++;
p->flags |= MULTIFD_FLAG_SYNC; p->flags |= MULTIFD_FLAG_SYNC;
p->pending_job++; p->pending_job++;
qemu_file_update_transfer(f, p->packet_len); qemu_file_acct_rate_limit(f, p->packet_len);
ram_counters.multifd_bytes += p->packet_len; ram_counters.multifd_bytes += p->packet_len;
ram_counters.transferred += p->packet_len; ram_counters.transferred += p->packet_len;
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);

2
migration/qemu-file.c
View File

@ -704,7 +704,7 @@ void qemu_file_reset_rate_limit(QEMUFile *f)
f->rate_limit_used = 0; f->rate_limit_used = 0;
} }
void qemu_file_update_transfer(QEMUFile *f, int64_t len) void qemu_file_acct_rate_limit(QEMUFile *f, int64_t len)
{ {
f->rate_limit_used += len; f->rate_limit_used += len;
} }

9
migration/qemu-file.h
View File

@ -188,7 +188,14 @@ void qemu_file_skip(QEMUFile *f, int size);
*/ */
void qemu_file_credit_transfer(QEMUFile *f, size_t size); void qemu_file_credit_transfer(QEMUFile *f, size_t size);
void qemu_file_reset_rate_limit(QEMUFile *f); void qemu_file_reset_rate_limit(QEMUFile *f);
void qemu_file_update_transfer(QEMUFile *f, int64_t len); /*
* qemu_file_acct_rate_limit:
*
* Report on a number of bytes the have been transferred
* out of band from the main file object I/O methods, and
* need to be applied to the rate limiting calcuations
*/
void qemu_file_acct_rate_limit(QEMUFile *f, int64_t len);
void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate); void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate);
int64_t qemu_file_get_rate_limit(QEMUFile *f); int64_t qemu_file_get_rate_limit(QEMUFile *f);
int qemu_file_get_error_obj(QEMUFile *f, Error **errp); int qemu_file_get_error_obj(QEMUFile *f, Error **errp);