[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/6] net/colo-compare.c: Correct ordering in complete and fina
From: |
Lukas Straub |
Subject: |
[PATCH v2 6/6] net/colo-compare.c: Correct ordering in complete and finalize |
Date: |
Sun, 26 Apr 2020 21:25:58 +0200 |
In colo_compare_complete, insert CompareState into net_compares
only after everything has been initialized.
In colo_compare_finalize, remove CompareState from net_compares
before anything is deinitialized.
Signed-off-by: Lukas Straub <address@hidden>
---
net/colo-compare.c | 47 +++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index a82bb27a67..53cc145a84 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -1287,15 +1287,6 @@ static void colo_compare_complete(UserCreatable *uc,
Error **errp)
s->vnet_hdr);
}
- qemu_mutex_lock(&colo_compare_mutex);
- if (!colo_compare_active) {
- qemu_mutex_init(&event_mtx);
- qemu_cond_init(&event_complete_cond);
- colo_compare_active = true;
- }
- QTAILQ_INSERT_TAIL(&net_compares, s, next);
- qemu_mutex_unlock(&colo_compare_mutex);
-
s->sendco.done = true;
g_queue_init(&s->sendco.send_list);
@@ -1307,6 +1298,16 @@ static void colo_compare_complete(UserCreatable *uc,
Error **errp)
connection_destroy);
colo_compare_iothread(s);
+
+ qemu_mutex_lock(&colo_compare_mutex);
+ if (!colo_compare_active) {
+ qemu_mutex_init(&event_mtx);
+ qemu_cond_init(&event_complete_cond);
+ colo_compare_active = true;
+ }
+ QTAILQ_INSERT_TAIL(&net_compares, s, next);
+ qemu_mutex_unlock(&colo_compare_mutex);
+
return;
}
@@ -1377,6 +1378,20 @@ static void colo_compare_finalize(Object *obj)
CompareState *s = COLO_COMPARE(obj);
CompareState *tmp = NULL;
+ qemu_mutex_lock(&colo_compare_mutex);
+ QTAILQ_FOREACH(tmp, &net_compares, next) {
+ if (tmp == s) {
+ QTAILQ_REMOVE(&net_compares, s, next);
+ break;
+ }
+ }
+ if (QTAILQ_EMPTY(&net_compares)) {
+ colo_compare_active = false;
+ qemu_mutex_destroy(&event_mtx);
+ qemu_cond_destroy(&event_complete_cond);
+ }
+ qemu_mutex_unlock(&colo_compare_mutex);
+
AioContext *ctx = iothread_get_aio_context(s->iothread);
aio_context_acquire(ctx);
AIO_WAIT_WHILE(ctx, !s->sendco.done);
@@ -1395,20 +1410,6 @@ static void colo_compare_finalize(Object *obj)
qemu_bh_delete(s->event_bh);
- qemu_mutex_lock(&colo_compare_mutex);
- QTAILQ_FOREACH(tmp, &net_compares, next) {
- if (tmp == s) {
- QTAILQ_REMOVE(&net_compares, s, next);
- break;
- }
- }
- if (QTAILQ_EMPTY(&net_compares)) {
- colo_compare_active = false;
- qemu_mutex_destroy(&event_mtx);
- qemu_cond_destroy(&event_complete_cond);
- }
- qemu_mutex_unlock(&colo_compare_mutex);
-
/* Release all unhandled packets after compare thead exited */
g_queue_foreach(&s->conn_list, colo_flush_packets, s);
--
2.20.1
pgpAcrJia0ocR.pgp
Description: OpenPGP digital signature
- [PATCH v2 0/6] colo-compare bugfixes, Lukas Straub, 2020/04/26
- [PATCH v2 2/6] chardev/char.c: Use qemu_co_sleep_ns if in coroutine, Lukas Straub, 2020/04/26
- [PATCH v2 1/6] net/colo-compare.c: Create event_bh with the right AioContext, Lukas Straub, 2020/04/26
- [PATCH v2 4/6] net/colo-compare.c: Only hexdump packets if tracing is enabled, Lukas Straub, 2020/04/26
- [PATCH v2 5/6] net/colo-compare.c, softmmu/vl.c: Check that colo-compare is active, Lukas Straub, 2020/04/26
- [PATCH v2 3/6] net/colo-compare.c: Fix deadlock in compare_chr_send, Lukas Straub, 2020/04/26
- [PATCH v2 6/6] net/colo-compare.c: Correct ordering in complete and finalize,
Lukas Straub <=
- Re: [PATCH v2 0/6] colo-compare bugfixes, no-reply, 2020/04/26