Commit 8005fdd8 authored by Peter Xu's avatar Peter Xu Committed by Daniel P. Berrangé
Browse files

qio: non-default context for async conn 



We have worked on qio_task_run_in_thread() already.  Further, let
all the qio channel APIs use that context.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent a17536c5

chardev/char-socket.c

+2 −2
Original line number Diff line number Diff line
@@ -867,7 +867,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;

}
@@ -951,7 +951,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;

include/io/channel-socket.h

+12 −3
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ 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. If %NULL, the default

 *           context will be used.

 *

 * Attempt to connect to the address @addr. This method

 * will run in the background so the caller will regain
@@ -113,7 +115,8 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, 
                                      SocketAddress *addr,

                                      QIOTaskFunc callback,

                                      gpointer opaque,

                                      GDestroyNotify destroy);

                                      GDestroyNotify destroy,

                                      GMainContext *context);





/**
@@ -138,6 +141,8 @@ int qio_channel_socket_listen_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. If %NULL, the default

 *           context will be used.

 *

 * Attempt to listen to the address @addr. This method

 * will run in the background so the caller will regain
@@ -150,7 +155,8 @@ void qio_channel_socket_listen_async(QIOChannelSocket *ioc, 
                                     SocketAddress *addr,

                                     QIOTaskFunc callback,

                                     gpointer opaque,

                                     GDestroyNotify destroy);

                                     GDestroyNotify destroy,

                                     GMainContext *context);





/**
@@ -179,6 +185,8 @@ int qio_channel_socket_dgram_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. If %NULL, the default

 *           context will be used.

 *

 * Attempt to initialize a datagram socket bound to

 * @localAddr and communicating with peer @remoteAddr.
@@ -194,7 +202,8 @@ void qio_channel_socket_dgram_async(QIOChannelSocket *ioc, 
                                    SocketAddress *remoteAddr,

                                    QIOTaskFunc callback,

                                    gpointer opaque,

                                    GDestroyNotify destroy);

                                    GDestroyNotify destroy,

                                    GMainContext *context);





/**

io/channel-socket.c

+9 −6
Original line number Diff line number Diff line
@@ -174,7 +174,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);
@@ -189,7 +190,7 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, 
                           qio_channel_socket_connect_worker,

                           addrCopy,

                           (GDestroyNotify)qapi_free_SocketAddress,

                           NULL);

                           context);

}
@@ -234,7 +235,8 @@ void qio_channel_socket_listen_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);
@@ -248,7 +250,7 @@ void qio_channel_socket_listen_async(QIOChannelSocket *ioc, 
                           qio_channel_socket_listen_worker,

                           addrCopy,

                           (GDestroyNotify)qapi_free_SocketAddress,

                           NULL);

                           context);

}
@@ -310,7 +312,8 @@ void qio_channel_socket_dgram_async(QIOChannelSocket *ioc, 
                                    SocketAddress *remoteAddr,

                                    QIOTaskFunc callback,

                                    gpointer opaque,

                                    GDestroyNotify destroy)

                                    GDestroyNotify destroy,

                                    GMainContext *context)

{

    QIOTask *task = qio_task_new(

        OBJECT(ioc), callback, opaque, destroy);
@@ -325,7 +328,7 @@ void qio_channel_socket_dgram_async(QIOChannelSocket *ioc, 
                           qio_channel_socket_dgram_worker,

                           data,

                           qio_channel_socket_dgram_worker_free,

                           NULL);

                           context);

}

migration/socket.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

}

tests/test-io-channel-socket.c

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static void test_io_channel_setup_async(SocketAddress *listen_addr, 
    lioc = qio_channel_socket_new();

    qio_channel_socket_listen_async(

        lioc, listen_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);
@@ -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);