[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v16 06/14] migration: Multifd channels always wait o
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v16 06/14] migration: Multifd channels always wait on the sem |
Date: |
Tue, 26 Jun 2018 20:19:24 +0200 |
Either for quit, sync or packet, we first wake them.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 5c040e3ae5..45d6c43bfe 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -875,6 +875,7 @@ static void *multifd_send_thread(void *opaque)
p->num_packets = 1;
while (true) {
+ qemu_sem_wait(&p->sem);
qemu_mutex_lock(&p->mutex);
multifd_send_fill_packet(p);
if (p->quit) {
@@ -882,7 +883,9 @@ static void *multifd_send_thread(void *opaque)
break;
}
qemu_mutex_unlock(&p->mutex);
- qemu_sem_wait(&p->sem);
+ /* this is impossible */
+ error_setg(&local_err, "multifd_send_thread: Unknown command");
+ break;
}
out:
@@ -1026,6 +1029,7 @@ static void *multifd_recv_thread(void *opaque)
trace_multifd_recv_thread_start(p->id);
while (true) {
+ qemu_sem_wait(&p->sem);
qemu_mutex_lock(&p->mutex);
if (false) {
/* ToDo: Packet reception goes here */
@@ -1040,9 +1044,14 @@ static void *multifd_recv_thread(void *opaque)
break;
}
qemu_mutex_unlock(&p->mutex);
- qemu_sem_wait(&p->sem);
+ /* this is impossible */
+ error_setg(&local_err, "multifd_recv_thread: Unknown command");
+ break;
}
+ if (local_err) {
+ multifd_recv_terminate_threads(local_err);
+ }
qemu_mutex_lock(&p->mutex);
p->running = false;
qemu_mutex_unlock(&p->mutex);
--
2.17.1
- [Qemu-devel] [PATCH v16 01/14] migration: Create multipage support, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 04/14] migration: Abstract the number of bytes sent, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 03/14] migration: Calculate mbps only during transfer time, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 02/14] migration: Create multifd packet, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 05/14] migration: Add multifd traces for start/end thread, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 06/14] migration: Multifd channels always wait on the sem,
Juan Quintela <=
- [Qemu-devel] [PATCH v16 07/14] migration: Add block where to send/receive packets, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 09/14] migration: Create multifd_bytes ram_counter, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 08/14] migration: Synchronize multifd threads with main thread, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 11/14] migration: Start sending messages, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 12/14] migration: Wait for blocking IO, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 13/14] migration: Remove not needed semaphore and quit, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 10/14] migration: Create ram_save_multifd_page, Juan Quintela, 2018/06/26
- [Qemu-devel] [PATCH v16 14/14] migration: Stop sending whole pages through main channel, Juan Quintela, 2018/06/26