Skip to content

Commit

Permalink
migration: Make compress_data_with_multithreads return bool
Browse files Browse the repository at this point in the history
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231019110724.15324-5-quintela@redhat.com>
  • Loading branch information
Juan Quintela committed Oct 30, 2023
1 parent 4e400f9 commit 83df387
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
17 changes: 10 additions & 7 deletions migration/ram-compress.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,13 @@ static inline void set_compress_params(CompressParam *param, RAMBlock *block,
param->trigger = true;
}

int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
int (send_queued_data(CompressParam *)))
/*
* Return true when it compress a page
*/
bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
int (send_queued_data(CompressParam *)))
{
int thread_count, pages = -1;
int thread_count;
bool wait = migrate_compress_wait_thread();

thread_count = migrate_compress_threads();
Expand All @@ -281,22 +284,22 @@ int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,

qemu_cond_signal(&param->cond);
qemu_mutex_unlock(&param->mutex);
pages = 1;
break;
qemu_mutex_unlock(&comp_done_lock);
return true;
}
}

/*
* 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 (pages < 0 && wait) {
if (wait) {
qemu_cond_wait(&comp_done_cond, &comp_done_lock);
goto retry;
}
qemu_mutex_unlock(&comp_done_lock);

return pages;
return false;
}

/* return the size after decompression, or negative value on error */
Expand Down
4 changes: 2 additions & 2 deletions migration/ram-compress.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ void compress_threads_save_cleanup(void);
int compress_threads_save_setup(void);

void flush_compressed_data(int (send_queued_data(CompressParam *)));
int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
int (send_queued_data(CompressParam *)));
bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
int (send_queued_data(CompressParam *)));

int wait_for_decompress_done(void);
void compress_threads_load_cleanup(void);
Expand Down
3 changes: 1 addition & 2 deletions migration/ram.c
Original file line number Diff line number Diff line change
Expand Up @@ -2067,8 +2067,7 @@ static bool save_compress_page(RAMState *rs, PageSearchStatus *pss,
return false;
}

if (compress_page_with_multi_thread(pss->block, offset,
send_queued_data) > 0) {
if (compress_page_with_multi_thread(pss->block, offset, send_queued_data)) {
return true;
}

Expand Down

0 comments on commit 83df387

Please sign in to comment.