[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/14] ram.c: Let the compress threads return a CompressResult en
From: |
Lukas Straub |
Subject: |
[PATCH 01/14] ram.c: Let the compress threads return a CompressResult enum |
Date: |
Sun, 2 Apr 2023 17:56:03 +0000 |
This will be used in the next commits to move save_page_header()
out of compress code.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
migration/ram.c | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 9d1817ab7b..ca561e62bd 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -493,10 +493,17 @@ MigrationOps *migration_ops;
CompressionStats compression_counters;
+enum CompressResult {
+ RES_NONE = 0,
+ RES_ZEROPAGE = 1,
+ RES_COMPRESS = 2
+};
+typedef enum CompressResult CompressResult;
+
struct CompressParam {
bool done;
bool quit;
- bool zero_page;
+ CompressResult result;
QEMUFile *file;
QemuMutex mutex;
QemuCond cond;
@@ -538,8 +545,9 @@ static QemuCond decomp_done_cond;
static int ram_save_host_page_urgent(PageSearchStatus *pss);
-static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock
*block,
- ram_addr_t offset, uint8_t *source_buf);
+static CompressResult do_compress_ram_page(QEMUFile *f, z_stream *stream,
+ RAMBlock *block, ram_addr_t offset,
+ uint8_t *source_buf);
/* NOTE: page is the PFN not real ram_addr_t. */
static void pss_init(PageSearchStatus *pss, RAMBlock *rb, ram_addr_t page)
@@ -564,7 +572,7 @@ static void *do_data_compress(void *opaque)
CompressParam *param = opaque;
RAMBlock *block;
ram_addr_t offset;
- bool zero_page;
+ CompressResult result;
qemu_mutex_lock(¶m->mutex);
while (!param->quit) {
@@ -574,12 +582,12 @@ static void *do_data_compress(void *opaque)
param->block = NULL;
qemu_mutex_unlock(¶m->mutex);
- zero_page = do_compress_ram_page(param->file, ¶m->stream,
- block, offset, param->originbuf);
+ result = do_compress_ram_page(param->file, ¶m->stream,
+ block, offset, param->originbuf);
qemu_mutex_lock(&comp_done_lock);
param->done = true;
- param->zero_page = zero_page;
+ param->result = result;
qemu_cond_signal(&comp_done_cond);
qemu_mutex_unlock(&comp_done_lock);
@@ -1463,8 +1471,9 @@ static int ram_save_multifd_page(QEMUFile *file, RAMBlock
*block,
return 1;
}
-static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock
*block,
- ram_addr_t offset, uint8_t *source_buf)
+static CompressResult do_compress_ram_page(QEMUFile *f, z_stream *stream,
+ RAMBlock *block, ram_addr_t offset,
+ uint8_t *source_buf)
{
RAMState *rs = ram_state;
PageSearchStatus *pss = &rs->pss[RAM_CHANNEL_PRECOPY];
@@ -1472,7 +1481,7 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream
*stream, RAMBlock *block,
int ret;
if (save_zero_page_to_file(pss, f, block, offset)) {
- return true;
+ return RES_ZEROPAGE;
}
save_page_header(pss, f, block, offset | RAM_SAVE_FLAG_COMPRESS_PAGE);
@@ -1487,8 +1496,9 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream
*stream, RAMBlock *block,
if (ret < 0) {
qemu_file_set_error(migrate_get_current()->to_dst_file, ret);
error_report("compressed data failed!");
+ return RES_NONE;
}
- return false;
+ return RES_COMPRESS;
}
static void
@@ -1496,7 +1506,7 @@ update_compress_thread_counts(const CompressParam *param,
int bytes_xmit)
{
ram_transferred_add(bytes_xmit);
- if (param->zero_page) {
+ if (param->result == RES_ZEROPAGE) {
stat64_add(&ram_atomic_counters.duplicate, 1);
return;
}
--
2.30.2
pgp7YW1bRO51p.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 <=
- [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, 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