Don't lock if depth is zero. (#310148, Wim Taymans)

2005-07-12  Matthias Clasen  <mclasen@redhat.com>

	* glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock
	if depth is zero.  (#310148, Wim Taymans)

diff --git a/ChangeLog b/ChangeLog
index d6cf06f..abb3bfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock
+       if depth is zero.  (#310148, Wim Taymans)
+
 2005-07-10  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.c (g_listenv): Ignore anomalous environment

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d6cf06f..abb3bfe 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock
+       if depth is zero.  (#310148, Wim Taymans)
+
 2005-07-10  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.c (g_listenv): Ignore anomalous environment

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d6cf06f..abb3bfe 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock
+       if depth is zero.  (#310148, Wim Taymans)
+
 2005-07-10  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.c (g_listenv): Ignore anomalous environment

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d6cf06f..abb3bfe 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gthread.c (g_static_rec_mutex_lock_full): Don't lock
+       if depth is zero.  (#310148, Wim Taymans)
+
 2005-07-10  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.c (g_listenv): Ignore anomalous environment

diff --git a/glib/gthread.c b/glib/gthread.c
index e1a1080..85290db 100644 (file)
--- 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))