| Message ID | 20220620110205.1357829-9-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration: remove QEMUFileOps concept and assume use of QIOChannel | expand |
* Daniel P. Berrangé (berrange@redhat.com) wrote: > 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> > --- > migration/multifd.c | 4 ++-- > migration/qemu-file.c | 2 +- > migration/qemu-file.h | 9 ++++++++- > 3 files changed, 11 insertions(+), 4 deletions(-) > > diff --git a/migration/multifd.c b/migration/multifd.c > index 9282ab6aa4..684c014c86 100644 > --- a/migration/multifd.c > +++ b/migration/multifd.c > @@ -435,7 +435,7 @@ static int multifd_send_pages(QEMUFile *f) > p->pages = pages; > transferred = ((uint64_t) pages->num) * qemu_target_page_size() > + p->packet_len; > - qemu_file_update_transfer(f, transferred); > + qemu_file_acct_rate_limit(f, transferred); > ram_counters.multifd_bytes += transferred; > ram_counters.transferred += transferred; > 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->flags |= MULTIFD_FLAG_SYNC; > 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.transferred += p->packet_len; > qemu_mutex_unlock(&p->mutex); > diff --git a/migration/qemu-file.c b/migration/qemu-file.c > index 9a7f715e17..6bbdb60d4d 100644 > --- a/migration/qemu-file.c > +++ b/migration/qemu-file.c > @@ -704,7 +704,7 @@ void qemu_file_reset_rate_limit(QEMUFile *f) > 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; > } > diff --git a/migration/qemu-file.h b/migration/qemu-file.h > index d96f5f7118..901f2cf697 100644 > --- a/migration/qemu-file.h > +++ b/migration/qemu-file.h > @@ -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_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); > int64_t qemu_file_get_rate_limit(QEMUFile *f); > int qemu_file_get_error_obj(QEMUFile *f, Error **errp); > -- > 2.36.1 >
Daniel P. Berrangé <berrange@redhat.com> wrote: > 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: Juan Quintela <quintela@redhat.com>
diff --git a/migration/multifd.c b/migration/multifd.c index 9282ab6aa4..684c014c86 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -435,7 +435,7 @@ static int multifd_send_pages(QEMUFile *f) p->pages = pages; transferred = ((uint64_t) pages->num) * qemu_target_page_size() + p->packet_len; - qemu_file_update_transfer(f, transferred); + qemu_file_acct_rate_limit(f, transferred); ram_counters.multifd_bytes += transferred; ram_counters.transferred += transferred; 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->flags |= MULTIFD_FLAG_SYNC; 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.transferred += p->packet_len; qemu_mutex_unlock(&p->mutex); diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 9a7f715e17..6bbdb60d4d 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -704,7 +704,7 @@ void qemu_file_reset_rate_limit(QEMUFile *f) 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; } diff --git a/migration/qemu-file.h b/migration/qemu-file.h index d96f5f7118..901f2cf697 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -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_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); int64_t qemu_file_get_rate_limit(QEMUFile *f); int qemu_file_get_error_obj(QEMUFile *f, Error **errp);
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> --- migration/multifd.c | 4 ++-- migration/qemu-file.c | 2 +- migration/qemu-file.h | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-)