summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSebastian Wilhelmi <wilhelmi@ira.uka.de>2002-05-01 14:39:48 +0000
committerSebastian Wilhelmi <wilhelmi@src.gnome.org>2002-05-01 14:39:48 +0000
commit81d6a7dd7c6a698e22fe7d2e45eb530e899acabc (patch)
treec59663014d08edfeebba4451003f8794f1a7deee /docs
parent63ce57cd4da10a92957e81df26b9c6e6654580a5 (diff)
downloadglib-81d6a7dd7c6a698e22fe7d2e45eb530e899acabc.tar.gz
glib-81d6a7dd7c6a698e22fe7d2e45eb530e899acabc.tar.bz2
glib-81d6a7dd7c6a698e22fe7d2e45eb530e899acabc.zip
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)
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/ChangeLog5
-rw-r--r--docs/reference/glib/tmpl/threads.sgml16
2 files changed, 14 insertions, 7 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 25bd4039d..ca81b43c0 100644
--- 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 e0dca7483..25601e2d2 100644
--- 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>