From patchwork Tue Dec 11 12:46:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 205212 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4CCBD2C0082 for ; Wed, 12 Dec 2012 00:22:03 +1100 (EST) Received: from localhost ([::1]:57341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiPFy-0007P1-1f for incoming@patchwork.ozlabs.org; Tue, 11 Dec 2012 07:48:18 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiPFC-0005mQ-ND for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiPF6-0004NC-DW for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiPF6-0004N6-5g for qemu-devel@nongnu.org; Tue, 11 Dec 2012 07:47:24 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBBClNKh025405 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Dec 2012 07:47:23 -0500 Received: from trasno.mitica (ovpn-113-46.phx2.redhat.com [10.3.113.46]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qBBClCVY027513; Tue, 11 Dec 2012 07:47:22 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 11 Dec 2012 13:46:44 +0100 Message-Id: <1355230031-28233-9-git-send-email-quintela@redhat.com> In-Reply-To: <1355230031-28233-1-git-send-email-quintela@redhat.com> References: <1355230031-28233-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 08/35] migration: remove unfreeze logic X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now that we have a thread, and blocking writes, we don't need it. Signed-off-by: Juan Quintela --- buffered_file.c | 24 +----------------------- migration.c | 23 ----------------------- migration.h | 1 - 3 files changed, 1 insertion(+), 47 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index 27610b4..234b968 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -26,7 +26,6 @@ typedef struct QEMUFileBuffered { MigrationState *migration_state; QEMUFile *file; - int freeze_output; size_t bytes_xfer; size_t xfer_limit; uint8_t *buffer; @@ -70,13 +69,6 @@ static ssize_t buffered_flush(QEMUFileBuffered *s) ret = migrate_fd_put_buffer(s->migration_state, s->buffer + offset, s->buffer_size - offset); - if (ret == -EAGAIN) { - DPRINTF("backend not ready, freezing\n"); - ret = 0; - s->freeze_output = 1; - break; - } - if (ret <= 0) { DPRINTF("error flushing data, %zd\n", ret); break; @@ -110,9 +102,6 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in return error; } - DPRINTF("unfreezing output\n"); - s->freeze_output = 0; - if (size > 0) { DPRINTF("buffering %d bytes\n", size - offset); buffered_append(s, buf, size); @@ -126,7 +115,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in if (pos == 0 && size == 0) { DPRINTF("file is ready\n"); - if (!s->freeze_output && s->bytes_xfer < s->xfer_limit) { + if (s->bytes_xfer < s->xfer_limit) { DPRINTF("notifying client\n"); migrate_fd_put_ready(s->migration_state); } @@ -149,12 +138,6 @@ static int buffered_close(void *opaque) if (ret < 0) { break; } - if (s->freeze_output) { - ret = migrate_fd_wait_for_unfreeze(s->migration_state); - if (ret < 0) { - break; - } - } } ret2 = migrate_fd_close(s->migration_state); @@ -188,8 +171,6 @@ static int buffered_rate_limit(void *opaque) if (ret) { return ret; } - if (s->freeze_output) - return 1; if (s->bytes_xfer > s->xfer_limit) return 1; @@ -234,9 +215,6 @@ static void *buffered_file_thread(void *opaque) if (s->migration_state->complete) { break; } - if (s->freeze_output) { - continue; - } if (current_time >= expire_time) { s->bytes_xfer = 0; expire_time = current_time + BUFFER_DELAY; diff --git a/migration.c b/migration.c index 17ee872..693f329 100644 --- a/migration.c +++ b/migration.c @@ -383,29 +383,6 @@ static void migrate_fd_cancel(MigrationState *s) migrate_fd_cleanup(s); } -int migrate_fd_wait_for_unfreeze(MigrationState *s) -{ - int ret; - - DPRINTF("wait for unfreeze\n"); - if (s->state != MIG_STATE_ACTIVE) - return -EINVAL; - - do { - fd_set wfds; - - FD_ZERO(&wfds); - FD_SET(s->fd, &wfds); - - ret = select(s->fd + 1, NULL, &wfds, NULL, NULL); - } while (ret == -1 && (s->get_error(s)) == EINTR); - - if (ret == -1) { - return -s->get_error(s); - } - return 0; -} - int migrate_fd_close(MigrationState *s) { int rc = 0; diff --git a/migration.h b/migration.h index b66fd60..5ff68eb 100644 --- a/migration.h +++ b/migration.h @@ -81,7 +81,6 @@ void migrate_fd_connect(MigrationState *s); ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, size_t size); void migrate_fd_put_ready(MigrationState *s); -int migrate_fd_wait_for_unfreeze(MigrationState *s); int migrate_fd_close(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify);