From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZR-0005Y0-CX for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOkZQ-0000gr-2k for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZP-0000gm-Qn for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:08 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9I7V71t029437 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Oct 2012 03:31:07 -0400 From: Juan Quintela Date: Thu, 18 Oct 2012 09:30:18 +0200 Message-Id: <1350545426-23172-23-git-send-email-quintela@redhat.com> In-Reply-To: <1350545426-23172-1-git-send-email-quintela@redhat.com> References: <1350545426-23172-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 22/30] migration: unfold rest of migrate_fd_put_ready() into thread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This will allow us finer control in next patches. Signed-off-by: Juan Quintela --- migration.c | 95 ++++++++++++++++++++++++++----------------------------------- 1 file changed, 41 insertions(+), 54 deletions(-) diff --git a/migration.c b/migration.c index 7206866..e6ff1f1 100644 --- a/migration.c +++ b/migration.c @@ -644,54 +644,6 @@ static int64_t buffered_get_rate_limit(void *opaque) return s->xfer_limit; } -static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) -{ - int ret; - uint64_t pending_size; - bool last_round = false; - - qemu_mutex_lock_iothread(); - DPRINTF("iterate\n"); - pending_size = qemu_savevm_state_pending(s->file, max_size); - DPRINTF("pending size %lu max %lu\n", pending_size, max_size); - if (pending_size >= max_size) { - ret = qemu_savevm_state_iterate(s->file); - if (ret < 0) { - migrate_fd_error(s); - } - } else { - int old_vm_running = runstate_is_running(); - int64_t start_time, end_time; - - DPRINTF("done iterating\n"); - start_time = qemu_get_clock_ms(rt_clock); - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); - if (old_vm_running) { - vm_stop(RUN_STATE_FINISH_MIGRATE); - } else { - vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); - } - - if (qemu_savevm_state_complete(s->file) < 0) { - migrate_fd_error(s); - } else { - migrate_fd_completed(s); - } - end_time = qemu_get_clock_ms(rt_clock); - s->total_time = end_time - s->total_time; - s->downtime = end_time - start_time; - if (s->state != MIG_STATE_COMPLETED) { - if (old_vm_running) { - vm_start(); - } - } - last_round = true; - } - qemu_mutex_unlock_iothread(); - - return last_round; -} - /* 100ms xfer_limit is the limit that we should write each 100ms */ #define BUFFER_DELAY 100 @@ -716,6 +668,7 @@ static void *buffered_file_thread(void *opaque) while (true) { int64_t current_time = qemu_get_clock_ms(rt_clock); + uint64_t pending_size; qemu_mutex_lock_iothread(); if (m->state != MIG_STATE_ACTIVE) { @@ -727,6 +680,46 @@ static void *buffered_file_thread(void *opaque) qemu_mutex_unlock_iothread(); break; } + if (s->bytes_xfer < s->xfer_limit) { + DPRINTF("iterate\n"); + pending_size = qemu_savevm_state_pending(m->file, max_size); + DPRINTF("pending size %lu max %lu\n", pending_size, max_size); + if (pending_size >= max_size) { + ret = qemu_savevm_state_iterate(m->file); + if (ret < 0) { + qemu_mutex_unlock_iothread(); + break; + } + } else { + int old_vm_running = runstate_is_running(); + int64_t start_time, end_time; + + DPRINTF("done iterating\n"); + start_time = qemu_get_clock_ms(rt_clock); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + if (old_vm_running) { + vm_stop(RUN_STATE_FINISH_MIGRATE); + } else { + vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); + } + ret = qemu_savevm_state_complete(m->file); + if (ret < 0) { + qemu_mutex_unlock_iothread(); + break; + } else { + migrate_fd_completed(m); + } + end_time = qemu_get_clock_ms(rt_clock); + m->total_time = end_time - m->total_time; + m->downtime = end_time - start_time; + if (m->state != MIG_STATE_COMPLETED) { + if (old_vm_running) { + vm_start(); + } + } + last_round = true; + } + } qemu_mutex_unlock_iothread(); if (current_time >= initial_time + BUFFER_DELAY) { @@ -747,12 +740,6 @@ static void *buffered_file_thread(void *opaque) usleep((initial_time + BUFFER_DELAY - current_time)*1000); } buffered_flush(s); - - DPRINTF("file is ready\n"); - if (s->bytes_xfer < s->xfer_limit) { - DPRINTF("notifying client\n"); - last_round = migrate_fd_put_ready(m, max_size); - } } out: -- 1.7.11.7