bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor finding position for new hash entry

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2011-01-29 23:24:13 +10:00
parent 9320786349
commit 11e5e86151
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/libalpm/pkghash.c
View file

@ -81,11 +81,25 @@ pmpkghash_t *_alpm_pkghash_create(size_t size)
return(hash); return(hash);
} }
static size_t get_hash_position(unsigned long name_hash, pmpkghash_t *hash)
{
size_t position;
alpm_list_t *ptr;
position = name_hash % hash->buckets;
/* collision resolution using open addressing with linear probing */
while((ptr = hash->hash_table[position]) != NULL) {
position = (position + 1) % hash->buckets;
}
return(position);
}
/* Expand the hash table size to the next increment and rebin the entries */ /* Expand the hash table size to the next increment and rebin the entries */
static pmpkghash_t *rehash(pmpkghash_t *oldhash) static pmpkghash_t *rehash(pmpkghash_t *oldhash)
{ {
pmpkghash_t *newhash; pmpkghash_t *newhash;
alpm_list_t *ptr;
size_t newsize, position, i; size_t newsize, position, i;
/* Hash tables will need resized in two cases: /* Hash tables will need resized in two cases:
@ -120,12 +134,7 @@ static pmpkghash_t *rehash(pmpkghash_t *oldhash)
if(oldhash->hash_table[i] != NULL) { if(oldhash->hash_table[i] != NULL) {
pmpkg_t *package = oldhash->hash_table[i]->data; pmpkg_t *package = oldhash->hash_table[i]->data;
position = package->name_hash % newhash->buckets; position = get_hash_position(package->name_hash, newhash);
/* collision resolution using open addressing with linear probing */
while((ptr = newhash->hash_table[position]) != NULL) {
position = (position + 1) % newhash->buckets;
}
newhash->hash_table[position] = oldhash->hash_table[i]; newhash->hash_table[position] = oldhash->hash_table[i];
oldhash->hash_table[i] = NULL; oldhash->hash_table[i] = NULL;
@ -152,12 +161,7 @@ pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg)
hash = rehash(hash); hash = rehash(hash);
} }
position = pkg->name_hash % hash->buckets; position = get_hash_position(pkg->name_hash, hash);
/* collision resolution using open addressing with linear probing */
while((ptr = hash->hash_table[position]) != NULL) {
position = (position + 1) % hash->buckets;
}
ptr = calloc(1, sizeof(alpm_list_t)); ptr = calloc(1, sizeof(alpm_list_t));
if(ptr == NULL) { if(ptr == NULL) {
@ -188,12 +192,7 @@ pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg)
hash = rehash(hash); hash = rehash(hash);
} }
position = pkg->name_hash % hash->buckets; position = get_hash_position(pkg->name_hash, hash);
/* collision resolution using open addressing with linear probing */
while((ptr = hash->hash_table[position]) != NULL) {
position = (position + 1) % hash->buckets;
}
ptr = calloc(1, sizeof(alpm_list_t)); ptr = calloc(1, sizeof(alpm_list_t));
if(ptr == NULL) { if(ptr == NULL) {