luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 04:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

GHash: eliminate one of the lookup_nodes functions.

Browse Source 
Kill g_hash_table_lookup_node and rename g_hash_table_lookup_node_for_insertion
to g_hash_table_lookup_node.  Since at this point we already check for
toombstones in all callers of g_hash_table_lookup_node this doesn't make
a difference.

https://bugzilla.gnome.org/show_bug.cgi?id=644437
This commit is contained in:
Morten Welinder 2011-04-27 10:46:00 -04:00 committed by Matthias Clasen
parent 6e45153ef7
commit 0ae6bc3aaa
1 changed files with 12 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
glib/ghash.c
View File

@ -278,68 +278,6 @@ g_hash_table_set_shift_from_size (GHashTable *hash_table, gint size)
/* /*
* g_hash_table_lookup_node: * g_hash_table_lookup_node:
* @hash_table: our #GHashTable * @hash_table: our #GHashTable
* @key: the key to lookup against (may be %NULL)
* @hash_return: optional key hash return location
* Return value: index of the described node
*
* Performs a lookup in the hash table.
*
* Virtually all hash operations will use this function internally.
*
* This function first computes the hash value of the key using the
* user's hash function.
*
* If an entry in the table matching @key is found then this function
* returns the index of that entry in the table, and if not, the
* index of an empty node (never a tombstone).
*/
static inline guint
g_hash_table_lookup_node (GHashTable *hash_table,
gconstpointer key)
{
guint node_index;
guint hash_value;
guint step = 0;
hash_value = (* hash_table->hash_func) (key);
if (G_UNLIKELY (!HASH_IS_REAL (hash_value)))
hash_value = 2;
node_index = hash_value % hash_table->mod;
while (!HASH_IS_UNUSED (hash_table->hashes[node_index]))
{
/* We first check if our full hash values
* are equal so we can avoid calling the full-blown
* key equality function in most cases.
*/
if (hash_table->hashes[node_index] == hash_value)
{
gpointer node_key = hash_table->keys[node_index];
if (hash_table->key_equal_func)
{
if (hash_table->key_equal_func (node_key, key))
break;
}
else if (node_key == key)
{
break;
}
}
step++;
node_index += step;
node_index &= hash_table->mask;
}
return node_index;
}
/*
* g_hash_table_lookup_node_for_insertion:
* @hash_table: our #GHashTable
* @key: the key to lookup against * @key: the key to lookup against
* @hash_return: key hash return location * @hash_return: key hash return location
* Return value: index of the described node * Return value: index of the described node
@ -360,9 +298,9 @@ g_hash_table_lookup_node (GHashTable *hash_table,
* the hash record again for the new record. * the hash record again for the new record.
*/ */
static inline guint static inline guint
g_hash_table_lookup_node_for_insertion (GHashTable *hash_table, g_hash_table_lookup_node (GHashTable *hash_table,
gconstpointer key, gconstpointer key,
guint *hash_return) guint *hash_return)
{ {
guint node_index; guint node_index;
guint hash_value; guint hash_value;
@ -899,11 +837,12 @@ gpointer
g_hash_table_lookup (GHashTable *hash_table, g_hash_table_lookup (GHashTable *hash_table,
gconstpointer key) gconstpointer key)
{ {
guint node_index; guint node_index;
guint node_hash;
g_return_val_if_fail (hash_table != NULL, NULL); g_return_val_if_fail (hash_table != NULL, NULL);
node_index = g_hash_table_lookup_node (hash_table, key); node_index = g_hash_table_lookup_node (hash_table, key, &node_hash);
return HASH_IS_REAL (hash_table->hashes[node_index]) return HASH_IS_REAL (hash_table->hashes[node_index])
? hash_table->values[node_index] ? hash_table->values[node_index]
@ -934,11 +873,12 @@ g_hash_table_lookup_extended (GHashTable *hash_table,
gpointer *orig_key, gpointer *orig_key,
gpointer *value) gpointer *value)
{ {
guint node_index; guint node_index;
guint node_hash;
g_return_val_if_fail (hash_table != NULL, FALSE); g_return_val_if_fail (hash_table != NULL, FALSE);
node_index = g_hash_table_lookup_node (hash_table, lookup_key); node_index = g_hash_table_lookup_node (hash_table, lookup_key, &node_hash);
if (!HASH_IS_REAL (hash_table->hashes[node_index])) if (!HASH_IS_REAL (hash_table->hashes[node_index]))
return FALSE; return FALSE;
@ -981,7 +921,7 @@ g_hash_table_insert_internal (GHashTable *hash_table,
g_return_if_fail (hash_table != NULL); g_return_if_fail (hash_table != NULL);
g_return_if_fail (hash_table->ref_count > 0); g_return_if_fail (hash_table->ref_count > 0);
node_index = g_hash_table_lookup_node_for_insertion (hash_table, key, &key_hash); node_index = g_hash_table_lookup_node (hash_table, key, &key_hash);
old_hash = hash_table->hashes[node_index]; old_hash = hash_table->hashes[node_index];
@ -1087,10 +1027,11 @@ g_hash_table_remove_internal (GHashTable *hash_table,
gboolean notify) gboolean notify)
{ {
guint node_index; guint node_index;
guint node_hash;
g_return_val_if_fail (hash_table != NULL, FALSE); g_return_val_if_fail (hash_table != NULL, FALSE);
node_index = g_hash_table_lookup_node (hash_table, key); node_index = g_hash_table_lookup_node (hash_table, key, &node_hash);
if (!HASH_IS_REAL (hash_table->hashes[node_index])) if (!HASH_IS_REAL (hash_table->hashes[node_index]))
return FALSE; return FALSE;