From: Liang Li <liang.z.li@intel.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, Liang Li <liang.z.li@intel.com>,
armbru@redhat.com, lcapitulino@redhat.com,
Yang Zhang <yang.z.zhang@intel.com>,
amit.shah@redhat.com, dgilbert@redhat.com
Subject: [Qemu-devel] [v5 05/12] arch_init: Alloc and free data struct for compression
Date: Wed, 11 Feb 2015 11:06:19 +0800 [thread overview]
Message-ID: <1423623986-590-6-git-send-email-liang.z.li@intel.com> (raw)
In-Reply-To: <1423623986-590-1-git-send-email-liang.z.li@intel.com>
Define the data structure and variables used to do multiple thread
compression, 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 | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/arch_init.c b/arch_init.c
index bbb584c..7ccad8b 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -335,7 +335,12 @@ static uint32_t last_version;
static bool ram_bulk_stage;
struct CompressParam {
- /* To be done */
+ bool busy;
+ QEMUFile *file;
+ QemuMutex mutex;
+ QemuCond cond;
+ RAMBlock *block;
+ ram_addr_t offset;
};
typedef struct CompressParam CompressParam;
@@ -345,6 +350,14 @@ struct DecompressParam {
typedef struct DecompressParam DecompressParam;
static CompressParam *comp_param;
+/* comp_done_cond is used to wake up the migration thread when
+ * one of the compression threads has finished the compression.
+ * comp_done_lock is used to co-work with comp_done_cond.
+ */
+static QemuMutex *comp_done_lock;
+static QemuCond *comp_done_cond;
+/* The empty QEMUFileOps will be used by file in CompressParam */
+static const QEMUFileOps empty_ops = { };
static bool quit_comp_thread;
static bool quit_decomp_thread;
static DecompressParam *decomp_param;
@@ -380,11 +393,20 @@ void migrate_compress_threads_join(MigrationState *s)
thread_count = migrate_compress_threads();
for (i = 0; i < thread_count; i++) {
qemu_thread_join(s->compress_thread + i);
+ qemu_fclose(comp_param[i].file);
+ qemu_mutex_destroy(&comp_param[i].mutex);
+ qemu_cond_destroy(&comp_param[i].cond);
}
+ qemu_mutex_destroy(comp_done_lock);
+ qemu_cond_destroy(comp_done_cond);
g_free(s->compress_thread);
g_free(comp_param);
+ g_free(comp_done_cond);
+ g_free(comp_done_lock);
s->compress_thread = NULL;
comp_param = NULL;
+ comp_done_cond = NULL;
+ comp_done_lock = NULL;
}
void migrate_compress_threads_create(MigrationState *s)
@@ -398,7 +420,17 @@ void migrate_compress_threads_create(MigrationState *s)
thread_count = migrate_compress_threads();
s->compress_thread = g_new0(QemuThread, thread_count);
comp_param = g_new0(CompressParam, thread_count);
+ comp_done_cond = g_new0(QemuCond, 1);
+ comp_done_lock = g_new0(QemuMutex, 1);
+ qemu_cond_init(comp_done_cond);
+ qemu_mutex_init(comp_done_lock);
for (i = 0; i < thread_count; i++) {
+ /* com_param[i].file is just used as a dummy buffer to save data, set
+ * it's ops to empty.
+ */
+ comp_param[i].file = qemu_fopen_ops(NULL, &empty_ops);
+ qemu_mutex_init(&comp_param[i].mutex);
+ qemu_cond_init(&comp_param[i].cond);
qemu_thread_create(s->compress_thread + i, "compress",
do_data_compress, comp_param + i,
QEMU_THREAD_JOINABLE);
--
1.9.1
next prev parent reply other threads:[~2015-02-11 3:15 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-11 3:06 [Qemu-devel] [PATCH v5 0/12] migration: Add a new feature to do live migration Liang Li
2015-02-11 3:06 ` [Qemu-devel] [v5 01/12] docs: Add a doc about multiple thread compression Liang Li
2015-02-11 8:46 ` Juan Quintela
2015-02-11 3:06 ` [Qemu-devel] [v5 02/12] migration: Add the framework of multi-thread compression Liang Li
2015-02-11 8:52 ` Juan Quintela
2015-02-11 8:55 ` Juan Quintela
2015-02-11 11:10 ` Juan Quintela
2015-02-12 7:24 ` Li, Liang Z
2015-02-12 12:31 ` Juan Quintela
2015-02-11 3:06 ` [Qemu-devel] [v5 03/12] migration: Add the framework of multi-thread decompression Liang Li
2015-02-11 8:52 ` Juan Quintela
2015-02-11 3:06 ` [Qemu-devel] [v5 04/12] qemu-file: Add compression functions to QEMUFile Liang Li
2015-02-12 12:06 ` Juan Quintela
2015-02-11 3:06 ` Liang Li [this message]
2015-02-11 9:03 ` [Qemu-devel] [v5 05/12] arch_init: Alloc and free data struct for compression Juan Quintela
2015-02-12 5:32 ` Li, Liang Z
2015-02-12 12:05 ` Juan Quintela
2015-02-11 3:06 ` [Qemu-devel] [v5 06/12] arch_init: Add and free data struct for decompression Liang Li
2015-02-11 9:04 ` Juan Quintela
2015-02-11 3:06 ` [Qemu-devel] [v5 07/12] migration: Split the function ram_save_page Liang Li
2015-02-11 9:08 ` Juan Quintela
2015-02-11 11:02 ` Juan Quintela
2015-02-11 3:06 ` [Qemu-devel] [v5 08/12] migration: Add the core code of multi-thread compression Liang Li
2015-02-11 11:44 ` Juan Quintela
2015-02-12 7:43 ` Li, Liang Z
2015-03-02 2:46 ` Li, Liang Z
2015-02-11 3:06 ` [Qemu-devel] [v5 09/12] migration: Make compression co-work with xbzrle Liang Li
2015-02-11 11:46 ` Juan Quintela
2015-02-12 2:24 ` Li, Liang Z
2015-02-12 12:22 ` Juan Quintela
2015-02-12 15:10 ` Li, Liang Z
2015-02-11 3:06 ` [Qemu-devel] [v5 10/12] migration: Add the core code for decompression Liang Li
2015-02-11 11:48 ` Juan Quintela
2015-02-11 3:06 ` [Qemu-devel] [v5 11/12] migration: Add interface to control compression Liang Li
2015-02-11 3:06 ` [Qemu-devel] [v5 12/12] migration: Add commands to set and query parameter Liang Li
2015-02-11 11:53 ` Juan Quintela
2015-03-11 16:57 ` Dr. David Alan Gilbert
2015-03-12 10:30 ` Markus Armbruster
2015-03-19 2:30 ` Li, Liang Z
2015-03-19 7:49 ` Markus Armbruster
2015-03-19 14:21 ` Li, Liang Z
2015-03-20 5:16 ` Li, Liang Z
2015-03-19 14:33 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423623986-590-6-git-send-email-liang.z.li@intel.com \
--to=liang.z.li@intel.com \
--cc=amit.shah@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=yang.z.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).