[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/35] migration: take finer locking
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 09/35] migration: take finer locking |
Date: |
Tue, 11 Dec 2012 13:46:45 +0100 |
Instead of locking the whole migration_thread inside loop, just lock
migration_fd_put_notify, that is what interacts with the rest of the
world.
Signed-off-by: Juan Quintela <address@hidden>
---
buffered_file.c | 2 --
migration.c | 5 +++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index 234b968..d68eb66 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -223,9 +223,7 @@ static void *buffered_file_thread(void *opaque)
/* usleep expects microseconds */
usleep((expire_time - current_time)*1000);
}
- qemu_mutex_lock_iothread();
buffered_put_buffer(s, NULL, 0, 0);
- qemu_mutex_unlock_iothread();
}
g_free(s->buffer);
g_free(s);
diff --git a/migration.c b/migration.c
index 693f329..df5ab16 100644
--- a/migration.c
+++ b/migration.c
@@ -321,8 +321,10 @@ void migrate_fd_put_ready(MigrationState *s)
int ret;
static bool first_time = true;
+ qemu_mutex_lock_iothread();
if (s->state != MIG_STATE_ACTIVE) {
DPRINTF("put_ready returning because of non-active state\n");
+ qemu_mutex_unlock_iothread();
return;
}
if (first_time) {
@@ -332,6 +334,7 @@ void migrate_fd_put_ready(MigrationState *s)
if (ret < 0) {
DPRINTF("failed, %d\n", ret);
migrate_fd_error(s);
+ qemu_mutex_unlock_iothread();
return;
}
}
@@ -367,6 +370,8 @@ void migrate_fd_put_ready(MigrationState *s)
}
}
}
+ qemu_mutex_unlock_iothread();
+
}
static void migrate_fd_cancel(MigrationState *s)
--
1.7.11.7
- [Qemu-devel] [PATCH 00/35] Migration thread (20121211), Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 01/35] split MRU ram list, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 09/35] migration: take finer locking,
Juan Quintela <=
- [Qemu-devel] [PATCH 02/35] add a version number to ram_list, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 06/35] migration: stop all cpus correctly, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 05/35] migration: make qemu_fopen_ops_buffered() return void, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 04/35] buffered_file: Move from using a timer to use a thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 03/35] protect the ramlist with a separate mutex, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 08/35] migration: remove unfreeze logic, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 07/35] migration: make writes blocking, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 14/35] migration: include qemu-file.h, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 11/35] buffered_file: don't flush on put buffer, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 12/35] buffered_file: unfold buffered_append in buffered_put_buffer, Juan Quintela, 2012/12/11