From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqKKW-0005AU-HQ for qemu-devel@nongnu.org; Thu, 07 May 2015 07:51:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqKKV-0007Zc-Cx for qemu-devel@nongnu.org; Thu, 07 May 2015 07:51:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqKKV-0007ZT-8T for qemu-devel@nongnu.org; Thu, 07 May 2015 07:51:03 -0400 From: Juan Quintela Date: Thu, 7 May 2015 13:50:37 +0200 Message-Id: <1430999444-24315-10-git-send-email-quintela@redhat.com> In-Reply-To: <1430999444-24315-1-git-send-email-quintela@redhat.com> References: <1430999444-24315-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 09/16] migration: Make compression co-work with xbzrle List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Yang Zhang , Liang Li From: Liang Li Now, multiple thread compression can co-work with xbzrle. when xbzrle is on, multiple thread compression will only work at the first round of RAM data sync. Signed-off-by: Liang Li Signed-off-by: Yang Zhang Reviewed-by: Dr.David Alan Gilbert Signed-off-by: Juan Quintela --- arch_init.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 9f63c0f..b81acc9 100644 --- a/arch_init.c +++ b/arch_init.c @@ -349,6 +349,8 @@ 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 compression_switch; static bool quit_comp_thread; static bool quit_decomp_thread; static DecompressParam *decomp_param; @@ -435,6 +437,7 @@ void migrate_compress_threads_create(void) return; } quit_comp_thread = false; + compression_switch = true; thread_count = migrate_compress_threads(); compress_threads = g_new0(QemuThread, thread_count); comp_param = g_new0(CompressParam, thread_count); @@ -1060,9 +1063,16 @@ static int ram_find_and_save_block(QEMUFile *f, bool last_stage, block = QLIST_FIRST_RCU(&ram_list.blocks); complete_round = true; ram_bulk_stage = false; + if (migrate_use_xbzrle()) { + /* If xbzrle is on, stop using the data compression at this + * point. In theory, xbzrle can do better than compression. + */ + flush_compressed_data(f); + compression_switch = false; + } } } else { - if (migrate_use_compression()) { + if (compression_switch && migrate_use_compression()) { pages = ram_save_compressed_page(f, block, offset, last_stage, bytes_transferred); } else { -- 2.4.0