From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erJqZ-0008Rg-MI for qemu-devel@nongnu.org; Thu, 01 Mar 2018 03:45:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erJqY-0007LY-Jx for qemu-devel@nongnu.org; Thu, 01 Mar 2018 03:45:51 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39652 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 1erJqY-0007LI-E1 for qemu-devel@nongnu.org; Thu, 01 Mar 2018 03:45:50 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0415B17CEF8 for ; Thu, 1 Mar 2018 08:45:50 +0000 (UTC) From: Peter Xu Date: Thu, 1 Mar 2018 16:44:33 +0800 Message-Id: <20180301084438.13594-11-peterx@redhat.com> In-Reply-To: <20180301084438.13594-1-peterx@redhat.com> References: <20180301084438.13594-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v2 10/15] qio: non-default context for async conn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Daniel P . Berrange" , Juan Quintela , peterx@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Stefan Hajnoczi , "Dr . David Alan Gilbert" We have worked on qio_task_run_in_thread() already. Further, let qio_channel_socket_connect_async() pass that context to it. Signed-off-by: Peter Xu --- chardev/char-socket.c | 4 ++-- include/io/channel-socket.h | 4 +++- io/channel-socket.c | 5 +++-- migration/socket.c | 3 ++- tests/test-io-channel-socket.c | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 6c3f1de013..bd90680f5c 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -911,7 +911,7 @@ static gboolean socket_reconnect_timeout(gpointer opaque) tcp_chr_set_client_ioc_name(chr, sioc); qio_channel_socket_connect_async(sioc, s->addr, qemu_chr_socket_connected, - chr, NULL); + chr, NULL, NULL); return false; } @@ -995,7 +995,7 @@ static void qmp_chardev_open_socket(Chardev *chr, tcp_chr_set_client_ioc_name(chr, sioc); qio_channel_socket_connect_async(sioc, s->addr, qemu_chr_socket_connected, - chr, NULL); + chr, NULL, NULL); } else { if (s->is_listen) { char *name; diff --git a/include/io/channel-socket.h b/include/io/channel-socket.h index 53801f6042..90f7227397 100644 --- a/include/io/channel-socket.h +++ b/include/io/channel-socket.h @@ -101,6 +101,7 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, * @callback: the function to invoke on completion * @opaque: user data to pass to @callback * @destroy: the function to free @opaque + * @context: the context to run the async task * * Attempt to connect to the address @addr. This method * will run in the background so the caller will regain @@ -113,7 +114,8 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, SocketAddress *addr, QIOTaskFunc callback, gpointer opaque, - GDestroyNotify destroy); + GDestroyNotify destroy, + GMainContext *context); /** diff --git a/io/channel-socket.c b/io/channel-socket.c index 4224ce323a..a843e49939 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -173,7 +173,8 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, SocketAddress *addr, QIOTaskFunc callback, gpointer opaque, - GDestroyNotify destroy) + GDestroyNotify destroy, + GMainContext *context) { QIOTask *task = qio_task_new( OBJECT(ioc), callback, opaque, destroy); @@ -188,7 +189,7 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, qio_channel_socket_connect_worker, addrCopy, (GDestroyNotify)qapi_free_SocketAddress, - NULL); + context); } diff --git a/migration/socket.c b/migration/socket.c index 60d732535c..91071b06ef 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -103,7 +103,8 @@ static void socket_start_outgoing_migration(MigrationState *s, saddr, socket_outgoing_migration, data, - socket_connect_data_free); + socket_connect_data_free, + NULL); qapi_free_SocketAddress(saddr); } diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index d357cd2a8e..a67635b9b8 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -200,7 +200,7 @@ static void test_io_channel_setup_async(SocketAddress *listen_addr, qio_channel_socket_connect_async( QIO_CHANNEL_SOCKET(*src), connect_addr, - test_io_channel_complete, &data, NULL); + test_io_channel_complete, &data, NULL, NULL); g_main_loop_run(data.loop); g_main_context_iteration(g_main_context_default(), FALSE); -- 2.14.3