From patchwork Wed Feb 11 03:06:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 438661 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A0F1214007D for ; Wed, 11 Feb 2015 14:19:41 +1100 (AEDT) Received: from localhost ([::1]:42901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLNpz-00041J-Io for incoming@patchwork.ozlabs.org; Tue, 10 Feb 2015 22:19:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLNlY-0004Ns-7x for qemu-devel@nongnu.org; Tue, 10 Feb 2015 22:15:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLNlU-0000Kl-Gt for qemu-devel@nongnu.org; Tue, 10 Feb 2015 22:15:04 -0500 Received: from mga14.intel.com ([192.55.52.115]:45385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLNlU-0000Ke-Br for qemu-devel@nongnu.org; Tue, 10 Feb 2015 22:15:00 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP; 10 Feb 2015 19:07:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,555,1418112000"; d="scan'208";a="676115777" Received: from lil.sh.intel.com (HELO localhost) ([10.239.159.167]) by fmsmga002.fm.intel.com with ESMTP; 10 Feb 2015 19:14:58 -0800 From: Liang Li To: qemu-devel@nongnu.org Date: Wed, 11 Feb 2015 11:06:19 +0800 Message-Id: <1423623986-590-6-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423623986-590-1-git-send-email-liang.z.li@intel.com> References: <1423623986-590-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Cc: quintela@redhat.com, Liang Li , armbru@redhat.com, lcapitulino@redhat.com, Yang Zhang , amit.shah@redhat.com, dgilbert@redhat.com Subject: [Qemu-devel] [v5 05/12] arch_init: Alloc and free data struct for compression 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 Define the data structure and variables used to do multiple thread compression, and add the code to initialize and free them. Signed-off-by: Liang Li Signed-off-by: Yang Zhang Reviewed-by: Dr.David Alan Gilbert Reviewed-by: Juan Quintela --- arch_init.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index bbb584c..7ccad8b 100644 --- a/arch_init.c +++ b/arch_init.c @@ -335,7 +335,12 @@ static uint32_t last_version; static bool ram_bulk_stage; struct CompressParam { - /* To be done */ + bool busy; + QEMUFile *file; + QemuMutex mutex; + QemuCond cond; + RAMBlock *block; + ram_addr_t offset; }; typedef struct CompressParam CompressParam; @@ -345,6 +350,14 @@ struct DecompressParam { typedef struct DecompressParam DecompressParam; static CompressParam *comp_param; +/* comp_done_cond is used to wake up the migration thread when + * one of the compression threads has finished the compression. + * comp_done_lock is used to co-work with comp_done_cond. + */ +static QemuMutex *comp_done_lock; +static QemuCond *comp_done_cond; +/* The empty QEMUFileOps will be used by file in CompressParam */ +static const QEMUFileOps empty_ops = { }; static bool quit_comp_thread; static bool quit_decomp_thread; static DecompressParam *decomp_param; @@ -380,11 +393,20 @@ void migrate_compress_threads_join(MigrationState *s) thread_count = migrate_compress_threads(); for (i = 0; i < thread_count; i++) { qemu_thread_join(s->compress_thread + i); + qemu_fclose(comp_param[i].file); + qemu_mutex_destroy(&comp_param[i].mutex); + qemu_cond_destroy(&comp_param[i].cond); } + qemu_mutex_destroy(comp_done_lock); + qemu_cond_destroy(comp_done_cond); g_free(s->compress_thread); g_free(comp_param); + g_free(comp_done_cond); + g_free(comp_done_lock); s->compress_thread = NULL; comp_param = NULL; + comp_done_cond = NULL; + comp_done_lock = NULL; } void migrate_compress_threads_create(MigrationState *s) @@ -398,7 +420,17 @@ void migrate_compress_threads_create(MigrationState *s) thread_count = migrate_compress_threads(); s->compress_thread = g_new0(QemuThread, thread_count); comp_param = g_new0(CompressParam, thread_count); + comp_done_cond = g_new0(QemuCond, 1); + comp_done_lock = g_new0(QemuMutex, 1); + qemu_cond_init(comp_done_cond); + qemu_mutex_init(comp_done_lock); for (i = 0; i < thread_count; i++) { + /* com_param[i].file is just used as a dummy buffer to save data, set + * it's ops to empty. + */ + comp_param[i].file = qemu_fopen_ops(NULL, &empty_ops); + qemu_mutex_init(&comp_param[i].mutex); + qemu_cond_init(&comp_param[i].cond); qemu_thread_create(s->compress_thread + i, "compress", do_data_compress, comp_param + i, QEMU_THREAD_JOINABLE);