[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v16 13/14] migration: Remove not needed semaphore an
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v16 13/14] migration: Remove not needed semaphore and quit |
Date: |
Tue, 26 Jun 2018 20:19:31 +0200 |
We know quit with shutdwon in the QIO.
Signed-off-by: Juan Quintela <address@hidden>
--
Add comment
Use shutdown() instead of unref()
---
migration/ram.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 5d38d699f3..61f7313093 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -594,14 +594,10 @@ typedef struct {
QemuThread thread;
/* communication channel */
QIOChannel *c;
- /* sem where to wait for more work */
- QemuSemaphore sem;
/* this mutex protects the following parameters */
QemuMutex mutex;
/* is this channel thread running */
bool running;
- /* should this thread finish */
- bool quit;
/* array of pages to receive */
MultiFDPages_t *pages;
/* packet allocated len */
@@ -1144,8 +1140,11 @@ static void multifd_recv_terminate_threads(Error *err)
MultiFDRecvParams *p = &multifd_recv_state->params[i];
qemu_mutex_lock(&p->mutex);
- p->quit = true;
- qemu_sem_post(&p->sem);
+ /* We could arrive here for two reasons:
+ - normal quit, i.e. everything went fine, just finished
+ - error quit: We close the channels so the channel threads
+ finish the qio_channel_read_all_eof() */
+ qio_channel_shutdown(p->c, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
qemu_mutex_unlock(&p->mutex);
}
}
@@ -1168,7 +1167,6 @@ int multifd_load_cleanup(Error **errp)
object_unref(OBJECT(p->c));
p->c = NULL;
qemu_mutex_destroy(&p->mutex);
- qemu_sem_destroy(&p->sem);
qemu_sem_destroy(&p->sem_sync);
g_free(p->name);
p->name = NULL;
@@ -1291,9 +1289,7 @@ int multifd_load_setup(void)
MultiFDRecvParams *p = &multifd_recv_state->params[i];
qemu_mutex_init(&p->mutex);
- qemu_sem_init(&p->sem, 0);
qemu_sem_init(&p->sem_sync, 0);
- p->quit = false;
p->id = i;
p->pages = multifd_pages_init(page_count);
p->packet_len = sizeof(MultiFDPacket_t)
--
2.17.1
- Re: [Qemu-devel] [PATCH v16 03/14] migration: Calculate mbps only during transfer time, (continued)
- [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, 2018/06/26
- [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 <=
- [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