From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfjVJ-0003TA-B7 for qemu-devel@nongnu.org; Wed, 08 Apr 2015 02:30:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfjVE-0002v0-A8 for qemu-devel@nongnu.org; Wed, 08 Apr 2015 02:30:25 -0400 Received: from mga11.intel.com ([192.55.52.93]:60194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfjVE-0002un-37 for qemu-devel@nongnu.org; Wed, 08 Apr 2015 02:30:20 -0400 From: Liang Li Date: Wed, 8 Apr 2015 14:20:06 +0800 Message-Id: <1428474011-30797-10-git-send-email-liang.z.li@intel.com> In-Reply-To: <1428474011-30797-1-git-send-email-liang.z.li@intel.com> References: <1428474011-30797-1-git-send-email-liang.z.li@intel.com> Subject: [Qemu-devel] [v7 09/14] 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: quintela@redhat.com, Liang Li , armbru@redhat.com, lcapitulino@redhat.com, Yang Zhang , amit.shah@redhat.com, dgilbert@redhat.com 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 --- arch_init.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index d657a6c..8fb2ea4 100644 --- a/arch_init.c +++ b/arch_init.c @@ -351,6 +351,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 DecompressParam *decomp_param; static QemuThread *decompress_threads; static uint8_t *compressed_data_buf; @@ -436,6 +438,7 @@ void migrate_compress_threads_create(void) if (!migrate_use_compression()) { return; } + compression_switch = true; thread_count = migrate_compress_threads(); compress_threads = g_new0(QemuThread, thread_count); comp_param = g_new0(CompressParam, thread_count); @@ -1059,9 +1062,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 { -- 1.9.1