ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Make compression co-work with xbzrle 

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 <liang.z.li@intel.com>
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>
Reviewed-by: Dr.David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Liang Li 2015-03-23 16:32:24 +08:00 committed by Juan Quintela
parent 20eb617eac
commit 98f1138902
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch_init.c
View File

@ -349,6 +349,8 @@ static QemuMutex *comp_done_lock;
static QemuCond *comp_done_cond; static QemuCond *comp_done_cond;
/* The empty QEMUFileOps will be used by file in CompressParam */ /* The empty QEMUFileOps will be used by file in CompressParam */
static const QEMUFileOps empty_ops = { }; static const QEMUFileOps empty_ops = { };
static bool compression_switch;
static bool quit_comp_thread; static bool quit_comp_thread;
static bool quit_decomp_thread; static bool quit_decomp_thread;
static DecompressParam *decomp_param; static DecompressParam *decomp_param;
@ -435,6 +437,7 @@ void migrate_compress_threads_create(void)
return; return;
} }
quit_comp_thread = false; quit_comp_thread = false;
compression_switch = true;
thread_count = migrate_compress_threads(); thread_count = migrate_compress_threads();
compress_threads = g_new0(QemuThread, thread_count); compress_threads = g_new0(QemuThread, thread_count);
comp_param = g_new0(CompressParam, thread_count); comp_param = g_new0(CompressParam, thread_count);
@ -1061,9 +1064,16 @@ static int ram_find_and_save_block(QEMUFile *f, bool last_stage,
block = QLIST_FIRST_RCU(&ram_list.blocks); block = QLIST_FIRST_RCU(&ram_list.blocks);
complete_round = true; complete_round = true;
ram_bulk_stage = false; 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 { } else {
if (migrate_use_compression()) { if (compression_switch && migrate_use_compression()) {
pages = ram_save_compressed_page(f, block, offset, last_stage, pages = ram_save_compressed_page(f, block, offset, last_stage,
bytes_transferred); bytes_transferred);
} else { } else {