[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/33] migration: Make global sem_sync semaphore by c
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 32/33] migration: Make global sem_sync semaphore by channel |
Date: |
Thu, 15 Aug 2019 17:35:03 +0100 |
From: Juan Quintela <address@hidden>
This makes easy to debug things because when you want for all threads
to arrive at that semaphore, you know which one your are waiting for.
Signed-off-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index b542929a7c..c7aa3d9a2c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -661,6 +661,8 @@ typedef struct {
uint64_t num_packets;
/* pages sent through this channel */
uint64_t num_pages;
+ /* syncs main thread and channels */
+ QemuSemaphore sem_sync;
} MultiFDSendParams;
typedef struct {
@@ -896,8 +898,6 @@ struct {
MultiFDSendParams *params;
/* array of pages to sent */
MultiFDPages_t *pages;
- /* syncs main thread and channels */
- QemuSemaphore sem_sync;
/* global number of generated multifd packets */
uint64_t packet_num;
/* send channels ready */
@@ -1039,6 +1039,7 @@ void multifd_save_cleanup(void)
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;
multifd_pages_clear(p->pages);
@@ -1048,7 +1049,6 @@ void multifd_save_cleanup(void)
p->packet = NULL;
}
qemu_sem_destroy(&multifd_send_state->channels_ready);
- qemu_sem_destroy(&multifd_send_state->sem_sync);
g_free(multifd_send_state->params);
multifd_send_state->params = NULL;
multifd_pages_clear(multifd_send_state->pages);
@@ -1096,7 +1096,7 @@ static void multifd_send_sync_main(RAMState *rs)
MultiFDSendParams *p = &multifd_send_state->params[i];
trace_multifd_send_sync_main_wait(p->id);
- qemu_sem_wait(&multifd_send_state->sem_sync);
+ qemu_sem_wait(&p->sem_sync);
}
trace_multifd_send_sync_main(multifd_send_state->packet_num);
}
@@ -1156,7 +1156,7 @@ static void *multifd_send_thread(void *opaque)
qemu_mutex_unlock(&p->mutex);
if (flags & MULTIFD_FLAG_SYNC) {
- qemu_sem_post(&multifd_send_state->sem_sync);
+ qemu_sem_post(&p->sem_sync);
}
qemu_sem_post(&multifd_send_state->channels_ready);
} else if (p->quit) {
@@ -1179,7 +1179,7 @@ out:
*/
if (ret != 0) {
if (flags & MULTIFD_FLAG_SYNC) {
- qemu_sem_post(&multifd_send_state->sem_sync);
+ qemu_sem_post(&p->sem_sync);
}
qemu_sem_post(&multifd_send_state->channels_ready);
}
@@ -1225,7 +1225,6 @@ int multifd_save_setup(void)
multifd_send_state = g_malloc0(sizeof(*multifd_send_state));
multifd_send_state->params = g_new0(MultiFDSendParams, thread_count);
multifd_send_state->pages = multifd_pages_init(page_count);
- qemu_sem_init(&multifd_send_state->sem_sync, 0);
qemu_sem_init(&multifd_send_state->channels_ready, 0);
for (i = 0; i < thread_count; i++) {
@@ -1233,6 +1232,7 @@ int multifd_save_setup(void)
qemu_mutex_init(&p->mutex);
qemu_sem_init(&p->sem, 0);
+ qemu_sem_init(&p->sem_sync, 0);
p->quit = false;
p->pending_job = 0;
p->id = i;
--
2.21.0
- [Qemu-devel] [PULL 22/33] hmp: Remove migration capabilities from "info migrate", (continued)
- [Qemu-devel] [PULL 22/33] hmp: Remove migration capabilities from "info migrate", Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 23/33] migration: remove unused field bytes_xfer, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 24/33] migration: always initialise ram_counters for a new migration, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 25/33] migration: add qemu_file_update_transfer interface, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 26/33] migration: add speed limit for multifd migration, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 27/33] migration: update ram_counters for multifd sync packet, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 28/33] migration: rename migration_bitmap_sync_range to ramblock_sync_dirty_bitmap, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 30/33] qemu-file: move qemu_{get, put}_counted_string() declarations, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 29/33] migration/postcopy: use mis->bh instead of allocating a QEMUBH, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 31/33] migration: Add traces for multifd terminate threads, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 32/33] migration: Make global sem_sync semaphore by channel,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 33/33] migration: add some multifd traces, Dr. David Alan Gilbert (git), 2019/08/15
- Re: [Qemu-devel] [PULL 00/33] migration queue, Peter Maydell, 2019/08/16