[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/25] migration: rename qemu_file_update_transfer to qemu_file_ac
From: |
Juan Quintela |
Subject: |
[PULL 12/25] migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit |
Date: |
Wed, 22 Jun 2022 02:25:34 +0200 |
From: Daniel P. Berrangé <berrange@redhat.com>
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>
---
migration/qemu-file.h | 9 ++++++++-
migration/multifd.c | 4 ++--
migration/qemu-file.c | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
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);
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;
}
--
2.35.3
- [PULL 00/25] Migration 20220621 patches, Juan Quintela, 2022/06/21
- [PULL 01/25] migration: Remove RDMA_UNREGISTRATION_EXAMPLE, Juan Quintela, 2022/06/21
- [PULL 02/25] QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability, Juan Quintela, 2022/06/21
- [PULL 04/25] migration: Change zero_copy_send from migration parameter to migration capability, Juan Quintela, 2022/06/21
- [PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works, Juan Quintela, 2022/06/21
- [PULL 05/25] io: add a QIOChannelNull equivalent to /dev/null, Juan Quintela, 2022/06/21
- [PULL 06/25] migration: switch to use QIOChannelNull for dummy channel, Juan Quintela, 2022/06/21
- [PULL 07/25] migration: remove unreachble RDMA code in save_hook impl, Juan Quintela, 2022/06/21
- [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer, Juan Quintela, 2022/06/21
- [PULL 12/25] migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit,
Juan Quintela <=
- [PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMState, Juan Quintela, 2022/06/21
- [PULL 08/25] migration: rename rate limiting fields in QEMUFile, Juan Quintela, 2022/06/21
- [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred, Juan Quintela, 2022/06/21
- [PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_processed', Juan Quintela, 2022/06/21
- [PULL 13/25] migration: introduce a QIOChannel impl for BlockDriverState VMState, Juan Quintela, 2022/06/21
- [PULL 15/25] migration: stop passing 'opaque' parameter to QEMUFile hooks, Juan Quintela, 2022/06/21
- [PULL 16/25] migration: hardcode assumption that QEMUFile is backed with QIOChannel, Juan Quintela, 2022/06/21
- [PULL 18/25] migration: remove unused QEMUFileGetFD typedef / qemu_get_fd method, Juan Quintela, 2022/06/21
- [PULL 19/25] migration: remove the QEMUFileOps 'shut_down' callback, Juan Quintela, 2022/06/21
- [PULL 17/25] migration: introduce new constructors for QEMUFile, Juan Quintela, 2022/06/21