Message ID | 1422875149-13198-7-git-send-email-liang.z.li@intel.com |
---|---|
State | New |
Headers | show |
* Liang Li (liang.z.li@intel.com) wrote: > Define the data structure and variables used to do multiple thread > decompression, and add the code to initialize and free them. > > Signed-off-by: Liang Li <liang.z.li@intel.com> > Signed-off-by: Yang Zhang <yang.z.zhang@intel.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > arch_init.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/arch_init.c b/arch_init.c > index 87c4947..500f299 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -345,7 +345,12 @@ struct CompressParam { > typedef struct CompressParam CompressParam; > > struct DecompressParam { > - /* To be done */ > + bool busy; > + QemuMutex mutex; > + QemuCond cond; > + void *des; > + uint8 *compbuf; > + int len; > }; > typedef struct DecompressParam DecompressParam; > > @@ -1188,6 +1193,9 @@ void migrate_decompress_threads_create(int count) > compressed_data_buf = g_malloc0(compressBound(TARGET_PAGE_SIZE)); > quit_thread = false; > for (i = 0; i < count; i++) { > + qemu_mutex_init(&decomp_param[i].mutex); > + qemu_cond_init(&decomp_param[i].cond); > + decomp_param[i].compbuf = g_malloc0(compressBound(TARGET_PAGE_SIZE)); > qemu_thread_create(decompress_threads + i, "decompress", > do_data_decompress, decomp_param + i, > QEMU_THREAD_JOINABLE); > @@ -1202,6 +1210,9 @@ void migrate_decompress_threads_join(void) > thread_count = migrate_decompress_threads(); > for (i = 0; i < thread_count; i++) { > qemu_thread_join(decompress_threads + i); > + qemu_mutex_destroy(&decomp_param[i].mutex); > + qemu_cond_destroy(&decomp_param[i].cond); > + g_free(decomp_param[i].compbuf); > } > g_free(decompress_threads); > g_free(decomp_param); > -- > 1.9.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/arch_init.c b/arch_init.c index 87c4947..500f299 100644 --- a/arch_init.c +++ b/arch_init.c @@ -345,7 +345,12 @@ struct CompressParam { typedef struct CompressParam CompressParam; struct DecompressParam { - /* To be done */ + bool busy; + QemuMutex mutex; + QemuCond cond; + void *des; + uint8 *compbuf; + int len; }; typedef struct DecompressParam DecompressParam; @@ -1188,6 +1193,9 @@ void migrate_decompress_threads_create(int count) compressed_data_buf = g_malloc0(compressBound(TARGET_PAGE_SIZE)); quit_thread = false; for (i = 0; i < count; i++) { + qemu_mutex_init(&decomp_param[i].mutex); + qemu_cond_init(&decomp_param[i].cond); + decomp_param[i].compbuf = g_malloc0(compressBound(TARGET_PAGE_SIZE)); qemu_thread_create(decompress_threads + i, "decompress", do_data_decompress, decomp_param + i, QEMU_THREAD_JOINABLE); @@ -1202,6 +1210,9 @@ void migrate_decompress_threads_join(void) thread_count = migrate_decompress_threads(); for (i = 0; i < thread_count; i++) { qemu_thread_join(decompress_threads + i); + qemu_mutex_destroy(&decomp_param[i].mutex); + qemu_cond_destroy(&decomp_param[i].cond); + g_free(decomp_param[i].compbuf); } g_free(decompress_threads); g_free(decomp_param);