ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test-util-sockets: Clean up SocketAddress construction 

The thread functions build the SocketAddress from global variable
@abstract_sock_name and the tight flag passed as pointer
argument (either NULL or (gpointer)1).  There is no need for such
hackery; simply pass the SocketAddress instead.

While there, dumb down g_rand_int_range() to g_random_int().

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>
This commit is contained in:
Markus Armbruster 2020-11-02 10:44:14 +01:00 committed by Daniel P. Berrangé
parent d1a393211b
commit 718a9be02d
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tests/test-util-sockets.c
View File

@ -230,25 +230,15 @@ static void test_socket_fd_pass_num_nocli(void)
#endif #endif
#ifdef __linux__ #ifdef __linux__
static gchar *abstract_sock_name;
static gpointer unix_server_thread_func(gpointer user_data) static gpointer unix_server_thread_func(gpointer user_data)
{ {
SocketAddress addr; SocketAddress *addr = user_data;
Error *err = NULL; int fd;
int fd = -1; int connfd;
int connfd = -1;
struct sockaddr_un un; struct sockaddr_un un;
socklen_t len = sizeof(un); socklen_t len = sizeof(un);
addr.type = SOCKET_ADDRESS_TYPE_UNIX; fd = socket_listen(addr, 1, &error_abort);
addr.u.q_unix.path = abstract_sock_name;
addr.u.q_unix.has_tight = true;
addr.u.q_unix.tight = user_data != NULL;
addr.u.q_unix.has_abstract = true;
addr.u.q_unix.abstract = true;
fd = socket_listen(&addr, 1, &err);
g_assert_cmpint(fd, >=, 0); g_assert_cmpint(fd, >=, 0);
g_assert(fd_is_socket(fd)); g_assert(fd_is_socket(fd));
@ -257,69 +247,67 @@ static gpointer unix_server_thread_func(gpointer user_data)
close(connfd); close(connfd);
close(fd); close(fd);
return NULL; return NULL;
} }
static gpointer unix_client_thread_func(gpointer user_data) static gpointer unix_client_thread_func(gpointer user_data)
{ {
SocketAddress addr; SocketAddress *addr = user_data;
Error *err = NULL; int fd;
int fd = -1;
addr.type = SOCKET_ADDRESS_TYPE_UNIX;
addr.u.q_unix.path = abstract_sock_name;
addr.u.q_unix.has_tight = true;
addr.u.q_unix.tight = user_data != NULL;
addr.u.q_unix.has_abstract = true;
addr.u.q_unix.abstract = true;
fd = socket_connect(&addr, &err);
fd = socket_connect(addr, &error_abort);
g_assert_cmpint(fd, >=, 0); g_assert_cmpint(fd, >=, 0);
close(fd); close(fd);
return NULL; return NULL;
} }
static void test_socket_unix_abstract_good(void) static void test_socket_unix_abstract_good(void)
{ {
GRand *r = g_rand_new(); SocketAddress addr;
abstract_sock_name = g_strdup_printf("unix-%d-%d", getpid(), addr.type = SOCKET_ADDRESS_TYPE_UNIX;
g_rand_int_range(r, 100, 1000)); addr.u.q_unix.path = g_strdup_printf("unix-%d-%u",
getpid(), g_random_int());
addr.u.q_unix.has_abstract = true;
addr.u.q_unix.abstract = true;
/* non tight socklen serv and cli */ /* 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", GThread *serv = g_thread_new("abstract_unix_server",
unix_server_thread_func, unix_server_thread_func,
NULL); &addr);
sleep(1); sleep(1);
GThread *cli = g_thread_new("abstract_unix_client", GThread *cli = g_thread_new("abstract_unix_client",
unix_client_thread_func, unix_client_thread_func,
NULL); &addr);
g_thread_join(cli); g_thread_join(cli);
g_thread_join(serv); g_thread_join(serv);
/* tight socklen serv and cli */ /* 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", serv = g_thread_new("abstract_unix_server",
unix_server_thread_func, unix_server_thread_func,
(gpointer)1); &addr);
sleep(1); sleep(1);
cli = g_thread_new("abstract_unix_client", cli = g_thread_new("abstract_unix_client",
unix_client_thread_func, unix_client_thread_func,
(gpointer)1); &addr);
g_thread_join(cli); g_thread_join(cli);
g_thread_join(serv); g_thread_join(serv);
g_free(abstract_sock_name); g_free(addr.u.q_unix.path);
g_rand_free(r);
} }
#endif #endif