From nobody Sun Nov 9 11:36:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550805410802675.5519842938658; Thu, 21 Feb 2019 19:16:50 -0800 (PST) Received: from localhost ([127.0.0.1]:43414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx1KM-00028C-B7 for importer@patchew.org; Thu, 21 Feb 2019 22:16:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx1Il-0001IW-IV for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gx1Ik-0000gx-70 for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55594) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gx1Ij-0008VM-Fi for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:01 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5644A3005FC5 for ; Fri, 22 Feb 2019 03:14:33 +0000 (UTC) Received: from xz-x1.redhat.com (ovpn-12-57.pek2.redhat.com [10.72.12.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCA315D9D4; Fri, 22 Feb 2019 03:14:30 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2019 11:14:10 +0800 Message-Id: <20190222031413.20250-2-peterx@redhat.com> In-Reply-To: <20190222031413.20250-1-peterx@redhat.com> References: <20190222031413.20250-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 22 Feb 2019 03:14:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] iothread: replace init_done_cond with a semaphore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , peterx@redhat.com, Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Only sending an init-done message using lock+cond seems an overkill to me. Replacing it with a simpler semaphore. Meanwhile, init the semaphore unconditionally, then we can destroy it unconditionally too in finalize which seems cleaner. Signed-off-by: Peter Xu Reviewed-by: Stefan Hajnoczi --- include/sysemu/iothread.h | 3 +-- iothread.c | 17 ++++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index 8a7ac2c528..50411ba54a 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -27,8 +27,7 @@ typedef struct { GMainContext *worker_context; GMainLoop *main_loop; GOnce once; - QemuMutex init_done_lock; - QemuCond init_done_cond; /* is thread initialization done? */ + QemuSemaphore init_done_sem; /* is thread init done? */ bool stopping; /* has iothread_stop() been called? */ bool running; /* should iothread_run() continue? */ int thread_id; diff --git a/iothread.c b/iothread.c index e615b7ae52..6e297e9ef1 100644 --- a/iothread.c +++ b/iothread.c @@ -55,10 +55,8 @@ static void *iothread_run(void *opaque) rcu_register_thread(); =20 my_iothread =3D iothread; - qemu_mutex_lock(&iothread->init_done_lock); iothread->thread_id =3D qemu_get_thread_id(); - qemu_cond_signal(&iothread->init_done_cond); - qemu_mutex_unlock(&iothread->init_done_lock); + qemu_sem_post(&iothread->init_done_sem); =20 while (iothread->running) { aio_poll(iothread->ctx, true); @@ -115,6 +113,7 @@ static void iothread_instance_init(Object *obj) =20 iothread->poll_max_ns =3D IOTHREAD_POLL_MAX_NS_DEFAULT; iothread->thread_id =3D -1; + qemu_sem_init(&iothread->init_done_sem, 0); } =20 static void iothread_instance_finalize(Object *obj) @@ -123,10 +122,6 @@ static void iothread_instance_finalize(Object *obj) =20 iothread_stop(iothread); =20 - if (iothread->thread_id !=3D -1) { - qemu_cond_destroy(&iothread->init_done_cond); - qemu_mutex_destroy(&iothread->init_done_lock); - } /* * Before glib2 2.33.10, there is a glib2 bug that GSource context * pointer may not be cleared even if the context has already been @@ -145,6 +140,7 @@ static void iothread_instance_finalize(Object *obj) g_main_context_unref(iothread->worker_context); iothread->worker_context =3D NULL; } + qemu_sem_destroy(&iothread->init_done_sem); } =20 static void iothread_complete(UserCreatable *obj, Error **errp) @@ -173,8 +169,6 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) return; } =20 - qemu_mutex_init(&iothread->init_done_lock); - qemu_cond_init(&iothread->init_done_cond); iothread->once =3D (GOnce) G_ONCE_INIT; =20 /* This assumes we are called from a thread with useful CPU affinity f= or us @@ -188,12 +182,9 @@ static void iothread_complete(UserCreatable *obj, Erro= r **errp) g_free(name); =20 /* Wait for initialization to complete */ - qemu_mutex_lock(&iothread->init_done_lock); while (iothread->thread_id =3D=3D -1) { - qemu_cond_wait(&iothread->init_done_cond, - &iothread->init_done_lock); + qemu_sem_wait(&iothread->init_done_sem); } - qemu_mutex_unlock(&iothread->init_done_lock); } =20 typedef struct { --=20 2.17.1 From nobody Sun Nov 9 11:36:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550805429426676.6246844817604; Thu, 21 Feb 2019 19:17:09 -0800 (PST) Received: from localhost ([127.0.0.1]:43418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx1Kk-0002OO-D4 for importer@patchew.org; Thu, 21 Feb 2019 22:17:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx1Ix-0001Pn-AL for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gx1Iv-0000ru-Al for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53634) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gx1Ir-00009h-A4 for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:11 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E6053688B for ; Fri, 22 Feb 2019 03:14:37 +0000 (UTC) Received: from xz-x1.redhat.com (ovpn-12-57.pek2.redhat.com [10.72.12.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFCEF5D9D4; Fri, 22 Feb 2019 03:14:33 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2019 11:14:11 +0800 Message-Id: <20190222031413.20250-3-peterx@redhat.com> In-Reply-To: <20190222031413.20250-1-peterx@redhat.com> References: <20190222031413.20250-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 22 Feb 2019 03:14:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] iothread: create the gcontext onconditionally X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , peterx@redhat.com, Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In existing code we create the gcontext dynamically at the first access of the gcontext from caller. That can bring some complexity and potential races during using iothread. Since the context itself is not that big a resource, and we won't have millions of iothread, let's simply create the gcontext unconditionally. This will also be a preparation work further to move the thread context push operation earlier than before (now it's only pushed right before we want to start running the gmainloop). Removing the g_once since it's not necessary, while introducing a new run_gcontext boolean to show whether we want to run the gcontext. Signed-off-by: Peter Xu Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/sysemu/iothread.h | 2 +- iothread.c | 43 +++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index 50411ba54a..5f6240d5cb 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -24,9 +24,9 @@ typedef struct { =20 QemuThread thread; AioContext *ctx; + bool run_gcontext; /* whether we should run gcontext */ GMainContext *worker_context; GMainLoop *main_loop; - GOnce once; QemuSemaphore init_done_sem; /* is thread init done? */ bool stopping; /* has iothread_stop() been called? */ bool running; /* should iothread_run() continue? */ diff --git a/iothread.c b/iothread.c index 6e297e9ef1..6fa87876e0 100644 --- a/iothread.c +++ b/iothread.c @@ -65,7 +65,7 @@ static void *iothread_run(void *opaque) * We must check the running state again in case it was * changed in previous aio_poll() */ - if (iothread->running && atomic_read(&iothread->worker_context)) { + if (iothread->running && atomic_read(&iothread->run_gcontext)) { GMainLoop *loop; =20 g_main_context_push_thread_default(iothread->worker_context); @@ -114,6 +114,8 @@ static void iothread_instance_init(Object *obj) iothread->poll_max_ns =3D IOTHREAD_POLL_MAX_NS_DEFAULT; iothread->thread_id =3D -1; qemu_sem_init(&iothread->init_done_sem, 0); + /* By default, we don't run gcontext */ + atomic_set(&iothread->run_gcontext, 0); } =20 static void iothread_instance_finalize(Object *obj) @@ -143,6 +145,16 @@ static void iothread_instance_finalize(Object *obj) qemu_sem_destroy(&iothread->init_done_sem); } =20 +static void iothread_init_gcontext(IOThread *iothread) +{ + GSource *source; + + iothread->worker_context =3D g_main_context_new(); + source =3D aio_get_g_source(iothread_get_aio_context(iothread)); + g_source_attach(source, iothread->worker_context); + g_source_unref(source); +} + static void iothread_complete(UserCreatable *obj, Error **errp) { Error *local_error =3D NULL; @@ -157,6 +169,12 @@ static void iothread_complete(UserCreatable *obj, Erro= r **errp) return; } =20 + /* + * Init one GMainContext for the iothread unconditionally, even if + * it's not used + */ + iothread_init_gcontext(iothread); + aio_context_set_poll_params(iothread->ctx, iothread->poll_max_ns, iothread->poll_grow, @@ -169,8 +187,6 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) return; } =20 - iothread->once =3D (GOnce) G_ONCE_INIT; - /* This assumes we are called from a thread with useful CPU affinity f= or us * to inherit. */ @@ -333,27 +349,10 @@ IOThreadInfoList *qmp_query_iothreads(Error **errp) return head; } =20 -static gpointer iothread_g_main_context_init(gpointer opaque) -{ - AioContext *ctx; - IOThread *iothread =3D opaque; - GSource *source; - - iothread->worker_context =3D g_main_context_new(); - - ctx =3D iothread_get_aio_context(iothread); - source =3D aio_get_g_source(ctx); - g_source_attach(source, iothread->worker_context); - g_source_unref(source); - - aio_notify(iothread->ctx); - return NULL; -} - GMainContext *iothread_get_g_main_context(IOThread *iothread) { - g_once(&iothread->once, iothread_g_main_context_init, iothread); - + atomic_set(&iothread->run_gcontext, 1); + aio_notify(iothread->ctx); return iothread->worker_context; } =20 --=20 2.17.1 From nobody Sun Nov 9 11:36:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550805411897321.9850623294526; Thu, 21 Feb 2019 19:16:51 -0800 (PST) Received: from localhost ([127.0.0.1]:43416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx1KQ-00029n-MY for importer@patchew.org; Thu, 21 Feb 2019 22:16:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx1Im-0001IX-6Z for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gx1Ik-0000hl-Jl for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57158) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gx1Ij-0000M3-Vj for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:15:02 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C0826699D for ; Fri, 22 Feb 2019 03:14:48 +0000 (UTC) Received: from xz-x1.redhat.com (ovpn-12-57.pek2.redhat.com [10.72.12.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C7495D9D4; Fri, 22 Feb 2019 03:14:37 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2019 11:14:12 +0800 Message-Id: <20190222031413.20250-4-peterx@redhat.com> In-Reply-To: <20190222031413.20250-1-peterx@redhat.com> References: <20190222031413.20250-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 22 Feb 2019 03:14:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] iothread: create main loop unconditionally X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , peterx@redhat.com, Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since we've have the gcontext always there, create the main loop altogether. The iothread_run() is even cleaner. Signed-off-by: Peter Xu Reviewed-by: Marc-Andr=C3=A9 Lureau --- iothread.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/iothread.c b/iothread.c index 6fa87876e0..9abdbace66 100644 --- a/iothread.c +++ b/iothread.c @@ -66,17 +66,8 @@ static void *iothread_run(void *opaque) * changed in previous aio_poll() */ if (iothread->running && atomic_read(&iothread->run_gcontext)) { - GMainLoop *loop; - g_main_context_push_thread_default(iothread->worker_context); - iothread->main_loop =3D - g_main_loop_new(iothread->worker_context, TRUE); - loop =3D iothread->main_loop; - g_main_loop_run(iothread->main_loop); - iothread->main_loop =3D NULL; - g_main_loop_unref(loop); - g_main_context_pop_thread_default(iothread->worker_context); } } @@ -141,6 +132,8 @@ static void iothread_instance_finalize(Object *obj) if (iothread->worker_context) { g_main_context_unref(iothread->worker_context); iothread->worker_context =3D NULL; + g_main_loop_unref(iothread->main_loop); + iothread->main_loop =3D NULL; } qemu_sem_destroy(&iothread->init_done_sem); } @@ -153,6 +146,7 @@ static void iothread_init_gcontext(IOThread *iothread) source =3D aio_get_g_source(iothread_get_aio_context(iothread)); g_source_attach(source, iothread->worker_context); g_source_unref(source); + iothread->main_loop =3D g_main_loop_new(iothread->worker_context, TRUE= ); } =20 static void iothread_complete(UserCreatable *obj, Error **errp) --=20 2.17.1 From nobody Sun Nov 9 11:36:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550805557289432.38555194159517; Thu, 21 Feb 2019 19:19:17 -0800 (PST) Received: from localhost ([127.0.0.1]:43436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx1Mk-0003lb-8P for importer@patchew.org; Thu, 21 Feb 2019 22:19:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx1Ju-0002Az-09 for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:16:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gx1Jt-0002JW-1s for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:16:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gx1Js-0000Pi-OD for qemu-devel@nongnu.org; Thu, 21 Feb 2019 22:16:12 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A998D99CE8 for ; Fri, 22 Feb 2019 03:14:52 +0000 (UTC) Received: from xz-x1.redhat.com (ovpn-12-57.pek2.redhat.com [10.72.12.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2909A5D9D4; Fri, 22 Feb 2019 03:14:48 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2019 11:14:13 +0800 Message-Id: <20190222031413.20250-5-peterx@redhat.com> In-Reply-To: <20190222031413.20250-1-peterx@redhat.com> References: <20190222031413.20250-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 22 Feb 2019 03:14:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] iothread: push gcontext earlier in the thread_fn X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , peterx@redhat.com, Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We were pushing the context until right before running the gmainloop. Now since we have everything unconditionally, we can move this earlier. One benefit is that now it's done even before init_done_sem, so as long as the iothread user calls iothread_create() and completes, we know that the thread stack is ready. Signed-off-by: Peter Xu --- iothread.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/iothread.c b/iothread.c index 9abdbace66..7b7cba5d04 100644 --- a/iothread.c +++ b/iothread.c @@ -53,7 +53,7 @@ static void *iothread_run(void *opaque) IOThread *iothread =3D opaque; =20 rcu_register_thread(); - + g_main_context_push_thread_default(iothread->worker_context); my_iothread =3D iothread; iothread->thread_id =3D qemu_get_thread_id(); qemu_sem_post(&iothread->init_done_sem); @@ -66,12 +66,11 @@ static void *iothread_run(void *opaque) * changed in previous aio_poll() */ if (iothread->running && atomic_read(&iothread->run_gcontext)) { - g_main_context_push_thread_default(iothread->worker_context); g_main_loop_run(iothread->main_loop); - g_main_context_pop_thread_default(iothread->worker_context); } } =20 + g_main_context_pop_thread_default(iothread->worker_context); rcu_unregister_thread(); return NULL; } --=20 2.17.1