mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-util-sockets: Synchronize properly, don't sleep(1)

Browse Source 
The abstract sockets test spawns a thread to listen and accept, and a
second one to connect, with a sleep(1) in between to "ensure" the
former is listening when the latter tries to connect.  Review fail.
Risks spurious test failure, say when a heavily loaded machine doesn't
schedule the first thread quickly enough.  It's also slow.

Listen and accept in the main thread, and start the connect thread in
between.  Look ma, no sleep!  Run time drops from 2s wall clock to a
few milliseconds.

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:16 +01:00 committed by Daniel P. Berrangé
parent 89cb0bb554
commit 39458d4e30
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,26 +230,6 @@ static void test_socket_fd_pass_num_nocli(void)
#endif #endif
#ifdef __linux__ #ifdef __linux__
static gpointer unix_server_thread_func(gpointer user_data)
{
SocketAddress *addr = user_data;
int fd;
int connfd;
struct sockaddr_un un;
socklen_t len = sizeof(un);
fd = socket_listen(addr, 1, &error_abort);
g_assert_cmpint(fd, >=, 0);
g_assert(fd_is_socket(fd));
connfd = accept(fd, (struct sockaddr *)&un, &len);
g_assert_cmpint(connfd, !=, -1);
close(connfd);
close(fd);
return NULL;
}
static gpointer unix_client_thread_func(gpointer user_data) static gpointer unix_client_thread_func(gpointer user_data)
{ {
SocketAddress *addr = user_data; SocketAddress *addr = user_data;
@ -263,20 +243,26 @@ static gpointer unix_client_thread_func(gpointer user_data)
static void test_socket_unix_abstract_one(SocketAddress *addr) static void test_socket_unix_abstract_one(SocketAddress *addr)
{ {
GThread *serv, *cli; int fd, connfd;
GThread *cli;
struct sockaddr_un un;
socklen_t len = sizeof(un);
serv = g_thread_new("abstract_unix_server", fd = socket_listen(addr, 1, &error_abort);
unix_server_thread_func, g_assert_cmpint(fd, >=, 0);
addr); g_assert(fd_is_socket(fd));
sleep(1);
cli = g_thread_new("abstract_unix_client", cli = g_thread_new("abstract_unix_client",
unix_client_thread_func, unix_client_thread_func,
addr); addr);
connfd = accept(fd, (struct sockaddr *)&un, &len);
g_assert_cmpint(connfd, !=, -1);
close(connfd);
close(fd);
g_thread_join(cli); g_thread_join(cli);
g_thread_join(serv);
} }
static void test_socket_unix_abstract_good(void) static void test_socket_unix_abstract_good(void)