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

gutils: use atomic pointers for g_application_name

Browse Source 
The mutex is not necessary to guard a single pointer.
This commit is contained in:
Thomas Haller 2023-11-08 08:27:20 +01:00
parent 0d61895ef1
commit 54e0b2d75b
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
glib/gutils.c
View File

@ -1176,7 +1176,6 @@ g_set_prgname (const gchar *prgname)
g_atomic_pointer_set (&g_prgname, prgname); g_atomic_pointer_set (&g_prgname, prgname);
} }
G_LOCK_DEFINE_STATIC (g_application_name);
static gchar *g_application_name = NULL; static gchar *g_application_name = NULL;
/** /**
@ -1198,16 +1197,14 @@ static gchar *g_application_name = NULL;
const gchar * const gchar *
g_get_application_name (void) g_get_application_name (void)
{ {
gchar* retval; const char *retval;
G_LOCK (g_application_name); retval = g_atomic_pointer_get (&g_application_name);
retval = g_application_name;
G_UNLOCK (g_application_name);
if (retval == NULL) if (retval)
return g_get_prgname (); return retval;
return retval; return g_get_prgname ();
} }
/** /**
@ -1231,19 +1228,17 @@ g_get_application_name (void)
void void
g_set_application_name (const gchar *application_name) g_set_application_name (const gchar *application_name)
{ {
gboolean already_set = FALSE; char *name;
g_return_if_fail (application_name); g_return_if_fail (application_name);
G_LOCK (g_application_name); name = g_strdup (application_name);
if (g_application_name)
already_set = TRUE;
else
g_application_name = g_strdup (application_name);
G_UNLOCK (g_application_name);
if (already_set) if (!g_atomic_pointer_compare_and_exchange (&g_application_name, NULL, name))
g_warning ("g_set_application_name() called multiple times"); {
g_warning ("g_set_application_name() called multiple times");
g_free (name);
}
} }
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32