a7b9285033
Alias qemu-system-* man page to qemu.1 (bz #907746) Drop execute bit on service files (bz #963917) Conditionalize KSM service on host virt support (bz #963681) Split out KSM package, make it not pulled in by default
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From 84b78ab739083a154713d89384b85550b39f2057 Mon Sep 17 00:00:00 2001
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
Date: Fri, 1 Feb 2013 12:41:38 +0100
|
|
Subject: [PATCH] migration: don't account sleep time for calculating bandwidth
|
|
|
|
While we are sleeping we are not sending, so we should not use that
|
|
time to estimate our bandwidth.
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
|
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
|
|
(cherry picked from commit 7161082c8d8cf167c508976887a0a63f4db92b51)
|
|
---
|
|
migration.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/migration.c b/migration.c
|
|
index 0026f08..ebfbbde 100644
|
|
--- a/migration.c
|
|
+++ b/migration.c
|
|
@@ -658,6 +658,7 @@ static void *buffered_file_thread(void *opaque)
|
|
{
|
|
MigrationState *s = opaque;
|
|
int64_t initial_time = qemu_get_clock_ms(rt_clock);
|
|
+ int64_t sleep_time = 0;
|
|
int64_t max_size = 0;
|
|
bool last_round = false;
|
|
int ret;
|
|
@@ -730,7 +731,7 @@ static void *buffered_file_thread(void *opaque)
|
|
current_time = qemu_get_clock_ms(rt_clock);
|
|
if (current_time >= initial_time + BUFFER_DELAY) {
|
|
uint64_t transferred_bytes = s->bytes_xfer;
|
|
- uint64_t time_spent = current_time - initial_time;
|
|
+ uint64_t time_spent = current_time - initial_time - sleep_time;
|
|
double bandwidth = transferred_bytes / time_spent;
|
|
max_size = bandwidth * migrate_max_downtime() / 1000000;
|
|
|
|
@@ -739,11 +740,13 @@ static void *buffered_file_thread(void *opaque)
|
|
transferred_bytes, time_spent, bandwidth, max_size);
|
|
|
|
s->bytes_xfer = 0;
|
|
+ sleep_time = 0;
|
|
initial_time = current_time;
|
|
}
|
|
if (!last_round && (s->bytes_xfer >= s->xfer_limit)) {
|
|
/* usleep expects microseconds */
|
|
g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
|
|
+ sleep_time += qemu_get_clock_ms(rt_clock) - current_time;
|
|
}
|
|
ret = buffered_flush(s);
|
|
if (ret < 0) {
|