qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PULL 04/11] test-util-sockets: Factor out test_socket_unix_abstract_one()
Date: Tue,  3 Nov 2020 14:02:18 +0000	[thread overview]
Message-ID: <20201103140225.496776-5-berrange@redhat.com> (raw)
In-Reply-To: <20201103140225.496776-1-berrange@redhat.com>

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



  parent reply	other threads:[~2020-11-03 14:10 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-03 14:02 [PULL 00/11] Sock next patches Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 01/11] test-util-sockets: Plug file descriptor leak Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 02/11] test-util-sockets: Correct to set has_abstract, has_tight Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 03/11] test-util-sockets: Clean up SocketAddress construction Daniel P. Berrangé
2020-11-03 14:02 ` Daniel P. Berrangé [this message]
2020-11-03 14:02 ` [PULL 05/11] test-util-sockets: Synchronize properly, don't sleep(1) Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 06/11] test-util-sockets: Test the complete abstract socket matrix Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 07/11] sockets: Fix default of UnixSocketAddress member @tight Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 08/11] sockets: Fix socket_sockaddr_to_address_unix() for abstract sockets Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 09/11] char-socket: Fix qemu_chr_socket_address() " Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 10/11] sockets: Bypass "replace empty @path" for abstract unix sockets Daniel P. Berrangé
2020-11-03 14:02 ` [PULL 11/11] sockets: Make abstract UnixSocketAddress depend on CONFIG_LINUX Daniel P. Berrangé
2020-11-03 15:35 ` [PULL 00/11] Sock next patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201103140225.496776-5-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=armbru@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).