[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v15 11/12] migration: Remove not needed semaphore an
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v15 11/12] migration: Remove not needed semaphore and quit |
Date: |
Thu, 21 Jun 2018 01:28:50 +0200 |
We know quit closing the QIO.
Signed-off-by: Juan Quintela <address@hidden>
--
Add comment
don't object_ref() twice.
---
migration/ram.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 2c3a452a7d..57d3ad1c45 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 */
@@ -1152,8 +1148,12 @@ 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() */
+ object_unref(OBJECT(p->c));
+ p->c = NULL;
qemu_mutex_unlock(&p->mutex);
}
}
@@ -1173,10 +1173,7 @@ int multifd_load_cleanup(Error **errp)
if (p->running) {
qemu_thread_join(&p->thread);
}
- 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;
@@ -1299,9 +1296,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
- [Qemu-devel] [PATCH v15 03/12] migration: Add multifd traces for start/end thread, (continued)
- [Qemu-devel] [PATCH v15 03/12] migration: Add multifd traces for start/end thread, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 04/12] migration: Calculate transferred ram correctly, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 06/12] migration: Add block where to send/receive packets, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 09/12] migration: Start sending messages, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 08/12] migration: Create ram_save_multifd_page, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 12/12] migration: Stop sending whole pages through main channel, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 05/12] migration: Multifd channels always wait on the sem, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 07/12] migration: Synchronize multifd threads with main thread, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 10/12] migration: Wait for blocking IO, Juan Quintela, 2018/06/20
- [Qemu-devel] [PATCH v15 11/12] migration: Remove not needed semaphore and quit,
Juan Quintela <=
- Re: [Qemu-devel] [PATCH v15 00/12] Multifd, no-reply, 2018/06/22