system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-14 15:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

migration: Make compress_data_with_multithreads return bool

Browse source 
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>
This commit is contained in:
Juan Quintela 2023-10-19 13:07:17 +02:00
parent 4e400f9091
commit 83df387df7
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
migration/ram-compress.c
View file

@ -260,10 +260,13 @@ static inline void set_compress_params(CompressParam *param, RAMBlock *block,
param->trigger = true; 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(); bool wait = migrate_compress_wait_thread();
thread_count = migrate_compress_threads(); thread_count = migrate_compress_threads();
@ -281,8 +284,8 @@ retry:
qemu_cond_signal(&param->cond); qemu_cond_signal(&param->cond);
qemu_mutex_unlock(&param->mutex); qemu_mutex_unlock(&param->mutex);
pages = 1; qemu_mutex_unlock(&comp_done_lock);
break; return true;
} }
} }
@ -290,13 +293,13 @@ retry:
* wait for the free thread if the user specifies 'compress-wait-thread', * 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. * 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); qemu_cond_wait(&comp_done_cond, &comp_done_lock);
goto retry; goto retry;
} }
qemu_mutex_unlock(&comp_done_lock); qemu_mutex_unlock(&comp_done_lock);
return pages; return false;
} }
/* return the size after decompression, or negative value on error */ /* return the size after decompression, or negative value on error */

4
migration/ram-compress.h
View file

@ -60,8 +60,8 @@ void compress_threads_save_cleanup(void);
int compress_threads_save_setup(void); int compress_threads_save_setup(void);
void flush_compressed_data(int (send_queued_data(CompressParam *))); void flush_compressed_data(int (send_queued_data(CompressParam *)));
int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset, bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
int (send_queued_data(CompressParam *))); int (send_queued_data(CompressParam *)));
int wait_for_decompress_done(void); int wait_for_decompress_done(void);
void compress_threads_load_cleanup(void); void compress_threads_load_cleanup(void);

3
migration/ram.c
View file

@ -2067,8 +2067,7 @@ static bool save_compress_page(RAMState *rs, PageSearchStatus *pss,
return false; return false;
} }
if (compress_page_with_multi_thread(pss->block, offset, if (compress_page_with_multi_thread(pss->block, offset, send_queued_data)) {
send_queued_data) > 0) {
return true; return true;
} }