1999-10-15 09:50:25 +02:00
|
|
|
/* An expandable hash tables datatype.
|
2001-03-15 21:14:33 +01:00
|
|
|
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
|
1999-10-15 09:50:25 +02:00
|
|
|
Contributed by Vladimir Makarov (vmakarov@cygnus.com).
|
|
|
|
|
|
|
|
This file is part of the libiberty library.
|
|
|
|
Libiberty is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
Libiberty is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with libiberty; see the file COPYING.LIB. If
|
|
|
|
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
/* This package implements basic hash table functionality. It is possible
|
|
|
|
to search for an entry, create an entry and destroy an entry.
|
|
|
|
|
|
|
|
Elements in the table are generic pointers.
|
|
|
|
|
|
|
|
The size of the table is not fixed; if the occupancy of the table
|
|
|
|
grows too high the hash table will be expanded.
|
|
|
|
|
|
|
|
The abstract data implementation is based on generalized Algorithm D
|
|
|
|
from Knuth's book "The art of computer programming". Hash table is
|
|
|
|
expanded by creation of new hash table and transferring elements from
|
|
|
|
the old table to the new table. */
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
1999-11-28 08:58:37 +01:00
|
|
|
#include <sys/types.h>
|
|
|
|
|
1999-10-15 09:50:25 +02:00
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
|
2000-05-29 21:33:52 +02:00
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
|
1999-11-10 17:45:34 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
|
1999-10-15 09:50:25 +02:00
|
|
|
#include "libiberty.h"
|
|
|
|
#include "hashtab.h"
|
|
|
|
|
|
|
|
/* This macro defines reserved value for empty table entry. */
|
|
|
|
|
2000-11-03 21:26:51 +01:00
|
|
|
#define EMPTY_ENTRY ((PTR) 0)
|
1999-10-15 09:50:25 +02:00
|
|
|
|
|
|
|
/* This macro defines reserved value for table entry which contained
|
|
|
|
a deleted element. */
|
|
|
|
|
2000-11-03 21:26:51 +01:00
|
|
|
#define DELETED_ENTRY ((PTR) 1)
|
1999-10-15 09:50:25 +02:00
|
|
|
|
2000-03-29 21:04:54 +02:00
|
|
|
static unsigned long higher_prime_number PARAMS ((unsigned long));
|
2000-04-24 09:29:11 +02:00
|
|
|
static hashval_t hash_pointer PARAMS ((const void *));
|
|
|
|
static int eq_pointer PARAMS ((const void *, const void *));
|
2000-11-04 08:42:53 +01:00
|
|
|
static int htab_expand PARAMS ((htab_t));
|
2000-11-03 21:26:51 +01:00
|
|
|
static PTR *find_empty_slot_for_expand PARAMS ((htab_t, hashval_t));
|
2000-04-24 09:29:11 +02:00
|
|
|
|
|
|
|
/* At some point, we could make these be NULL, and modify the
|
|
|
|
hash-table routines to handle NULL specially; that would avoid
|
|
|
|
function-call overhead for the common case of hashing pointers. */
|
|
|
|
htab_hash htab_hash_pointer = hash_pointer;
|
|
|
|
htab_eq htab_eq_pointer = eq_pointer;
|
2000-03-29 21:04:54 +02:00
|
|
|
|
2000-11-27 05:23:38 +01:00
|
|
|
/* The following function returns a nearest prime number which is
|
|
|
|
greater than N, and near a power of two. */
|
1999-10-15 09:50:25 +02:00
|
|
|
|
|
|
|
static unsigned long
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
higher_prime_number (n)
|
|
|
|
unsigned long n;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
2000-11-27 05:23:38 +01:00
|
|
|
/* These are primes that are near, but slightly smaller than, a
|
|
|
|
power of two. */
|
|
|
|
static unsigned long primes[] = {
|
2001-03-15 21:24:59 +01:00
|
|
|
(unsigned long) 2,
|
|
|
|
(unsigned long) 7,
|
|
|
|
(unsigned long) 13,
|
|
|
|
(unsigned long) 31,
|
|
|
|
(unsigned long) 61,
|
|
|
|
(unsigned long) 127,
|
|
|
|
(unsigned long) 251,
|
|
|
|
(unsigned long) 509,
|
|
|
|
(unsigned long) 1021,
|
|
|
|
(unsigned long) 2039,
|
|
|
|
(unsigned long) 4093,
|
|
|
|
(unsigned long) 8191,
|
|
|
|
(unsigned long) 16381,
|
|
|
|
(unsigned long) 32749,
|
|
|
|
(unsigned long) 65521,
|
|
|
|
(unsigned long) 131071,
|
|
|
|
(unsigned long) 262139,
|
|
|
|
(unsigned long) 524287,
|
|
|
|
(unsigned long) 1048573,
|
|
|
|
(unsigned long) 2097143,
|
|
|
|
(unsigned long) 4194301,
|
|
|
|
(unsigned long) 8388593,
|
|
|
|
(unsigned long) 16777213,
|
|
|
|
(unsigned long) 33554393,
|
|
|
|
(unsigned long) 67108859,
|
|
|
|
(unsigned long) 134217689,
|
|
|
|
(unsigned long) 268435399,
|
|
|
|
(unsigned long) 536870909,
|
|
|
|
(unsigned long) 1073741789,
|
|
|
|
(unsigned long) 2147483647,
|
|
|
|
/* 4294967291L */
|
2001-03-15 22:41:13 +01:00
|
|
|
((unsigned long) 2147483647) + ((unsigned long) 2147483644),
|
2000-11-27 05:23:38 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
unsigned long* low = &primes[0];
|
|
|
|
unsigned long* high = &primes[sizeof(primes) / sizeof(primes[0])];
|
|
|
|
|
|
|
|
while (low != high)
|
|
|
|
{
|
|
|
|
unsigned long* mid = low + (high - low) / 2;
|
|
|
|
if (n > *mid)
|
|
|
|
low = mid + 1;
|
|
|
|
else
|
|
|
|
high = mid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we've run out of primes, abort. */
|
|
|
|
if (n > *low)
|
|
|
|
{
|
|
|
|
fprintf (stderr, "Cannot find prime bigger than %lu\n", n);
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
|
|
|
|
return *low;
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|
|
|
|
|
2000-04-24 09:29:11 +02:00
|
|
|
/* Returns a hash code for P. */
|
|
|
|
|
2000-04-25 00:29:09 +02:00
|
|
|
static hashval_t
|
2000-04-24 09:29:11 +02:00
|
|
|
hash_pointer (p)
|
2000-11-03 21:26:51 +01:00
|
|
|
const PTR p;
|
2000-04-24 09:29:11 +02:00
|
|
|
{
|
2000-05-16 18:59:20 +02:00
|
|
|
return (hashval_t) ((long)p >> 3);
|
2000-04-24 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns non-zero if P1 and P2 are equal. */
|
|
|
|
|
2000-04-25 00:29:09 +02:00
|
|
|
static int
|
2000-04-24 09:29:11 +02:00
|
|
|
eq_pointer (p1, p2)
|
2000-11-03 21:26:51 +01:00
|
|
|
const PTR p1;
|
|
|
|
const PTR p2;
|
2000-04-24 09:29:11 +02:00
|
|
|
{
|
|
|
|
return p1 == p2;
|
|
|
|
}
|
|
|
|
|
1999-10-15 09:50:25 +02:00
|
|
|
/* This function creates table with length slightly longer than given
|
|
|
|
source length. Created hash table is initiated as empty (all the
|
|
|
|
hash table entries are EMPTY_ENTRY). The function returns the
|
2000-11-04 08:42:53 +01:00
|
|
|
created hash table. Memory allocation must not fail. */
|
1999-10-15 09:50:25 +02:00
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_t
|
2000-03-10 01:00:24 +01:00
|
|
|
htab_create (size, hash_f, eq_f, del_f)
|
1999-10-15 09:50:25 +02:00
|
|
|
size_t size;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_hash hash_f;
|
|
|
|
htab_eq eq_f;
|
2000-03-10 01:00:24 +01:00
|
|
|
htab_del del_f;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_t result;
|
1999-10-15 09:50:25 +02:00
|
|
|
|
|
|
|
size = higher_prime_number (size);
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
result = (htab_t) xcalloc (1, sizeof (struct htab));
|
2000-11-03 21:26:51 +01:00
|
|
|
result->entries = (PTR *) xcalloc (size, sizeof (PTR));
|
1999-10-15 09:50:25 +02:00
|
|
|
result->size = size;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
result->hash_f = hash_f;
|
|
|
|
result->eq_f = eq_f;
|
2000-03-10 01:00:24 +01:00
|
|
|
result->del_f = del_f;
|
2000-11-04 08:42:53 +01:00
|
|
|
result->return_allocation_failure = 0;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This function creates table with length slightly longer than given
|
|
|
|
source length. The created hash table is initiated as empty (all the
|
|
|
|
hash table entries are EMPTY_ENTRY). The function returns the created
|
|
|
|
hash table. Memory allocation may fail; it may return NULL. */
|
|
|
|
|
|
|
|
htab_t
|
|
|
|
htab_try_create (size, hash_f, eq_f, del_f)
|
|
|
|
size_t size;
|
|
|
|
htab_hash hash_f;
|
|
|
|
htab_eq eq_f;
|
|
|
|
htab_del del_f;
|
|
|
|
{
|
|
|
|
htab_t result;
|
|
|
|
|
|
|
|
size = higher_prime_number (size);
|
|
|
|
result = (htab_t) calloc (1, sizeof (struct htab));
|
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
result->entries = (PTR *) calloc (size, sizeof (PTR));
|
|
|
|
if (result->entries == NULL)
|
|
|
|
{
|
|
|
|
free (result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
result->size = size;
|
|
|
|
result->hash_f = hash_f;
|
|
|
|
result->eq_f = eq_f;
|
|
|
|
result->del_f = del_f;
|
|
|
|
result->return_allocation_failure = 1;
|
1999-10-15 09:50:25 +02:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This function frees all memory allocated for given hash table.
|
|
|
|
Naturally the hash table must already exist. */
|
|
|
|
|
|
|
|
void
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_delete (htab)
|
|
|
|
htab_t htab;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
2000-03-10 01:00:24 +01:00
|
|
|
int i;
|
2000-04-18 22:42:00 +02:00
|
|
|
|
2000-03-10 01:00:24 +01:00
|
|
|
if (htab->del_f)
|
|
|
|
for (i = htab->size - 1; i >= 0; i--)
|
2000-04-18 22:42:00 +02:00
|
|
|
if (htab->entries[i] != EMPTY_ENTRY
|
|
|
|
&& htab->entries[i] != DELETED_ENTRY)
|
|
|
|
(*htab->del_f) (htab->entries[i]);
|
2000-03-10 01:00:24 +01:00
|
|
|
|
1999-10-15 09:50:25 +02:00
|
|
|
free (htab->entries);
|
|
|
|
free (htab);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This function clears all entries in the given hash table. */
|
|
|
|
|
|
|
|
void
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_empty (htab)
|
|
|
|
htab_t htab;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
2000-03-10 01:00:24 +01:00
|
|
|
int i;
|
2000-04-18 22:42:00 +02:00
|
|
|
|
2000-03-10 01:00:24 +01:00
|
|
|
if (htab->del_f)
|
|
|
|
for (i = htab->size - 1; i >= 0; i--)
|
2000-04-18 22:42:00 +02:00
|
|
|
if (htab->entries[i] != EMPTY_ENTRY
|
|
|
|
&& htab->entries[i] != DELETED_ENTRY)
|
|
|
|
(*htab->del_f) (htab->entries[i]);
|
2000-03-10 01:00:24 +01:00
|
|
|
|
2000-11-03 21:26:51 +01:00
|
|
|
memset (htab->entries, 0, htab->size * sizeof (PTR));
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|
|
|
|
|
2000-03-14 19:28:45 +01:00
|
|
|
/* Similar to htab_find_slot, but without several unwanted side effects:
|
|
|
|
- Does not call htab->eq_f when it finds an existing entry.
|
|
|
|
- Does not change the count of elements/searches/collisions in the
|
|
|
|
hash table.
|
|
|
|
This function also assumes there are no deleted entries in the table.
|
|
|
|
HASH is the hash value for the element to be inserted. */
|
2000-04-18 22:42:00 +02:00
|
|
|
|
2000-11-03 21:26:51 +01:00
|
|
|
static PTR *
|
2000-03-14 19:28:45 +01:00
|
|
|
find_empty_slot_for_expand (htab, hash)
|
|
|
|
htab_t htab;
|
2000-03-31 09:04:37 +02:00
|
|
|
hashval_t hash;
|
2000-03-14 19:28:45 +01:00
|
|
|
{
|
|
|
|
size_t size = htab->size;
|
2000-03-31 09:04:37 +02:00
|
|
|
hashval_t hash2 = 1 + hash % (size - 2);
|
2000-03-14 19:28:45 +01:00
|
|
|
unsigned int index = hash % size;
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *slot = htab->entries + index;
|
2000-04-18 22:42:00 +02:00
|
|
|
|
2000-03-14 19:28:45 +01:00
|
|
|
if (*slot == EMPTY_ENTRY)
|
|
|
|
return slot;
|
2000-04-18 22:42:00 +02:00
|
|
|
else if (*slot == DELETED_ENTRY)
|
2000-03-14 19:28:45 +01:00
|
|
|
abort ();
|
|
|
|
|
|
|
|
index += hash2;
|
|
|
|
if (index >= size)
|
|
|
|
index -= size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-10-15 09:50:25 +02:00
|
|
|
/* The following function changes size of memory allocated for the
|
|
|
|
entries and repeatedly inserts the table elements. The occupancy
|
|
|
|
of the table after the call will be about 50%. Naturally the hash
|
|
|
|
table must already exist. Remember also that the place of the
|
2000-11-04 08:42:53 +01:00
|
|
|
table entries is changed. If memory allocation failures are allowed,
|
|
|
|
this function will return zero, indicating that the table could not be
|
|
|
|
expanded. If all goes well, it will return a non-zero value. */
|
1999-10-15 09:50:25 +02:00
|
|
|
|
2000-11-04 08:42:53 +01:00
|
|
|
static int
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_expand (htab)
|
|
|
|
htab_t htab;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *oentries;
|
|
|
|
PTR *olimit;
|
|
|
|
PTR *p;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
|
|
|
|
oentries = htab->entries;
|
|
|
|
olimit = oentries + htab->size;
|
|
|
|
|
|
|
|
htab->size = higher_prime_number (htab->size * 2);
|
2000-11-04 08:42:53 +01:00
|
|
|
|
|
|
|
if (htab->return_allocation_failure)
|
|
|
|
{
|
|
|
|
PTR *nentries = (PTR *) calloc (htab->size, sizeof (PTR *));
|
|
|
|
if (nentries == NULL)
|
|
|
|
return 0;
|
|
|
|
htab->entries = nentries;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
htab->entries = (PTR *) xcalloc (htab->size, sizeof (PTR *));
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
|
|
|
|
htab->n_elements -= htab->n_deleted;
|
|
|
|
htab->n_deleted = 0;
|
|
|
|
|
|
|
|
p = oentries;
|
|
|
|
do
|
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR x = *p;
|
2000-04-18 22:42:00 +02:00
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
if (x != EMPTY_ENTRY && x != DELETED_ENTRY)
|
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *q = find_empty_slot_for_expand (htab, (*htab->hash_f) (x));
|
2000-04-18 22:42:00 +02:00
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
*q = x;
|
|
|
|
}
|
2000-04-18 22:42:00 +02:00
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
p++;
|
|
|
|
}
|
|
|
|
while (p < olimit);
|
2000-04-18 22:42:00 +02:00
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
free (oentries);
|
2000-11-04 08:42:53 +01:00
|
|
|
return 1;
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
/* This function searches for a hash table entry equal to the given
|
|
|
|
element. It cannot be used to insert or delete an element. */
|
|
|
|
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR
|
2000-03-14 19:28:45 +01:00
|
|
|
htab_find_with_hash (htab, element, hash)
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_t htab;
|
2000-11-03 21:26:51 +01:00
|
|
|
const PTR element;
|
2000-03-31 09:04:37 +02:00
|
|
|
hashval_t hash;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
2000-03-31 09:04:37 +02:00
|
|
|
unsigned int index;
|
|
|
|
hashval_t hash2;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
size_t size;
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR entry;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
|
|
|
|
htab->searches++;
|
|
|
|
size = htab->size;
|
|
|
|
index = hash % size;
|
1999-10-15 09:50:25 +02:00
|
|
|
|
2000-03-29 21:04:54 +02:00
|
|
|
entry = htab->entries[index];
|
|
|
|
if (entry == EMPTY_ENTRY
|
|
|
|
|| (entry != DELETED_ENTRY && (*htab->eq_f) (entry, element)))
|
|
|
|
return entry;
|
|
|
|
|
|
|
|
hash2 = 1 + hash % (size - 2);
|
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
for (;;)
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab->collisions++;
|
|
|
|
index += hash2;
|
|
|
|
if (index >= size)
|
|
|
|
index -= size;
|
2000-03-29 21:04:54 +02:00
|
|
|
|
|
|
|
entry = htab->entries[index];
|
|
|
|
if (entry == EMPTY_ENTRY
|
|
|
|
|| (entry != DELETED_ENTRY && (*htab->eq_f) (entry, element)))
|
|
|
|
return entry;
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
}
|
|
|
|
|
2000-03-14 19:28:45 +01:00
|
|
|
/* Like htab_find_slot_with_hash, but compute the hash value from the
|
|
|
|
element. */
|
2000-04-18 22:42:00 +02:00
|
|
|
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR
|
2000-03-14 19:28:45 +01:00
|
|
|
htab_find (htab, element)
|
|
|
|
htab_t htab;
|
2000-11-03 21:26:51 +01:00
|
|
|
const PTR element;
|
2000-03-14 19:28:45 +01:00
|
|
|
{
|
|
|
|
return htab_find_with_hash (htab, element, (*htab->hash_f) (element));
|
|
|
|
}
|
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
/* This function searches for a hash table slot containing an entry
|
|
|
|
equal to the given element. To delete an entry, call this with
|
|
|
|
INSERT = 0, then call htab_clear_slot on the slot returned (possibly
|
|
|
|
after doing some checks). To insert an entry, call this with
|
2000-11-04 08:42:53 +01:00
|
|
|
INSERT = 1, then write the value you want into the returned slot.
|
|
|
|
When inserting an entry, NULL may be returned if memory allocation
|
|
|
|
fails. */
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *
|
2000-03-14 19:28:45 +01:00
|
|
|
htab_find_slot_with_hash (htab, element, hash, insert)
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_t htab;
|
2000-11-03 21:26:51 +01:00
|
|
|
const PTR element;
|
2000-03-31 09:04:37 +02:00
|
|
|
hashval_t hash;
|
2000-04-18 22:42:00 +02:00
|
|
|
enum insert_option insert;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *first_deleted_slot;
|
2000-03-31 09:04:37 +02:00
|
|
|
unsigned int index;
|
|
|
|
hashval_t hash2;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
size_t size;
|
|
|
|
|
2000-11-04 08:42:53 +01:00
|
|
|
if (insert == INSERT && htab->size * 3 <= htab->n_elements * 4
|
|
|
|
&& htab_expand (htab) == 0)
|
|
|
|
return NULL;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
|
|
|
|
size = htab->size;
|
|
|
|
hash2 = 1 + hash % (size - 2);
|
|
|
|
index = hash % size;
|
|
|
|
|
1999-10-15 09:50:25 +02:00
|
|
|
htab->searches++;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
first_deleted_slot = NULL;
|
|
|
|
|
|
|
|
for (;;)
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR entry = htab->entries[index];
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
if (entry == EMPTY_ENTRY)
|
|
|
|
{
|
2000-04-18 22:42:00 +02:00
|
|
|
if (insert == NO_INSERT)
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
htab->n_elements++;
|
|
|
|
|
|
|
|
if (first_deleted_slot)
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
*first_deleted_slot = EMPTY_ENTRY;
|
|
|
|
return first_deleted_slot;
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
|
|
|
|
return &htab->entries[index];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (entry == DELETED_ENTRY)
|
|
|
|
{
|
|
|
|
if (!first_deleted_slot)
|
|
|
|
first_deleted_slot = &htab->entries[index];
|
|
|
|
}
|
2000-04-18 22:42:00 +02:00
|
|
|
else if ((*htab->eq_f) (entry, element))
|
|
|
|
return &htab->entries[index];
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
|
|
|
|
htab->collisions++;
|
|
|
|
index += hash2;
|
|
|
|
if (index >= size)
|
|
|
|
index -= size;
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-03-14 19:28:45 +01:00
|
|
|
/* Like htab_find_slot_with_hash, but compute the hash value from the
|
|
|
|
element. */
|
2000-04-18 22:42:00 +02:00
|
|
|
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *
|
2000-03-14 19:28:45 +01:00
|
|
|
htab_find_slot (htab, element, insert)
|
|
|
|
htab_t htab;
|
2000-11-03 21:26:51 +01:00
|
|
|
const PTR element;
|
2000-04-18 22:42:00 +02:00
|
|
|
enum insert_option insert;
|
2000-03-14 19:28:45 +01:00
|
|
|
{
|
|
|
|
return htab_find_slot_with_hash (htab, element, (*htab->hash_f) (element),
|
|
|
|
insert);
|
|
|
|
}
|
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
/* This function deletes an element with the given value from hash
|
|
|
|
table. If there is no matching element in the hash table, this
|
|
|
|
function does nothing. */
|
1999-10-15 09:50:25 +02:00
|
|
|
|
|
|
|
void
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_remove_elt (htab, element)
|
|
|
|
htab_t htab;
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR element;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *slot;
|
1999-10-15 09:50:25 +02:00
|
|
|
|
2000-04-18 22:42:00 +02:00
|
|
|
slot = htab_find_slot (htab, element, NO_INSERT);
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
if (*slot == EMPTY_ENTRY)
|
|
|
|
return;
|
|
|
|
|
2000-03-10 01:00:24 +01:00
|
|
|
if (htab->del_f)
|
|
|
|
(*htab->del_f) (*slot);
|
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
*slot = DELETED_ENTRY;
|
|
|
|
htab->n_deleted++;
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
/* This function clears a specified slot in a hash table. It is
|
|
|
|
useful when you've already done the lookup and don't want to do it
|
|
|
|
again. */
|
1999-10-23 17:56:52 +02:00
|
|
|
|
|
|
|
void
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_clear_slot (htab, slot)
|
|
|
|
htab_t htab;
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *slot;
|
1999-10-23 17:56:52 +02:00
|
|
|
{
|
|
|
|
if (slot < htab->entries || slot >= htab->entries + htab->size
|
|
|
|
|| *slot == EMPTY_ENTRY || *slot == DELETED_ENTRY)
|
|
|
|
abort ();
|
2000-04-18 22:42:00 +02:00
|
|
|
|
2000-03-10 01:00:24 +01:00
|
|
|
if (htab->del_f)
|
|
|
|
(*htab->del_f) (*slot);
|
2000-04-18 22:42:00 +02:00
|
|
|
|
1999-10-23 17:56:52 +02:00
|
|
|
*slot = DELETED_ENTRY;
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab->n_deleted++;
|
1999-10-23 17:56:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This function scans over the entire hash table calling
|
|
|
|
CALLBACK for each live entry. If CALLBACK returns false,
|
|
|
|
the iteration stops. INFO is passed as CALLBACK's second
|
|
|
|
argument. */
|
|
|
|
|
|
|
|
void
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_traverse (htab, callback, info)
|
|
|
|
htab_t htab;
|
|
|
|
htab_trav callback;
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR info;
|
1999-10-23 17:56:52 +02:00
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR *slot = htab->entries;
|
|
|
|
PTR *limit = slot + htab->size;
|
2000-04-18 22:42:00 +02:00
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
do
|
|
|
|
{
|
2000-11-03 21:26:51 +01:00
|
|
|
PTR x = *slot;
|
2000-04-18 22:42:00 +02:00
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
if (x != EMPTY_ENTRY && x != DELETED_ENTRY)
|
2000-03-14 19:28:45 +01:00
|
|
|
if (!(*callback) (slot, info))
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
while (++slot < limit);
|
1999-10-23 17:56:52 +02:00
|
|
|
}
|
|
|
|
|
2000-04-18 22:42:00 +02:00
|
|
|
/* Return the current size of given hash table. */
|
1999-10-15 09:50:25 +02:00
|
|
|
|
|
|
|
size_t
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_size (htab)
|
|
|
|
htab_t htab;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
|
|
|
return htab->size;
|
|
|
|
}
|
|
|
|
|
2000-04-18 22:42:00 +02:00
|
|
|
/* Return the current number of elements in given hash table. */
|
1999-10-15 09:50:25 +02:00
|
|
|
|
|
|
|
size_t
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
htab_elements (htab)
|
|
|
|
htab_t htab;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
return htab->n_elements - htab->n_deleted;
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|
|
|
|
|
2000-04-18 22:42:00 +02:00
|
|
|
/* Return the fraction of fixed collisions during all work with given
|
|
|
|
hash table. */
|
1999-10-15 09:50:25 +02:00
|
|
|
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
double
|
|
|
|
htab_collisions (htab)
|
|
|
|
htab_t htab;
|
1999-10-15 09:50:25 +02:00
|
|
|
{
|
2000-04-18 22:42:00 +02:00
|
|
|
if (htab->searches == 0)
|
hashtab.c: Remove debugging variables (all_searches, all_collisions, all_expansions).
* hashtab.c: Remove debugging variables (all_searches,
all_collisions, all_expansions). Delete
all_hash_table_collisions.
(create_hash_table, delete_hash_table, empty_hash_table,
find_hash_table_entry, remove_element_from_hash_table_entry,
clear_hash_table_slot, traverse_hash_table, hash_table_size,
hash_table_elements_number, hash_table_collisions): Rename to:
htab_create, htab_delete, htab_empty, htab_find_slot,
htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
htab_elements, htab_collisions.
(htab_find): New function, handles common case where you don't
plan to add or delete an entry.
(htab_expand): Don't create a whole new table, just a new
entry vector.
(htab_find_slot): Simplify logic.
* hashtab.h (hash_table_t): Rename to htab_t.
(struct hash_table): Rename to struct htab. Shorten element
names. Reorder elements by size.
(htab_hash, htab_eq, htab_trav): New typedefs for the callback
function pointers.
(hash_table_entry_t): Discard; just use void * for element
type.
From-SVN: r32437
2000-03-09 00:44:29 +01:00
|
|
|
return 0.0;
|
2000-04-18 22:42:00 +02:00
|
|
|
|
|
|
|
return (double) htab->collisions / (double) htab->searches;
|
1999-10-15 09:50:25 +02:00
|
|
|
}
|