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

GIOScheduler: Avoid constant iteration over pending job list

Browse Source 
The iteration over the list (while holding a mutex) was a serious
performance hit for asynchronous I/O.  We can just use
g_cancellable_connect().

https://bugzilla.gnome.org/show_bug.cgi?id=678576
This commit is contained in:
Colin Walters 2012-06-21 10:20:20 -04:00
parent a8ddd52a45
commit 2839297686
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gio/gioscheduler.c
View File

@ -120,34 +120,17 @@ 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;
GSList *l;
gboolean resort_jobs; job->io_priority = -1;
G_LOCK (active_jobs); if (job_thread_pool != NULL)
active_jobs = g_slist_delete_link (active_jobs, job->active_link);
resort_jobs = FALSE;
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 +141,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_slist_delete_link (active_jobs, job->active_link);
G_UNLOCK (active_jobs);
g_io_job_free (job); g_io_job_free (job);
} }
@ -221,7 +206,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);
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 ();