[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/11] test-util-sockets: Factor out test_socket_unix_abstract_one
From: |
Daniel P . Berrangé |
Subject: |
[PULL 04/11] test-util-sockets: Factor out test_socket_unix_abstract_one() |
Date: |
Tue, 3 Nov 2020 14:02:18 +0000 |
From: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/test-util-sockets.c | 48 ++++++++++++++++-----------------------
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
index a4792253ba..40ff893e64 100644
--- a/tests/test-util-sockets.c
+++ b/tests/test-util-sockets.c
@@ -261,6 +261,24 @@ static gpointer unix_client_thread_func(gpointer user_data)
return NULL;
}
+static void test_socket_unix_abstract_one(SocketAddress *addr)
+{
+ GThread *serv, *cli;
+
+ serv = g_thread_new("abstract_unix_server",
+ unix_server_thread_func,
+ addr);
+
+ sleep(1);
+
+ cli = g_thread_new("abstract_unix_client",
+ unix_client_thread_func,
+ addr);
+
+ g_thread_join(cli);
+ g_thread_join(serv);
+}
+
static void test_socket_unix_abstract_good(void)
{
SocketAddress addr;
@@ -272,40 +290,14 @@ static void test_socket_unix_abstract_good(void)
addr.u.q_unix.abstract = true;
/* non tight socklen serv and cli */
-
addr.u.q_unix.has_tight = false;
addr.u.q_unix.tight = false;
-
- GThread *serv = g_thread_new("abstract_unix_server",
- unix_server_thread_func,
- &addr);
-
- sleep(1);
-
- GThread *cli = g_thread_new("abstract_unix_client",
- unix_client_thread_func,
- &addr);
-
- g_thread_join(cli);
- g_thread_join(serv);
+ test_socket_unix_abstract_one(&addr);
/* tight socklen serv and cli */
-
addr.u.q_unix.has_tight = true;
addr.u.q_unix.tight = true;
-
- serv = g_thread_new("abstract_unix_server",
- unix_server_thread_func,
- &addr);
-
- sleep(1);
-
- cli = g_thread_new("abstract_unix_client",
- unix_client_thread_func,
- &addr);
-
- g_thread_join(cli);
- g_thread_join(serv);
+ test_socket_unix_abstract_one(&addr);
g_free(addr.u.q_unix.path);
}
--
2.28.0
- [PULL 00/11] Sock next patches, Daniel P . Berrangé, 2020/11/03
- [PULL 02/11] test-util-sockets: Correct to set has_abstract, has_tight, Daniel P . Berrangé, 2020/11/03
- [PULL 01/11] test-util-sockets: Plug file descriptor leak, Daniel P . Berrangé, 2020/11/03
- [PULL 03/11] test-util-sockets: Clean up SocketAddress construction, Daniel P . Berrangé, 2020/11/03
- [PULL 04/11] test-util-sockets: Factor out test_socket_unix_abstract_one(),
Daniel P . Berrangé <=
- [PULL 05/11] test-util-sockets: Synchronize properly, don't sleep(1), Daniel P . Berrangé, 2020/11/03
- [PULL 06/11] test-util-sockets: Test the complete abstract socket matrix, Daniel P . Berrangé, 2020/11/03
- [PULL 07/11] sockets: Fix default of UnixSocketAddress member @tight, Daniel P . Berrangé, 2020/11/03
- [PULL 08/11] sockets: Fix socket_sockaddr_to_address_unix() for abstract sockets, Daniel P . Berrangé, 2020/11/03
- [PULL 10/11] sockets: Bypass "replace empty @path" for abstract unix sockets, Daniel P . Berrangé, 2020/11/03
- [PULL 09/11] char-socket: Fix qemu_chr_socket_address() for abstract sockets, Daniel P . Berrangé, 2020/11/03
- [PULL 11/11] sockets: Make abstract UnixSocketAddress depend on CONFIG_LINUX, Daniel P . Berrangé, 2020/11/03
- Re: [PULL 00/11] Sock next patches, Peter Maydell, 2020/11/03