Extended the comments on those functions, that are NOOPs, before

2007-06-15  Sebastian Wilhelmi  <wilhelmi@google.com>

	* docs/reference/glib/tmpl/threads.sgml: Extended the comments on
	those functions, that are NOOPs, before g_thread_init() has been
	called. (#447583)

	* glib/gthread.c (g_static_mutex_free): Clarified comment to
	remind myself, tha calling g_static_mutex_free() before
	g_thread_init() is safe.

svn path=/trunk/; revision=5567

diff --git a/ChangeLog b/ChangeLog
index b140ead..cf2904e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-15  Sebastian Wilhelmi  <wilhelmi@google.com>
+
+       * docs/reference/glib/tmpl/threads.sgml: Extended the comments on
+       those functions, that are NOOPs, before g_thread_init() has been
+       called. (#447583)
+
+       * glib/gthread.c (g_static_mutex_free): Clarified comment to
+       remind myself, tha calling g_static_mutex_free() before
+       g_thread_init() is safe.
+
 2007-06-15  Cody Russell  <bratsche@gnome.org>
 
        * docs/reference/gobject/tmpl/gboxed.sgml:

diff --git a/docs/reference/glib/tmpl/threads.sgml b/docs/reference/glib/tmpl/threads.sgml
index 0eed7a7..4432c81 100644 (file)
--- a/docs/reference/glib/tmpl/threads.sgml
+++ b/docs/reference/glib/tmpl/threads.sgml
@@ -714,8 +714,11 @@ platforms.
 </para>
 
 <para>
-All of the <function>g_static_mutex_*</function> functions can also be 
-used even if g_thread_init() has not yet been called.
+All of the <function>g_static_mutex_*</function> functions apart from
+<function>g_static_mutex_get_mutex</function> can also be used even if
+g_thread_init() has not yet been called. Then they do nothing, apart
+from <function>g_static_mutex_trylock</function>, which does nothing
+but returning %TRUE.
 </para>
 
 <note>
@@ -911,8 +914,10 @@ the following functions.
 </para>
 
 <para>
-All of the <function>g_static_rec_mutex_*</function> functions can
-be used even if g_thread_init() has not been called.
+All of the <function>g_static_rec_mutex_*</function> functions can be
+used even if g_thread_init() has not been called. Then they do
+nothing, apart from <function>g_static_rec_mutex_trylock</function>,
+which does nothing but returning %TRUE.
 </para>
 
 
@@ -969,7 +974,7 @@ functions increases the depth of @mutex and immediately returns %TRUE.
 
 <!-- ##### FUNCTION g_static_rec_mutex_unlock ##### -->
 <para>
-Unlocks @mutex. Another thread can will be allowed to lock @mutex only
+Unlocks @mutex. Another thread will be allowed to lock @mutex only
 when it has been unlocked as many times as it had been locked
 before. If @mutex is completely unlocked and another thread is blocked
 in a g_static_rec_mutex_lock() call for @mutex, it will be woken and
@@ -1094,7 +1099,9 @@ the following functions.
 
 <para>
 All of the <function>g_static_rw_lock_*</function> functions can be 
-used even if g_thread_init() has not been called.
+used even if g_thread_init() has not been called. Then they do
+nothing, apart from <function>g_static_rw_lock_*_trylock</function>,
+which does nothing but returning %TRUE.
 </para>
 
 <note>

diff --git a/glib/gthread.c b/glib/gthread.c
index 81df421..c47a1b3 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -230,7 +230,10 @@ g_static_mutex_free (GStaticMutex* mutex)
   g_return_if_fail (mutex);
 
   /* The runtime_mutex is the first (or only) member of GStaticMutex,
-   * see both versions (of glibconfig.h) in configure.in */
+   * see both versions (of glibconfig.h) in configure.in. Note, that
+   * this variable is NULL, if g_thread_init() hasn't been called or
+   * if we're using the default thread implementation and it provides
+   * static mutexes. */
   runtime_mutex = ((GMutex**)mutex);
 
   if (*runtime_mutex)