[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/14] ram.c: Remove last ram.c dependency from the core compress
From: |
Lukas Straub |
Subject: |
[PATCH 06/14] ram.c: Remove last ram.c dependency from the core compress code |
Date: |
Sun, 2 Apr 2023 17:56:21 +0000 |
Make compression interfaces take send_queued_data() as an argument.
Remove save_page_use_compression() from flush_compressed_data().
This removes the last ram.c dependency from the core compress code.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
migration/ram.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index f55eb0e587..20428ccf42 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1556,13 +1556,10 @@ static int send_queued_data(CompressParam *param)
return len;
}
-static void flush_compressed_data(RAMState *rs)
+static void flush_compressed_data(int (send_queued_data(CompressParam *)))
{
int idx, thread_count;
- if (!save_page_use_compression(rs)) {
- return;
- }
thread_count = migrate_compress_threads();
qemu_mutex_lock(&comp_done_lock);
@@ -1584,6 +1581,15 @@ static void flush_compressed_data(RAMState *rs)
}
}
+static void ram_flush_compressed_data(RAMState *rs)
+{
+ if (!save_page_use_compression(rs)) {
+ return;
+ }
+
+ flush_compressed_data(send_queued_data);
+}
+
static inline void set_compress_params(CompressParam *param, RAMBlock *block,
ram_addr_t offset)
{
@@ -1592,7 +1598,8 @@ static inline void set_compress_params(CompressParam
*param, RAMBlock *block,
param->trigger = true;
}
-static int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset)
+static int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
+ int (send_queued_data(CompressParam *)))
{
int idx, thread_count, pages = -1;
bool wait = migrate_compress_wait_thread();
@@ -1673,7 +1680,7 @@ static int find_dirty_block(RAMState *rs,
PageSearchStatus *pss)
* Also If xbzrle is on, stop using the data compression at this
* point. In theory, xbzrle can do better than compression.
*/
- flush_compressed_data(rs);
+ ram_flush_compressed_data(rs);
/* Hit the end of the list */
pss->block = QLIST_FIRST_RCU(&ram_list.blocks);
@@ -2363,11 +2370,11 @@ static bool save_compress_page(RAMState *rs,
PageSearchStatus *pss,
* much CPU resource.
*/
if (block != pss->last_sent_block) {
- flush_compressed_data(rs);
+ ram_flush_compressed_data(rs);
return false;
}
- if (compress_page_with_multi_thread(block, offset) > 0) {
+ if (compress_page_with_multi_thread(block, offset, send_queued_data) > 0) {
return true;
}
@@ -3419,7 +3426,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
* page is sent in one chunk.
*/
if (migrate_postcopy_ram()) {
- flush_compressed_data(rs);
+ ram_flush_compressed_data(rs);
}
/*
@@ -3512,7 +3519,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
}
qemu_mutex_unlock(&rs->bitmap_mutex);
- flush_compressed_data(rs);
+ ram_flush_compressed_data(rs);
ram_control_after_iterate(f, RAM_CONTROL_FINISH);
}
--
2.30.2
pgpQ154OsbtTK.pgp
Description: OpenPGP digital signature
- [PATCH 00/14] migration/ram.c: Refactor compress code, Lukas Straub, 2023/04/02
- [PATCH 03/14] ram.c: Reset result after sending queued data, Lukas Straub, 2023/04/02
- [PATCH 04/14] ram.c: Do not call save_page_header() from compress threads, Lukas Straub, 2023/04/02
- [PATCH 01/14] ram.c: Let the compress threads return a CompressResult enum, Lukas Straub, 2023/04/02
- [PATCH 02/14] ram.c: Dont change param->block in the compress thread, Lukas Straub, 2023/04/02
- [PATCH 05/14] ram.c: Call update_compress_thread_counts from compress_send_queued_data, Lukas Straub, 2023/04/02
- [PATCH 06/14] ram.c: Remove last ram.c dependency from the core compress code,
Lukas Straub <=
- [PATCH 07/14] ram.c: Introduce whitespace (squash with next patch), Lukas Straub, 2023/04/02
- [PATCH 08/14] ram.c: Move core compression code into its own file, Lukas Straub, 2023/04/02
- [PATCH 09/14] ram.c: Remove whitespace (squash with previous patch), Lukas Straub, 2023/04/02
- [PATCH 10/14] ram.c: Move core decompression code into its own file, Lukas Straub, 2023/04/02
- [PATCH 11/14] ram compress: Assert that the file buffer matches the result, Lukas Straub, 2023/04/02
- [PATCH 12/14] ram.c: Remove unused include after moving out code, Lukas Straub, 2023/04/02
- [PATCH 13/14] ram-compress.c: Make target independent, Lukas Straub, 2023/04/02