[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v15 04/12] migration: Calculate transferred ram corr
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v15 04/12] migration: Calculate transferred ram correctly |
Date: |
Thu, 21 Jun 2018 01:28:43 +0200 |
On multifd we send data from more places that main channel.
Signed-off-by: Juan Quintela <address@hidden>
--
Add placeholder for packets size
---
migration/migration.c | 12 ++++++++++--
migration/ram.c | 7 +++++++
migration/ram.h | 1 +
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index e1eaa97df4..224629533b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2728,12 +2728,20 @@ static void migration_update_counters(MigrationState *s,
{
uint64_t transferred, time_spent;
double bandwidth;
+ uint64_t now;
if (current_time < s->iteration_start_time + BUFFER_DELAY) {
return;
}
- transferred = qemu_ftell(s->to_dst_file) - s->iteration_initial_bytes;
+ if (migrate_use_multifd()) {
+ now = ram_counters.normal * qemu_target_page_size()
+ + multifd_packets_size()
+ + qemu_ftell(s->to_dst_file);
+ } else {
+ now = qemu_ftell(s->to_dst_file);
+ }
+ transferred = now - s->iteration_initial_bytes;
time_spent = current_time - s->iteration_start_time;
bandwidth = (double)transferred / time_spent;
s->threshold_size = bandwidth * s->parameters.downtime_limit;
@@ -2752,7 +2760,7 @@ static void migration_update_counters(MigrationState *s,
qemu_file_reset_rate_limit(s->to_dst_file);
s->iteration_start_time = current_time;
- s->iteration_initial_bytes = qemu_ftell(s->to_dst_file);
+ s->iteration_initial_bytes = now;
trace_migrate_transferred(transferred, time_spent,
bandwidth, s->threshold_size);
diff --git a/migration/ram.c b/migration/ram.c
index d146689d3a..d7f8b0d989 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -952,6 +952,13 @@ int multifd_save_setup(void)
return 0;
}
+/* Size in bytes of the page headers */
+int multifd_packets_size(void)
+{
+ /* We are not yet sending any data through channels */
+ return 0;
+}
+
struct {
MultiFDRecvParams *params;
/* number of created threads */
diff --git a/migration/ram.h b/migration/ram.h
index d386f4d641..e1decb7418 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -47,6 +47,7 @@ int multifd_load_setup(void);
int multifd_load_cleanup(Error **errp);
bool multifd_recv_all_channels_created(void);
void multifd_recv_new_channel(QIOChannel *ioc);
+int multifd_packets_size(void);
uint64_t ram_pagesize_summary(void);
int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
--
2.17.1
- [Qemu-devel] [PATCH v15 00/12] Multifd, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 01/12] migration: Create multipage support, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 02/12] migration: Create multifd packet, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 03/12] migration: Add multifd traces for start/end thread, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 04/12] migration: Calculate transferred ram correctly,
Juan Quintela <=
- [Qemu-devel] [PATCH v15 06/12] migration: Add block where to send/receive packets, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 09/12] migration: Start sending messages, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 08/12] migration: Create ram_save_multifd_page, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 12/12] migration: Stop sending whole pages through main channel, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 05/12] migration: Multifd channels always wait on the sem, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 07/12] migration: Synchronize multifd threads with main thread, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 10/12] migration: Wait for blocking IO, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 11/12] migration: Remove not needed semaphore and quit, Juan Quintela, 2018/06/20
- Re: [Qemu-devel] [PATCH v15 00/12] Multifd, no-reply, 2018/06/22