Added g_static_mutex_init to allow initialization of a GStaticMutex, that

2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gthread.c, gthread.h: Added g_static_mutex_init to allow
	initialization of a GStaticMutex, that can not be initialized with
	G_STATIC_MUTEX_INIT, for example in allocated structures.

	* glib/tmpl/threads.sgml, glib/glib-sections.txt: Added
	documentation for g_static_mutex_init().

WCVS: ----------------------------------------------------------------------

diff --git a/ChangeLog b/ChangeLog
index 14de7e9f40cbcd7c4aa03baa9e88916688285a3d..ad1a0040a98fb406fb7f745872f0345555576e11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread.c, gthread.h: Added g_static_mutex_init to allow
+       initialization of a GStaticMutex, that can not be initialized with
+       G_STATIC_MUTEX_INIT, for example in allocated structures.
+
 Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 14de7e9f40cbcd7c4aa03baa9e88916688285a3d..ad1a0040a98fb406fb7f745872f0345555576e11 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread.c, gthread.h: Added g_static_mutex_init to allow
+       initialization of a GStaticMutex, that can not be initialized with
+       G_STATIC_MUTEX_INIT, for example in allocated structures.
+
 Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 14de7e9f40cbcd7c4aa03baa9e88916688285a3d..ad1a0040a98fb406fb7f745872f0345555576e11 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread.c, gthread.h: Added g_static_mutex_init to allow
+       initialization of a GStaticMutex, that can not be initialized with
+       G_STATIC_MUTEX_INIT, for example in allocated structures.
+
 Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 14de7e9f40cbcd7c4aa03baa9e88916688285a3d..ad1a0040a98fb406fb7f745872f0345555576e11 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread.c, gthread.h: Added g_static_mutex_init to allow
+       initialization of a GStaticMutex, that can not be initialized with
+       G_STATIC_MUTEX_INIT, for example in allocated structures.
+
 Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 14de7e9f40cbcd7c4aa03baa9e88916688285a3d..ad1a0040a98fb406fb7f745872f0345555576e11 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread.c, gthread.h: Added g_static_mutex_init to allow
+       initialization of a GStaticMutex, that can not be initialized with
+       G_STATIC_MUTEX_INIT, for example in allocated structures.
+
 Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 14de7e9f40cbcd7c4aa03baa9e88916688285a3d..ad1a0040a98fb406fb7f745872f0345555576e11 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread.c, gthread.h: Added g_static_mutex_init to allow
+       initialization of a GStaticMutex, that can not be initialized with
+       G_STATIC_MUTEX_INIT, for example in allocated structures.
+
 Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 14de7e9f40cbcd7c4aa03baa9e88916688285a3d..ad1a0040a98fb406fb7f745872f0345555576e11 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread.c, gthread.h: Added g_static_mutex_init to allow
+       initialization of a GStaticMutex, that can not be initialized with
+       G_STATIC_MUTEX_INIT, for example in allocated structures.
+
 Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 14de7e9f40cbcd7c4aa03baa9e88916688285a3d..ad1a0040a98fb406fb7f745872f0345555576e11 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread.c, gthread.h: Added g_static_mutex_init to allow
+       initialization of a GStaticMutex, that can not be initialized with
+       G_STATIC_MUTEX_INIT, for example in allocated structures.
+
 Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a3858899e7720ca56368ee4c325824b2a0b1d741..57f908d13071d4d5199b0f3f5aeaad6a35afc8aa 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-01  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/tmpl/threads.sgml, glib/glib-sections.txt: Added
+       documentation for g_static_mutex_init().
+
 Wed Jan 31 07:14:22 2001  Tim Janik  <timj@gtk.org>
 
        * gobject/Makefile.am: adapt to work with new CVS gtk-doc, leaving the old

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 4fdbf90442105a0da772815f4f8e0ac2c6d7b57a..53c3c3f721a508b51cb5f77a6e300fa3ba7957c6 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -461,6 +461,7 @@ g_mutex_free
 <SUBSECTION>
 GStaticMutex
 G_STATIC_MUTEX_INIT
+g_static_mutex_init
 g_static_mutex_lock
 g_static_mutex_trylock
 g_static_mutex_unlock

diff --git a/docs/reference/glib/tmpl/threads.sgml b/docs/reference/glib/tmpl/threads.sgml
index 10fbee496813968b273dc75b64f8dcb21e9f2c57..9a7cb1439611169f91e2387858bd2f7743e2302d 100644 (file)
--- a/docs/reference/glib/tmpl/threads.sgml
+++ b/docs/reference/glib/tmpl/threads.sgml
@@ -370,6 +370,12 @@ not use such constructs in your own programs. One working solution is:
 #GStaticMutex provides a simpler and safer way of doing this.
 </para>
 
+<para>
+If you want to use a mutex, but your code should also work without
+calling g_thread_init() first, you can not use a #GMutex, as
+g_mutex_new() requires that. Use a #GStaticMutex instead.
+</para>
+
 <para>
 A #GMutex should only be accessed via the following functions.
 </para>
@@ -473,10 +479,10 @@ Sometimes you would like to dynamically create a mutex. If you don't
 want to require prior calling to g_thread_init(), because your code
 should also be usable in non-threaded programs, you are not able to
 use g_mutex_new() and thus #GMutex, as that requires a prior call to
-g_thread_init(). In theses cases you can also use a #GStaticMutex, but
-you should remember to free the #GStaticMutex with
-g_static_mutex_free() when not needed anymore to free up any
-allocated recourses.
+g_thread_init(). In theses cases you can also use a #GStaticMutex. It
+must be initialized with g_static_mutex_init() before using it and
+freed with with g_static_mutex_free() when not needed anymore to free
+up any allocated recourses.
 </para>
 
 <para>
@@ -520,8 +526,10 @@ functions.
 <!-- ##### MACRO G_STATIC_MUTEX_INIT ##### -->
 
 <para>
-Every #GStaticMutex must be initialized with this macro, before it can
-be used.
+A #GStaticMutex must be initialized with this macro, before it can be
+used. This macro can used be to initialize a variable, but it cannot
+be assigned to a variable. In that case you have to use
+g_static_mutex_init().
 </para>
 
 <para>
@@ -535,6 +543,16 @@ GStaticMutex my_mutex = G_STATIC_MUTEX_INIT;
 
 
 
+<!-- ##### FUNCTION g_static_mutex_init ##### -->
+<para>
+A #GStaticMutex must be initialized with this function, before it can
+be used. Alternatively you can initialize it with
+#G_STATIC_MUTEX_INIT.
+</para>
+
+@mutex: a #GStaticMutex to be initialized.
+
+
 <!-- ##### FUNCTION g_static_mutex_lock ##### -->
 <para>
 works like g_mutex_lock(), but for a #GStaticMutex.

diff --git a/glib/gthread.c b/glib/gthread.c
index 4e94474f3965ac2bd41f7e65cc980c43bbfbd3ec..71b5627195ef1b1ea011c568ca1486e676a7dc4d 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -159,6 +159,16 @@ g_static_mutex_get_mutex_impl (GMutex** mutex)
   return *mutex;
 }
 
+void 
+g_static_mutex_init (GStaticMutex *mutex)
+{
+  static GStaticMutex init_mutex = G_STATIC_MUTEX_INIT;
+
+  g_return_if_fail (mutex);
+
+  memcpy (mutex, &init_mutex, sizeof (GStaticMutex));
+}
+
 void
 g_static_mutex_free (GStaticMutex* mutex)
 {

diff --git a/glib/gthread.h b/glib/gthread.h
index 303c4419e9a8585608d6af1f8fba4edec8388d2f..1f86418f4fcc16be71f2f33550c66acedbb368ac 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -227,6 +227,7 @@ void g_thread_set_priority (GThread         *thread,
     g_mutex_trylock (g_static_mutex_get_mutex (mutex))
 #define g_static_mutex_unlock(mutex) \
     g_mutex_unlock (g_static_mutex_get_mutex (mutex))
+void g_static_mutex_init (GStaticMutex *mutex);
 void g_static_mutex_free (GStaticMutex *mutex);
 
 struct _GStaticPrivate

diff --git a/gthread.c b/gthread.c
index 4e94474f3965ac2bd41f7e65cc980c43bbfbd3ec..71b5627195ef1b1ea011c568ca1486e676a7dc4d 100644 (file)
--- a/gthread.c
+++ b/gthread.c
@@ -159,6 +159,16 @@ g_static_mutex_get_mutex_impl (GMutex** mutex)
   return *mutex;
 }
 
+void 
+g_static_mutex_init (GStaticMutex *mutex)
+{
+  static GStaticMutex init_mutex = G_STATIC_MUTEX_INIT;
+
+  g_return_if_fail (mutex);
+
+  memcpy (mutex, &init_mutex, sizeof (GStaticMutex));
+}
+
 void
 g_static_mutex_free (GStaticMutex* mutex)
 {

diff --git a/gthread.h b/gthread.h
index 303c4419e9a8585608d6af1f8fba4edec8388d2f..1f86418f4fcc16be71f2f33550c66acedbb368ac 100644 (file)
--- a/gthread.h
+++ b/gthread.h
@@ -227,6 +227,7 @@ void g_thread_set_priority (GThread         *thread,
     g_mutex_trylock (g_static_mutex_get_mutex (mutex))
 #define g_static_mutex_unlock(mutex) \
     g_mutex_unlock (g_static_mutex_get_mutex (mutex))
+void g_static_mutex_init (GStaticMutex *mutex);
 void g_static_mutex_free (GStaticMutex *mutex);
 
 struct _GStaticPrivate