luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-10-29 18:46:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3105-threaded-resolver-refs' into 'main'

Browse Source 
gthreadedresolver: Fix race between source callbacks and finalize

Closes #3105

See merge request GNOME/glib!3575
This commit is contained in:
Philip Withnall 2023-09-12 10:25:13 +00:00
commit 0398518d5e
1 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gio/gthreadedresolver.c
View File

@ -1422,10 +1422,17 @@ lookup_records_finish (GResolver *resolver,
static gboolean static gboolean
timeout_cb (gpointer user_data) timeout_cb (gpointer user_data)
{ {
GTask *task = G_TASK (user_data); GWeakRef *weak_task = user_data;
LookupData *data = g_task_get_task_data (task); GTask *task = NULL; /* (owned) */
LookupData *data;
gboolean should_return; gboolean should_return;
task = g_weak_ref_get (weak_task);
if (task == NULL)
return G_SOURCE_REMOVE;
data = g_task_get_task_data (task);
g_mutex_lock (&data->lock); g_mutex_lock (&data->lock);
should_return = g_atomic_int_compare_and_exchange (&data->will_return, NOT_YET, TIMED_OUT); should_return = g_atomic_int_compare_and_exchange (&data->will_return, NOT_YET, TIMED_OUT);
@ -1443,6 +1450,8 @@ timeout_cb (gpointer user_data)
g_cond_broadcast (&data->cond); g_cond_broadcast (&data->cond);
g_mutex_unlock (&data->lock); g_mutex_unlock (&data->lock);
g_object_unref (task);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -1452,10 +1461,17 @@ static gboolean
cancelled_cb (GCancellable *cancellable, cancelled_cb (GCancellable *cancellable,
gpointer user_data) gpointer user_data)
{ {
GTask *task = G_TASK (user_data); GWeakRef *weak_task = user_data;
LookupData *data = g_task_get_task_data (task); GTask *task = NULL; /* (owned) */
LookupData *data;
gboolean should_return; gboolean should_return;
task = g_weak_ref_get (weak_task);
if (task == NULL)
return G_SOURCE_REMOVE;
data = g_task_get_task_data (task);
g_mutex_lock (&data->lock); g_mutex_lock (&data->lock);
g_assert (g_cancellable_is_cancelled (cancellable)); g_assert (g_cancellable_is_cancelled (cancellable));
@ -1473,9 +1489,18 @@ cancelled_cb (GCancellable *cancellable,
g_cond_broadcast (&data->cond); g_cond_broadcast (&data->cond);
g_mutex_unlock (&data->lock); g_mutex_unlock (&data->lock);
g_object_unref (task);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
static void
weak_ref_clear_and_free (GWeakRef *weak_ref)
{
g_weak_ref_clear (weak_ref);
g_free (weak_ref);
}
static void static void
run_task_in_thread_pool_async (GThreadedResolver *self, run_task_in_thread_pool_async (GThreadedResolver *self,
GTask *task) GTask *task)
@ -1490,17 +1515,23 @@ run_task_in_thread_pool_async (GThreadedResolver *self,
if (timeout_ms != 0) if (timeout_ms != 0)
{ {
GWeakRef *weak_task = g_new0 (GWeakRef, 1);
g_weak_ref_set (weak_task, task);
data->timeout_source = g_timeout_source_new (timeout_ms); data->timeout_source = g_timeout_source_new (timeout_ms);
g_source_set_static_name (data->timeout_source, "[gio] threaded resolver timeout"); g_source_set_static_name (data->timeout_source, "[gio] threaded resolver timeout");
g_source_set_callback (data->timeout_source, G_SOURCE_FUNC (timeout_cb), task, NULL); g_source_set_callback (data->timeout_source, G_SOURCE_FUNC (timeout_cb), g_steal_pointer (&weak_task), (GDestroyNotify) weak_ref_clear_and_free);
g_source_attach (data->timeout_source, GLIB_PRIVATE_CALL (g_get_worker_context) ()); g_source_attach (data->timeout_source, GLIB_PRIVATE_CALL (g_get_worker_context) ());
} }
if (cancellable != NULL) if (cancellable != NULL)
{ {
GWeakRef *weak_task = g_new0 (GWeakRef, 1);
g_weak_ref_set (weak_task, task);
data->cancellable_source = g_cancellable_source_new (cancellable); data->cancellable_source = g_cancellable_source_new (cancellable);
g_source_set_static_name (data->cancellable_source, "[gio] threaded resolver cancellable"); g_source_set_static_name (data->cancellable_source, "[gio] threaded resolver cancellable");
g_source_set_callback (data->cancellable_source, G_SOURCE_FUNC (cancelled_cb), task, NULL); g_source_set_callback (data->cancellable_source, G_SOURCE_FUNC (cancelled_cb), g_steal_pointer (&weak_task), (GDestroyNotify) weak_ref_clear_and_free);
g_source_attach (data->cancellable_source, GLIB_PRIVATE_CALL (g_get_worker_context) ()); g_source_attach (data->cancellable_source, GLIB_PRIVATE_CALL (g_get_worker_context) ());
} }