[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/14] ram.c: Call update_compress_thread_counts from compress_se
From: |
Lukas Straub |
Subject: |
[PATCH 05/14] ram.c: Call update_compress_thread_counts from compress_send_queued_data |
Date: |
Sun, 2 Apr 2023 17:56:17 +0000 |
This makes the core compress code more independend from ram.c.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
migration/ram.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 7ab008145b..f55eb0e587 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1551,12 +1551,14 @@ static int send_queued_data(CompressParam *param)
abort();
}
+ update_compress_thread_counts(param, len);
+
return len;
}
static void flush_compressed_data(RAMState *rs)
{
- int idx, len, thread_count;
+ int idx, thread_count;
if (!save_page_use_compression(rs)) {
return;
@@ -1575,15 +1577,8 @@ static void flush_compressed_data(RAMState *rs)
qemu_mutex_lock(&comp_param[idx].mutex);
if (!comp_param[idx].quit) {
CompressParam *param = &comp_param[idx];
- len = send_queued_data(param);
+ send_queued_data(param);
compress_reset_result(param);
-
- /*
- * it's safe to fetch zero_page without holding comp_done_lock
- * as there is no further request submitted to the thread,
- * i.e, the thread should be waiting for a request at this point.
- */
- update_compress_thread_counts(param, len);
}
qemu_mutex_unlock(&comp_param[idx].mutex);
}
@@ -1599,7 +1594,7 @@ static inline void set_compress_params(CompressParam
*param, RAMBlock *block,
static int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset)
{
- int idx, thread_count, bytes_xmit = -1, pages = -1;
+ int idx, thread_count, pages = -1;
bool wait = migrate_compress_wait_thread();
thread_count = migrate_compress_threads();
@@ -1610,11 +1605,10 @@ retry:
CompressParam *param = &comp_param[idx];
qemu_mutex_lock(¶m->mutex);
param->done = false;
- bytes_xmit = send_queued_data(param);
+ send_queued_data(param);
compress_reset_result(param);
set_compress_params(param, block, offset);
- update_compress_thread_counts(param, bytes_xmit);
qemu_cond_signal(¶m->cond);
qemu_mutex_unlock(¶m->mutex);
pages = 1;
--
2.30.2
pgpFT5dHPmzb_.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 <=
- [PATCH 06/14] ram.c: Remove last ram.c dependency from the core compress code, Lukas Straub, 2023/04/02
- [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