luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 12:25:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix data race in gmenumodel test

Browse Source 
Synchronize access to server_connection.
This commit is contained in:
Tomasz Miąsko 2019-02-27 00:00:00 +00:00
parent aeb7dbad30
commit 0679bd2732
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gio/tests/gmenumodel.c
View File

@ -752,11 +752,11 @@ typedef struct
GDBusServer *server; GDBusServer *server;
GThread *service_thread; GThread *service_thread;
/* Protects server_connection and service_loop. */
GMutex service_loop_lock; GMutex service_loop_lock;
GCond service_loop_cond; GCond service_loop_cond;
GMainLoop *service_loop; GMainLoop *service_loop;
GMainLoop *loop;
} PeerConnection; } PeerConnection;
static gboolean static gboolean
@ -766,9 +766,10 @@ on_new_connection (GDBusServer *server,
{ {
PeerConnection *data = user_data; PeerConnection *data = user_data;
g_mutex_lock (&data->service_loop_lock);
data->server_connection = g_object_ref (connection); data->server_connection = g_object_ref (connection);
g_cond_broadcast (&data->service_loop_cond);
g_main_loop_quit (data->loop); g_mutex_unlock (&data->service_loop_lock);
return TRUE; return TRUE;
} }
@ -801,6 +802,15 @@ await_service_loop (PeerConnection *data)
g_mutex_unlock (&data->service_loop_lock); g_mutex_unlock (&data->service_loop_lock);
} }
static void
await_server_connection (PeerConnection *data)
{
g_mutex_lock (&data->service_loop_lock);
while (data->server_connection == NULL)
g_cond_wait (&data->service_loop_cond, &data->service_loop_lock);
g_mutex_unlock (&data->service_loop_lock);
}
static gpointer static gpointer
service_thread_func (gpointer user_data) service_thread_func (gpointer user_data)
{ {
@ -874,7 +884,6 @@ peer_connection_up (PeerConnection *data)
GError *error; GError *error;
memset (data, '\0', sizeof (PeerConnection)); memset (data, '\0', sizeof (PeerConnection));
data->loop = g_main_loop_new (NULL, FALSE);
g_mutex_init (&data->service_loop_lock); g_mutex_init (&data->service_loop_lock);
g_cond_init (&data->service_loop_cond); g_cond_init (&data->service_loop_cond);
@ -897,8 +906,7 @@ peer_connection_up (PeerConnection *data)
&error); &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (data->client_connection != NULL); g_assert (data->client_connection != NULL);
while (data->server_connection == NULL) await_server_connection (data);
g_main_loop_run (data->loop);
} }
static void static void
@ -915,8 +923,6 @@ peer_connection_down (PeerConnection *data)
g_mutex_clear (&data->service_loop_lock); g_mutex_clear (&data->service_loop_lock);
g_cond_clear (&data->service_loop_cond); g_cond_clear (&data->service_loop_cond);
g_main_loop_unref (data->loop);
} }
struct roundtrip_state struct roundtrip_state