From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1Fnm-0005Xf-LV for qemu-devel@nongnu.org; Fri, 01 Feb 2013 07:33:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1Fnl-0000OM-8F for qemu-devel@nongnu.org; Fri, 01 Feb 2013 07:33:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1Fnk-0000OA-WF for qemu-devel@nongnu.org; Fri, 01 Feb 2013 07:33:05 -0500 From: Juan Quintela Date: Fri, 1 Feb 2013 13:32:56 +0100 Message-Id: <1359721976-19238-5-git-send-email-quintela@redhat.com> In-Reply-To: <1359721976-19238-1-git-send-email-quintela@redhat.com> References: <1359721976-19238-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] migration: calculate expected_downtime List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Qemu Devel , Anthony Liguori We removed the calculation in commit e4ed1541ac9413eac494a03532e34beaf8a7d1c5 Now we add it back. We need to create dirty_bytes_rate because we can't include cpu-all.h from migration.c, and there is no other way to include TARGET_PAGE_SIZE. Signed-off-by: Juan Quintela --- arch_init.c | 1 + include/migration/migration.h | 1 + migration.c | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/arch_init.c b/arch_init.c index dada6de..634490a 100644 --- a/arch_init.c +++ b/arch_init.c @@ -414,6 +414,7 @@ static void migration_bitmap_sync(void) if (end_time > start_time + 1000) { s->dirty_pages_rate = num_dirty_pages_period * 1000 / (end_time - start_time); + s->dirty_bytes_rate = s->dirty_pages_rate * TARGET_PAGE_SIZE; start_time = end_time; num_dirty_pages_period = 0; } diff --git a/include/migration/migration.h b/include/migration/migration.h index a8c9639..d121409 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -51,6 +51,7 @@ struct MigrationState int64_t downtime; int64_t expected_downtime; int64_t dirty_pages_rate; + int64_t dirty_bytes_rate; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; bool complete; diff --git a/migration.c b/migration.c index 64e75ca..4eca42e 100644 --- a/migration.c +++ b/migration.c @@ -746,6 +746,11 @@ static void *buffered_file_thread(void *opaque) DPRINTF("transferred %" PRIu64 " time_spent %" PRIu64 " bandwidth %g max_size %" PRId64 "\n", transferred_bytes, time_spent, bandwidth, max_size); + /* if we haven't sent anything, we don't want to recalculate + 10000 is a small enough number for our purposes */ + if (s->dirty_bytes_rate && transferred_bytes > 10000) { + s->expected_downtime = s->dirty_bytes_rate / bandwidth; + } s->bytes_xfer = 0; sleep_time = 0; -- 1.8.1