Clarify recursion issues with GMutex. (#78171)

2002-05-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glib/tmpl/threads.sgml: Clarify recursion issues with
	GMutex. (#78171)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 25bd403..ca81b43 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/tmpl/threads.sgml: Clarify recursion issues with
+       GMutex. (#78171)
+
 2002-04-24  Matthias Clasen  <maclas@gmx.de>
 
        * gobject/gobject-sections.txt: 

diff --git a/docs/reference/glib/tmpl/threads.sgml b/docs/reference/glib/tmpl/threads.sgml
index e0dca74..25601e2 100644 (file)
--- a/docs/reference/glib/tmpl/threads.sgml
+++ b/docs/reference/glib/tmpl/threads.sgml
@@ -585,9 +585,10 @@ called and will do nothing then.
 
 <note>
 <para>
-#GMutex is not recursive, i.e. a thread will deadlock, if it already
-has locked @mutex while calling g_mutex_lock(). Use
-#GStaticRecMutex instead, if you need recursive mutexes.
+#GMutex is neither guaranteed to be recursive nor to be non-recursive,
+i.e. a thread could deadlock while calling g_mutex_lock(), if it
+already has locked @mutex. Use #GStaticRecMutex, if you need recursive
+mutexes.
 </para>
 </note>
 
@@ -609,9 +610,10 @@ called and will immediately return %TRUE then.
 
 <note>
 <para>
-#GMutex is not recursive, i.e. g_mutex_trylock() will return %FALSE,
-if the current thread already has locked @mutex. Use
-#GStaticRecMutex instead, if you need recursive mutexes.
+#GMutex is neither guaranteed to be recursive nor to be non-recursive,
+i.e. the return value of g_mutex_trylock() could be both %FALSE or
+%TRUE, if the current thread already has locked @mutex. Use
+#GStaticRecMutex, if you need recursive mutexes.
 </para>
 </note>
 
@@ -1136,7 +1138,7 @@ g_static_rw_lock_reader_unlock().
 
 <para>
 #GStaticRWLock is not recursive. It might seem to be possible to
-recursivly lock for reading, but that can result in a deadlock as
+recursively lock for reading, but that can result in a deadlock as
 well, due to writer preference.
 </para>