From patchwork Mon Feb 2 11:05:41 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: 435418 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 D4E9C1402A7 for ; Mon, 2 Feb 2015 22:16:35 +1100 (AEDT) Received: from localhost ([::1]:53965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIEzZ-0002dn-UP for incoming@patchwork.ozlabs.org; Mon, 02 Feb 2015 06:16:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIEx9-0006vB-FD for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:14:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIEx4-0004uW-FZ for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:14:03 -0500 Received: from mga02.intel.com ([134.134.136.20]:41339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIEx4-0004uL-9y for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:13:58 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 02 Feb 2015 03:13:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="448648019" Received: from lil.sh.intel.com (HELO localhost) ([10.239.159.167]) by FMSMGA003.fm.intel.com with ESMTP; 02 Feb 2015 02:59:50 -0800 From: Liang Li To: qemu-devel@nongnu.org Date: Mon, 2 Feb 2015 19:05:41 +0800 Message-Id: <1422875149-13198-6-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422875149-13198-1-git-send-email-liang.z.li@intel.com> References: <1422875149-13198-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: 134.134.136.20 Cc: quintela@redhat.com, Liang Li , armbru@redhat.com, dgilbert@redhat.com, Yang Zhang , amit.shah@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [v4 05/13] 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 --- arch_init.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index ed34eb3..87c4947 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_thread; static DecompressParam *decomp_param; static QemuThread *decompress_threads; @@ -379,11 +392,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) @@ -397,7 +419,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);