luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 10:38:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

giomodule: make the default_modules mutex recursive

Browse Source 
It is possible for _g_io_module_get_default() to be called recursively
(eg, if a module of one type is loaded that tries to look up gsettings
from its init() method and ends up causing the gsettings module to be
loaded). So use a recursive mutex.
This commit is contained in:
Dan Winship 2011-10-12 13:57:44 -04:00
parent 71cf70b39c
commit 95cab96515
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/giomodule.c
View File

@ -630,7 +630,7 @@ g_io_modules_load_all_in_directory (const char *dirname)
return g_io_modules_load_all_in_directory_with_scope (dirname, NULL); return g_io_modules_load_all_in_directory_with_scope (dirname, NULL);
} }
G_LOCK_DEFINE_STATIC (default_modules); GRecMutex default_modules_lock;
GHashTable *default_modules; GHashTable *default_modules;
static gpointer static gpointer
@ -692,7 +692,7 @@ _g_io_module_get_default (const gchar *extension_point,
GIOExtension *extension, *preferred; GIOExtension *extension, *preferred;
gpointer impl; gpointer impl;
G_LOCK (default_modules); g_rec_mutex_lock (&default_modules_lock);
if (default_modules) if (default_modules)
{ {
gpointer key; gpointer key;
@ -700,7 +700,7 @@ _g_io_module_get_default (const gchar *extension_point,
if (g_hash_table_lookup_extended (default_modules, extension_point, if (g_hash_table_lookup_extended (default_modules, extension_point,
&key, &impl)) &key, &impl))
{ {
G_UNLOCK (default_modules); g_rec_mutex_unlock (&default_modules_lock);
return impl; return impl;
} }
} }
@ -715,7 +715,7 @@ _g_io_module_get_default (const gchar *extension_point,
if (!ep) if (!ep)
{ {
g_warn_if_reached (); g_warn_if_reached ();
G_UNLOCK (default_modules); g_rec_mutex_unlock (&default_modules_lock);
return NULL; return NULL;
} }
@ -752,7 +752,7 @@ _g_io_module_get_default (const gchar *extension_point,
g_hash_table_insert (default_modules, g_hash_table_insert (default_modules,
g_strdup (extension_point), g_strdup (extension_point),
impl ? g_object_ref (impl) : NULL); impl ? g_object_ref (impl) : NULL);
G_UNLOCK (default_modules); g_rec_mutex_unlock (&default_modules_lock);
return impl; return impl;
} }