Skip to content

Commit

Permalink
* hashtab.c (htab_size): Move to top of file; mark inline.
Browse files Browse the repository at this point in the history 
        (htab_elements): Likewise.
        (htab_mod, htab_mod_m2): New.
        (htab_delete): Refactor htab->size and htab->entries.
        (htab_empty): Likewise.
        (find_empty_slot_for_expand): Use htab_size, htab_mod, htab_mod_m2.
        (htab_find_with_hash, htab_find_slot_with_hash): Likewise.
        (htab_clear_slot): Use htab_size, htab_elements.
        (htab_traverse_noresize, htab_traverse): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80278 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
rth committed Apr 1, 2004
1 parent 0a561da commit dd070f6
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 49 deletions.
12 changes: 12 additions & 0 deletions libiberty/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
2004-03-31 Richard Henderson <rth@redhat.com>

* hashtab.c (htab_size): Move to top of file; mark inline.
(htab_elements): Likewise.
(htab_mod, htab_mod_m2): New.
(htab_delete): Refactor htab->size and htab->entries.
(htab_empty): Likewise.
(find_empty_slot_for_expand): Use htab_size, htab_mod, htab_mod_m2.
(htab_find_with_hash, htab_find_slot_with_hash): Likewise.
(htab_clear_slot): Use htab_size, htab_elements.
(htab_traverse_noresize, htab_traverse): Likewise.

2004-03-17 Ian Lance Taylor <ian@wasabisystems.com>

* pex-unix.c (pexecute): Use vfork instead of fork, with
Expand Down
120 changes: 71 additions & 49 deletions libiberty/hashtab.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,44 @@ eq_pointer (p1, p2)
return p1 == p2;
}

/* Return the current size of given hash table. */

inline size_t
htab_size (htab)
htab_t htab;
{
return htab->size;
}

/* Return the current number of elements in given hash table. */

inline size_t
htab_elements (htab)
htab_t htab;
{
return htab->n_elements - htab->n_deleted;
}

/* Compute the primary hash for HASH given HTAB's current size. */

static inline hashval_t
htab_mod (hash, htab)
hashval_t hash;
htab_t htab;
{
return hash % htab_size (htab);
}

/* Compute the secondary hash for HASH given HTAB's current size. */

static inline hashval_t
htab_mod_m2 (hash, htab)
hashval_t hash;
htab_t htab;
{
return 1 + hash % (htab_size (htab) - 2);
}

/* 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
Expand Down Expand Up @@ -282,22 +320,23 @@ void
htab_delete (htab)
htab_t htab;
{
size_t size = htab_size (htab);
PTR *entries = htab->entries;
int i;

if (htab->del_f)
for (i = htab->size - 1; i >= 0; i--)
if (htab->entries[i] != EMPTY_ENTRY
&& htab->entries[i] != DELETED_ENTRY)
(*htab->del_f) (htab->entries[i]);
for (i = size - 1; i >= 0; i--)
if (entries[i] != EMPTY_ENTRY && entries[i] != DELETED_ENTRY)
(*htab->del_f) (entries[i]);

if (htab->free_f != NULL)
{
(*htab->free_f) (htab->entries);
(*htab->free_f) (entries);
(*htab->free_f) (htab);
}
else if (htab->free_with_arg_f != NULL)
{
(*htab->free_with_arg_f) (htab->alloc_arg, htab->entries);
(*htab->free_with_arg_f) (htab->alloc_arg, entries);
(*htab->free_with_arg_f) (htab->alloc_arg, htab);
}
}
Expand All @@ -308,15 +347,16 @@ void
htab_empty (htab)
htab_t htab;
{
size_t size = htab_size (htab);
PTR *entries = htab->entries;
int i;

if (htab->del_f)
for (i = htab->size - 1; i >= 0; i--)
if (htab->entries[i] != EMPTY_ENTRY
&& htab->entries[i] != DELETED_ENTRY)
(*htab->del_f) (htab->entries[i]);
for (i = size - 1; i >= 0; i--)
if (entries[i] != EMPTY_ENTRY && entries[i] != DELETED_ENTRY)
(*htab->del_f) (entries[i]);

memset (htab->entries, 0, htab->size * sizeof (PTR));
memset (entries, 0, size * sizeof (PTR));
}

/* Similar to htab_find_slot, but without several unwanted side effects:
Expand All @@ -331,8 +371,8 @@ find_empty_slot_for_expand (htab, hash)
htab_t htab;
hashval_t hash;
{
size_t size = htab->size;
unsigned int index = hash % size;
hashval_t index = htab_mod (hash, htab);
size_t size = htab_size (htab);
PTR *slot = htab->entries + index;
hashval_t hash2;

Expand All @@ -341,7 +381,7 @@ find_empty_slot_for_expand (htab, hash)
else if (*slot == DELETED_ENTRY)
abort ();

hash2 = 1 + hash % (size - 2);
hash2 = htab_mod_m2 (hash, htab);
for (;;)
{
index += hash2;
Expand Down Expand Up @@ -431,22 +471,20 @@ htab_find_with_hash (htab, element, hash)
const PTR element;
hashval_t hash;
{
unsigned int index;
hashval_t hash2;
hashval_t index, hash2;
size_t size;
PTR entry;

htab->searches++;
size = htab->size;
index = hash % size;
size = htab_size (htab);
index = htab_mod (hash, htab);

entry = htab->entries[index];
if (entry == EMPTY_ENTRY
|| (entry != DELETED_ENTRY && (*htab->eq_f) (entry, element)))
return entry;

hash2 = 1 + hash % (size - 2);

hash2 = htab_mod_m2 (hash, htab);
for (;;)
{
htab->collisions++;
Expand Down Expand Up @@ -488,17 +526,19 @@ htab_find_slot_with_hash (htab, element, hash, insert)
enum insert_option insert;
{
PTR *first_deleted_slot;
unsigned int index;
hashval_t hash2;
hashval_t index, hash2;
size_t size;
PTR entry;

if (insert == INSERT && htab->size * 3 <= htab->n_elements * 4
&& htab_expand (htab) == 0)
return NULL;
size = htab_size (htab);
if (insert == INSERT && size * 3 <= htab->n_elements * 4)
{
if (htab_expand (htab) == 0)
return NULL;
size = htab_size (htab);
}

size = htab->size;
index = hash % size;
index = htab_mod (hash, htab);

htab->searches++;
first_deleted_slot = NULL;
Expand All @@ -511,7 +551,7 @@ htab_find_slot_with_hash (htab, element, hash, insert)
else if ((*htab->eq_f) (entry, element))
return &htab->entries[index];

hash2 = 1 + hash % (size - 2);
hash2 = htab_mod_m2 (hash, htab);
for (;;)
{
htab->collisions++;
Expand Down Expand Up @@ -590,7 +630,7 @@ htab_clear_slot (htab, slot)
htab_t htab;
PTR *slot;
{
if (slot < htab->entries || slot >= htab->entries + htab->size
if (slot < htab->entries || slot >= htab->entries + htab_size (htab)
|| *slot == EMPTY_ENTRY || *slot == DELETED_ENTRY)
abort ();

Expand All @@ -616,7 +656,7 @@ htab_traverse_noresize (htab, callback, info)
PTR *limit;

slot = htab->entries;
limit = slot + htab->size;
limit = slot + htab_size (htab);

do
{
Expand All @@ -638,30 +678,12 @@ htab_traverse (htab, callback, info)
htab_trav callback;
PTR info;
{
if ((htab->n_elements - htab->n_deleted) * 8 < htab->size)
if (htab_elements (htab) * 8 < htab_size (htab))
htab_expand (htab);

htab_traverse_noresize (htab, callback, info);
}

/* Return the current size of given hash table. */

size_t
htab_size (htab)
htab_t htab;
{
return htab->size;
}

/* Return the current number of elements in given hash table. */

size_t
htab_elements (htab)
htab_t htab;
{
return htab->n_elements - htab->n_deleted;
}

/* Return the fraction of fixed collisions during all work with given
hash table. */

Expand Down

0 comments on commit dd070f6

Please sign in to comment.