[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/38] migration: Make compress_data_with_multithreads return bool
From: |
Juan Quintela |
Subject: |
[PULL 10/38] migration: Make compress_data_with_multithreads return bool |
Date: |
Tue, 31 Oct 2023 10:01:14 +0100 |
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231019110724.15324-5-quintela@redhat.com>
---
migration/ram-compress.h | 4 ++--
migration/ram-compress.c | 17 ++++++++++-------
migration/ram.c | 3 +--
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/migration/ram-compress.h b/migration/ram-compress.h
index e55d3b50bd..b228640092 100644
--- a/migration/ram-compress.h
+++ b/migration/ram-compress.h
@@ -60,8 +60,8 @@ void compress_threads_save_cleanup(void);
int compress_threads_save_setup(void);
void flush_compressed_data(int (send_queued_data(CompressParam *)));
-int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
- int (send_queued_data(CompressParam *)));
+bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
+ int (send_queued_data(CompressParam *)));
int wait_for_decompress_done(void);
void compress_threads_load_cleanup(void);
diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index d037dfe6cf..ef03d60a6d 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -260,10 +260,13 @@ static inline void set_compress_params(CompressParam
*param, RAMBlock *block,
param->trigger = true;
}
-int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
- int (send_queued_data(CompressParam *)))
+/*
+ * Return true when it compress a page
+ */
+bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
+ int (send_queued_data(CompressParam *)))
{
- int thread_count, pages = -1;
+ int thread_count;
bool wait = migrate_compress_wait_thread();
thread_count = migrate_compress_threads();
@@ -281,8 +284,8 @@ retry:
qemu_cond_signal(¶m->cond);
qemu_mutex_unlock(¶m->mutex);
- pages = 1;
- break;
+ qemu_mutex_unlock(&comp_done_lock);
+ return true;
}
}
@@ -290,13 +293,13 @@ retry:
* wait for the free thread if the user specifies 'compress-wait-thread',
* otherwise we will post the page out in the main thread as normal page.
*/
- if (pages < 0 && wait) {
+ if (wait) {
qemu_cond_wait(&comp_done_cond, &comp_done_lock);
goto retry;
}
qemu_mutex_unlock(&comp_done_lock);
- return pages;
+ return false;
}
/* return the size after decompression, or negative value on error */
diff --git a/migration/ram.c b/migration/ram.c
index 8246663f64..63a575ae90 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2067,8 +2067,7 @@ static bool save_compress_page(RAMState *rs,
PageSearchStatus *pss,
return false;
}
- if (compress_page_with_multi_thread(pss->block, offset,
- send_queued_data) > 0) {
+ if (compress_page_with_multi_thread(pss->block, offset, send_queued_data))
{
return true;
}
--
2.41.0
- [PULL 00/38] Migration 20231031 patches, Juan Quintela, 2023/10/31
- [PULL 01/38] migration/doc: Add contents, Juan Quintela, 2023/10/31
- [PULL 03/38] migration/doc: How to migrate when hosts have different features, Juan Quintela, 2023/10/31
- [PULL 04/38] migration/doc: We broke backwards compatibility, Juan Quintela, 2023/10/31
- [PULL 02/38] migration/doc: Add documentation for backwards compatiblity, Juan Quintela, 2023/10/31
- [PULL 06/38] migration: Rename ram_handle_compressed() to ram_handle_zero(), Juan Quintela, 2023/10/31
- [PULL 07/38] migration: Give one error if trying to set MULTIFD and XBZRLE, Juan Quintela, 2023/10/31
- [PULL 05/38] migration: Receiving a zero page non zero is an error, Juan Quintela, 2023/10/31
- [PULL 08/38] migration: Give one error if trying to set COMPRESSION and XBZRLE, Juan Quintela, 2023/10/31
- [PULL 10/38] migration: Make compress_data_with_multithreads return bool,
Juan Quintela <=
- [PULL 12/38] migration: Move busy++ to migrate_with_multithread, Juan Quintela, 2023/10/31
- [PULL 09/38] migration: Remove save_page_use_compression(), Juan Quintela, 2023/10/31
- [PULL 14/38] migration: Export send_queued_data(), Juan Quintela, 2023/10/31
- [PULL 15/38] migration: Move ram_flush_compressed_data() to ram-compress.c, Juan Quintela, 2023/10/31
- [PULL 11/38] migration: Simplify compress_page_with_multithread(), Juan Quintela, 2023/10/31
- [PULL 18/38] migration/ram: Fix compilation with -Wshadow=local, Juan Quintela, 2023/10/31
- [PULL 13/38] migration: Create compress_update_rates(), Juan Quintela, 2023/10/31
- [PULL 19/38] migration: rename vmstate_save_needed->vmstate_section_needed, Juan Quintela, 2023/10/31
- [PULL 20/38] migration: set file error on subsection loading, Juan Quintela, 2023/10/31
- [PULL 21/38] qemu-iotests: Filter warnings about block migration being deprecated, Juan Quintela, 2023/10/31