[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/13] migration: create multifd migration threads
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 06/13] migration: create multifd migration threads |
Date: |
Wed, 20 Apr 2016 16:44:34 +0200 |
Creation of the threads, nothing inside yet.
Signed-off-by: Juan Quintela <address@hidden>
---
include/migration/migration.h | 4 ++
migration/migration.c | 6 ++
migration/ram.c | 148 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 158 insertions(+)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 19d535d..9f94c75 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -220,6 +220,10 @@ bool migration_in_postcopy_after_devices(MigrationState *);
MigrationState *migrate_get_current(void);
int migrate_multifd_threads(void);
+void migrate_multifd_send_threads_create(void);
+void migrate_multifd_send_threads_join(void);
+void migrate_multifd_recv_threads_create(void);
+void migrate_multifd_recv_threads_join(void);
void migrate_compress_threads_create(void);
void migrate_compress_threads_join(void);
diff --git a/migration/migration.c b/migration/migration.c
index 29e43ff..b3ad36b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -335,6 +335,7 @@ static void process_incoming_migration_bh(void *opaque)
MIGRATION_STATUS_FAILED);
error_report_err(local_err);
migrate_decompress_threads_join();
+ migrate_multifd_recv_threads_join();
exit(EXIT_FAILURE);
}
@@ -359,6 +360,7 @@ static void process_incoming_migration_bh(void *opaque)
runstate_set(global_state_get_runstate());
}
migrate_decompress_threads_join();
+ migrate_multifd_recv_threads_join();
/*
* This must happen after any state changes since as soon as an external
* observer sees this event they might start to prod at the VM assuming
@@ -412,6 +414,7 @@ static void process_incoming_migration_co(void *opaque)
MIGRATION_STATUS_FAILED);
error_report("load of migration failed: %s", strerror(-ret));
migrate_decompress_threads_join();
+ migrate_multifd_recv_threads_join();
exit(EXIT_FAILURE);
}
@@ -426,6 +429,7 @@ void process_incoming_migration(QEMUFile *f)
assert(fd != -1);
migrate_decompress_threads_create();
+ migrate_multifd_recv_threads_create();
qemu_set_nonblock(fd);
qemu_coroutine_enter(co, f);
}
@@ -844,6 +848,7 @@ static void migrate_fd_cleanup(void *opaque)
qemu_mutex_lock_iothread();
migrate_compress_threads_join();
+ migrate_multifd_send_threads_join();
qemu_fclose(s->to_dst_file);
s->to_dst_file = NULL;
}
@@ -1825,6 +1830,7 @@ void migrate_fd_connect(MigrationState *s)
}
migrate_compress_threads_create();
+ migrate_multifd_send_threads_create();
qemu_thread_create(&s->thread, "migration", migration_thread, s,
QEMU_THREAD_JOINABLE);
s->migration_thread_running = true;
diff --git a/migration/ram.c b/migration/ram.c
index 648362c..6139f7c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -390,6 +390,154 @@ void migrate_compress_threads_create(void)
}
}
+/* Multiple fd's */
+
+struct MultiFDSendParams {
+ QemuThread thread;
+ QemuCond cond;
+ QemuMutex mutex;
+ bool quit;
+};
+typedef struct MultiFDSendParams MultiFDSendParams;
+
+static MultiFDSendParams *multifd_send;
+
+static void *multifd_send_thread(void *opaque)
+{
+ MultiFDSendParams *params = opaque;
+
+ qemu_mutex_lock(¶ms->mutex);
+ while (!params->quit){
+ qemu_cond_wait(¶ms->cond, ¶ms->mutex);
+ }
+ qemu_mutex_unlock(¶ms->mutex);
+
+ return NULL;
+}
+
+static void terminate_multifd_send_threads(void)
+{
+ int i, thread_count;
+
+ thread_count = migrate_multifd_threads();
+ for (i = 0; i < thread_count; i++) {
+ qemu_mutex_lock(&multifd_send[i].mutex);
+ multifd_send[i].quit = true;
+ qemu_cond_signal(&multifd_send[i].cond);
+ qemu_mutex_unlock(&multifd_send[i].mutex);
+ }
+}
+
+void migrate_multifd_send_threads_join(void)
+{
+ int i, thread_count;
+
+ if (!migrate_multifd()){
+ return;
+ }
+ terminate_multifd_send_threads();
+ thread_count = migrate_multifd_threads();
+ for (i = 0; i < thread_count; i++) {
+ qemu_thread_join(&multifd_send[i].thread);
+ qemu_mutex_destroy(&multifd_send[i].mutex);
+ qemu_cond_destroy(&multifd_send[i].cond);
+ }
+ g_free(multifd_send);
+ multifd_send = NULL;
+}
+
+void migrate_multifd_send_threads_create(void)
+{
+ int i, thread_count;
+
+ if (!migrate_multifd()){
+ return;
+ }
+ thread_count = migrate_multifd_threads();
+ multifd_send = g_new0(MultiFDSendParams, thread_count);
+ for (i = 0; i < thread_count; i++) {
+ qemu_mutex_init(&multifd_send[i].mutex);
+ qemu_cond_init(&multifd_send[i].cond);
+ multifd_send[i].quit = false;
+ qemu_thread_create(&multifd_send[i].thread, "multifd_send",
+ multifd_send_thread, &multifd_send[i],
+ QEMU_THREAD_JOINABLE);
+ }
+}
+
+struct MultiFDRecvParams {
+ QemuThread thread;
+ QemuCond cond;
+ QemuMutex mutex;
+ bool quit;
+};
+typedef struct MultiFDRecvParams MultiFDRecvParams;
+
+static MultiFDRecvParams *multifd_recv;
+
+static void *multifd_recv_thread(void *opaque)
+{
+ MultiFDSendParams *params = opaque;
+
+ qemu_mutex_lock(¶ms->mutex);
+ while (!params->quit){
+ qemu_cond_wait(¶ms->cond, ¶ms->mutex);
+ }
+ qemu_mutex_unlock(¶ms->mutex);
+
+ return NULL;
+}
+
+static void terminate_multifd_recv_threads(void)
+{
+ int i, thread_count;
+
+ thread_count = migrate_multifd_threads();
+ for (i = 0; i < thread_count; i++) {
+ qemu_mutex_lock(&multifd_recv[i].mutex);
+ multifd_recv[i].quit = true;
+ qemu_cond_signal(&multifd_recv[i].cond);
+ qemu_mutex_unlock(&multifd_recv[i].mutex);
+ }
+}
+
+void migrate_multifd_recv_threads_join(void)
+{
+ int i, thread_count;
+
+ if (!migrate_multifd()){
+ return;
+ }
+ terminate_multifd_recv_threads();
+ thread_count = migrate_multifd_threads();
+ for (i = 0; i < thread_count; i++) {
+ qemu_thread_join(&multifd_recv[i].thread);
+ qemu_mutex_destroy(&multifd_recv[i].mutex);
+ qemu_cond_destroy(&multifd_recv[i].cond);
+ }
+ g_free(multifd_recv);
+ multifd_recv = NULL;
+}
+
+void migrate_multifd_recv_threads_create(void)
+{
+ int i, thread_count;
+
+ if (!migrate_multifd()){
+ return;
+ }
+ thread_count = migrate_multifd_threads();
+ multifd_recv = g_new0(MultiFDRecvParams, thread_count);
+ for (i = 0; i < thread_count; i++) {
+ qemu_mutex_init(&multifd_recv[i].mutex);
+ qemu_cond_init(&multifd_recv[i].cond);
+ multifd_recv[i].quit = false;
+ qemu_thread_create(&multifd_recv[i].thread, "multifd_recv",
+ multifd_recv_thread, &multifd_recv[i],
+ QEMU_THREAD_JOINABLE);
+ }
+}
+
/**
* save_page_header: Write page header to wire
*
--
2.5.5
- [Qemu-devel] [RFC 00/13] Multiple fd migration support, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 01/13] migration: create Migration Incoming State at init time, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 03/13] migration: [HACK] Don't create decompression threads if not enabled, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 02/13] migration: Pass TCP args in an struct, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 09/13] migration: Create thread infrastructure for multifd send side, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 06/13] migration: create multifd migration threads,
Juan Quintela <=
- [Qemu-devel] [PATCH 07/13] migration: Start of multiple fd work, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 04/13] migration: Add multifd capability, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 05/13] migration: Create x-multifd-threads parameter, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 08/13] migration: create ram_multifd_page, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 10/13] migration: Send the fd number which we are going to use for this page, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 12/13] migration: Test new fd infrastructure, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 13/13] migration: [HACK]Transfer pages over new channels, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 11/13] migration: Create thread infrastructure for multifd recv side, Juan Quintela, 2016/04/20