From: zhanghailiang <zhang.zhanghailiang@huawei.com>
To: jasowang@redhat.com, zhangchen.fnst@cn.fujitsu.com,
lizhijian@cn.fujitsu.com
Cc: qemu-devel@nongnu.org, xuquan8@huawei.com,
pss.wulizhen@huawei.com,
zhanghailiang <zhang.zhanghailiang@huawei.com>
Subject: [Qemu-devel] [PATCH 2/5] colo-compare: kick compare thread to exit while finalize
Date: Wed, 15 Feb 2017 16:34:14 +0800 [thread overview]
Message-ID: <1487147657-166092-3-git-send-email-zhang.zhanghailiang@huawei.com> (raw)
In-Reply-To: <1487147657-166092-1-git-send-email-zhang.zhanghailiang@huawei.com>
We should call g_main_loop_quit() to notify colo compare thread to
exit, Or it will run in g_main_loop_run() forever.
Besides, the finalizing process can't happen in context of colo thread,
it is reasonable to remove the 'if (qemu_thread_is_self(&s->thread))'
branch.
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
---
net/colo-compare.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index fdde788..a16e2d5 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -83,6 +83,8 @@ typedef struct CompareState {
GHashTable *connection_track_table;
/* compare thread, a thread for each NIC */
QemuThread thread;
+
+ GMainLoop *compare_loop;
} CompareState;
typedef struct CompareClass {
@@ -496,7 +498,6 @@ static gboolean check_old_packet_regular(void *opaque)
static void *colo_compare_thread(void *opaque)
{
GMainContext *worker_context;
- GMainLoop *compare_loop;
CompareState *s = opaque;
GSource *timeout_source;
@@ -507,7 +508,7 @@ static void *colo_compare_thread(void *opaque)
qemu_chr_fe_set_handlers(&s->chr_sec_in, compare_chr_can_read,
compare_sec_chr_in, NULL, s, worker_context, true);
- compare_loop = g_main_loop_new(worker_context, FALSE);
+ s->compare_loop = g_main_loop_new(worker_context, FALSE);
/* To kick any packets that the secondary doesn't match */
timeout_source = g_timeout_source_new(REGULAR_PACKET_CHECK_MS);
@@ -515,10 +516,10 @@ static void *colo_compare_thread(void *opaque)
(GSourceFunc)check_old_packet_regular, s, NULL);
g_source_attach(timeout_source, worker_context);
- g_main_loop_run(compare_loop);
+ g_main_loop_run(s->compare_loop);
g_source_unref(timeout_source);
- g_main_loop_unref(compare_loop);
+ g_main_loop_unref(s->compare_loop);
g_main_context_unref(worker_context);
return NULL;
}
@@ -703,13 +704,11 @@ static void colo_compare_finalize(Object *obj)
qemu_chr_fe_deinit(&s->chr_sec_in);
qemu_chr_fe_deinit(&s->chr_out);
- g_queue_free(&s->conn_list);
+ g_main_loop_quit(s->compare_loop);
+ qemu_thread_join(&s->thread);
- if (qemu_thread_is_self(&s->thread)) {
- /* compare connection */
- g_queue_foreach(&s->conn_list, colo_compare_connection, s);
- qemu_thread_join(&s->thread);
- }
+
+ g_queue_free(&s->conn_list);
g_free(s->pri_indev);
g_free(s->sec_indev);
--
1.8.3.1
next prev parent reply other threads:[~2017-02-15 8:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 8:34 [Qemu-devel] [PATCH 0/5] colo-compare: fix some bugs zhanghailiang
2017-02-15 8:34 ` [Qemu-devel] [PATCH 1/5] colo-compare: use g_timeout_source_new() to process the stale packets zhanghailiang
2017-02-15 8:34 ` zhanghailiang [this message]
2017-02-16 2:25 ` [Qemu-devel] [PATCH 2/5] colo-compare: kick compare thread to exit while finalize Zhang Chen
2017-02-16 2:34 ` Jason Wang
2017-02-16 2:45 ` Hailiang Zhang
2017-02-15 8:34 ` [Qemu-devel] [PATCH 3/5] colo-compare: release all unhandled packets in finalize function zhanghailiang
2017-02-16 2:27 ` Zhang Chen
2017-02-16 5:25 ` Hailiang Zhang
2017-02-16 2:34 ` Jason Wang
2017-02-16 2:43 ` Hailiang Zhang
2017-02-16 2:47 ` Jason Wang
2017-02-15 8:34 ` [Qemu-devel] [PATCH 4/5] char: remove the right fd been watched in qemu_chr_fe_set_handlers() zhanghailiang
2017-02-15 8:34 ` [Qemu-devel] [PATCH 5/5] colo-compare: Fix removing fds been watched incorrectly in finalization zhanghailiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487147657-166092-3-git-send-email-zhang.zhanghailiang@huawei.com \
--to=zhang.zhanghailiang@huawei.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=pss.wulizhen@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=xuquan8@huawei.com \
--cc=zhangchen.fnst@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.