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

gmain: simplify g_main_context_find_source_by_id()

Browse Source 
Since we now keep a hashtable of sources, we can implement this function
without iteration.

https://bugzilla.gnome.org/show_bug.cgi?id=724839
This commit is contained in:
Ryan Lortie 2014-02-08 12:23:46 +00:00
parent 9e81709012
commit 393503ba5b
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
glib/gmain.c
View File

@ -2039,37 +2039,30 @@ g_source_unref (GSource *source)
/** /**
* g_main_context_find_source_by_id: * g_main_context_find_source_by_id:
* @context: (allow-none): a #GMainContext (if %NULL, the default context will be used) * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used)
* @source_id: the source ID, as returned by g_source_get_id(). * @source_id: the source ID, as returned by g_source_get_id().
* *
* Finds a #GSource given a pair of context and ID. * Finds a #GSource given a pair of context and ID.
* *
* Returns: (transfer none): the #GSource if found, otherwise, %NULL * Returns: (transfer none): the #GSource if found, otherwise, %NULL
**/ **/
GSource * GSource *
g_main_context_find_source_by_id (GMainContext *context, g_main_context_find_source_by_id (GMainContext *context,
guint source_id) guint source_id)
{ {
GSourceIter iter;
GSource *source; GSource *source;
g_return_val_if_fail (source_id > 0, NULL); g_return_val_if_fail (source_id > 0, NULL);
if (context == NULL) if (context == NULL)
context = g_main_context_default (); context = g_main_context_default ();
LOCK_CONTEXT (context);
g_source_iter_init (&iter, context, FALSE);
while (g_source_iter_next (&iter, &source))
{
if (!SOURCE_DESTROYED (source) &&
source->source_id == source_id)
break;
}
g_source_iter_clear (&iter);
LOCK_CONTEXT (context);
source = g_hash_table_lookup (context->sources, GUINT_TO_POINTER (source_id));
UNLOCK_CONTEXT (context); UNLOCK_CONTEXT (context);
if (source && SOURCE_DESTROYED (source))
source = NULL;
return source; return source;
} }