From nobody Wed Nov 12 03:45:33 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 ARC-Seal: i=1; a=rsa-sha256; t=1567578934; cv=none; d=zoho.com; s=zohoarc; b=N9moYQ0eWlH9d4BXH57qEVoHgml4P6JOkuAHEaYhdx4OMhvefUrWovEsWb7Fn6IDmAFMIZEIB/q7v3Sfhmk+3vGaHAco6nSYf4AdnYdOnlUcD+3vhYPxuPhOA9kuQ1oRAEWJRT5Jcwroa6A8lQrsBilly5CfFszoa9FdRhF+pO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567578934; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=reEROzSNQf3d7GYpz/f6o79pdZb219RYkbddulX0wNk=; b=WXTSUIFv5TokW4b8nB9CMmBjXaK4t4kFylt9m6IZip4/YTPwB46kHwoIbbt95coVyIWQfBMqvYZaruPQyyJ3hAFQ/wiziW8+Xv59+B8PsQpCxc9QYEmkkCNt9KH9Vftni7NzWPAz09Dhr9+9CliKOSDWptPZ/p0gowsLWxQTYW8= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15675789347975.154386108330073; Tue, 3 Sep 2019 23:35:34 -0700 (PDT) Received: from localhost ([::1]:53806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5OtB-0000h0-6p for importer@patchew.org; Wed, 04 Sep 2019 02:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42941) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5Ono-0006Vs-Jt for qemu-devel@nongnu.org; Wed, 04 Sep 2019 02:30:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5Onn-0003tt-5u for qemu-devel@nongnu.org; Wed, 04 Sep 2019 02:30:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i5Onh-0003TZ-64; Wed, 04 Sep 2019 02:29:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA7EB806D1; Wed, 4 Sep 2019 06:29:34 +0000 (UTC) Received: from secure.mitica (ovpn-116-17.ams2.redhat.com [10.36.116.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id B764219C4F; Wed, 4 Sep 2019 06:29:31 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 08:29:13 +0200 Message-Id: <20190904062915.6488-4-quintela@redhat.com> In-Reply-To: <20190904062915.6488-1-quintela@redhat.com> References: <20190904062915.6488-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 04 Sep 2019 06:29:34 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PULL 3/5] socket: Add num connections to qio_channel_socket_async() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Juan Quintela , "Dr. David Alan Gilbert" , Michael Roth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Max Reitz , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Juan Quintela --- include/io/channel-socket.h | 2 ++ io/channel-socket.c | 30 +++++++++++++++++++++++------- io/trace-events | 2 +- tests/test-io-channel-socket.c | 2 +- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/include/io/channel-socket.h b/include/io/channel-socket.h index ed88e5b8c1..777ff5954e 100644 --- a/include/io/channel-socket.h +++ b/include/io/channel-socket.h @@ -140,6 +140,7 @@ int qio_channel_socket_listen_sync(QIOChannelSocket *io= c, * qio_channel_socket_listen_async: * @ioc: the socket channel object * @addr: the address to listen to + * @num: the expected ammount of connections * @callback: the function to invoke on completion * @opaque: user data to pass to @callback * @destroy: the function to free @opaque @@ -155,6 +156,7 @@ int qio_channel_socket_listen_sync(QIOChannelSocket *io= c, */ void qio_channel_socket_listen_async(QIOChannelSocket *ioc, SocketAddress *addr, + int num, QIOTaskFunc callback, gpointer opaque, GDestroyNotify destroy, diff --git a/io/channel-socket.c b/io/channel-socket.c index 6258c25983..b74f5b92a0 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -220,14 +220,27 @@ int qio_channel_socket_listen_sync(QIOChannelSocket *= ioc, } =20 =20 +struct QIOChannelListenWorkerData { + SocketAddress *addr; + int num; /* amount of expected connections */ +}; + +static void qio_channel_listen_worker_free(gpointer opaque) +{ + struct QIOChannelListenWorkerData *data =3D opaque; + + qapi_free_SocketAddress(data->addr); + g_free(data); +} + static void qio_channel_socket_listen_worker(QIOTask *task, gpointer opaque) { QIOChannelSocket *ioc =3D QIO_CHANNEL_SOCKET(qio_task_get_source(task)= ); - SocketAddress *addr =3D opaque; + struct QIOChannelListenWorkerData *data =3D opaque; Error *err =3D NULL; =20 - qio_channel_socket_listen_sync(ioc, addr, 1, &err); + qio_channel_socket_listen_sync(ioc, data->addr, data->num, &err); =20 qio_task_set_error(task, err); } @@ -235,6 +248,7 @@ static void qio_channel_socket_listen_worker(QIOTask *t= ask, =20 void qio_channel_socket_listen_async(QIOChannelSocket *ioc, SocketAddress *addr, + int num, QIOTaskFunc callback, gpointer opaque, GDestroyNotify destroy, @@ -242,16 +256,18 @@ void qio_channel_socket_listen_async(QIOChannelSocket= *ioc, { QIOTask *task =3D qio_task_new( OBJECT(ioc), callback, opaque, destroy); - SocketAddress *addrCopy; + struct QIOChannelListenWorkerData *data; =20 - addrCopy =3D QAPI_CLONE(SocketAddress, addr); + data =3D g_new0(struct QIOChannelListenWorkerData, 1); + data->addr =3D QAPI_CLONE(SocketAddress, addr); + data->num =3D num; =20 /* socket_listen() blocks in DNS lookups, so we must use a thread */ - trace_qio_channel_socket_listen_async(ioc, addr); + trace_qio_channel_socket_listen_async(ioc, addr, num); qio_task_run_in_thread(task, qio_channel_socket_listen_worker, - addrCopy, - (GDestroyNotify)qapi_free_SocketAddress, + data, + qio_channel_listen_worker_free, context); } =20 diff --git a/io/trace-events b/io/trace-events index 2e6aa1d749..d7bc70b966 100644 --- a/io/trace-events +++ b/io/trace-events @@ -18,7 +18,7 @@ qio_channel_socket_connect_async(void *ioc, void *addr) "= Socket connect async io qio_channel_socket_connect_fail(void *ioc) "Socket connect fail ioc=3D%p" qio_channel_socket_connect_complete(void *ioc, int fd) "Socket connect com= plete ioc=3D%p fd=3D%d" qio_channel_socket_listen_sync(void *ioc, void *addr, int num) "Socket lis= ten sync ioc=3D%p addr=3D%p num=3D%d" -qio_channel_socket_listen_async(void *ioc, void *addr) "Socket listen asyn= c ioc=3D%p addr=3D%p" +qio_channel_socket_listen_async(void *ioc, void *addr, int num) "Socket li= sten async ioc=3D%p addr=3D%p num=3D%d" qio_channel_socket_listen_fail(void *ioc) "Socket listen fail ioc=3D%p" qio_channel_socket_listen_complete(void *ioc, int fd) "Socket listen compl= ete ioc=3D%p fd=3D%d" qio_channel_socket_dgram_sync(void *ioc, void *localAddr, void *remoteAddr= ) "Socket dgram sync ioc=3D%p localAddr=3D%p remoteAddr=3D%p" diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index 613ada32c0..d43083a766 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -113,7 +113,7 @@ static void test_io_channel_setup_async(SocketAddress *= listen_addr, =20 lioc =3D qio_channel_socket_new(); qio_channel_socket_listen_async( - lioc, listen_addr, + lioc, listen_addr, 1, test_io_channel_complete, &data, NULL, NULL); =20 g_main_loop_run(data.loop); --=20 2.21.0