luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-03 19:30:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'th/main-context-default-no-mutex' into 'master'

Browse Source 
gmain: use atomic operation instead of GMutex to access g_main_context_default()

See merge request GNOME/glib!1135
This commit is contained in:
Philip Withnall 2019-10-07 13:22:30 +00:00
commit 4e12e7ed0d
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glib/gmain.c
View File

@ -439,9 +439,6 @@ static void block_source (GSource *source);
static GMainContext *glib_worker_context; static GMainContext *glib_worker_context;
G_LOCK_DEFINE_STATIC (main_loop);
static GMainContext *default_main_context;
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
@ -678,23 +675,24 @@ g_main_context_new (void)
GMainContext * GMainContext *
g_main_context_default (void) g_main_context_default (void)
{ {
/* Slow, but safe */ static GMainContext *default_main_context;
G_LOCK (main_loop); if (g_once_init_enter (&default_main_context))
if (!default_main_context)
{ {
default_main_context = g_main_context_new (); GMainContext *context;
TRACE (GLIB_MAIN_CONTEXT_DEFAULT (default_main_context)); context = g_main_context_new ();
TRACE (GLIB_MAIN_CONTEXT_DEFAULT (context));
#ifdef G_MAIN_POLL_DEBUG #ifdef G_MAIN_POLL_DEBUG
if (_g_main_poll_debug) if (_g_main_poll_debug)
g_print ("default context=%p\n", default_main_context); g_print ("default context=%p\n", context);
#endif #endif
}
G_UNLOCK (main_loop); g_once_init_leave ((gsize *) &default_main_context, (gsize) context);
}
return default_main_context; return default_main_context;
} }