[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [v5 10/12] migration: Add the core code for decompression
From: |
Liang Li |
Subject: |
[Qemu-devel] [v5 10/12] migration: Add the core code for decompression |
Date: |
Wed, 11 Feb 2015 11:06:24 +0800 |
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>
---
arch_init.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 48 insertions(+), 2 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 12dfa34..f9e6a95 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -833,6 +833,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->busy = true;
+ qemu_cond_signal(¶m->cond);
+ qemu_mutex_unlock(¶m->mutex);
+}
static uint64_t bytes_transferred;
@@ -1379,8 +1386,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->busy && !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->busy = false;
+ }
+ qemu_mutex_unlock(¶m->mutex);
}
return NULL;
@@ -1411,6 +1436,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);
@@ -1427,7 +1457,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].busy) {
+ 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)
--
1.9.1
- Re: [Qemu-devel] [v5 07/12] migration: Split the function ram_save_page, (continued)
[Qemu-devel] [v5 10/12] migration: Add the core code for decompression,
Liang Li <=
[Qemu-devel] [v5 11/12] migration: Add interface to control compression, Liang Li, 2015/02/10
[Qemu-devel] [v5 12/12] migration: Add commands to set and query parameter, Liang Li, 2015/02/10