/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 1999 The Free Software Foundation
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+/*
+ * Modified by the GLib Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GLib Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
/*
* MT safe
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "glib.h"
{
gint size;
gint nnodes;
- guint frozen;
GHashNode **nodes;
GHashFunc hash_func;
- GCompareFunc key_compare_func;
+ GEqualFunc key_equal_func;
};
static void g_hash_table_resize (GHashTable *hash_table);
-static GHashNode* g_hash_table_lookup_node (GHashTable *hash_table,
- gconstpointer key,
- GHashNode **last_p,
- guint *bucket_p);
+static GHashNode** g_hash_table_lookup_node (GHashTable *hash_table,
+ gconstpointer key);
static GHashNode* g_hash_node_new (gpointer key,
gpointer value);
static void g_hash_node_destroy (GHashNode *hash_node);
static void g_hash_nodes_destroy (GHashNode *hash_node);
-#define G_HASH_BUCKET(table,key) \
- ((* (table)->hash_func) (key) % (table)->size)
-G_LOCK_DECLARE_STATIC (g_hash_global);
+G_LOCK_DEFINE_STATIC (g_hash_global);
static GMemChunk *node_mem_chunk = NULL;
static GHashNode *node_free_list = NULL;
GHashTable*
g_hash_table_new (GHashFunc hash_func,
- GCompareFunc key_compare_func)
+ GEqualFunc key_equal_func)
{
GHashTable *hash_table;
guint i;
hash_table = g_new (GHashTable, 1);
hash_table->size = HASH_TABLE_MIN_SIZE;
hash_table->nnodes = 0;
- hash_table->frozen = FALSE;
hash_table->hash_func = hash_func ? hash_func : g_direct_hash;
- hash_table->key_compare_func = key_compare_func;
+ hash_table->key_equal_func = key_equal_func;
hash_table->nodes = g_new (GHashNode*, hash_table->size);
for (i = 0; i < hash_table->size; i++)
g_free (hash_table);
}
-static inline GHashNode*
-g_hash_table_lookup_node (GHashTable *hash_table,
- gconstpointer key,
- GHashNode **last_p,
- guint *bucket_p)
+static inline GHashNode**
+g_hash_table_lookup_node (GHashTable *hash_table,
+ gconstpointer key)
{
- GHashNode *node, *last = NULL;
- guint bucket;
+ GHashNode **node;
- bucket = G_HASH_BUCKET (hash_table, key);
- node = hash_table->nodes [bucket];
+ node = &hash_table->nodes
+ [(* hash_table->hash_func) (key) % hash_table->size];
/* Hash table lookup needs to be fast.
* We therefore remove the extra conditional of testing
- * whether to call the key_compare_func or not from
+ * whether to call the key_equal_func or not from
* the inner loop.
*/
- if (hash_table->key_compare_func)
- while (node && !(*hash_table->key_compare_func) (node->key, key))
- {
- last = node;
- node = node->next;
- }
+ if (hash_table->key_equal_func)
+ while (*node && !(*hash_table->key_equal_func) ((*node)->key, key))
+ node = &(*node)->next;
else
- while (node && node->key != key)
- {
- last = node;
- node = node->next;
- }
+ while (*node && (*node)->key != key)
+ node = &(*node)->next;
- if (last_p)
- *last_p = last;
- if (bucket_p)
- *bucket_p = bucket;
-
return node;
}
g_return_val_if_fail (hash_table != NULL, NULL);
- node = g_hash_table_lookup_node (hash_table, key, NULL, NULL);
+ node = *g_hash_table_lookup_node (hash_table, key);
return node ? node->value : NULL;
}
gpointer key,
gpointer value)
{
- GHashNode *node, *last;
- guint bucket;
+ GHashNode **node;
g_return_if_fail (hash_table != NULL);
-
- node = g_hash_table_lookup_node (hash_table, key, &last, &bucket);
- if (node == NULL)
- {
- node = g_hash_node_new (key, value);
-
- if (last == NULL)
- hash_table->nodes [bucket] = node;
- else
- last->next = node;
-
- hash_table->nnodes++;
- if (!hash_table->frozen)
- g_hash_table_resize (hash_table);
- }
- else
+ node = g_hash_table_lookup_node (hash_table, key);
+
+ if (*node)
{
/* do not reset node->key in this place, keeping
* the old key might be intended.
* can be used otherwise.
*
* node->key = key; */
- node->value = value;
+ (*node)->value = value;
+ }
+ else
+ {
+ *node = g_hash_node_new (key, value);
+ hash_table->nnodes++;
+ g_hash_table_resize (hash_table);
}
-
}
-void
-g_hash_table_remove (GHashTable *hash_table,
- gconstpointer key)
+gboolean
+g_hash_table_remove (GHashTable *hash_table,
+ gconstpointer key)
{
- GHashNode *node, *last;
- guint bucket;
+ GHashNode **node, *dest;
- g_return_if_fail (hash_table != NULL);
+ g_return_val_if_fail (hash_table != NULL, FALSE);
- node = g_hash_table_lookup_node (hash_table, key, &last, &bucket);
-
- if (node)
+ node = g_hash_table_lookup_node (hash_table, key);
+ if (*node)
{
- if (last == NULL)
- hash_table->nodes [bucket] = node->next;
- else
- last->next = node->next;
-
- g_hash_node_destroy (node);
-
+ dest = *node;
+ (*node) = dest->next;
+ g_hash_node_destroy (dest);
hash_table->nnodes--;
- if (!hash_table->frozen)
- g_hash_table_resize (hash_table);
+ g_hash_table_resize (hash_table);
+
+ return TRUE;
}
+
+ return FALSE;
}
gboolean
g_return_val_if_fail (hash_table != NULL, FALSE);
- node = g_hash_table_lookup_node (hash_table, lookup_key, NULL, NULL);
+ node = *g_hash_table_lookup_node (hash_table, lookup_key);
if (node)
{
void
g_hash_table_freeze (GHashTable *hash_table)
{
- g_return_if_fail (hash_table != NULL);
-
- hash_table->frozen++;
+#ifdef G_ENABLE_DEBUG
+ static gboolean first_call = TRUE;
+
+ if (first_call)
+ {
+ g_warning("g_hash_table_freeze and g_hash_table_thaw are deprecated.");
+ first_call = FALSE;
+ }
+#endif /* G_ENABLE_DEBUG */
}
void
g_hash_table_thaw (GHashTable *hash_table)
{
- g_return_if_fail (hash_table != NULL);
-
- if (hash_table->frozen)
- if (!(--hash_table->frozen))
- g_hash_table_resize (hash_table);
}
-gint
+guint
g_hash_table_foreach_remove (GHashTable *hash_table,
GHRFunc func,
gpointer user_data)
{
GHashNode *node, *prev;
guint i;
- gint deleted = 0;
+ guint deleted = 0;
g_return_val_if_fail (hash_table != NULL, 0);
g_return_val_if_fail (func != NULL, 0);
}
}
- if (!hash_table->frozen)
- g_hash_table_resize (hash_table);
+ g_hash_table_resize (hash_table);
return deleted;
}
}
/* Returns the number of elements contained in the hash table. */
-gint
+guint
g_hash_table_size (GHashTable *hash_table)
{
g_return_val_if_fail (hash_table != NULL, 0);
static void
g_hash_node_destroy (GHashNode *hash_node)
{
+
+#ifdef ENABLE_GC_FRIENDLY
+ hash_node->key = NULL;
+ hash_node->value = NULL;
+#endif /* ENABLE_GC_FRIENDLY */
+
G_LOCK (g_hash_global);
hash_node->next = node_free_list;
node_free_list = hash_node;
GHashNode *node = hash_node;
while (node->next)
- node = node->next;
-
+ {
+#ifdef ENABLE_GC_FRIENDLY
+ node->key = NULL;
+ node->value = NULL;
+#endif /* ENABLE_GC_FRIENDLY */
+ node = node->next;
+ }
+
+#ifdef ENABLE_GC_FRIENDLY
+ node->key = NULL;
+ node->value = NULL;
+#endif /* ENABLE_GC_FRIENDLY */
+
G_LOCK (g_hash_global);
node->next = node_free_list;
node_free_list = hash_node;
projects / platform / upstream / glib.git / blobdiff