From patchwork Tue Jul 24 18:36:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 173026 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 C4C402C0080 for ; Wed, 25 Jul 2012 05:03:57 +1000 (EST) Received: from localhost ([::1]:34934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stk06-000298-MM for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 14:38:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stjz4-0000VY-V3 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 14:37:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stjz3-0005mL-QO for qemu-devel@nongnu.org; Tue, 24 Jul 2012 14:37:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54654) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stjz3-0005ku-Iw for qemu-devel@nongnu.org; Tue, 24 Jul 2012 14:37:25 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6OIbOZ4002422 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 24 Jul 2012 14:37:25 -0400 Received: from trasno.mitica (ovpn-116-53.ams2.redhat.com [10.36.116.53]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6OIaqYq003393; Tue, 24 Jul 2012 14:37:24 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 20:36:49 +0200 Message-Id: <1343155012-26316-25-git-send-email-quintela@redhat.com> In-Reply-To: <1343155012-26316-1-git-send-email-quintela@redhat.com> References: <1343155012-26316-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 24/27] migration: take finer locking 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 Instead of locking the whole migration_thread inside loop, just lock migration_fd_put_notify, that is what interacts with the rest of the world. Signed-off-by: Juan Quintela --- buffered_file.c | 2 -- migration.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index b5e809c..de07a05 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -207,9 +207,7 @@ static void *buffered_file_thread(void *opaque) /* usleep expects microseconds */ usleep((expire_time - current_time)*1000); } - qemu_mutex_lock_iothread(); buffered_put_buffer(s, NULL, 0, 0); - qemu_mutex_unlock_iothread(); } g_free(s->buffer); g_free(s); diff --git a/migration.c b/migration.c index da0f192..2f45f66 100644 --- a/migration.c +++ b/migration.c @@ -327,8 +327,10 @@ void migrate_fd_put_ready(MigrationState *s) int ret; static bool first_time = true; + qemu_mutex_lock_iothread(); if (s->state != MIG_STATE_ACTIVE) { DPRINTF("put_ready returning because of non-active state\n"); + qemu_mutex_unlock_iothread(); return; } if (first_time) { @@ -338,6 +340,7 @@ void migrate_fd_put_ready(MigrationState *s) if (ret < 0) { DPRINTF("failed, %d\n", ret); migrate_fd_error(s); + qemu_mutex_unlock_iothread(); return; } } @@ -374,6 +377,8 @@ void migrate_fd_put_ready(MigrationState *s) } } } + qemu_mutex_unlock_iothread(); + } static void migrate_fd_cancel(MigrationState *s)