[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 10/18] migration: Simplify compress_page_with_multithread()
From: |
Lukas Straub |
Subject: |
Re: [PATCH 10/18] migration: Simplify compress_page_with_multithread() |
Date: |
Thu, 22 Jun 2023 13:46:22 +0200 |
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(¶m->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(¶m->cond);
> - qemu_mutex_unlock(¶m->mutex);
> + while (true) {
> + for (idx = 0; idx < thread_count; idx++) {
> + if (comp_param[idx].done) {
> + CompressParam *param = &comp_param[idx];
> + qemu_mutex_lock(¶m->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(¶m->cond);
> + qemu_mutex_unlock(¶m->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 */
pgp4vDM3QpNFU.pgp
Description: OpenPGP digital signature
- Re: [PATCH 03/18] migration: RDMA is not compatible with anything else, (continued)
- [PATCH 02/18] migration: Give one error if trying to set COMPRESSION and XBZRLE, Juan Quintela, 2023/06/13
- [PATCH 08/18] migration: Move update_compress_threads_counts() to ram-compress.c, Juan Quintela, 2023/06/13
- [PATCH 09/18] migration: Make compress_data_with_multithreads return bool, Juan Quintela, 2023/06/13
- [PATCH 06/18] migration: Create populate_compress(), Juan Quintela, 2023/06/13
- [PATCH 10/18] migration: Simplify compress_page_with_multithread(), Juan Quintela, 2023/06/13
- Re: [PATCH 10/18] migration: Simplify compress_page_with_multithread(),
Lukas Straub <=
- [PATCH 13/18] migration: Simplify decompress_data_with_multi_threads(), Juan Quintela, 2023/06/13
- [PATCH 15/18] migration: save_compress_page() can take block through pss, Juan Quintela, 2023/06/13
- [PATCH 18/18] migration: Remove not needed file parameter for save_zero_page*, Juan Quintela, 2023/06/13
- [PATCH 05/18] migration: Move compression_counters cleanup ram-compress.c, Juan Quintela, 2023/06/13
- [PATCH 12/18] migration: Create compression_update_rates(), Juan Quintela, 2023/06/13