From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8usO-0008AI-CW for qemu-devel@nongnu.org; Tue, 15 Dec 2015 14:03:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8usK-0007hX-38 for qemu-devel@nongnu.org; Tue, 15 Dec 2015 14:03:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8usJ-0007hR-Qu for qemu-devel@nongnu.org; Tue, 15 Dec 2015 14:03:04 -0500 From: "Dr. David Alan Gilbert (git)" Date: Tue, 15 Dec 2015 19:02:50 +0000 Message-Id: <1450206170-26901-7-git-send-email-dgilbert@redhat.com> In-Reply-To: <1450206170-26901-1-git-send-email-dgilbert@redhat.com> References: <1450206170-26901-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 6/6] multithread decompression: Avoid one copy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com, amit.shah@redhat.com Cc: jdenemar@redhat.com, liang.z.li@intel.com, zhang.zhanghailiang@huawei.com From: "Dr. David Alan Gilbert" qemu_get_buffer does a copy, we can avoid the memcpy, and we can then remove the extra buffer. Signed-off-by: Dr. David Alan Gilbert --- migration/ram.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 994552c..2da3b51 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -286,7 +286,6 @@ static bool quit_comp_thread; static bool quit_decomp_thread; static DecompressParam *decomp_param; static QemuThread *decompress_threads; -static uint8_t *compressed_data_buf; static int do_compress_ram_page(CompressParam *param); @@ -2207,7 +2206,6 @@ void migrate_decompress_threads_create(void) thread_count = migrate_decompress_threads(); decompress_threads = g_new0(QemuThread, thread_count); decomp_param = g_new0(DecompressParam, thread_count); - compressed_data_buf = g_malloc0(compressBound(TARGET_PAGE_SIZE)); quit_decomp_thread = false; for (i = 0; i < thread_count; i++) { qemu_mutex_init(&decomp_param[i].mutex); @@ -2238,13 +2236,11 @@ void migrate_decompress_threads_join(void) } g_free(decompress_threads); g_free(decomp_param); - g_free(compressed_data_buf); decompress_threads = NULL; decomp_param = NULL; - compressed_data_buf = NULL; } -static void decompress_data_with_multi_threads(uint8_t *compbuf, +static void decompress_data_with_multi_threads(QEMUFile *f, void *host, int len) { int idx, thread_count; @@ -2253,7 +2249,7 @@ static void decompress_data_with_multi_threads(uint8_t *compbuf, while (true) { for (idx = 0; idx < thread_count; idx++) { if (!decomp_param[idx].start) { - memcpy(decomp_param[idx].compbuf, compbuf, len); + qemu_get_buffer(f, decomp_param[idx].compbuf, len); decomp_param[idx].des = host; decomp_param[idx].len = len; start_decompression(&decomp_param[idx]); @@ -2498,8 +2494,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) ret = -EINVAL; break; } - qemu_get_buffer(f, compressed_data_buf, len); - decompress_data_with_multi_threads(compressed_data_buf, host, len); + decompress_data_with_multi_threads(f, host, len); break; case RAM_SAVE_FLAG_XBZRLE: -- 2.5.0