1998-06-10 23:21:14 +00:00
|
|
|
/* GLIB - Library of useful routines for C programming
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:02:02 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1998-06-10 23:21:14 +00:00
|
|
|
* 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
|
2007-12-04 00:47:41 +00:00
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2000-07-26 11:02:02 +00:00
|
|
|
* Lesser General Public License for more details.
|
1998-06-10 23:21:14 +00:00
|
|
|
*
|
2000-07-26 11:02:02 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1998-06-10 23:21:14 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
1998-12-15 05:28:02 +00:00
|
|
|
|
1999-02-24 06:14:27 +00:00
|
|
|
/*
|
2000-07-26 11:02:02 +00:00
|
|
|
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
|
1999-02-24 06:14:27 +00:00
|
|
|
* file for a list of people on the GLib Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
2007-12-04 00:47:41 +00:00
|
|
|
* GLib at ftp://ftp.gtk.org/pub/gtk/.
|
1999-02-24 06:14:27 +00:00
|
|
|
*/
|
|
|
|
|
2007-12-04 00:47:41 +00:00
|
|
|
/*
|
1998-12-15 05:28:02 +00:00
|
|
|
* MT safe
|
|
|
|
*/
|
|
|
|
|
2002-12-04 01:27:44 +00:00
|
|
|
#include "config.h"
|
Ok, I'm a moron. When I originally implemented ENABLE_GC_FRIENDLY, I
2000-12-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gslist.c, glist.c: Ok, I'm a moron. When I originally
implemented ENABLE_GC_FRIENDLY, I forgot to include config.h into
the affected files. Now that Alex did that for those two,
inevitable typos surfaced, which are now fixed.
* garray.c, ghash.c, gqueue.c, gtree.c: Include config.h as well,
as ENABLE_GC_FRIENDLY should be known.
2000-12-19 15:40:30 +00:00
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
#include <string.h> /* memset */
|
|
|
|
|
2010-09-03 23:03:14 -04:00
|
|
|
#include "ghash.h"
|
|
|
|
|
2011-04-30 22:28:34 -04:00
|
|
|
#include "gstrfuncs.h"
|
2010-09-04 18:04:34 +01:00
|
|
|
#include "gatomic.h"
|
2010-09-03 23:03:14 -04:00
|
|
|
#include "gtestutils.h"
|
2011-09-18 18:59:20 -04:00
|
|
|
#include "gslice.h"
|
2010-09-03 23:03:14 -04:00
|
|
|
|
1998-06-10 23:21:14 +00:00
|
|
|
|
2010-01-28 22:36:48 -05:00
|
|
|
/**
|
2011-02-01 16:17:23 -02:00
|
|
|
* SECTION:hash_tables
|
2010-01-28 22:36:48 -05:00
|
|
|
* @title: Hash Tables
|
|
|
|
* @short_description: associations between keys and values so that
|
2011-10-02 00:08:13 -04:00
|
|
|
* given a key the value can be found quickly
|
2010-01-28 22:36:48 -05:00
|
|
|
*
|
|
|
|
* A #GHashTable provides associations between keys and values which is
|
|
|
|
* optimized so that given a key, the associated value can be found
|
|
|
|
* very quickly.
|
|
|
|
*
|
|
|
|
* Note that neither keys nor values are copied when inserted into the
|
|
|
|
* #GHashTable, so they must exist for the lifetime of the #GHashTable.
|
|
|
|
* This means that the use of static strings is OK, but temporary
|
|
|
|
* strings (i.e. those created in buffers and those returned by GTK+
|
|
|
|
* widgets) should be copied with g_strdup() before being inserted.
|
|
|
|
*
|
|
|
|
* If keys or values are dynamically allocated, you must be careful to
|
|
|
|
* ensure that they are freed when they are removed from the
|
|
|
|
* #GHashTable, and also when they are overwritten by new insertions
|
|
|
|
* into the #GHashTable. It is also not advisable to mix static strings
|
|
|
|
* and dynamically-allocated strings in a #GHashTable, because it then
|
|
|
|
* becomes difficult to determine whether the string should be freed.
|
|
|
|
*
|
|
|
|
* To create a #GHashTable, use g_hash_table_new().
|
|
|
|
*
|
|
|
|
* To insert a key and value into a #GHashTable, use
|
|
|
|
* g_hash_table_insert().
|
|
|
|
*
|
|
|
|
* To lookup a value corresponding to a given key, use
|
|
|
|
* g_hash_table_lookup() and g_hash_table_lookup_extended().
|
|
|
|
*
|
2011-04-30 22:28:34 -04:00
|
|
|
* g_hash_table_lookup_extended() can also be used to simply
|
|
|
|
* check if a key is present in the hash table.
|
|
|
|
*
|
2010-01-28 22:36:48 -05:00
|
|
|
* To remove a key and value, use g_hash_table_remove().
|
|
|
|
*
|
|
|
|
* To call a function for each key and value pair use
|
|
|
|
* g_hash_table_foreach() or use a iterator to iterate over the
|
|
|
|
* key/value pairs in the hash table, see #GHashTableIter.
|
|
|
|
*
|
|
|
|
* To destroy a #GHashTable use g_hash_table_destroy().
|
2011-04-30 22:28:34 -04:00
|
|
|
*
|
|
|
|
* <example>
|
|
|
|
* <title>Using a GHashTable as a set</title>
|
|
|
|
* <para>
|
|
|
|
* A common use-case for hash tables is to store information about
|
|
|
|
* a set of keys, without associating any particular value with each
|
|
|
|
* key. GHashTable optimizes one way of doing so: If you store only
|
|
|
|
* key-value pairs where key == value, then GHashTable does not
|
|
|
|
* allocate memory to store the values, which can be a considerable
|
|
|
|
* space saving, if your set is large.
|
|
|
|
* </para>
|
|
|
|
* <programlisting>
|
|
|
|
* GHashTable *
|
|
|
|
* set_new (GHashFunc hash_func,
|
|
|
|
* GEqualFunc equal_func,
|
|
|
|
* GDestroyNotify destroy)
|
|
|
|
* {
|
2011-08-10 12:25:57 +02:00
|
|
|
* return g_hash_table_new_full (hash_func, equal_func, destroy, NULL);
|
2011-04-30 22:28:34 -04:00
|
|
|
* }
|
|
|
|
*
|
|
|
|
* void
|
2012-01-06 20:48:04 -05:00
|
|
|
* set_add (GHashTable *set,
|
|
|
|
* gpointer element)
|
2011-04-30 22:28:34 -04:00
|
|
|
* {
|
2012-01-06 20:48:04 -05:00
|
|
|
* g_hash_table_replace (set, element, element);
|
2011-04-30 22:28:34 -04:00
|
|
|
* }
|
|
|
|
*
|
|
|
|
* gboolean
|
|
|
|
* set_contains (GHashTable *set,
|
|
|
|
* gpointer element)
|
|
|
|
* {
|
|
|
|
* return g_hash_table_lookup_extended (set, element, NULL, NULL);
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* gboolean
|
|
|
|
* set_remove (GHashTable *set,
|
|
|
|
* gpointer element)
|
|
|
|
* {
|
|
|
|
* return g_hash_table_remove (set, element);
|
|
|
|
* }
|
|
|
|
* </programlisting>
|
|
|
|
* </example>
|
2012-01-06 10:09:32 -05:00
|
|
|
*
|
|
|
|
* As of version 2.32, there is also a g_hash_table_add() function to
|
|
|
|
* add a key to a #GHashTable that is being used as a set.
|
2011-04-30 22:28:34 -04:00
|
|
|
*/
|
2010-01-28 22:36:48 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GHashTable:
|
|
|
|
*
|
|
|
|
* The #GHashTable struct is an opaque data structure to represent a
|
|
|
|
* <link linkend="glib-Hash-Tables">Hash Table</link>. It should only be
|
|
|
|
* accessed via the following functions.
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2010-01-28 22:36:48 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GHashFunc:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @key: a key
|
2010-01-28 22:36:48 -05:00
|
|
|
*
|
|
|
|
* Specifies the type of the hash function which is passed to
|
|
|
|
* g_hash_table_new() when a #GHashTable is created.
|
|
|
|
*
|
|
|
|
* The function is passed a key and should return a #guint hash value.
|
|
|
|
* The functions g_direct_hash(), g_int_hash() and g_str_hash() provide
|
2011-10-04 09:42:28 +01:00
|
|
|
* hash functions which can be used when the key is a #gpointer, #gint*,
|
2010-01-28 22:36:48 -05:00
|
|
|
* and #gchar* respectively.
|
|
|
|
*
|
2011-10-04 09:42:28 +01:00
|
|
|
* g_direct_hash() is also the appropriate hash function for keys
|
|
|
|
* of the form <literal>GINT_TO_POINTER (n)</literal> (or similar macros).
|
|
|
|
*
|
2012-01-24 21:11:13 -05:00
|
|
|
* <!-- FIXME: Need more here. --> A good hash functions should produce
|
|
|
|
* hash values that are evenly distributed over a fairly large range.
|
|
|
|
* The modulus is taken with the hash table size (a prime number) to
|
|
|
|
* find the 'bucket' to place each key into. The function should also
|
|
|
|
* be very fast, since it is called for each key lookup.
|
|
|
|
*
|
|
|
|
* Note that the hash functions provided by GLib have these qualities,
|
|
|
|
* but are not particularly robust against manufactured keys that
|
|
|
|
* cause hash collisions. Therefore, you should consider choosing
|
|
|
|
* a more secure hash function when using a GHashTable with keys
|
|
|
|
* that originate in untrusted data (such as HTTP requests).
|
|
|
|
* Using g_str_hash() in that situation might make your application
|
|
|
|
* vulerable to <ulink url="https://lwn.net/Articles/474912/">Algorithmic Complexity Attacks</ulink>.
|
2011-10-02 00:08:13 -04:00
|
|
|
*
|
2012-01-25 10:09:09 -05:00
|
|
|
* The key to choosing a good hash is unpredictability. Even
|
|
|
|
* cryptographic hashes are very easy to find collisions for when the
|
|
|
|
* remainder is taken modulo a somewhat predictable prime number. There
|
|
|
|
* must be an element of randomness that an attacker is unable to guess.
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Returns: the hash value corresponding to the key
|
|
|
|
*/
|
2010-01-28 22:36:48 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GHFunc:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @key: a key
|
|
|
|
* @value: the value corresponding to the key
|
|
|
|
* @user_data: user data passed to g_hash_table_foreach()
|
2010-01-28 22:36:48 -05:00
|
|
|
*
|
|
|
|
* Specifies the type of the function passed to g_hash_table_foreach().
|
|
|
|
* It is called with each key/value pair, together with the @user_data
|
|
|
|
* parameter which is passed to g_hash_table_foreach().
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2010-01-28 22:36:48 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GHRFunc:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @key: a key
|
|
|
|
* @value: the value associated with the key
|
|
|
|
* @user_data: user data passed to g_hash_table_remove()
|
2010-01-28 22:36:48 -05:00
|
|
|
*
|
|
|
|
* Specifies the type of the function passed to
|
|
|
|
* g_hash_table_foreach_remove(). It is called with each key/value
|
|
|
|
* pair, together with the @user_data parameter passed to
|
|
|
|
* g_hash_table_foreach_remove(). It should return %TRUE if the
|
|
|
|
* key/value pair should be removed from the #GHashTable.
|
2011-10-02 00:08:13 -04:00
|
|
|
*
|
|
|
|
* Returns: %TRUE if the key/value pair should be removed from the
|
|
|
|
* #GHashTable
|
|
|
|
*/
|
2010-01-28 22:36:48 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GEqualFunc:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @a: a value
|
|
|
|
* @b: a value to compare with
|
2010-01-28 22:36:48 -05:00
|
|
|
*
|
|
|
|
* Specifies the type of a function used to test two values for
|
|
|
|
* equality. The function should return %TRUE if both values are equal
|
|
|
|
* and %FALSE otherwise.
|
2011-10-02 00:08:13 -04:00
|
|
|
*
|
|
|
|
* Returns: %TRUE if @a = @b; %FALSE otherwise
|
|
|
|
*/
|
2010-01-28 22:36:48 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GHashTableIter:
|
|
|
|
*
|
|
|
|
* A GHashTableIter structure represents an iterator that can be used
|
|
|
|
* to iterate over the elements of a #GHashTable. GHashTableIter
|
|
|
|
* structures are typically allocated on the stack and then initialized
|
|
|
|
* with g_hash_table_iter_init().
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_freeze:
|
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
*
|
|
|
|
* This function is deprecated and will be removed in the next major
|
|
|
|
* release of GLib. It does nothing.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_thaw:
|
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
*
|
|
|
|
* This function is deprecated and will be removed in the next major
|
|
|
|
* release of GLib. It does nothing.
|
|
|
|
*/
|
2010-01-28 22:36:48 -05:00
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
#define HASH_TABLE_MIN_SHIFT 3 /* 1 << 3 == 8 buckets */
|
1998-06-10 23:21:14 +00:00
|
|
|
|
2011-05-26 21:52:50 -04:00
|
|
|
#define UNUSED_HASH_VALUE 0
|
|
|
|
#define TOMBSTONE_HASH_VALUE 1
|
|
|
|
#define HASH_IS_UNUSED(h_) ((h_) == UNUSED_HASH_VALUE)
|
|
|
|
#define HASH_IS_TOMBSTONE(h_) ((h_) == TOMBSTONE_HASH_VALUE)
|
2011-04-27 09:53:39 -04:00
|
|
|
#define HASH_IS_REAL(h_) ((h_) >= 2)
|
|
|
|
|
1998-07-07 08:27:58 +00:00
|
|
|
struct _GHashTable
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
2001-03-30 18:14:41 +00:00
|
|
|
gint size;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
gint mod;
|
|
|
|
guint mask;
|
2001-03-30 18:14:41 +00:00
|
|
|
gint nnodes;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
gint noccupied; /* nnodes + tombstones */
|
2011-04-27 10:39:56 -04:00
|
|
|
|
|
|
|
gpointer *keys;
|
|
|
|
guint *hashes;
|
|
|
|
gpointer *values;
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
GHashFunc hash_func;
|
|
|
|
GEqualFunc key_equal_func;
|
2011-05-28 22:33:37 -04:00
|
|
|
gint ref_count;
|
2007-12-15 03:54:09 +00:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
/*
|
|
|
|
* Tracks the structure of the hash table, not its contents: is only
|
|
|
|
* incremented when a node is added or removed (is not incremented
|
|
|
|
* when the key or data of a node is modified).
|
|
|
|
*/
|
|
|
|
int version;
|
|
|
|
#endif
|
2001-03-30 18:14:41 +00:00
|
|
|
GDestroyNotify key_destroy_func;
|
|
|
|
GDestroyNotify value_destroy_func;
|
1998-06-10 23:21:14 +00:00
|
|
|
};
|
|
|
|
|
2007-12-15 03:54:09 +00:00
|
|
|
typedef struct
|
|
|
|
{
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
GHashTable *hash_table;
|
|
|
|
gpointer dummy1;
|
|
|
|
gpointer dummy2;
|
|
|
|
int position;
|
|
|
|
gboolean dummy3;
|
|
|
|
int version;
|
2007-12-15 03:54:09 +00:00
|
|
|
} RealIter;
|
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
/* Each table size has an associated prime modulo (the first prime
|
|
|
|
* lower than the table size) used to find the initial bucket. Probing
|
|
|
|
* then works modulo 2^n. The prime modulo is necessary to get a
|
2011-10-02 00:08:13 -04:00
|
|
|
* good distribution with poor hash functions.
|
|
|
|
*/
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
static const gint prime_mod [] =
|
|
|
|
{
|
|
|
|
1, /* For 1 << 0 */
|
|
|
|
2,
|
|
|
|
3,
|
|
|
|
7,
|
|
|
|
13,
|
|
|
|
31,
|
|
|
|
61,
|
|
|
|
127,
|
|
|
|
251,
|
|
|
|
509,
|
|
|
|
1021,
|
|
|
|
2039,
|
|
|
|
4093,
|
|
|
|
8191,
|
|
|
|
16381,
|
|
|
|
32749,
|
|
|
|
65521, /* For 1 << 16 */
|
|
|
|
131071,
|
|
|
|
262139,
|
|
|
|
524287,
|
|
|
|
1048573,
|
|
|
|
2097143,
|
|
|
|
4194301,
|
|
|
|
8388593,
|
|
|
|
16777213,
|
|
|
|
33554393,
|
|
|
|
67108859,
|
|
|
|
134217689,
|
|
|
|
268435399,
|
|
|
|
536870909,
|
|
|
|
1073741789,
|
|
|
|
2147483647 /* For 1 << 31 */
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
g_hash_table_set_shift (GHashTable *hash_table, gint shift)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
guint mask = 0;
|
|
|
|
|
|
|
|
hash_table->size = 1 << shift;
|
|
|
|
hash_table->mod = prime_mod [shift];
|
|
|
|
|
|
|
|
for (i = 0; i < shift; i++)
|
|
|
|
{
|
|
|
|
mask <<= 1;
|
|
|
|
mask |= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
hash_table->mask = mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
g_hash_table_find_closest_shift (gint n)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
for (i = 0; n; i++)
|
|
|
|
n >>= 1;
|
|
|
|
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
g_hash_table_set_shift_from_size (GHashTable *hash_table, gint size)
|
|
|
|
{
|
|
|
|
gint shift;
|
|
|
|
|
|
|
|
shift = g_hash_table_find_closest_shift (size);
|
|
|
|
shift = MAX (shift, HASH_TABLE_MIN_SHIFT);
|
|
|
|
|
|
|
|
g_hash_table_set_shift (hash_table, shift);
|
|
|
|
}
|
|
|
|
|
2007-12-05 06:09:55 +00:00
|
|
|
/*
|
2007-12-04 03:47:17 +00:00
|
|
|
* g_hash_table_lookup_node:
|
|
|
|
* @hash_table: our #GHashTable
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
* @key: the key to lookup against
|
|
|
|
* @hash_return: key hash return location
|
|
|
|
*
|
|
|
|
* Performs a lookup in the hash table, preserving extra information
|
|
|
|
* usually needed for insertion.
|
|
|
|
*
|
|
|
|
* 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 unused node (empty or tombstone) where the key can be
|
|
|
|
* inserted.
|
|
|
|
*
|
|
|
|
* The computed hash value is returned in the variable pointed to
|
|
|
|
* by @hash_return. This is to save insertions from having to compute
|
|
|
|
* the hash record again for the new record.
|
2011-10-02 00:08:13 -04:00
|
|
|
*
|
|
|
|
* Returns: index of the described node
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
*/
|
|
|
|
static inline guint
|
2011-04-27 10:46:00 -04:00
|
|
|
g_hash_table_lookup_node (GHashTable *hash_table,
|
2011-05-19 23:50:03 -04:00
|
|
|
gconstpointer key,
|
|
|
|
guint *hash_return)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
|
|
|
guint node_index;
|
2011-05-23 00:40:33 -04:00
|
|
|
guint node_hash;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
guint hash_value;
|
2011-05-02 11:45:52 -04:00
|
|
|
guint first_tombstone = 0;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
gboolean have_tombstone = FALSE;
|
|
|
|
guint step = 0;
|
|
|
|
|
2011-05-23 00:40:33 -04:00
|
|
|
hash_value = hash_table->hash_func (key);
|
2011-04-27 09:53:39 -04:00
|
|
|
if (G_UNLIKELY (!HASH_IS_REAL (hash_value)))
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
hash_value = 2;
|
|
|
|
|
|
|
|
*hash_return = hash_value;
|
|
|
|
|
|
|
|
node_index = hash_value % hash_table->mod;
|
2011-05-23 00:40:33 -04:00
|
|
|
node_hash = hash_table->hashes[node_index];
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
2011-05-23 00:40:33 -04:00
|
|
|
while (!HASH_IS_UNUSED (node_hash))
|
2007-12-04 03:47:03 +00:00
|
|
|
{
|
2011-05-23 00:40:33 -04:00
|
|
|
/* We first check if our full hash values
|
|
|
|
* are equal so we can avoid calling the full-blown
|
|
|
|
* key equality function in most cases.
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
*/
|
2011-04-27 10:39:56 -04:00
|
|
|
if (node_hash == hash_value)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
2011-05-19 23:50:03 -04:00
|
|
|
gpointer node_key = hash_table->keys[node_index];
|
2011-04-27 10:39:56 -04:00
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
if (hash_table->key_equal_func)
|
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
if (hash_table->key_equal_func (node_key, key))
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
return node_index;
|
|
|
|
}
|
2011-04-27 10:39:56 -04:00
|
|
|
else if (node_key == key)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
|
|
|
return node_index;
|
|
|
|
}
|
|
|
|
}
|
2011-05-21 20:56:04 -04:00
|
|
|
else if (HASH_IS_TOMBSTONE (node_hash) && !have_tombstone)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
|
|
|
first_tombstone = node_index;
|
|
|
|
have_tombstone = TRUE;
|
2007-12-04 03:47:03 +00:00
|
|
|
}
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
|
|
|
step++;
|
|
|
|
node_index += step;
|
|
|
|
node_index &= hash_table->mask;
|
2011-05-23 00:40:33 -04:00
|
|
|
node_hash = hash_table->hashes[node_index];
|
2007-12-04 03:47:03 +00:00
|
|
|
}
|
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
if (have_tombstone)
|
|
|
|
return first_tombstone;
|
|
|
|
|
|
|
|
return node_index;
|
2007-12-04 03:47:03 +00:00
|
|
|
}
|
|
|
|
|
2007-12-05 06:09:55 +00:00
|
|
|
/*
|
2007-12-04 03:47:17 +00:00
|
|
|
* g_hash_table_remove_node:
|
|
|
|
* @hash_table: our #GHashTable
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
* @node: pointer to node to remove
|
2007-12-04 03:47:17 +00:00
|
|
|
* @notify: %TRUE if the destroy notify handlers are to be called
|
|
|
|
*
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
* Removes a node from the hash table and updates the node count.
|
|
|
|
* The node is replaced by a tombstone. No table resize is performed.
|
2007-12-04 03:47:17 +00:00
|
|
|
*
|
|
|
|
* If @notify is %TRUE then the destroy notify functions are called
|
|
|
|
* for the key and value of the hash node.
|
2007-12-05 06:09:55 +00:00
|
|
|
*/
|
2007-12-04 03:47:03 +00:00
|
|
|
static void
|
|
|
|
g_hash_table_remove_node (GHashTable *hash_table,
|
2011-10-02 00:08:13 -04:00
|
|
|
gint i,
|
2007-12-04 03:47:03 +00:00
|
|
|
gboolean notify)
|
|
|
|
{
|
2011-05-19 23:50:03 -04:00
|
|
|
gpointer key;
|
|
|
|
gpointer value;
|
2007-12-04 03:47:03 +00:00
|
|
|
|
2011-05-19 23:50:03 -04:00
|
|
|
key = hash_table->keys[i];
|
|
|
|
value = hash_table->values[i];
|
2007-12-04 03:47:03 +00:00
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
/* Erect tombstone */
|
2011-05-26 21:52:50 -04:00
|
|
|
hash_table->hashes[i] = TOMBSTONE_HASH_VALUE;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
|
|
|
/* Be GC friendly */
|
2011-04-27 10:39:56 -04:00
|
|
|
hash_table->keys[i] = NULL;
|
|
|
|
hash_table->values[i] = NULL;
|
2007-12-04 03:47:03 +00:00
|
|
|
|
|
|
|
hash_table->nnodes--;
|
2011-05-19 23:50:03 -04:00
|
|
|
|
|
|
|
if (notify && hash_table->key_destroy_func)
|
|
|
|
hash_table->key_destroy_func (key);
|
|
|
|
|
|
|
|
if (notify && hash_table->value_destroy_func)
|
|
|
|
hash_table->value_destroy_func (value);
|
|
|
|
|
2007-12-04 03:47:03 +00:00
|
|
|
}
|
|
|
|
|
2007-12-05 06:09:55 +00:00
|
|
|
/*
|
2007-12-04 03:47:17 +00:00
|
|
|
* g_hash_table_remove_all_nodes:
|
|
|
|
* @hash_table: our #GHashTable
|
|
|
|
* @notify: %TRUE if the destroy notify handlers are to be called
|
|
|
|
*
|
|
|
|
* Removes all nodes from the table. Since this may be a precursor to
|
|
|
|
* freeing the table entirely, no resize is performed.
|
|
|
|
*
|
|
|
|
* If @notify is %TRUE then the destroy notify functions are called
|
|
|
|
* for the key and value of the hash node.
|
2007-12-05 06:09:55 +00:00
|
|
|
*/
|
2007-12-04 03:47:03 +00:00
|
|
|
static void
|
|
|
|
g_hash_table_remove_all_nodes (GHashTable *hash_table,
|
|
|
|
gboolean notify)
|
|
|
|
{
|
|
|
|
int i;
|
2011-05-19 23:50:03 -04:00
|
|
|
gpointer key;
|
|
|
|
gpointer value;
|
|
|
|
|
|
|
|
hash_table->nnodes = 0;
|
|
|
|
hash_table->noccupied = 0;
|
2007-12-04 03:47:03 +00:00
|
|
|
|
2011-05-19 23:50:03 -04:00
|
|
|
if (!notify ||
|
|
|
|
(hash_table->key_destroy_func == NULL &&
|
|
|
|
hash_table->value_destroy_func == NULL))
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
2011-05-19 23:50:03 -04:00
|
|
|
memset (hash_table->hashes, 0, hash_table->size * sizeof (guint));
|
|
|
|
memset (hash_table->keys, 0, hash_table->size * sizeof (gpointer));
|
|
|
|
memset (hash_table->values, 0, hash_table->size * sizeof (gpointer));
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
2011-05-19 23:50:03 -04:00
|
|
|
return;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
}
|
|
|
|
|
2011-05-19 23:50:03 -04:00
|
|
|
for (i = 0; i < hash_table->size; i++)
|
|
|
|
{
|
|
|
|
if (HASH_IS_REAL (hash_table->hashes[i]))
|
|
|
|
{
|
|
|
|
key = hash_table->keys[i];
|
|
|
|
value = hash_table->values[i];
|
2007-12-04 03:47:03 +00:00
|
|
|
|
2011-05-26 21:52:50 -04:00
|
|
|
hash_table->hashes[i] = UNUSED_HASH_VALUE;
|
2011-05-19 23:50:03 -04:00
|
|
|
hash_table->keys[i] = NULL;
|
|
|
|
hash_table->values[i] = NULL;
|
|
|
|
|
|
|
|
if (hash_table->key_destroy_func != NULL)
|
|
|
|
hash_table->key_destroy_func (key);
|
|
|
|
|
|
|
|
if (hash_table->value_destroy_func != NULL)
|
|
|
|
hash_table->value_destroy_func (value);
|
|
|
|
}
|
2011-05-26 21:52:50 -04:00
|
|
|
else if (HASH_IS_TOMBSTONE (hash_table->hashes[i]))
|
|
|
|
{
|
|
|
|
hash_table->hashes[i] = UNUSED_HASH_VALUE;
|
|
|
|
}
|
2011-05-19 23:50:03 -04:00
|
|
|
}
|
2007-12-04 03:47:03 +00:00
|
|
|
}
|
|
|
|
|
2007-12-05 06:09:55 +00:00
|
|
|
/*
|
2007-12-04 03:47:17 +00:00
|
|
|
* g_hash_table_resize:
|
|
|
|
* @hash_table: our #GHashTable
|
|
|
|
*
|
|
|
|
* Resizes the hash table to the optimal size based on the number of
|
2011-10-02 00:08:13 -04:00
|
|
|
* nodes currently held. If you call this function then a resize will
|
|
|
|
* occur, even if one does not need to occur.
|
|
|
|
* Use g_hash_table_maybe_resize() instead.
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
*
|
|
|
|
* This function may "resize" the hash table to its current size, with
|
|
|
|
* the side effect of cleaning up tombstones and otherwise optimizing
|
|
|
|
* the probe sequences.
|
2007-12-05 06:09:55 +00:00
|
|
|
*/
|
2007-12-04 03:47:03 +00:00
|
|
|
static void
|
|
|
|
g_hash_table_resize (GHashTable *hash_table)
|
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
gpointer *new_keys;
|
|
|
|
gpointer *new_values;
|
|
|
|
guint *new_hashes;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
gint old_size;
|
2007-12-04 03:47:03 +00:00
|
|
|
gint i;
|
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
old_size = hash_table->size;
|
|
|
|
g_hash_table_set_shift_from_size (hash_table, hash_table->nnodes * 2);
|
2007-12-04 03:47:03 +00:00
|
|
|
|
2011-04-30 22:28:34 -04:00
|
|
|
new_keys = g_new0 (gpointer, hash_table->size);
|
|
|
|
if (hash_table->keys == hash_table->values)
|
|
|
|
new_values = new_keys;
|
|
|
|
else
|
|
|
|
new_values = g_new0 (gpointer, hash_table->size);
|
2011-04-27 10:39:56 -04:00
|
|
|
new_hashes = g_new0 (guint, hash_table->size);
|
2007-12-04 03:47:03 +00:00
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
for (i = 0; i < old_size; i++)
|
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
guint node_hash = hash_table->hashes[i];
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
guint hash_val;
|
|
|
|
guint step = 0;
|
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
if (!HASH_IS_REAL (node_hash))
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
continue;
|
2007-12-04 03:47:03 +00:00
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
hash_val = node_hash % hash_table->mod;
|
2007-12-04 03:47:03 +00:00
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
while (!HASH_IS_UNUSED (new_hashes[hash_val]))
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
|
|
|
step++;
|
|
|
|
hash_val += step;
|
|
|
|
hash_val &= hash_table->mask;
|
|
|
|
}
|
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
new_hashes[hash_val] = hash_table->hashes[i];
|
|
|
|
new_keys[hash_val] = hash_table->keys[i];
|
|
|
|
new_values[hash_val] = hash_table->values[i];
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
}
|
2007-12-04 03:47:03 +00:00
|
|
|
|
2011-04-30 22:28:34 -04:00
|
|
|
if (hash_table->keys != hash_table->values)
|
|
|
|
g_free (hash_table->values);
|
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
g_free (hash_table->keys);
|
|
|
|
g_free (hash_table->hashes);
|
|
|
|
|
|
|
|
hash_table->keys = new_keys;
|
|
|
|
hash_table->values = new_values;
|
|
|
|
hash_table->hashes = new_hashes;
|
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
hash_table->noccupied = hash_table->nnodes;
|
2007-12-04 03:47:03 +00:00
|
|
|
}
|
1998-06-10 23:21:14 +00:00
|
|
|
|
2007-12-05 06:09:55 +00:00
|
|
|
/*
|
2007-12-04 03:47:17 +00:00
|
|
|
* g_hash_table_maybe_resize:
|
|
|
|
* @hash_table: our #GHashTable
|
|
|
|
*
|
|
|
|
* Resizes the hash table, if needed.
|
|
|
|
*
|
|
|
|
* Essentially, calls g_hash_table_resize() if the table has strayed
|
|
|
|
* too far from its ideal size for its number of nodes.
|
2007-12-05 06:09:55 +00:00
|
|
|
*/
|
2007-12-04 03:46:13 +00:00
|
|
|
static inline void
|
|
|
|
g_hash_table_maybe_resize (GHashTable *hash_table)
|
|
|
|
{
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
gint noccupied = hash_table->noccupied;
|
2007-12-04 03:46:13 +00:00
|
|
|
gint size = hash_table->size;
|
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
if ((size > hash_table->nnodes * 4 && size > 1 << HASH_TABLE_MIN_SHIFT) ||
|
|
|
|
(size <= noccupied + (noccupied / 16)))
|
2007-12-04 03:46:13 +00:00
|
|
|
g_hash_table_resize (hash_table);
|
|
|
|
}
|
1998-06-10 23:21:14 +00:00
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_new:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_func: a function to create a hash value from a key
|
|
|
|
* @key_equal_func: a function to check two keys for equality
|
2001-03-30 18:14:41 +00:00
|
|
|
*
|
2005-11-22 13:16:58 +00:00
|
|
|
* Creates a new #GHashTable with a reference count of 1.
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Hash values returned by @hash_func are used to determine where keys
|
|
|
|
* are stored within the #GHashTable data structure. The g_direct_hash(),
|
|
|
|
* g_int_hash(), g_int64_hash(), g_double_hash() and g_str_hash()
|
|
|
|
* functions are provided for some common types of keys.
|
|
|
|
* If @hash_func is %NULL, g_direct_hash() is used.
|
|
|
|
*
|
|
|
|
* @key_equal_func is used when looking up keys in the #GHashTable.
|
|
|
|
* The g_direct_equal(), g_int_equal(), g_int64_equal(), g_double_equal()
|
|
|
|
* and g_str_equal() functions are provided for the most common types
|
|
|
|
* of keys. If @key_equal_func is %NULL, keys are compared directly in
|
|
|
|
* a similar fashion to g_direct_equal(), but without the overhead of
|
|
|
|
* a function call.
|
|
|
|
*
|
|
|
|
* Return value: a new #GHashTable
|
|
|
|
*/
|
|
|
|
GHashTable *
|
|
|
|
g_hash_table_new (GHashFunc hash_func,
|
|
|
|
GEqualFunc key_equal_func)
|
2001-03-30 18:14:41 +00:00
|
|
|
{
|
|
|
|
return g_hash_table_new_full (hash_func, key_equal_func, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_new_full:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_func: a function to create a hash value from a key
|
|
|
|
* @key_equal_func: a function to check two keys for equality
|
2012-03-24 23:58:45 +11:00
|
|
|
* @key_destroy_func: (allow-none): a function to free the memory allocated for the key
|
2011-10-02 00:08:13 -04:00
|
|
|
* used when removing the entry from the #GHashTable, or %NULL
|
|
|
|
* if you don't want to supply such a function.
|
2012-03-24 23:58:45 +11:00
|
|
|
* @value_destroy_func: (allow-none): a function to free the memory allocated for the
|
2011-10-02 00:08:13 -04:00
|
|
|
* value used when removing the entry from the #GHashTable, or %NULL
|
|
|
|
* if you don't want to supply such a function.
|
|
|
|
*
|
|
|
|
* Creates a new #GHashTable like g_hash_table_new() with a reference
|
|
|
|
* count of 1 and allows to specify functions to free the memory
|
|
|
|
* allocated for the key and value that get called when removing the
|
|
|
|
* entry from the #GHashTable.
|
|
|
|
*
|
|
|
|
* Return value: a new #GHashTable
|
|
|
|
*/
|
|
|
|
GHashTable *
|
|
|
|
g_hash_table_new_full (GHashFunc hash_func,
|
|
|
|
GEqualFunc key_equal_func,
|
|
|
|
GDestroyNotify key_destroy_func,
|
|
|
|
GDestroyNotify value_destroy_func)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
1998-07-07 08:27:58 +00:00
|
|
|
GHashTable *hash_table;
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
hash_table = g_slice_new (GHashTable);
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
g_hash_table_set_shift (hash_table, HASH_TABLE_MIN_SHIFT);
|
2001-03-30 18:14:41 +00:00
|
|
|
hash_table->nnodes = 0;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
hash_table->noccupied = 0;
|
2001-03-30 18:14:41 +00:00
|
|
|
hash_table->hash_func = hash_func ? hash_func : g_direct_hash;
|
|
|
|
hash_table->key_equal_func = key_equal_func;
|
2005-11-22 13:16:58 +00:00
|
|
|
hash_table->ref_count = 1;
|
2007-12-15 03:54:09 +00:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
hash_table->version = 0;
|
|
|
|
#endif
|
2001-03-30 18:14:41 +00:00
|
|
|
hash_table->key_destroy_func = key_destroy_func;
|
|
|
|
hash_table->value_destroy_func = value_destroy_func;
|
2011-04-27 10:39:56 -04:00
|
|
|
hash_table->keys = g_new0 (gpointer, hash_table->size);
|
2011-04-30 22:28:34 -04:00
|
|
|
hash_table->values = hash_table->keys;
|
2011-04-27 10:39:56 -04:00
|
|
|
hash_table->hashes = g_new0 (guint, hash_table->size);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
1998-07-07 08:27:58 +00:00
|
|
|
return hash_table;
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
2007-12-15 03:54:09 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_iter_init:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @iter: an uninitialized #GHashTableIter
|
|
|
|
* @hash_table: a #GHashTable
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
|
|
|
* Initializes a key/value pair iterator and associates it with
|
|
|
|
* @hash_table. Modifying the hash table after calling this function
|
|
|
|
* invalidates the returned iterator.
|
2007-12-15 04:13:15 +00:00
|
|
|
* |[
|
2007-12-15 03:54:09 +00:00
|
|
|
* GHashTableIter iter;
|
|
|
|
* gpointer key, value;
|
|
|
|
*
|
2007-12-15 04:13:15 +00:00
|
|
|
* g_hash_table_iter_init (&iter, hash_table);
|
2011-10-02 00:08:13 -04:00
|
|
|
* while (g_hash_table_iter_next (&iter, &key, &value))
|
2007-12-15 04:13:15 +00:00
|
|
|
* {
|
|
|
|
* /* do something with key and value */
|
|
|
|
* }
|
|
|
|
* ]|
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
|
|
|
* Since: 2.16
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2007-12-15 03:54:09 +00:00
|
|
|
void
|
|
|
|
g_hash_table_iter_init (GHashTableIter *iter,
|
2011-05-19 23:50:03 -04:00
|
|
|
GHashTable *hash_table)
|
2007-12-15 03:54:09 +00:00
|
|
|
{
|
|
|
|
RealIter *ri = (RealIter *) iter;
|
|
|
|
|
|
|
|
g_return_if_fail (iter != NULL);
|
|
|
|
g_return_if_fail (hash_table != NULL);
|
|
|
|
|
|
|
|
ri->hash_table = hash_table;
|
|
|
|
ri->position = -1;
|
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
ri->version = hash_table->version;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_iter_next:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @iter: an initialized #GHashTableIter
|
2012-03-24 23:58:45 +11:00
|
|
|
* @key: (allow-none): a location to store the key, or %NULL
|
|
|
|
* @value: (allow-none): a location to store the value, or %NULL
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
|
|
|
* Advances @iter and retrieves the key and/or value that are now
|
|
|
|
* pointed to as a result of this advancement. If %FALSE is returned,
|
|
|
|
* @key and @value are not set, and the iterator becomes invalid.
|
|
|
|
*
|
|
|
|
* Return value: %FALSE if the end of the #GHashTable has been reached.
|
|
|
|
*
|
|
|
|
* Since: 2.16
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2007-12-15 03:54:09 +00:00
|
|
|
gboolean
|
|
|
|
g_hash_table_iter_next (GHashTableIter *iter,
|
2011-05-19 23:50:03 -04:00
|
|
|
gpointer *key,
|
|
|
|
gpointer *value)
|
2007-12-15 03:54:09 +00:00
|
|
|
{
|
|
|
|
RealIter *ri = (RealIter *) iter;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
gint position;
|
2007-12-15 03:54:09 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (iter != NULL, FALSE);
|
2008-03-31 03:45:28 +00:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
2007-12-15 03:54:09 +00:00
|
|
|
g_return_val_if_fail (ri->version == ri->hash_table->version, FALSE);
|
2008-03-31 03:45:28 +00:00
|
|
|
#endif
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
g_return_val_if_fail (ri->position < ri->hash_table->size, FALSE);
|
2007-12-15 03:54:09 +00:00
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
position = ri->position;
|
2007-12-15 03:54:09 +00:00
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
do
|
2007-12-15 03:54:09 +00:00
|
|
|
{
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
position++;
|
|
|
|
if (position >= ri->hash_table->size)
|
|
|
|
{
|
|
|
|
ri->position = position;
|
|
|
|
return FALSE;
|
|
|
|
}
|
2007-12-15 03:54:09 +00:00
|
|
|
}
|
2011-04-27 10:39:56 -04:00
|
|
|
while (!HASH_IS_REAL (ri->hash_table->hashes[position]));
|
2007-12-15 03:54:09 +00:00
|
|
|
|
|
|
|
if (key != NULL)
|
2011-04-27 10:39:56 -04:00
|
|
|
*key = ri->hash_table->keys[position];
|
2007-12-15 03:54:09 +00:00
|
|
|
if (value != NULL)
|
2011-04-27 10:39:56 -04:00
|
|
|
*value = ri->hash_table->values[position];
|
2007-12-15 03:54:09 +00:00
|
|
|
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
ri->position = position;
|
2007-12-15 03:54:09 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_iter_get_hash_table:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @iter: an initialized #GHashTableIter
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
|
|
|
* Returns the #GHashTable associated with @iter.
|
|
|
|
*
|
|
|
|
* Return value: the #GHashTable associated with @iter.
|
|
|
|
*
|
|
|
|
* Since: 2.16
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2007-12-15 03:54:09 +00:00
|
|
|
GHashTable *
|
|
|
|
g_hash_table_iter_get_hash_table (GHashTableIter *iter)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (iter != NULL, NULL);
|
|
|
|
|
|
|
|
return ((RealIter *) iter)->hash_table;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
iter_remove_or_steal (RealIter *ri, gboolean notify)
|
|
|
|
{
|
|
|
|
g_return_if_fail (ri != NULL);
|
2008-03-31 03:45:28 +00:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
2007-12-15 03:54:09 +00:00
|
|
|
g_return_if_fail (ri->version == ri->hash_table->version);
|
2008-03-31 03:45:28 +00:00
|
|
|
#endif
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
g_return_if_fail (ri->position >= 0);
|
|
|
|
g_return_if_fail (ri->position < ri->hash_table->size);
|
2007-12-15 03:54:09 +00:00
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
g_hash_table_remove_node (ri->hash_table, ri->position, notify);
|
2008-06-10 17:03:15 +00:00
|
|
|
|
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
ri->version++;
|
|
|
|
ri->hash_table->version++;
|
|
|
|
#endif
|
2007-12-15 03:54:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2010-03-21 14:04:07 -05:00
|
|
|
* g_hash_table_iter_remove:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @iter: an initialized #GHashTableIter
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
|
|
|
* Removes the key/value pair currently pointed to by the iterator
|
|
|
|
* from its associated #GHashTable. Can only be called after
|
2011-10-02 00:08:13 -04:00
|
|
|
* g_hash_table_iter_next() returned %TRUE, and cannot be called
|
|
|
|
* more than once for the same key/value pair.
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* If the #GHashTable was created using g_hash_table_new_full(),
|
|
|
|
* the key and value are freed using the supplied destroy functions,
|
|
|
|
* otherwise you have to make sure that any dynamically allocated
|
|
|
|
* values are freed yourself.
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
|
|
|
* Since: 2.16
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2007-12-15 03:54:09 +00:00
|
|
|
void
|
|
|
|
g_hash_table_iter_remove (GHashTableIter *iter)
|
|
|
|
{
|
|
|
|
iter_remove_or_steal ((RealIter *) iter, TRUE);
|
|
|
|
}
|
|
|
|
|
2011-06-18 19:40:34 +02:00
|
|
|
/*
|
|
|
|
* g_hash_table_insert_node:
|
|
|
|
* @hash_table: our #GHashTable
|
|
|
|
* @node_index: pointer to node to insert/replace
|
|
|
|
* @key_hash: key hash
|
2012-03-24 23:58:45 +11:00
|
|
|
* @key: (allow-none): key to replace with, or %NULL
|
2011-06-18 19:40:34 +02:00
|
|
|
* @value: value to replace with
|
2011-10-24 13:25:15 -04:00
|
|
|
* @keep_new_key: whether to replace the key in the node with @key
|
|
|
|
* @reusing_key: whether @key was taken out of the existing node
|
2011-06-18 19:40:34 +02:00
|
|
|
*
|
|
|
|
* Inserts a value at @node_index in the hash table and updates it.
|
2011-10-24 13:25:15 -04:00
|
|
|
*
|
|
|
|
* If @key has been taken out of the existing node (ie it is not
|
|
|
|
* passed in via a g_hash_table_insert/replace) call, then @reusing_key
|
|
|
|
* should be %TRUE.
|
2011-06-18 19:40:34 +02:00
|
|
|
*/
|
|
|
|
static void
|
|
|
|
g_hash_table_insert_node (GHashTable *hash_table,
|
|
|
|
guint node_index,
|
|
|
|
guint key_hash,
|
|
|
|
gpointer key,
|
|
|
|
gpointer value,
|
2011-10-24 13:25:15 -04:00
|
|
|
gboolean keep_new_key,
|
|
|
|
gboolean reusing_key)
|
2011-06-18 19:40:34 +02:00
|
|
|
{
|
|
|
|
guint old_hash;
|
|
|
|
gpointer old_key;
|
|
|
|
gpointer old_value;
|
|
|
|
|
|
|
|
if (G_UNLIKELY (hash_table->keys == hash_table->values && key != value))
|
|
|
|
hash_table->values = g_memdup (hash_table->keys, sizeof (gpointer) * hash_table->size);
|
|
|
|
|
|
|
|
old_hash = hash_table->hashes[node_index];
|
|
|
|
old_key = hash_table->keys[node_index];
|
|
|
|
old_value = hash_table->values[node_index];
|
|
|
|
|
|
|
|
if (HASH_IS_REAL (old_hash))
|
|
|
|
{
|
|
|
|
if (keep_new_key)
|
|
|
|
hash_table->keys[node_index] = key;
|
|
|
|
hash_table->values[node_index] = value;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
hash_table->keys[node_index] = key;
|
|
|
|
hash_table->values[node_index] = value;
|
|
|
|
hash_table->hashes[node_index] = key_hash;
|
|
|
|
|
|
|
|
hash_table->nnodes++;
|
|
|
|
|
|
|
|
if (HASH_IS_UNUSED (old_hash))
|
|
|
|
{
|
|
|
|
/* We replaced an empty node, and not a tombstone */
|
|
|
|
hash_table->noccupied++;
|
|
|
|
g_hash_table_maybe_resize (hash_table);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
hash_table->version++;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
if (HASH_IS_REAL (old_hash))
|
|
|
|
{
|
2011-10-24 13:25:15 -04:00
|
|
|
if (hash_table->key_destroy_func && !reusing_key)
|
2011-06-18 19:40:34 +02:00
|
|
|
hash_table->key_destroy_func (keep_new_key ? old_key : key);
|
|
|
|
if (hash_table->value_destroy_func)
|
|
|
|
hash_table->value_destroy_func (old_value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_iter_replace:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @iter: an initialized #GHashTableIter
|
2011-06-18 19:40:34 +02:00
|
|
|
* @value: the value to replace with
|
|
|
|
*
|
|
|
|
* Replaces the value currently pointed to by the iterator
|
|
|
|
* from its associated #GHashTable. Can only be called after
|
|
|
|
* g_hash_table_iter_next() returned %TRUE.
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* If you supplied a @value_destroy_func when creating the
|
|
|
|
* #GHashTable, the old value is freed using that function.
|
2011-06-18 19:40:34 +02:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Since: 2.30
|
|
|
|
*/
|
2011-06-18 19:40:34 +02:00
|
|
|
void
|
|
|
|
g_hash_table_iter_replace (GHashTableIter *iter,
|
|
|
|
gpointer value)
|
|
|
|
{
|
|
|
|
RealIter *ri;
|
|
|
|
guint node_hash;
|
|
|
|
gpointer key;
|
|
|
|
|
|
|
|
ri = (RealIter *) iter;
|
|
|
|
|
|
|
|
g_return_if_fail (ri != NULL);
|
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
g_return_if_fail (ri->version == ri->hash_table->version);
|
|
|
|
#endif
|
|
|
|
g_return_if_fail (ri->position >= 0);
|
|
|
|
g_return_if_fail (ri->position < ri->hash_table->size);
|
|
|
|
|
|
|
|
node_hash = ri->hash_table->hashes[ri->position];
|
|
|
|
key = ri->hash_table->keys[ri->position];
|
|
|
|
|
2011-10-24 13:25:15 -04:00
|
|
|
g_hash_table_insert_node (ri->hash_table, ri->position, node_hash, key, value, TRUE, TRUE);
|
2011-06-18 19:40:34 +02:00
|
|
|
|
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
ri->version++;
|
|
|
|
ri->hash_table->version++;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-12-15 03:54:09 +00:00
|
|
|
/**
|
2010-03-21 14:04:07 -05:00
|
|
|
* g_hash_table_iter_steal:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @iter: an initialized #GHashTableIter
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Removes the key/value pair currently pointed to by the
|
|
|
|
* iterator from its associated #GHashTable, without calling
|
|
|
|
* the key and value destroy functions. Can only be called
|
|
|
|
* after g_hash_table_iter_next() returned %TRUE, and cannot
|
|
|
|
* be called more than once for the same key/value pair.
|
2007-12-15 03:54:09 +00:00
|
|
|
*
|
|
|
|
* Since: 2.16
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2007-12-15 03:54:09 +00:00
|
|
|
void
|
|
|
|
g_hash_table_iter_steal (GHashTableIter *iter)
|
|
|
|
{
|
|
|
|
iter_remove_or_steal ((RealIter *) iter, FALSE);
|
|
|
|
}
|
|
|
|
|
2005-11-22 13:16:58 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_ref:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a valid #GHashTable
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2005-11-22 13:16:58 +00:00
|
|
|
* Atomically increments the reference count of @hash_table by one.
|
|
|
|
* This function is MT-safe and may be called from any thread.
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Return value: the passed in #GHashTable
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2005-11-23 04:29:43 +00:00
|
|
|
* Since: 2.10
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
|
|
|
GHashTable *
|
2005-11-22 13:16:58 +00:00
|
|
|
g_hash_table_ref (GHashTable *hash_table)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (hash_table != NULL, NULL);
|
|
|
|
|
2011-05-23 00:40:33 -04:00
|
|
|
g_atomic_int_inc (&hash_table->ref_count);
|
|
|
|
|
2005-11-22 13:16:58 +00:00
|
|
|
return hash_table;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_unref:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a valid #GHashTable
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2005-11-22 13:16:58 +00:00
|
|
|
* Atomically decrements the reference count of @hash_table by one.
|
|
|
|
* If the reference count drops to 0, all keys and values will be
|
|
|
|
* destroyed, and all memory allocated by the hash table is released.
|
|
|
|
* This function is MT-safe and may be called from any thread.
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2005-11-23 04:29:43 +00:00
|
|
|
* Since: 2.10
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2005-11-22 13:16:58 +00:00
|
|
|
void
|
|
|
|
g_hash_table_unref (GHashTable *hash_table)
|
|
|
|
{
|
|
|
|
g_return_if_fail (hash_table != NULL);
|
|
|
|
|
2011-05-23 00:40:33 -04:00
|
|
|
if (g_atomic_int_dec_and_test (&hash_table->ref_count))
|
2005-11-22 13:16:58 +00:00
|
|
|
{
|
2007-12-06 15:38:03 +00:00
|
|
|
g_hash_table_remove_all_nodes (hash_table, TRUE);
|
2011-04-30 22:28:34 -04:00
|
|
|
if (hash_table->keys != hash_table->values)
|
|
|
|
g_free (hash_table->values);
|
2011-04-27 10:39:56 -04:00
|
|
|
g_free (hash_table->keys);
|
|
|
|
g_free (hash_table->hashes);
|
2005-11-22 13:16:58 +00:00
|
|
|
g_slice_free (GHashTable, hash_table);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_destroy:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2005-11-25 23:20:22 +00:00
|
|
|
* Destroys all keys and values in the #GHashTable and decrements its
|
2005-11-22 13:16:58 +00:00
|
|
|
* reference count by 1. If keys and/or values are dynamically allocated,
|
|
|
|
* you should either free them first or create the #GHashTable with destroy
|
|
|
|
* notifiers using g_hash_table_new_full(). In the latter case the destroy
|
|
|
|
* functions you supplied will be called on all keys and values during the
|
|
|
|
* destruction phase.
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
1998-06-10 23:21:14 +00:00
|
|
|
void
|
|
|
|
g_hash_table_destroy (GHashTable *hash_table)
|
|
|
|
{
|
1998-09-21 02:32:30 +00:00
|
|
|
g_return_if_fail (hash_table != NULL);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2006-06-01 14:16:39 +00:00
|
|
|
g_hash_table_remove_all (hash_table);
|
2005-11-22 13:16:58 +00:00
|
|
|
g_hash_table_unref (hash_table);
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_lookup:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @key: the key to look up
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2004-08-30 03:59:59 +00:00
|
|
|
* Looks up a key in a #GHashTable. Note that this function cannot
|
|
|
|
* distinguish between a key that is not present and one which is present
|
|
|
|
* and has the value %NULL. If you need this distinction, use
|
|
|
|
* g_hash_table_lookup_extended().
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-12-22 00:16:06 +00:00
|
|
|
* Return value: (allow-none): the associated value, or %NULL if the key is not found
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
1998-09-21 02:32:30 +00:00
|
|
|
gpointer
|
2011-10-02 00:08:13 -04:00
|
|
|
g_hash_table_lookup (GHashTable *hash_table,
|
|
|
|
gconstpointer key)
|
1998-09-21 02:32:30 +00:00
|
|
|
{
|
2011-04-27 10:46:00 -04:00
|
|
|
guint node_index;
|
|
|
|
guint node_hash;
|
2007-12-04 00:47:41 +00:00
|
|
|
|
1998-09-21 02:32:30 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, NULL);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2011-04-27 10:46:00 -04:00
|
|
|
node_index = g_hash_table_lookup_node (hash_table, key, &node_hash);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
return HASH_IS_REAL (hash_table->hashes[node_index])
|
|
|
|
? hash_table->values[node_index]
|
|
|
|
: NULL;
|
1998-09-21 02:32:30 +00:00
|
|
|
}
|
1998-09-02 07:44:02 +00:00
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_lookup_extended:
|
2008-11-04 17:01:19 +00:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @lookup_key: the key to look up
|
2011-12-22 00:16:06 +00:00
|
|
|
* @orig_key: (allow-none): return location for the original key, or %NULL
|
|
|
|
* @value: (allow-none): return location for the value associated with the key, or %NULL
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2001-03-30 18:14:41 +00:00
|
|
|
* Looks up a key in the #GHashTable, returning the original key and the
|
2007-12-04 00:47:41 +00:00
|
|
|
* associated value and a #gboolean which is %TRUE if the key was found. This
|
|
|
|
* is useful if you need to free the memory allocated for the original key,
|
2001-03-30 18:14:41 +00:00
|
|
|
* for example before calling g_hash_table_remove().
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2008-11-04 17:01:19 +00:00
|
|
|
* You can actually pass %NULL for @lookup_key to test
|
2011-02-25 10:40:39 -05:00
|
|
|
* whether the %NULL key exists, provided the hash and equal functions
|
|
|
|
* of @hash_table are %NULL-safe.
|
2008-11-04 17:01:19 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Return value: %TRUE if the key was found in the #GHashTable
|
|
|
|
*/
|
2001-03-30 18:14:41 +00:00
|
|
|
gboolean
|
|
|
|
g_hash_table_lookup_extended (GHashTable *hash_table,
|
2007-12-04 00:47:41 +00:00
|
|
|
gconstpointer lookup_key,
|
|
|
|
gpointer *orig_key,
|
|
|
|
gpointer *value)
|
2001-03-30 18:14:41 +00:00
|
|
|
{
|
2011-04-27 10:46:00 -04:00
|
|
|
guint node_index;
|
|
|
|
guint node_hash;
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, FALSE);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2011-04-27 10:46:00 -04:00
|
|
|
node_index = g_hash_table_lookup_node (hash_table, lookup_key, &node_hash);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
if (!HASH_IS_REAL (hash_table->hashes[node_index]))
|
2001-03-30 18:14:41 +00:00
|
|
|
return FALSE;
|
2007-12-04 03:46:48 +00:00
|
|
|
|
|
|
|
if (orig_key)
|
2011-04-27 10:39:56 -04:00
|
|
|
*orig_key = hash_table->keys[node_index];
|
2007-12-04 03:46:48 +00:00
|
|
|
|
|
|
|
if (value)
|
2011-04-27 10:39:56 -04:00
|
|
|
*value = hash_table->values[node_index];
|
2007-12-04 03:46:48 +00:00
|
|
|
|
|
|
|
return TRUE;
|
2001-03-30 18:14:41 +00:00
|
|
|
}
|
|
|
|
|
2007-12-05 06:09:55 +00:00
|
|
|
/*
|
2007-12-04 03:47:17 +00:00
|
|
|
* g_hash_table_insert_internal:
|
|
|
|
* @hash_table: our #GHashTable
|
|
|
|
* @key: the key to insert
|
|
|
|
* @value: the value to insert
|
|
|
|
* @keep_new_key: if %TRUE and this key already exists in the table
|
|
|
|
* then call the destroy notify function on the old key. If %FALSE
|
|
|
|
* then call the destroy notify function on the new key.
|
|
|
|
*
|
|
|
|
* Implements the common logic for the g_hash_table_insert() and
|
|
|
|
* g_hash_table_replace() functions.
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Do a lookup of @key. If it is found, replace it with the new
|
|
|
|
* @value (and perhaps the new @key). If it is not found, create
|
|
|
|
* a new node.
|
2007-12-05 06:09:55 +00:00
|
|
|
*/
|
2007-11-28 03:40:39 +00:00
|
|
|
static void
|
|
|
|
g_hash_table_insert_internal (GHashTable *hash_table,
|
|
|
|
gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gboolean keep_new_key)
|
1998-09-21 02:32:30 +00:00
|
|
|
{
|
2006-12-27 05:43:40 +00:00
|
|
|
guint key_hash;
|
2011-06-18 19:40:34 +02:00
|
|
|
guint node_index;
|
2007-12-04 00:47:41 +00:00
|
|
|
|
1998-09-21 02:32:30 +00:00
|
|
|
g_return_if_fail (hash_table != NULL);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2011-04-27 10:46:00 -04:00
|
|
|
node_index = g_hash_table_lookup_node (hash_table, key, &key_hash);
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
2011-10-24 13:25:15 -04:00
|
|
|
g_hash_table_insert_node (hash_table, node_index, key_hash, key, value, keep_new_key, FALSE);
|
2001-03-30 18:14:41 +00:00
|
|
|
}
|
|
|
|
|
2007-11-28 03:40:39 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_insert:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @key: a key to insert
|
|
|
|
* @value: the value to associate with the key
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2007-11-28 03:40:39 +00:00
|
|
|
* Inserts a new key and value into a #GHashTable.
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* If the key already exists in the #GHashTable its current
|
|
|
|
* value is replaced with the new value. If you supplied a
|
|
|
|
* @value_destroy_func when creating the #GHashTable, the old
|
|
|
|
* value is freed using that function. If you supplied a
|
|
|
|
* @key_destroy_func when creating the #GHashTable, the passed
|
|
|
|
* key is freed using that function.
|
|
|
|
*/
|
2007-11-28 03:40:39 +00:00
|
|
|
void
|
|
|
|
g_hash_table_insert (GHashTable *hash_table,
|
2007-12-04 00:47:41 +00:00
|
|
|
gpointer key,
|
|
|
|
gpointer value)
|
2007-11-28 03:40:39 +00:00
|
|
|
{
|
2008-01-02 11:54:08 +00:00
|
|
|
g_hash_table_insert_internal (hash_table, key, value, FALSE);
|
2007-11-28 03:40:39 +00:00
|
|
|
}
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_replace:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @key: a key to insert
|
|
|
|
* @value: the value to associate with the key
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
|
|
|
* Inserts a new key and value into a #GHashTable similar to
|
2011-10-02 00:08:13 -04:00
|
|
|
* g_hash_table_insert(). The difference is that if the key
|
|
|
|
* already exists in the #GHashTable, it gets replaced by the
|
|
|
|
* new key. If you supplied a @value_destroy_func when creating
|
|
|
|
* the #GHashTable, the old value is freed using that function.
|
|
|
|
* If you supplied a @key_destroy_func when creating the
|
2007-12-04 00:47:41 +00:00
|
|
|
* #GHashTable, the old key is freed using that function.
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2001-03-30 18:14:41 +00:00
|
|
|
void
|
|
|
|
g_hash_table_replace (GHashTable *hash_table,
|
2007-12-04 00:47:41 +00:00
|
|
|
gpointer key,
|
|
|
|
gpointer value)
|
2001-03-30 18:14:41 +00:00
|
|
|
{
|
2008-01-02 11:54:08 +00:00
|
|
|
g_hash_table_insert_internal (hash_table, key, value, TRUE);
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
2012-01-06 10:09:32 -05:00
|
|
|
/**
|
|
|
|
* g_hash_table_add:
|
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @key: a key to insert
|
|
|
|
*
|
|
|
|
* This is a convenience function for using a #GHashTable as a set. It
|
|
|
|
* is equivalent to calling g_hash_table_replace() with @key as both the
|
|
|
|
* key and the value.
|
|
|
|
*
|
|
|
|
* When a hash table only ever contains keys that have themselves as the
|
|
|
|
* corresponding value it is able to be stored more efficiently. See
|
|
|
|
* the discussion in the section description.
|
|
|
|
*
|
|
|
|
* Since: 2.32
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
g_hash_table_add (GHashTable *hash_table,
|
|
|
|
gpointer key)
|
|
|
|
{
|
|
|
|
g_hash_table_insert_internal (hash_table, key, key, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_contains:
|
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @key: a key to check
|
|
|
|
*
|
|
|
|
* Checks if @key is in @hash_table.
|
|
|
|
*
|
|
|
|
* Since: 2.32
|
|
|
|
**/
|
|
|
|
gboolean
|
|
|
|
g_hash_table_contains (GHashTable *hash_table,
|
|
|
|
gconstpointer key)
|
|
|
|
{
|
|
|
|
guint node_index;
|
|
|
|
guint node_hash;
|
|
|
|
|
|
|
|
g_return_val_if_fail (hash_table != NULL, FALSE);
|
|
|
|
|
|
|
|
node_index = g_hash_table_lookup_node (hash_table, key, &node_hash);
|
|
|
|
|
|
|
|
return HASH_IS_REAL (hash_table->hashes[node_index]);
|
|
|
|
}
|
|
|
|
|
2007-12-05 06:09:55 +00:00
|
|
|
/*
|
2007-12-04 03:47:17 +00:00
|
|
|
* g_hash_table_remove_internal:
|
|
|
|
* @hash_table: our #GHashTable
|
|
|
|
* @key: the key to remove
|
|
|
|
* @notify: %TRUE if the destroy notify handlers are to be called
|
|
|
|
* Return value: %TRUE if a node was found and removed, else %FALSE
|
|
|
|
*
|
|
|
|
* Implements the common logic for the g_hash_table_remove() and
|
|
|
|
* g_hash_table_steal() functions.
|
|
|
|
*
|
|
|
|
* Do a lookup of @key and remove it if it is found, calling the
|
|
|
|
* destroy notify handlers only if @notify is %TRUE.
|
2007-12-05 06:09:55 +00:00
|
|
|
*/
|
2007-12-03 09:29:47 +00:00
|
|
|
static gboolean
|
|
|
|
g_hash_table_remove_internal (GHashTable *hash_table,
|
|
|
|
gconstpointer key,
|
|
|
|
gboolean notify)
|
|
|
|
{
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
guint node_index;
|
2011-04-27 10:46:00 -04:00
|
|
|
guint node_hash;
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2007-12-03 09:29:47 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, FALSE);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2011-04-27 10:46:00 -04:00
|
|
|
node_index = g_hash_table_lookup_node (hash_table, key, &node_hash);
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
if (!HASH_IS_REAL (hash_table->hashes[node_index]))
|
2007-12-03 09:29:47 +00:00
|
|
|
return FALSE;
|
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
g_hash_table_remove_node (hash_table, node_index, notify);
|
2007-12-04 03:46:13 +00:00
|
|
|
g_hash_table_maybe_resize (hash_table);
|
2007-12-03 09:29:47 +00:00
|
|
|
|
2007-12-15 03:54:09 +00:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
hash_table->version++;
|
|
|
|
#endif
|
|
|
|
|
2007-12-03 09:29:47 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_remove:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @key: the key to remove
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2001-03-30 18:14:41 +00:00
|
|
|
* Removes a key and its associated value from a #GHashTable.
|
|
|
|
*
|
|
|
|
* If the #GHashTable was created using g_hash_table_new_full(), the
|
2001-12-16 19:31:36 +00:00
|
|
|
* key and value are freed using the supplied destroy functions, otherwise
|
2007-12-04 00:47:41 +00:00
|
|
|
* you have to make sure that any dynamically allocated values are freed
|
2001-03-30 18:14:41 +00:00
|
|
|
* yourself.
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Returns: %TRUE if the key was found and removed from the #GHashTable
|
|
|
|
*/
|
2000-12-13 00:44:18 +00:00
|
|
|
gboolean
|
2007-12-04 00:47:41 +00:00
|
|
|
g_hash_table_remove (GHashTable *hash_table,
|
2007-12-03 09:29:47 +00:00
|
|
|
gconstpointer key)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
2007-12-03 09:29:47 +00:00
|
|
|
return g_hash_table_remove_internal (hash_table, key, TRUE);
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
2007-12-04 03:47:03 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_steal:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @key: the key to remove
|
2007-12-04 03:47:03 +00:00
|
|
|
*
|
|
|
|
* Removes a key and its associated value from a #GHashTable without
|
|
|
|
* calling the key and value destroy functions.
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Returns: %TRUE if the key was found and removed from the #GHashTable
|
|
|
|
*/
|
2007-12-04 03:47:03 +00:00
|
|
|
gboolean
|
|
|
|
g_hash_table_steal (GHashTable *hash_table,
|
|
|
|
gconstpointer key)
|
|
|
|
{
|
|
|
|
return g_hash_table_remove_internal (hash_table, key, FALSE);
|
|
|
|
}
|
|
|
|
|
2006-06-01 14:16:39 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_remove_all:
|
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
*
|
|
|
|
* Removes all keys and their associated values from a #GHashTable.
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* If the #GHashTable was created using g_hash_table_new_full(),
|
|
|
|
* the keys and values are freed using the supplied destroy functions,
|
|
|
|
* otherwise you have to make sure that any dynamically allocated
|
|
|
|
* values are freed yourself.
|
2006-06-01 14:16:39 +00:00
|
|
|
*
|
|
|
|
* Since: 2.12
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2006-06-01 14:16:39 +00:00
|
|
|
void
|
|
|
|
g_hash_table_remove_all (GHashTable *hash_table)
|
|
|
|
{
|
|
|
|
g_return_if_fail (hash_table != NULL);
|
|
|
|
|
2007-12-15 03:54:09 +00:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
if (hash_table->nnodes != 0)
|
|
|
|
hash_table->version++;
|
|
|
|
#endif
|
|
|
|
|
2007-12-03 21:21:28 +00:00
|
|
|
g_hash_table_remove_all_nodes (hash_table, TRUE);
|
2007-12-04 03:46:13 +00:00
|
|
|
g_hash_table_maybe_resize (hash_table);
|
2006-06-01 14:16:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_steal_all:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
2006-06-01 14:16:39 +00:00
|
|
|
*
|
2007-12-04 00:47:41 +00:00
|
|
|
* Removes all keys and their associated values from a #GHashTable
|
2006-06-01 14:16:39 +00:00
|
|
|
* without calling the key and value destroy functions.
|
|
|
|
*
|
|
|
|
* Since: 2.12
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2006-06-01 14:16:39 +00:00
|
|
|
void
|
|
|
|
g_hash_table_steal_all (GHashTable *hash_table)
|
|
|
|
{
|
|
|
|
g_return_if_fail (hash_table != NULL);
|
|
|
|
|
2007-12-15 03:54:09 +00:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
if (hash_table->nnodes != 0)
|
|
|
|
hash_table->version++;
|
|
|
|
#endif
|
|
|
|
|
2007-12-03 21:21:28 +00:00
|
|
|
g_hash_table_remove_all_nodes (hash_table, FALSE);
|
2007-12-04 03:46:13 +00:00
|
|
|
g_hash_table_maybe_resize (hash_table);
|
2006-06-01 14:16:39 +00:00
|
|
|
}
|
|
|
|
|
2007-12-05 06:09:55 +00:00
|
|
|
/*
|
2007-12-04 03:47:17 +00:00
|
|
|
* g_hash_table_foreach_remove_or_steal:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
2007-12-04 03:47:17 +00:00
|
|
|
* @func: the user's callback function
|
|
|
|
* @user_data: data for @func
|
|
|
|
* @notify: %TRUE if the destroy notify handlers are to be called
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Implements the common logic for g_hash_table_foreach_remove()
|
|
|
|
* and g_hash_table_foreach_steal().
|
2007-12-04 03:47:17 +00:00
|
|
|
*
|
|
|
|
* Iterates over every node in the table, calling @func with the key
|
2011-10-02 00:08:13 -04:00
|
|
|
* and value of the node (and @user_data). If @func returns %TRUE the
|
2007-12-04 03:47:17 +00:00
|
|
|
* node is removed from the table.
|
|
|
|
*
|
|
|
|
* If @notify is true then the destroy notify handlers will be called
|
|
|
|
* for each removed node.
|
2007-12-05 06:09:55 +00:00
|
|
|
*/
|
2007-12-04 03:47:03 +00:00
|
|
|
static guint
|
|
|
|
g_hash_table_foreach_remove_or_steal (GHashTable *hash_table,
|
2011-05-19 23:50:03 -04:00
|
|
|
GHRFunc func,
|
2007-12-04 03:47:03 +00:00
|
|
|
gpointer user_data,
|
|
|
|
gboolean notify)
|
|
|
|
{
|
|
|
|
guint deleted = 0;
|
|
|
|
gint i;
|
2011-05-20 15:07:08 -04:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
gint version = hash_table->version;
|
|
|
|
#endif
|
2007-12-04 03:47:03 +00:00
|
|
|
|
|
|
|
for (i = 0; i < hash_table->size; i++)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
guint node_hash = hash_table->hashes[i];
|
|
|
|
gpointer node_key = hash_table->keys[i];
|
|
|
|
gpointer node_value = hash_table->values[i];
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
if (HASH_IS_REAL (node_hash) &&
|
2011-05-19 23:50:03 -04:00
|
|
|
(* func) (node_key, node_value, user_data))
|
2007-12-04 03:47:03 +00:00
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
g_hash_table_remove_node (hash_table, i, notify);
|
2007-12-04 03:47:03 +00:00
|
|
|
deleted++;
|
|
|
|
}
|
2011-05-20 15:07:08 -04:00
|
|
|
|
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
g_return_val_if_fail (version == hash_table->version, 0);
|
|
|
|
#endif
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
}
|
2007-12-04 03:47:03 +00:00
|
|
|
|
|
|
|
g_hash_table_maybe_resize (hash_table);
|
|
|
|
|
2007-12-15 03:54:09 +00:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
if (deleted > 0)
|
|
|
|
hash_table->version++;
|
|
|
|
#endif
|
|
|
|
|
2007-12-04 03:47:03 +00:00
|
|
|
return deleted;
|
|
|
|
}
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_foreach_remove:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @func: the function to call for each key/value pair
|
|
|
|
* @user_data: user data to pass to the function
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Calls the given function for each key/value pair in the
|
|
|
|
* #GHashTable. If the function returns %TRUE, then the key/value
|
|
|
|
* pair is removed from the #GHashTable. If you supplied key or
|
|
|
|
* value destroy functions when creating the #GHashTable, they are
|
|
|
|
* used to free the memory allocated for the removed keys and values.
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* See #GHashTableIter for an alternative way to loop over the
|
2007-12-15 03:54:09 +00:00
|
|
|
* key/value pairs in the hash table.
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Return value: the number of key/value pairs removed
|
|
|
|
*/
|
2001-03-30 18:14:41 +00:00
|
|
|
guint
|
2007-12-04 00:47:41 +00:00
|
|
|
g_hash_table_foreach_remove (GHashTable *hash_table,
|
|
|
|
GHRFunc func,
|
|
|
|
gpointer user_data)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
2001-03-30 18:14:41 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, 0);
|
|
|
|
g_return_val_if_fail (func != NULL, 0);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
return g_hash_table_foreach_remove_or_steal (hash_table, func, user_data, TRUE);
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_foreach_steal:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @func: the function to call for each key/value pair
|
|
|
|
* @user_data: user data to pass to the function
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Calls the given function for each key/value pair in the
|
|
|
|
* #GHashTable. If the function returns %TRUE, then the key/value
|
|
|
|
* pair is removed from the #GHashTable, but no key or value
|
|
|
|
* destroy functions are called.
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2011-05-20 15:07:08 -04:00
|
|
|
* See #GHashTableIter for an alternative way to loop over the
|
2007-12-15 03:54:09 +00:00
|
|
|
* key/value pairs in the hash table.
|
|
|
|
*
|
2001-03-30 18:14:41 +00:00
|
|
|
* Return value: the number of key/value pairs removed.
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2001-03-30 18:14:41 +00:00
|
|
|
guint
|
|
|
|
g_hash_table_foreach_steal (GHashTable *hash_table,
|
2007-12-04 00:47:41 +00:00
|
|
|
GHRFunc func,
|
|
|
|
gpointer user_data)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
2001-03-30 18:14:41 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, 0);
|
|
|
|
g_return_val_if_fail (func != NULL, 0);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
return g_hash_table_foreach_remove_or_steal (hash_table, func, user_data, FALSE);
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_foreach:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @func: the function to call for each key/value pair
|
|
|
|
* @user_data: user data to pass to the function
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2001-11-29 20:49:07 +00:00
|
|
|
* Calls the given function for each of the key/value pairs in the
|
|
|
|
* #GHashTable. The function is passed the key and value of each
|
|
|
|
* pair, and the given @user_data parameter. The hash table may not
|
|
|
|
* be modified while iterating over it (you can't add/remove
|
|
|
|
* items). To remove all items matching a predicate, use
|
2005-07-26 15:49:15 +00:00
|
|
|
* g_hash_table_foreach_remove().
|
2007-06-25 14:44:41 +00:00
|
|
|
*
|
|
|
|
* See g_hash_table_find() for performance caveats for linear
|
|
|
|
* order searches in contrast to g_hash_table_lookup().
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
1998-06-10 23:21:14 +00:00
|
|
|
void
|
|
|
|
g_hash_table_foreach (GHashTable *hash_table,
|
2007-12-04 00:47:41 +00:00
|
|
|
GHFunc func,
|
|
|
|
gpointer user_data)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
|
|
|
gint i;
|
2011-05-20 15:07:08 -04:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
2012-02-09 17:59:55 +01:00
|
|
|
gint version;
|
2011-05-20 15:07:08 -04:00
|
|
|
#endif
|
2007-12-04 00:47:41 +00:00
|
|
|
|
1998-09-21 02:32:30 +00:00
|
|
|
g_return_if_fail (hash_table != NULL);
|
|
|
|
g_return_if_fail (func != NULL);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2012-02-09 17:59:55 +01:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
version = hash_table->version;
|
|
|
|
#endif
|
|
|
|
|
1998-07-07 08:27:58 +00:00
|
|
|
for (i = 0; i < hash_table->size; i++)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
guint node_hash = hash_table->hashes[i];
|
|
|
|
gpointer node_key = hash_table->keys[i];
|
|
|
|
gpointer node_value = hash_table->values[i];
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
2011-04-27 10:39:56 -04:00
|
|
|
if (HASH_IS_REAL (node_hash))
|
|
|
|
(* func) (node_key, node_value, user_data);
|
2011-05-20 15:07:08 -04:00
|
|
|
|
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
g_return_if_fail (version == hash_table->version);
|
|
|
|
#endif
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
}
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
2004-02-20 02:05:36 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_find:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
* @predicate: function to test the key/value pairs for a certain property
|
|
|
|
* @user_data: user data to pass to the function
|
|
|
|
*
|
|
|
|
* Calls the given function for key/value pairs in the #GHashTable
|
|
|
|
* until @predicate returns %TRUE. The function is passed the key
|
|
|
|
* and value of each pair, and the given @user_data parameter. The
|
|
|
|
* hash table may not be modified while iterating over it (you can't
|
|
|
|
* add/remove items).
|
|
|
|
*
|
|
|
|
* Note, that hash tables are really only optimized for forward
|
|
|
|
* lookups, i.e. g_hash_table_lookup(). So code that frequently issues
|
|
|
|
* g_hash_table_find() or g_hash_table_foreach() (e.g. in the order of
|
|
|
|
* once per every entry in a hash table) should probably be reworked
|
|
|
|
* to use additional or different data structures for reverse lookups
|
|
|
|
* (keep in mind that an O(n) find/foreach operation issued for all n
|
|
|
|
* values in a hash table ends up needing O(n*n) operations).
|
2004-02-27 21:11:51 +00:00
|
|
|
*
|
2011-12-22 00:16:06 +00:00
|
|
|
* Return value: (allow-none): The value of the first key/value pair is returned,
|
2011-05-20 15:07:08 -04:00
|
|
|
* for which @predicate evaluates to %TRUE. If no pair with the
|
|
|
|
* requested property is found, %NULL is returned.
|
2004-02-27 21:11:51 +00:00
|
|
|
*
|
|
|
|
* Since: 2.4
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
2004-02-20 02:05:36 +00:00
|
|
|
gpointer
|
2011-05-20 15:07:08 -04:00
|
|
|
g_hash_table_find (GHashTable *hash_table,
|
|
|
|
GHRFunc predicate,
|
|
|
|
gpointer user_data)
|
2004-02-20 02:05:36 +00:00
|
|
|
{
|
|
|
|
gint i;
|
2011-05-20 15:07:08 -04:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
2012-02-09 17:59:55 +01:00
|
|
|
gint version;
|
2011-05-20 15:07:08 -04:00
|
|
|
#endif
|
|
|
|
gboolean match;
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2004-02-20 02:05:36 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, NULL);
|
|
|
|
g_return_val_if_fail (predicate != NULL, NULL);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2012-02-09 17:59:55 +01:00
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
version = hash_table->version;
|
|
|
|
#endif
|
|
|
|
|
2011-05-20 15:07:08 -04:00
|
|
|
match = FALSE;
|
|
|
|
|
2004-02-20 02:05:36 +00:00
|
|
|
for (i = 0; i < hash_table->size; i++)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
guint node_hash = hash_table->hashes[i];
|
|
|
|
gpointer node_key = hash_table->keys[i];
|
|
|
|
gpointer node_value = hash_table->values[i];
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
|
2011-05-20 15:07:08 -04:00
|
|
|
if (HASH_IS_REAL (node_hash))
|
|
|
|
match = predicate (node_key, node_value, user_data);
|
|
|
|
|
|
|
|
#ifndef G_DISABLE_ASSERT
|
|
|
|
g_return_val_if_fail (version == hash_table->version, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (match)
|
2011-04-27 10:39:56 -04:00
|
|
|
return node_value;
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
}
|
|
|
|
|
2004-02-20 02:05:36 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2001-03-30 18:14:41 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_size:
|
2011-10-02 00:08:13 -04:00
|
|
|
* @hash_table: a #GHashTable
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2001-03-30 18:14:41 +00:00
|
|
|
* Returns the number of elements contained in the #GHashTable.
|
2007-12-04 00:47:41 +00:00
|
|
|
*
|
2001-03-30 18:14:41 +00:00
|
|
|
* Return value: the number of key/value pairs in the #GHashTable.
|
2011-10-02 00:08:13 -04:00
|
|
|
*/
|
1999-02-15 05:47:24 +00:00
|
|
|
guint
|
1998-09-21 02:32:30 +00:00
|
|
|
g_hash_table_size (GHashTable *hash_table)
|
1998-07-07 08:27:58 +00:00
|
|
|
{
|
1998-09-21 02:32:30 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, 0);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
1998-07-07 08:27:58 +00:00
|
|
|
return hash_table->nnodes;
|
|
|
|
}
|
1998-06-10 23:21:14 +00:00
|
|
|
|
2007-04-11 13:09:38 +00:00
|
|
|
/**
|
|
|
|
* g_hash_table_get_keys:
|
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Retrieves every key inside @hash_table. The returned data
|
|
|
|
* is valid until @hash_table is modified.
|
2007-04-11 13:09:38 +00:00
|
|
|
*
|
|
|
|
* Return value: a #GList containing all the keys inside the hash
|
2011-10-02 00:08:13 -04:00
|
|
|
* table. The content of the list is owned by the hash table and
|
|
|
|
* should not be modified or freed. Use g_list_free() when done
|
|
|
|
* using the list.
|
2007-04-11 13:09:38 +00:00
|
|
|
*
|
|
|
|
* Since: 2.14
|
|
|
|
*/
|
|
|
|
GList *
|
|
|
|
g_hash_table_get_keys (GHashTable *hash_table)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
GList *retval;
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2007-04-11 13:09:38 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, NULL);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2007-04-11 13:09:38 +00:00
|
|
|
retval = NULL;
|
|
|
|
for (i = 0; i < hash_table->size; i++)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
if (HASH_IS_REAL (hash_table->hashes[i]))
|
|
|
|
retval = g_list_prepend (retval, hash_table->keys[i]);
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
}
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2007-04-11 13:09:38 +00:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_hash_table_get_values:
|
|
|
|
* @hash_table: a #GHashTable
|
|
|
|
*
|
2011-10-02 00:08:13 -04:00
|
|
|
* Retrieves every value inside @hash_table. The returned data
|
|
|
|
* is valid until @hash_table is modified.
|
2007-04-11 13:09:38 +00:00
|
|
|
*
|
|
|
|
* Return value: a #GList containing all the values inside the hash
|
2011-10-02 00:08:13 -04:00
|
|
|
* table. The content of the list is owned by the hash table and
|
|
|
|
* should not be modified or freed. Use g_list_free() when done
|
|
|
|
* using the list.
|
2007-04-11 13:09:38 +00:00
|
|
|
*
|
|
|
|
* Since: 2.14
|
|
|
|
*/
|
|
|
|
GList *
|
|
|
|
g_hash_table_get_values (GHashTable *hash_table)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
GList *retval;
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2007-04-11 13:09:38 +00:00
|
|
|
g_return_val_if_fail (hash_table != NULL, NULL);
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2007-04-11 13:09:38 +00:00
|
|
|
retval = NULL;
|
|
|
|
for (i = 0; i < hash_table->size; i++)
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
{
|
2011-04-27 10:39:56 -04:00
|
|
|
if (HASH_IS_REAL (hash_table->hashes[i]))
|
|
|
|
retval = g_list_prepend (retval, hash_table->values[i]);
|
Rewrite most of GHashTable to use open addressing with quadratic probing
2008-09-19 Hans Petter Jansson <hpj@novell.com>
Rewrite most of GHashTable to use open addressing with quadratic
probing instead of chaining. This has the potential to reduce memory
fragmentation significantly, while being slightly faster due to
better locality and no need to call alloc/free functions for nodes.
Benchmarks suggest it also uses less memory overall.
* glib/ghash.c (prime_mod): Table of suitable primes for
initial-probe distribution.
(g_hash_table_set_shift): New function.
(g_hash_table_find_closest_shift): New function.
(g_hash_table_set_shift_from_size): New function.
(g_hash_table_lookup_node_for_insertion): New function.
(g_hash_table_lookup_node): Rewritten to return node index instead of
pointer, use quadratic probe on flat table, and not return insertion
data. The latter saves some computation for read-only lookups.
(g_hash_table_remove_node): Rewrite to take a pointer directly to the
node structure to remove, and clear that. Remove unlinking code.
(g_hash_table_remove_all_nodes): Rewrite to not clear nodes
individually, but en masse using memset () after potentially calling
notify functions.
(iter_remove_or_steal): Use new data structure and algorithm. Vastly
simplified - now just a call to g_hash_table_remove_node ().
(g_hash_table_resize): New resize code, re-indexing with new prime
and cleaning up tombstones.
(g_hash_table_maybe_resize): Table may hold 8 buckets minimum, no less
than 1/4 load excluding tombstones, and no more than 15/16 load
including tombstones. These numbers are the results of a lot of
benchmarking with multiple complex applications, and should not be
changed lightly.
(g_hash_table_iter_next)
(g_hash_table_lookup)
(g_hash_table_lookup_extended)
(g_hash_table_insert_internal)
(g_hash_table_remove_internal)
(g_hash_table_foreach_remove_or_steal)
(g_hash_table_foreach)
(g_hash_table_find)
(g_hash_table_get_keys)
(g_hash_table_get_values): Use new data structure and algorithm,
fairly trivial changes.
svn path=/trunk/; revision=7518
2008-09-20 04:05:11 +00:00
|
|
|
}
|
2007-12-04 00:47:41 +00:00
|
|
|
|
2007-04-11 13:09:38 +00:00
|
|
|
return retval;
|
|
|
|
}
|
2011-10-02 00:08:54 -04:00
|
|
|
|
|
|
|
/* Hash functions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_str_equal:
|
|
|
|
* @v1: a key
|
|
|
|
* @v2: a key to compare with @v1
|
|
|
|
*
|
|
|
|
* Compares two strings for byte-by-byte equality and returns %TRUE
|
|
|
|
* if they are equal. It can be passed to g_hash_table_new() as the
|
2011-10-04 09:48:35 +01:00
|
|
|
* @key_equal_func parameter, when using non-%NULL strings as keys in a
|
|
|
|
* #GHashTable.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Note that this function is primarily meant as a hash table comparison
|
|
|
|
* function. For a general-purpose, %NULL-safe string comparison function,
|
|
|
|
* see g_strcmp0().
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if the two keys match
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
g_str_equal (gconstpointer v1,
|
|
|
|
gconstpointer v2)
|
|
|
|
{
|
|
|
|
const gchar *string1 = v1;
|
|
|
|
const gchar *string2 = v2;
|
|
|
|
|
|
|
|
return strcmp (string1, string2) == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_str_hash:
|
|
|
|
* @v: a string key
|
|
|
|
*
|
|
|
|
* Converts a string to a hash value.
|
|
|
|
*
|
|
|
|
* This function implements the widely used "djb" hash apparently posted
|
|
|
|
* by Daniel Bernstein to comp.lang.c some time ago. The 32 bit
|
|
|
|
* unsigned hash value starts at 5381 and for each byte 'c' in the
|
|
|
|
* string, is updated: <literal>hash = hash * 33 + c</literal>. This
|
|
|
|
* function uses the signed value of each byte.
|
|
|
|
*
|
|
|
|
* It can be passed to g_hash_table_new() as the @hash_func parameter,
|
2011-10-04 09:48:35 +01:00
|
|
|
* when using non-%NULL strings as keys in a #GHashTable.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Returns: a hash value corresponding to the key
|
|
|
|
*/
|
|
|
|
guint
|
|
|
|
g_str_hash (gconstpointer v)
|
|
|
|
{
|
|
|
|
const signed char *p;
|
|
|
|
guint32 h = 5381;
|
|
|
|
|
|
|
|
for (p = v; *p != '\0'; p++)
|
|
|
|
h = (h << 5) + h + *p;
|
|
|
|
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_direct_hash:
|
2011-10-04 09:44:27 +01:00
|
|
|
* @v: (allow-none): a #gpointer key
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Converts a gpointer to a hash value.
|
2011-10-04 09:44:27 +01:00
|
|
|
* It can be passed to g_hash_table_new() as the @hash_func parameter,
|
|
|
|
* when using opaque pointers compared by pointer value as keys in a
|
|
|
|
* #GHashTable.
|
|
|
|
*
|
|
|
|
* This hash function is also appropriate for keys that are integers stored
|
|
|
|
* in pointers, such as <literal>GINT_TO_POINTER (n)</literal>.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Returns: a hash value corresponding to the key.
|
|
|
|
*/
|
|
|
|
guint
|
|
|
|
g_direct_hash (gconstpointer v)
|
|
|
|
{
|
|
|
|
return GPOINTER_TO_UINT (v);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_direct_equal:
|
2011-10-04 09:44:27 +01:00
|
|
|
* @v1: (allow-none): a key
|
|
|
|
* @v2: (allow-none): a key to compare with @v1
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Compares two #gpointer arguments and returns %TRUE if they are equal.
|
|
|
|
* It can be passed to g_hash_table_new() as the @key_equal_func
|
2011-10-04 09:44:27 +01:00
|
|
|
* parameter, when using opaque pointers compared by pointer value as keys
|
|
|
|
* in a #GHashTable.
|
|
|
|
*
|
|
|
|
* This equality function is also appropriate for keys that are integers stored
|
|
|
|
* in pointers, such as <literal>GINT_TO_POINTER (n)</literal>.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Returns: %TRUE if the two keys match.
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
g_direct_equal (gconstpointer v1,
|
|
|
|
gconstpointer v2)
|
|
|
|
{
|
|
|
|
return v1 == v2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_int_equal:
|
|
|
|
* @v1: a pointer to a #gint key
|
|
|
|
* @v2: a pointer to a #gint key to compare with @v1
|
|
|
|
*
|
|
|
|
* Compares the two #gint values being pointed to and returns
|
|
|
|
* %TRUE if they are equal.
|
|
|
|
* It can be passed to g_hash_table_new() as the @key_equal_func
|
2011-10-04 09:48:35 +01:00
|
|
|
* parameter, when using non-%NULL pointers to integers as keys in a
|
|
|
|
* #GHashTable.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
2011-10-04 09:42:28 +01:00
|
|
|
* Note that this function acts on pointers to #gint, not on #gint directly:
|
|
|
|
* if your hash table's keys are of the form
|
|
|
|
* <literal>GINT_TO_POINTER (n)</literal>, use g_direct_equal() instead.
|
|
|
|
*
|
2011-10-02 00:08:54 -04:00
|
|
|
* Returns: %TRUE if the two keys match.
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
g_int_equal (gconstpointer v1,
|
|
|
|
gconstpointer v2)
|
|
|
|
{
|
|
|
|
return *((const gint*) v1) == *((const gint*) v2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_int_hash:
|
|
|
|
* @v: a pointer to a #gint key
|
|
|
|
*
|
|
|
|
* Converts a pointer to a #gint to a hash value.
|
|
|
|
* It can be passed to g_hash_table_new() as the @hash_func parameter,
|
2011-10-04 09:48:35 +01:00
|
|
|
* when using non-%NULL pointers to integer values as keys in a #GHashTable.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
2011-10-04 09:42:28 +01:00
|
|
|
* Note that this function acts on pointers to #gint, not on #gint directly:
|
|
|
|
* if your hash table's keys are of the form
|
|
|
|
* <literal>GINT_TO_POINTER (n)</literal>, use g_direct_hash() instead.
|
|
|
|
*
|
2011-10-02 00:08:54 -04:00
|
|
|
* Returns: a hash value corresponding to the key.
|
|
|
|
*/
|
|
|
|
guint
|
|
|
|
g_int_hash (gconstpointer v)
|
|
|
|
{
|
|
|
|
return *(const gint*) v;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_int64_equal:
|
|
|
|
* @v1: a pointer to a #gint64 key
|
|
|
|
* @v2: a pointer to a #gint64 key to compare with @v1
|
|
|
|
*
|
|
|
|
* Compares the two #gint64 values being pointed to and returns
|
|
|
|
* %TRUE if they are equal.
|
|
|
|
* It can be passed to g_hash_table_new() as the @key_equal_func
|
2011-10-04 09:48:35 +01:00
|
|
|
* parameter, when using non-%NULL pointers to 64-bit integers as keys in a
|
|
|
|
* #GHashTable.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Returns: %TRUE if the two keys match.
|
|
|
|
*
|
|
|
|
* Since: 2.22
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
g_int64_equal (gconstpointer v1,
|
|
|
|
gconstpointer v2)
|
|
|
|
{
|
|
|
|
return *((const gint64*) v1) == *((const gint64*) v2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_int64_hash:
|
|
|
|
* @v: a pointer to a #gint64 key
|
|
|
|
*
|
|
|
|
* Converts a pointer to a #gint64 to a hash value.
|
2011-10-04 09:48:35 +01:00
|
|
|
*
|
2011-10-02 00:08:54 -04:00
|
|
|
* It can be passed to g_hash_table_new() as the @hash_func parameter,
|
2011-10-04 09:48:35 +01:00
|
|
|
* when using non-%NULL pointers to 64-bit integer values as keys in a
|
|
|
|
* #GHashTable.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Returns: a hash value corresponding to the key.
|
|
|
|
*
|
|
|
|
* Since: 2.22
|
|
|
|
*/
|
|
|
|
guint
|
|
|
|
g_int64_hash (gconstpointer v)
|
|
|
|
{
|
|
|
|
return (guint) *(const gint64*) v;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_double_equal:
|
|
|
|
* @v1: a pointer to a #gdouble key
|
|
|
|
* @v2: a pointer to a #gdouble key to compare with @v1
|
|
|
|
*
|
|
|
|
* Compares the two #gdouble values being pointed to and returns
|
|
|
|
* %TRUE if they are equal.
|
|
|
|
* It can be passed to g_hash_table_new() as the @key_equal_func
|
2011-10-04 09:48:35 +01:00
|
|
|
* parameter, when using non-%NULL pointers to doubles as keys in a
|
|
|
|
* #GHashTable.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Returns: %TRUE if the two keys match.
|
|
|
|
*
|
|
|
|
* Since: 2.22
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
g_double_equal (gconstpointer v1,
|
|
|
|
gconstpointer v2)
|
|
|
|
{
|
|
|
|
return *((const gdouble*) v1) == *((const gdouble*) v2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_double_hash:
|
|
|
|
* @v: a pointer to a #gdouble key
|
|
|
|
*
|
|
|
|
* Converts a pointer to a #gdouble to a hash value.
|
|
|
|
* It can be passed to g_hash_table_new() as the @hash_func parameter,
|
2011-10-04 09:48:35 +01:00
|
|
|
* It can be passed to g_hash_table_new() as the @hash_func parameter,
|
|
|
|
* when using non-%NULL pointers to doubles as keys in a #GHashTable.
|
2011-10-02 00:08:54 -04:00
|
|
|
*
|
|
|
|
* Returns: a hash value corresponding to the key.
|
|
|
|
*
|
|
|
|
* Since: 2.22
|
|
|
|
*/
|
|
|
|
guint
|
|
|
|
g_double_hash (gconstpointer v)
|
|
|
|
{
|
|
|
|
return (guint) *(const gdouble*) v;
|
|
|
|
}
|