brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a static mutex for the default Clutter lock

Browse Source 
The Big Clutter Lock™ can now be a static GMutex, since GLib supports
them. We can also drop a bunch of checks given the recent changes in
GLib threading API.
This commit is contained in:
Emmanuele Bassi 2011-10-07 15:08:27 +01:00
parent 3690ddc4a0
commit 32b8217027
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/clutter-main.c
View File

@ -119,7 +119,7 @@ static ClutterMainContext *ClutterCntx = NULL;
G_LOCK_DEFINE_STATIC (ClutterCntx); G_LOCK_DEFINE_STATIC (ClutterCntx);
/* main lock and locking/unlocking functions */ /* main lock and locking/unlocking functions */
static GMutex *clutter_threads_mutex = NULL; static GMutex clutter_threads_mutex;
static GCallback clutter_threads_lock = NULL; static GCallback clutter_threads_lock = NULL;
static GCallback clutter_threads_unlock = NULL; static GCallback clutter_threads_unlock = NULL;
@ -694,15 +694,13 @@ clutter_main (void)
static void static void
clutter_threads_impl_lock (void) clutter_threads_impl_lock (void)
{ {
if (G_LIKELY (clutter_threads_mutex != NULL)) g_mutex_lock (&clutter_threads_mutex);
g_mutex_lock (clutter_threads_mutex);
} }
static void static void
clutter_threads_impl_unlock (void) clutter_threads_impl_unlock (void)
{ {
if (G_LIKELY (clutter_threads_mutex != NULL)) g_mutex_unlock (&clutter_threads_mutex);
g_mutex_unlock (clutter_threads_mutex);
} }
/** /**
@ -723,18 +721,10 @@ clutter_threads_impl_unlock (void)
void void
clutter_threads_init (void) clutter_threads_init (void)
{ {
if (!g_thread_supported ()) if (clutter_threads_lock == NULL)
g_error ("g_thread_init() must be called before clutter_threads_init()");
if (clutter_threads_mutex != NULL)
return;
clutter_threads_mutex = g_mutex_new ();
if (!clutter_threads_lock)
clutter_threads_lock = clutter_threads_impl_lock; clutter_threads_lock = clutter_threads_impl_lock;
if (!clutter_threads_unlock) if (clutter_threads_unlock == NULL)
clutter_threads_unlock = clutter_threads_impl_unlock; clutter_threads_unlock = clutter_threads_impl_unlock;
} }