moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Renamed HASH_FULLNESS_THRESHOLD to HASH_MAX_FULLNESS.

Browse Source
This commit is contained in:
hniksic 2003-10-31 18:45:16 -08:00
parent 5b8d5d5a05
commit 3dc9f336e8
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hash.c
View File

@ -145,12 +145,13 @@ so, delete this exception statement from your version. */
hash_table_remove is careful to rehash the mappings that follow the hash_table_remove is careful to rehash the mappings that follow the
deleted one. */ deleted one. */
/* When hash table's fullness exceeds this threshold, the hash table /* Maximum allowed fullness: when hash table's fullness exceeds this
is resized. */ value, the table is resized. */
#define HASH_FULLNESS_THRESHOLD 0.75 #define HASH_MAX_FULLNESS 0.75
/* The hash table size is multiplied by this factor with each resize. /* The hash table size is multiplied by this factor (and then rounded
This guarantees infrequent resizes. */ to the next prime) with each resize. This guarantees infrequent
resizes. */
#define HASH_RESIZE_FACTOR 2 #define HASH_RESIZE_FACTOR 2
struct mapping { struct mapping {
@ -268,14 +269,16 @@ hash_table_new (int items,
ht->hash_function = hash_function ? hash_function : ptrhash; ht->hash_function = hash_function ? hash_function : ptrhash;
ht->test_function = test_function ? test_function : ptrcmp; ht->test_function = test_function ? test_function : ptrcmp;
/* If the size of struct hash_table ever becomes a concern, this
field can go. (Wget doesn't create many hashes.) */
ht->prime_offset = 0; ht->prime_offset = 0;
/* Calculate the size that ensures that the table will store at /* Calculate the size that ensures that the table will store at
least ITEMS keys without the need to resize. */ least ITEMS keys without the need to resize. */
size = 1 + items / HASH_FULLNESS_THRESHOLD; size = 1 + items / HASH_MAX_FULLNESS;
size = prime_size (size, &ht->prime_offset); size = prime_size (size, &ht->prime_offset);
ht->size = size; ht->size = size;
ht->resize_threshold = size * HASH_FULLNESS_THRESHOLD; ht->resize_threshold = size * HASH_MAX_FULLNESS;
/*assert (ht->resize_threshold >= items);*/ /*assert (ht->resize_threshold >= items);*/
ht->mappings = xnew0_array (struct mapping, ht->size); ht->mappings = xnew0_array (struct mapping, ht->size);
@ -377,17 +380,16 @@ grow_hash_table (struct hash_table *ht)
#endif #endif
ht->size = newsize; ht->size = newsize;
ht->resize_threshold = newsize * HASH_FULLNESS_THRESHOLD; ht->resize_threshold = newsize * HASH_MAX_FULLNESS;
ht->mappings = mappings = xnew0_array (struct mapping, ht->size); ht->mappings = mappings = xnew0_array (struct mapping, ht->size);
for (mp = old_mappings; mp < old_end; mp++) for (mp = old_mappings; mp < old_end; mp++)
if (NON_EMPTY (mp)) if (NON_EMPTY (mp))
{ {
struct mapping *new_mp = mappings + HASH_POSITION (ht, mp->key); struct mapping *new_mp = mappings + HASH_POSITION (ht, mp->key);
/* We don't need to test for uniqueness of keys because all /* We don't need to test for uniqueness of keys because they
the keys come from the hash table and are therefore known come from the hash table and are therefore known to be
to be unique. */ unique. */
LOOP_NON_EMPTY (new_mp, mappings, newsize) LOOP_NON_EMPTY (new_mp, mappings, newsize)
; ;
*new_mp = *mp; *new_mp = *mp;