[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v13 04/12] migration: Calculate transferred ram
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH v13 04/12] migration: Calculate transferred ram correctly |
Date: |
Thu, 31 May 2018 18:14:33 +0100 |
User-agent: |
Mutt/1.9.5 (2018-04-13) |
* Juan Quintela (address@hidden) wrote:
> On multifd we send data from more places that main channel.
>
> Signed-off-by: Juan Quintela <address@hidden>
> ---
> migration/migration.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 05aec2c905..55d7b64e24 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -2679,12 +2679,19 @@ 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()
> + + qemu_ftell(s->to_dst_file);
Didn't we decide after the last set that this had to include the headers
as well?
Dave
> + } 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;
> @@ -2704,7 +2711,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);
> --
> 2.17.0
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH v13 00/12] Multifd, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 01/12] migration: Create multipage support, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 03/12] migration: Add multifd traces for start/end thread, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 04/12] migration: Calculate transferred ram correctly, Juan Quintela, 2018/05/23
- Re: [Qemu-devel] [PATCH v13 04/12] migration: Calculate transferred ram correctly,
Dr. David Alan Gilbert <=
- [Qemu-devel] [PATCH v13 05/12] migration: Multifd channels always wait on the sem, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 02/12] migration: Create multifd packet, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 06/12] migration: Add block where to send/receive packets, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 08/12] migration: Create ram_save_multifd_page, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 07/12] migration: Synchronize multifd threads with main thread, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 11/12] migration: Remove not needed semaphore and quit, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 09/12] migration: Start sending messages, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 10/12] migration: Wait for blocking IO, Juan Quintela, 2018/05/23
- [Qemu-devel] [PATCH v13 12/12] migration: Stop sending whole pages through main channel, Juan Quintela, 2018/05/23
- Re: [Qemu-devel] [PATCH v13 00/12] Multifd, no-reply, 2018/05/23