[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [v6 09/14] migration: Make compression co-work with xbzrle
From: |
Liang Li |
Subject: |
[Qemu-devel] [v6 09/14] migration: Make compression co-work with xbzrle |
Date: |
Mon, 23 Mar 2015 16:32:24 +0800 |
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 <address@hidden>
Signed-off-by: Yang Zhang <address@hidden>
Reviewed-by: Dr.David Alan Gilbert <address@hidden>
---
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 {
--
1.9.1
- [Qemu-devel] [v6 08/14] migration: Add the core code of multi-thread compression, (continued)
- [Qemu-devel] [v6 08/14] migration: Add the core code of multi-thread compression, Liang Li, 2015/03/23
- [Qemu-devel] [v6 03/14] migration: Add the framework of multi-thread decompression, Liang Li, 2015/03/23
- [Qemu-devel] [v6 11/14] migration: Add interface to control compression, Liang Li, 2015/03/23
- [Qemu-devel] [v6 04/14] qemu-file: Add compression functions to QEMUFile, Liang Li, 2015/03/23
- [Qemu-devel] [v6 13/14] migration: Add qmp commands to set and query parameters, Liang Li, 2015/03/23
- [Qemu-devel] [v6 10/14] migration: Add the core code for decompression, Liang Li, 2015/03/23
- [Qemu-devel] [v6 09/14] migration: Make compression co-work with xbzrle,
Liang Li <=
- [Qemu-devel] [v6 14/14] migration: Add hmp interface to set and query parameters, Liang Li, 2015/03/23
- [Qemu-devel] [v6 06/14] arch_init: Add and free data struct for decompression, Liang Li, 2015/03/23
- [Qemu-devel] [v6 05/14] arch_init: Alloc and free data struct for compression, Liang Li, 2015/03/23
- [Qemu-devel] [v6 07/14] migration: Split save_zero_page from ram_save_page, Liang Li, 2015/03/23
- [Qemu-devel] [v6 12/14] migration: Use an array instead of 3 parameters, Liang Li, 2015/03/23
- [Qemu-devel] [v6 02/14] migration: Add the framework of multi-thread compression, Liang Li, 2015/03/23
- [Qemu-devel] [v6 01/14] docs: Add a doc about multiple thread compression, Liang Li, 2015/03/23