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

gresolver: Make get_default() thread-safe

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=773262
This commit is contained in:
Sebastian Dröge
2016-10-20 12:16:18 +03:00
parent c718bf881a
commit 2a970e33a4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gresolver.c
View File

@@ -185,6 +185,7 @@ g_resolver_init (GResolver *resolver)
#endif #endif
} }
G_LOCK_DEFINE_STATIC (default_resolver);
static GResolver *default_resolver; static GResolver *default_resolver;
/** /**
@@ -201,10 +202,15 @@ static GResolver *default_resolver;
GResolver * GResolver *
g_resolver_get_default (void) g_resolver_get_default (void)
{ {
GResolver *ret;
G_LOCK (default_resolver);
if (!default_resolver) if (!default_resolver)
default_resolver = g_object_new (G_TYPE_THREADED_RESOLVER, NULL); default_resolver = g_object_new (G_TYPE_THREADED_RESOLVER, NULL);
ret = g_object_ref (default_resolver);
G_UNLOCK (default_resolver);
return g_object_ref (default_resolver); return ret;
} }
/** /**
@@ -226,9 +232,11 @@ g_resolver_get_default (void)
void void
g_resolver_set_default (GResolver *resolver) g_resolver_set_default (GResolver *resolver)
{ {
G_LOCK (default_resolver);
if (default_resolver) if (default_resolver)
g_object_unref (default_resolver); g_object_unref (default_resolver);
default_resolver = g_object_ref (resolver); default_resolver = g_object_ref (resolver);
G_UNLOCK (default_resolver);
} }
/* Bionic has res_init() but it's not in any header */ /* Bionic has res_init() but it's not in any header */