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

GIOScheduler: Disconnect from cancellable after job completes

Browse Source 
This was causing crashes when a cancellable was canceled after the job
had completed.

https://bugzilla.gnome.org/show_bug.cgi?id=678576
This commit is contained in:
Colin Walters 2012-06-25 17:05:45 -04:00 committed by Ryan Lortie
parent 03f2f3b002
commit b65194e8df
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gio/gioscheduler.c
View File

@ -53,6 +53,7 @@ struct _GIOSchedulerJob {
gint io_priority; gint io_priority;
GCancellable *cancellable; GCancellable *cancellable;
gulong cancellable_id;
GMainContext *context; GMainContext *context;
}; };
@ -68,7 +69,11 @@ static void
g_io_job_free (GIOSchedulerJob *job) g_io_job_free (GIOSchedulerJob *job)
{ {
if (job->cancellable) if (job->cancellable)
{
if (job->cancellable_id)
g_cancellable_disconnect (job->cancellable, job->cancellable_id);
g_object_unref (job->cancellable); g_object_unref (job->cancellable);
}
g_main_context_unref (job->context); g_main_context_unref (job->context);
g_free (job); g_free (job);
} }
@ -120,34 +125,18 @@ init_scheduler (gpointer arg)
} }
static void static void
remove_active_job (GIOSchedulerJob *job) on_job_canceled (GCancellable *cancellable,
gpointer user_data)
{ {
GIOSchedulerJob *other_job; GIOSchedulerJob *job = user_data;
GList *l;
gboolean resort_jobs;
G_LOCK (active_jobs); job->io_priority = -1;
active_jobs = g_list_delete_link (active_jobs, job->active_link); job->cancellable_id = 0;
resort_jobs = FALSE; if (job_thread_pool != NULL)
for (l = active_jobs; l != NULL; l = l->next)
{
other_job = l->data;
if (other_job->io_priority >= 0 &&
g_cancellable_is_cancelled (other_job->cancellable))
{
other_job->io_priority = -1;
resort_jobs = TRUE;
}
}
G_UNLOCK (active_jobs);
if (resort_jobs &&
job_thread_pool != NULL)
g_thread_pool_set_sort_function (job_thread_pool, g_thread_pool_set_sort_function (job_thread_pool,
g_io_job_compare, g_io_job_compare,
NULL); NULL);
} }
static void static void
@ -158,7 +147,9 @@ job_destroy (gpointer data)
if (job->destroy_notify) if (job->destroy_notify)
job->destroy_notify (job->data); job->destroy_notify (job->data);
remove_active_job (job); G_LOCK (active_jobs);
active_jobs = g_list_delete_link (active_jobs, job->active_link);
G_UNLOCK (active_jobs);
g_io_job_free (job); g_io_job_free (job);
} }
@ -221,7 +212,11 @@ g_io_scheduler_push_job (GIOSchedulerJobFunc job_func,
job->io_priority = io_priority; job->io_priority = io_priority;
if (cancellable) if (cancellable)
{
job->cancellable = g_object_ref (cancellable); job->cancellable = g_object_ref (cancellable);
job->cancellable_id = g_cancellable_connect (job->cancellable, (GCallback)on_job_canceled,
job, NULL);
}
job->context = g_main_context_ref_thread_default (); job->context = g_main_context_ref_thread_default ();