This commit merges the glib-threads branch into the main

branch. See the ChangeLog for details of the changes.

In brief overview:

 - The set of threading functions can be set
 - A default implementation is provided in -lgthread
 - All static data structures are locked using these
   functions if g_thread_init() is called.

1 files changed, 10 insertions, 1 deletions

diff --git a/gcache.c b/gcache.c
index b2fe77910..800bb2b13 100644
--- a/gcache.c
+++ b/gcache.c
@@ -16,6 +16,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/* 
+ * MT safe
+ */
+
 #include "glib.h"
 
 
@@ -56,7 +61,7 @@ static void        g_cache_node_destroy (GCacheNode *node);
 
 
 static GMemChunk *node_mem_chunk = NULL;
-
+static G_LOCK_DEFINE(node_mem_chunk);
 
 GCache*
 g_cache_new (GCacheNewFunc      value_new_func,
@@ -193,11 +198,13 @@ g_cache_node_new (gpointer value)
 {
   GCacheNode *node;
 
+  g_lock (node_mem_chunk);
   if (!node_mem_chunk)
     node_mem_chunk = g_mem_chunk_new ("cache node mem chunk", sizeof (GCacheNode),
 				      1024, G_ALLOC_AND_FREE);
 
   node = g_chunk_new (GCacheNode, node_mem_chunk);
+  g_unlock (node_mem_chunk);
 
   node->value = value;
   node->ref_count = 1;
@@ -208,5 +215,7 @@ g_cache_node_new (gpointer value)
 static void
 g_cache_node_destroy (GCacheNode *node)
 {
+  g_lock (node_mem_chunk);
   g_mem_chunk_free (node_mem_chunk, node);
+  g_unlock (node_mem_chunk);
 }