Re: [PATCH v2 06/13] ram.c: Call update_compress_thread_counts from compress_send_queued_data

[Juan Quintela]

Lukas Straub  wrote:
> This makes the core compress code more independend from ram.c.
>
> Signed-off-by: Lukas Straub 

Reviewed-by: Juan Quintela 

I haven't looked all the series yet

> @@ -1575,15 +1577,8 @@ static void flush_compressed_data(RAMState *rs)
>  qemu_mutex_lock(_param[idx].mutex);
>  if (!comp_param[idx].quit) {
>  CompressParam *param = _param[idx];
> -len = send_queued_data(param);
> +send_queued_data(param);

but it appears that send_queued_data don't need to return anything now.

[PATCH v2 06/13] ram.c: Call update_compress_thread_counts from compress_send_queued_data

[Lukas Straub]

This makes the core compress code more independend from ram.c.

Signed-off-by: Lukas Straub 
---
 migration/ram.c | 18 ++
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index d248e1f062..3894d0ae79 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(_param[idx].mutex);
 if (!comp_param[idx].quit) {
 CompressParam *param = _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(_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 = _param[idx];
 qemu_mutex_lock(>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(>cond);
 qemu_mutex_unlock(>mutex);
 pages = 1;
--
2.40.0



pgptC0qHkxCXC.pgp
Description: OpenPGP digital signature