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

clutter/main: Simplify thead lock handling

Browse Source 
Now that there are only the default thread functions in
place, we don't need to store them.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/666
This commit is contained in:
Georges Basile Stavracas Neto 2019-06-30 18:00:42 -03:00
parent 5ed9abd51a
commit b0b1ff36ae
1 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
clutter/clutter/clutter-main.c
View File

@ -85,8 +85,6 @@ G_LOCK_DEFINE_STATIC (ClutterCntx);
/* main lock and locking/unlocking functions */ /* main lock and locking/unlocking functions */
static GMutex clutter_threads_mutex; static GMutex clutter_threads_mutex;
static GCallback clutter_threads_lock = NULL;
static GCallback clutter_threads_unlock = NULL;
/* command line options */ /* command line options */
static gboolean clutter_is_initialized = FALSE; static gboolean clutter_is_initialized = FALSE;
@ -146,38 +144,10 @@ static const GDebugKey clutter_paint_debug_keys[] = {
{ "damage-region", CLUTTER_DEBUG_PAINT_DAMAGE_REGION }, { "damage-region", CLUTTER_DEBUG_PAINT_DAMAGE_REGION },
}; };
static void
clutter_threads_impl_lock (void)
{
g_mutex_lock (&clutter_threads_mutex);
}
static void
clutter_threads_impl_unlock (void)
{
/* we need to trylock here, in case the lock hasn't been acquired; on
* various systems trying to release a mutex that hasn't been acquired
* will cause a run-time error. trylock() will either fail, in which
* case we can release the lock we own; or it will succeeds, in which
* case we need to release the lock we just acquired. so we ignore the
* returned value.
*
* see: https://bugs.gnome.org/679439
*/
g_mutex_trylock (&clutter_threads_mutex);
g_mutex_unlock (&clutter_threads_mutex);
}
static inline void static inline void
clutter_threads_init_default (void) clutter_threads_init_default (void)
{ {
g_mutex_init (&clutter_threads_mutex); g_mutex_init (&clutter_threads_mutex);
if (clutter_threads_lock == NULL)
clutter_threads_lock = clutter_threads_impl_lock;
if (clutter_threads_unlock == NULL)
clutter_threads_unlock = clutter_threads_impl_unlock;
} }
#define ENVIRONMENT_GROUP "Environment" #define ENVIRONMENT_GROUP "Environment"
@ -922,15 +892,23 @@ clutter_threads_add_timeout (guint interval,
void void
_clutter_threads_acquire_lock (void) _clutter_threads_acquire_lock (void)
{ {
if (clutter_threads_lock != NULL) g_mutex_lock (&clutter_threads_mutex);
(* clutter_threads_lock) ();
} }
void void
_clutter_threads_release_lock (void) _clutter_threads_release_lock (void)
{ {
if (clutter_threads_unlock != NULL) /* we need to trylock here, in case the lock hasn't been acquired; on
(* clutter_threads_unlock) (); * various systems trying to release a mutex that hasn't been acquired
* will cause a run-time error. trylock() will either fail, in which
* case we can release the lock we own; or it will succeeds, in which
* case we need to release the lock we just acquired. so we ignore the
* returned value.
*
* see: https://bugs.gnome.org/679439
*/
g_mutex_trylock (&clutter_threads_mutex);
g_mutex_unlock (&clutter_threads_mutex);
} }
void void