From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIExM-0007IV-02 for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:14:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIExH-0004xR-10 for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:14:15 -0500 Received: from mga11.intel.com ([192.55.52.93]:26733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIExG-0004xN-S5 for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:14:10 -0500 From: Liang Li Date: Mon, 2 Feb 2015 19:05:46 +0800 Message-Id: <1422875149-13198-11-git-send-email-liang.z.li@intel.com> In-Reply-To: <1422875149-13198-1-git-send-email-liang.z.li@intel.com> References: <1422875149-13198-1-git-send-email-liang.z.li@intel.com> Subject: [Qemu-devel] [v4 10/13] migration: Add the core code for decompression 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, dgilbert@redhat.com, Yang Zhang , amit.shah@redhat.com, lcapitulino@redhat.com Implement the core logic of multiple thread decompression, the decompression can work now. Signed-off-by: Liang Li Signed-off-by: Yang Zhang --- arch_init.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index 8ef0315..549fdbb 100644 --- a/arch_init.c +++ b/arch_init.c @@ -814,6 +814,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; @@ -1347,8 +1354,27 @@ 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_thread) { - /* To be done */ + qemu_mutex_lock(¶m->mutex); + while (!param->busy) { + qemu_cond_wait(¶m->cond, ¶m->mutex); + if (quit_thread) { + break; + } + pagesize = TARGET_PAGE_SIZE; + /* 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; @@ -1379,6 +1405,9 @@ void migrate_decompress_threads_join(void) quit_thread = true; thread_count = migrate_decompress_threads(); for (i = 0; i < thread_count; i++) { + qemu_cond_signal(&decomp_param[i].cond); + } + 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); @@ -1395,7 +1424,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