[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/15] migration: Add the core code for decompression
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 10/15] migration: Add the core code for decompression |
Date: |
Wed, 6 May 2015 19:49:59 +0200 |
From: Liang Li <address@hidden>
Implement the core logic of multiple thread decompression,
the decompression can work now.
Signed-off-by: Liang Li <address@hidden>
Signed-off-by: Yang Zhang <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 48 insertions(+), 2 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index b81acc9..6a0d709 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -888,6 +888,13 @@ static inline void start_compression(CompressParam *param)
qemu_mutex_unlock(¶m->mutex);
}
+static inline void start_decompression(DecompressParam *param)
+{
+ qemu_mutex_lock(¶m->mutex);
+ param->start = true;
+ qemu_cond_signal(¶m->cond);
+ qemu_mutex_unlock(¶m->mutex);
+}
static uint64_t bytes_transferred;
@@ -1459,8 +1466,26 @@ void ram_handle_compressed(void *host, uint8_t ch,
uint64_t size)
static void *do_data_decompress(void *opaque)
{
+ DecompressParam *param = opaque;
+ size_t pagesize;
+
while (!quit_decomp_thread) {
- /* To be done */
+ qemu_mutex_lock(¶m->mutex);
+ while (!param->start && !quit_decomp_thread) {
+ qemu_cond_wait(¶m->cond, ¶m->mutex);
+ pagesize = TARGET_PAGE_SIZE;
+ if (!quit_decomp_thread) {
+ /* uncompress() will return failed in some case, especially
+ * when the page is dirted when doing the compression, it's
+ * not a problem because the dirty page will be retransferred
+ * and uncompress() won't break the data in other pages.
+ */
+ uncompress((Bytef *)param->des, &pagesize,
+ (const Bytef *)param->compbuf, param->len);
+ }
+ param->start = false;
+ }
+ qemu_mutex_unlock(¶m->mutex);
}
return NULL;
@@ -1492,6 +1517,11 @@ void migrate_decompress_threads_join(void)
quit_decomp_thread = true;
thread_count = migrate_decompress_threads();
for (i = 0; i < thread_count; i++) {
+ qemu_mutex_lock(&decomp_param[i].mutex);
+ qemu_cond_signal(&decomp_param[i].cond);
+ qemu_mutex_unlock(&decomp_param[i].mutex);
+ }
+ for (i = 0; i < thread_count; i++) {
qemu_thread_join(decompress_threads + i);
qemu_mutex_destroy(&decomp_param[i].mutex);
qemu_cond_destroy(&decomp_param[i].cond);
@@ -1508,7 +1538,23 @@ void migrate_decompress_threads_join(void)
static void decompress_data_with_multi_threads(uint8_t *compbuf,
void *host, int len)
{
- /* To be done */
+ int idx, thread_count;
+
+ thread_count = migrate_decompress_threads();
+ while (true) {
+ for (idx = 0; idx < thread_count; idx++) {
+ if (!decomp_param[idx].start) {
+ memcpy(decomp_param[idx].compbuf, compbuf, len);
+ decomp_param[idx].des = host;
+ decomp_param[idx].len = len;
+ start_decompression(&decomp_param[idx]);
+ break;
+ }
+ }
+ if (idx < thread_count) {
+ break;
+ }
+ }
}
static int ram_load(QEMUFile *f, void *opaque, int version_id)
--
2.4.0
- [Qemu-devel] [PULL 00/15] migration pull request, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 01/15] docs: Add a doc about multiple thread compression, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 04/15] qemu-file: Add compression functions to QEMUFile, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 05/15] arch_init: Alloc and free data struct for compression, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 02/15] migration: Add the framework of multi-thread compression, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 06/15] arch_init: Add and free data struct for decompression, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 03/15] migration: Add the framework of multi-thread decompression, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 07/15] migration: Split save_zero_page from ram_save_page, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 08/15] migration: Add the core code of multi-thread compression, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 09/15] migration: Make compression co-work with xbzrle, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 10/15] migration: Add the core code for decompression,
Juan Quintela <=
- [Qemu-devel] [PULL 11/15] migration: Add interface to control compression, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 15/15] migration: avoid divide by zero in xbzrle cache miss rate, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 13/15] migration: Add qmp commands to set and query parameters, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 12/15] migration: Use an array instead of 3 parameters, Juan Quintela, 2015/05/06
- [Qemu-devel] [PULL 14/15] migration: Add hmp interface to set and query parameters, Juan Quintela, 2015/05/06
- Re: [Qemu-devel] [PULL 00/15] migration pull request, Peter Maydell, 2015/05/06