From nobody Wed Oct 22 13:01:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519794985201957.3182550633472; Tue, 27 Feb 2018 21:16:25 -0800 (PST) Received: from localhost ([::1]:42280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1equ6K-00078s-3d for importer@patchew.org; Wed, 28 Feb 2018 00:16:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqtxI-00081P-Ba for qemu-devel@nongnu.org; Wed, 28 Feb 2018 00:07:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqtxH-0000hf-6a for qemu-devel@nongnu.org; Wed, 28 Feb 2018 00:07:04 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54546 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqtxH-0000hV-1p for qemu-devel@nongnu.org; Wed, 28 Feb 2018 00:07:03 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B1FF140FB650 for ; Wed, 28 Feb 2018 05:07:02 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-95.pek2.redhat.com [10.72.12.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F5F92024CA6; Wed, 28 Feb 2018 05:06:59 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 28 Feb 2018 13:06:24 +0800 Message-Id: <20180228050633.7410-6-peterx@redhat.com> In-Reply-To: <20180228050633.7410-1-peterx@redhat.com> References: <20180228050633.7410-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 28 Feb 2018 05:07:02 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 28 Feb 2018 05:07:02 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 05/14] qio: refactor net listener source operations 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: Juan Quintela , Markus Armbruster , peterx@redhat.com, "Dr . David Alan Gilbert" , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Three functions are abstracted from the old code: - qio_net_listener_source_add(): create one source for listener - qio_net_listener_sources_clear(): unset existing net lister sources - qio_net_listener_sources_update(): setup all sources for listener Use them where possible. Signed-off-by: Peter Xu --- io/net-listener.c | 82 +++++++++++++++++++++++++++------------------------= ---- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/io/net-listener.c b/io/net-listener.c index de38dfae99..3e9ac51b0e 100644 --- a/io/net-listener.c +++ b/io/net-listener.c @@ -106,6 +106,39 @@ int qio_net_listener_open_sync(QIONetListener *listene= r, } } =20 +static guint qio_net_listener_source_add(QIONetListener *listener, + QIOChannelSocket *sioc) +{ + return qio_channel_add_watch(QIO_CHANNEL(sioc), G_IO_IN, + qio_net_listener_channel_func, + listener, (GDestroyNotify)object_unref); +} + +static void qio_net_listener_sources_clear(QIONetListener *listener) +{ + size_t i; + + for (i =3D 0; i < listener->nsioc; i++) { + if (listener->io_tag[i]) { + g_source_remove(listener->io_tag[i]); + listener->io_tag[i] =3D 0; + } + } +} + +static void qio_net_listener_sources_update(QIONetListener *listener) +{ + size_t i; + + if (listener->io_func !=3D NULL) { + for (i =3D 0; i < listener->nsioc; i++) { + assert(listener->io_tag[i] =3D=3D 0); + object_ref(OBJECT(listener)); + listener->io_tag[i] =3D qio_net_listener_source_add( + listener, listener->sioc[i]); + } + } +} =20 void qio_net_listener_add(QIONetListener *listener, QIOChannelSocket *sioc) @@ -127,10 +160,8 @@ void qio_net_listener_add(QIONetListener *listener, =20 if (listener->io_func !=3D NULL) { object_ref(OBJECT(listener)); - listener->io_tag[listener->nsioc] =3D qio_channel_add_watch( - QIO_CHANNEL(listener->sioc[listener->nsioc]), G_IO_IN, - qio_net_listener_channel_func, - listener, (GDestroyNotify)object_unref); + listener->io_tag[listener->nsioc] =3D qio_net_listener_source_add( + listener, listener->sioc[listener->nsioc]); } =20 listener->nsioc++; @@ -142,8 +173,6 @@ void qio_net_listener_set_client_func(QIONetListener *l= istener, gpointer data, GDestroyNotify notify) { - size_t i; - if (listener->io_notify) { listener->io_notify(listener->io_data); } @@ -151,22 +180,8 @@ void qio_net_listener_set_client_func(QIONetListener *= listener, listener->io_data =3D data; listener->io_notify =3D notify; =20 - for (i =3D 0; i < listener->nsioc; i++) { - if (listener->io_tag[i]) { - g_source_remove(listener->io_tag[i]); - listener->io_tag[i] =3D 0; - } - } - - if (listener->io_func !=3D NULL) { - for (i =3D 0; i < listener->nsioc; i++) { - object_ref(OBJECT(listener)); - listener->io_tag[i] =3D qio_channel_add_watch( - QIO_CHANNEL(listener->sioc[i]), G_IO_IN, - qio_net_listener_channel_func, - listener, (GDestroyNotify)object_unref); - } - } + qio_net_listener_sources_clear(listener); + qio_net_listener_sources_update(listener); } =20 =20 @@ -210,12 +225,7 @@ QIOChannelSocket *qio_net_listener_wait_client(QIONetL= istener *listener) }; size_t i; =20 - for (i =3D 0; i < listener->nsioc; i++) { - if (listener->io_tag[i]) { - g_source_remove(listener->io_tag[i]); - listener->io_tag[i] =3D 0; - } - } + qio_net_listener_sources_clear(listener); =20 sources =3D g_new0(GSource *, listener->nsioc); for (i =3D 0; i < listener->nsioc; i++) { @@ -238,15 +248,7 @@ QIOChannelSocket *qio_net_listener_wait_client(QIONetL= istener *listener) g_main_loop_unref(loop); g_main_context_unref(ctxt); =20 - if (listener->io_func !=3D NULL) { - for (i =3D 0; i < listener->nsioc; i++) { - object_ref(OBJECT(listener)); - listener->io_tag[i] =3D qio_channel_add_watch( - QIO_CHANNEL(listener->sioc[i]), G_IO_IN, - qio_net_listener_channel_func, - listener, (GDestroyNotify)object_unref); - } - } + qio_net_listener_sources_update(listener); =20 return data.sioc; } @@ -259,11 +261,9 @@ void qio_net_listener_disconnect(QIONetListener *liste= ner) return; } =20 + qio_net_listener_sources_clear(listener); + for (i =3D 0; i < listener->nsioc; i++) { - if (listener->io_tag[i]) { - g_source_remove(listener->io_tag[i]); - listener->io_tag[i] =3D 0; - } qio_channel_close(QIO_CHANNEL(listener->sioc[i]), NULL); } listener->connected =3D false; --=20 2.14.3