From 392980c78340fb81da20a91510af8cb9f7629090 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 12 Jul 2005 16:56:51 +0000 Subject: [PATCH] Don't lock if depth is zero. (#310148, Wim Taymans) 2005-07-12 Matthias Clasen * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock if depth is zero. (#310148, Wim Taymans) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gthread.c | 3 +++ 5 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index d6cf06f9e..abb3bfef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-07-12 Matthias Clasen + + * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock + if depth is zero. (#310148, Wim Taymans) + 2005-07-10 Matthias Clasen * glib/gutils.c (g_listenv): Ignore anomalous environment diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d6cf06f9e..abb3bfef2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-07-12 Matthias Clasen + + * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock + if depth is zero. (#310148, Wim Taymans) + 2005-07-10 Matthias Clasen * glib/gutils.c (g_listenv): Ignore anomalous environment diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index d6cf06f9e..abb3bfef2 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-07-12 Matthias Clasen + + * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock + if depth is zero. (#310148, Wim Taymans) + 2005-07-10 Matthias Clasen * glib/gutils.c (g_listenv): Ignore anomalous environment diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d6cf06f9e..abb3bfef2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-07-12 Matthias Clasen + + * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock + if depth is zero. (#310148, Wim Taymans) + 2005-07-10 Matthias Clasen * glib/gutils.c (g_listenv): Ignore anomalous environment diff --git a/glib/gthread.c b/glib/gthread.c index e1a10804c..85290db2a 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -335,6 +335,9 @@ g_static_rec_mutex_lock_full (GStaticRecMutex *mutex, if (!g_thread_supported ()) return; + if (depth == 0) + return; + G_THREAD_UF (thread_self, (&self)); if (g_system_thread_equal (self, mutex->owner))