* bfd-in.h (struct bfd_hash_table): Reorganize.  Add "frozen".
	* hash.c (bfd_hash_table_init_n): Init frozen.
	(bfd_hash_lookup): Don't grow if frozen.
	(bfd_hash_traverse): Freeze hash table during traversal.
	* bfd-in2.h: Regenerate.
This commit is contained in:
Alan Modra
2006-11-20 01:38:38 +00:00
parent 98a16ee117
commit 98f0b6ab8c
4 changed files with 32 additions and 16 deletions

View File

@@ -383,6 +383,7 @@ bfd_hash_table_init_n (struct bfd_hash_table *table,
table->size = size;
table->entsize = entsize;
table->count = 0;
table->frozen = 0;
table->newfunc = newfunc;
return TRUE;
}
@@ -471,7 +472,7 @@ bfd_hash_lookup (struct bfd_hash_table *table,
table->table[index] = hashp;
table->count++;
if (table->count > table->size * 3 / 4)
if (!table->frozen && table->count > table->size * 3 / 4)
{
unsigned long newsize = higher_prime_number (table->size);
struct bfd_hash_entry **newtable;
@@ -482,8 +483,7 @@ bfd_hash_lookup (struct bfd_hash_table *table,
that much memory, don't try to grow the table. */
if (newsize == 0 || alloc / sizeof (struct bfd_hash_entry *) != newsize)
{
/* Lie. Stops us trying to grow again for a while. */
table->count = 0;
table->frozen = 1;
return hashp;
}
@@ -573,14 +573,17 @@ bfd_hash_traverse (struct bfd_hash_table *table,
{
unsigned int i;
table->frozen = 1;
for (i = 0; i < table->size; i++)
{
struct bfd_hash_entry *p;
for (p = table->table[i]; p != NULL; p = p->next)
if (! (*func) (p, info))
return;
goto out;
}
out:
table->frozen = 0;
}
void