diff mbox series

[10/18] migration: Simplify compress_page_with_multithread()

Message ID 20230613145757.10131-11-quintela@redhat.com
State New
Headers show
Series Migration compression cleanup | expand

Commit Message

Juan Quintela June 13, 2023, 2:57 p.m. UTC 
Move the goto to a while true.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram-compress.c | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

Comments

Lukas Straub June 22, 2023, 11:46 a.m. UTC | #1 
On Tue, 13 Jun 2023 16:57:49 +0200
Juan Quintela <quintela@redhat.com> wrote:

> Move the goto to a while true.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Lukas Straub <lukasstraub2@web.de>

> ---
>  migration/ram-compress.c | 48 ++++++++++++++++++++--------------------
>  1 file changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/migration/ram-compress.c b/migration/ram-compress.c
> index 8ce9519f3d..3c44803132 100644
> --- a/migration/ram-compress.c
> +++ b/migration/ram-compress.c
> @@ -273,35 +273,35 @@ bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
>  
>      thread_count = migrate_compress_threads();
>      qemu_mutex_lock(&comp_done_lock);
> -retry:
> -    for (idx = 0; idx < thread_count; idx++) {
> -        if (comp_param[idx].done) {
> -            CompressParam *param = &comp_param[idx];
> -            qemu_mutex_lock(&param->mutex);
> -            param->done = false;
> -            send_queued_data(param);
> -            assert(qemu_file_buffer_empty(param->file));
> -            compress_reset_result(param);
> -            set_compress_params(param, block, offset);
>  
> -            qemu_cond_signal(&param->cond);
> -            qemu_mutex_unlock(&param->mutex);
> +    while (true) {
> +        for (idx = 0; idx < thread_count; idx++) {
> +            if (comp_param[idx].done) {
> +                CompressParam *param = &comp_param[idx];
> +                qemu_mutex_lock(&param->mutex);
> +                param->done = false;
> +                send_queued_data(param);
> +                assert(qemu_file_buffer_empty(param->file));
> +                compress_reset_result(param);
> +                set_compress_params(param, block, offset);
> +
> +                qemu_cond_signal(&param->cond);
> +                qemu_mutex_unlock(&param->mutex);
> +                qemu_mutex_unlock(&comp_done_lock);
> +                return true;
> +            }
> +        }
> +        if (!wait) {
>              qemu_mutex_unlock(&comp_done_lock);
> -            return true;
> +            return false;
>          }
> -    }
> -
> -    /*
> -     * 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 (wait) {
> +        /*
> +         * wait for a free thread if the user specifies
> +         * 'compress-wait-thread', otherwise we will post the page out
> +         * in the main thread as normal page.
> +         */
>          qemu_cond_wait(&comp_done_cond, &comp_done_lock);
> -        goto retry;
>      }
> -    qemu_mutex_unlock(&comp_done_lock);
> -
> -    return false;
>  }
>  
>  /* return the size after decompression, or negative value on error */
diff mbox series

Patch

diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index 8ce9519f3d..3c44803132 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -273,35 +273,35 @@  bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
 
     thread_count = migrate_compress_threads();
     qemu_mutex_lock(&comp_done_lock);
-retry:
-    for (idx = 0; idx < thread_count; idx++) {
-        if (comp_param[idx].done) {
-            CompressParam *param = &comp_param[idx];
-            qemu_mutex_lock(&param->mutex);
-            param->done = false;
-            send_queued_data(param);
-            assert(qemu_file_buffer_empty(param->file));
-            compress_reset_result(param);
-            set_compress_params(param, block, offset);
 
-            qemu_cond_signal(&param->cond);
-            qemu_mutex_unlock(&param->mutex);
+    while (true) {
+        for (idx = 0; idx < thread_count; idx++) {
+            if (comp_param[idx].done) {
+                CompressParam *param = &comp_param[idx];
+                qemu_mutex_lock(&param->mutex);
+                param->done = false;
+                send_queued_data(param);
+                assert(qemu_file_buffer_empty(param->file));
+                compress_reset_result(param);
+                set_compress_params(param, block, offset);
+
+                qemu_cond_signal(&param->cond);
+                qemu_mutex_unlock(&param->mutex);
+                qemu_mutex_unlock(&comp_done_lock);
+                return true;
+            }
+        }
+        if (!wait) {
             qemu_mutex_unlock(&comp_done_lock);
-            return true;
+            return false;
         }
-    }
-
-    /*
-     * 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 (wait) {
+        /*
+         * wait for a free thread if the user specifies
+         * 'compress-wait-thread', otherwise we will post the page out
+         * in the main thread as normal page.
+         */
         qemu_cond_wait(&comp_done_cond, &comp_done_lock);
-        goto retry;
     }
-    qemu_mutex_unlock(&comp_done_lock);
-
-    return false;
 }
 
 /* return the size after decompression, or negative value on error */