-/* Copyright (C) 2004 Christopher Clark <firstname.lastname@cl.cam.ac.uk> */
+/*
+ Copyright (c) 2002, 2004, Christopher Clark
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the name of the original author; nor the names of any contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
/* Modifications made by Jack Lange <jarusl@cs.northwestern.edu> */
+
+
#include <palacios/vmm.h>
#include <palacios/vmm_hashtable.h>
#include <palacios/vmm_string.h>
struct hash_entry {
- void * key;
- void * value;
+ addr_t key;
+ addr_t value;
uint_t hash;
struct hash_entry * next;
};
uint_t entry_count;
uint_t load_limit;
uint_t prime_index;
- uint_t (*hash_fn) (void * key);
- int (*eq_fn) (void * key1, void * key2);
+ uint_t (*hash_fn) (addr_t key);
+ int (*eq_fn) (addr_t key1, addr_t key2);
};
-uint_t do_hash(struct hashtable * htable, void * key) {
+uint_t do_hash(struct hashtable * htable, addr_t key) {
/* Aim to protect against poor hash functions by adding logic here
* - logic taken from java 1.4 hashtable source */
uint_t i = htable->hash_fn(key);
ulong_t hash_buffer(uchar_t * msg, uint_t length) {
ulong_t hash = 0;
ulong_t temp = 0;
- int i;
+ uint_t i;
for (i = 0; i < length; i++) {
hash = (hash << 4) + *(msg + i) + i;
/*****************************************************************************/
struct hashtable * create_hashtable(uint_t min_size,
- uint_t (*hash_fn) (void *),
- int (*eq_fn) (void *, void *)) {
+ uint_t (*hash_fn) (addr_t),
+ int (*eq_fn) (addr_t, addr_t)) {
struct hashtable * htable;
uint_t prime_index;
uint_t size = primes[0];
htable->entry_count = 0;
htable->hash_fn = hash_fn;
htable->eq_fn = eq_fn;
- htable->load_limit = (uint_t) ceil((double)(size * max_load_factor));
+ htable->load_limit = (uint_t) v3_ceil((double)(size * max_load_factor));
return htable;
}
htable->table_length = new_size;
- htable->load_limit = (uint_t) ceil(new_size * max_load_factor);
+ htable->load_limit = (uint_t) v3_ceil(new_size * max_load_factor);
return -1;
}
}
/*****************************************************************************/
-int hashtable_insert(struct hashtable * htable, void * key, void * value) {
+int hashtable_insert(struct hashtable * htable, addr_t key, addr_t value) {
/* This method allows duplicate keys - but they shouldn't be used */
uint_t index;
struct hash_entry * new_entry;
-int hashtable_change(struct hashtable * htable, void * key, void * value) {
+int hashtable_change(struct hashtable * htable, addr_t key, addr_t value, int free_value) {
+ struct hash_entry * tmp_entry;
+ uint_t hash_value;
+ uint_t index;
+
+ hash_value = do_hash(htable, key);
+
+ index = indexFor(htable->table_length, hash_value);
+
+ tmp_entry = htable->table[index];
+
+ while (tmp_entry != NULL) {
+ /* Check hash value to short circuit heavier comparison */
+ if ((hash_value == tmp_entry->hash) && (htable->eq_fn(key, tmp_entry->key))) {
+
+ if (free_value) {
+ V3_Free((void *)(tmp_entry->value));
+ }
+
+ tmp_entry->value = value;
+ return -1;
+ }
+ tmp_entry = tmp_entry->next;
+ }
+ return 0;
+}
+
+
+
+int hashtable_inc(struct hashtable * htable, addr_t key, addr_t value) {
+ struct hash_entry * tmp_entry;
+ uint_t hash_value;
+ uint_t index;
+
+ hash_value = do_hash(htable, key);
+
+ index = indexFor(htable->table_length, hash_value);
+
+ tmp_entry = htable->table[index];
+
+ while (tmp_entry != NULL) {
+ /* Check hash value to short circuit heavier comparison */
+ if ((hash_value == tmp_entry->hash) && (htable->eq_fn(key, tmp_entry->key))) {
+
+ tmp_entry->value += value;
+ return -1;
+ }
+ tmp_entry = tmp_entry->next;
+ }
+ return 0;
+}
+
+
+int hashtable_dec(struct hashtable * htable, addr_t key, addr_t value) {
struct hash_entry * tmp_entry;
uint_t hash_value;
uint_t index;
while (tmp_entry != NULL) {
/* Check hash value to short circuit heavier comparison */
if ((hash_value == tmp_entry->hash) && (htable->eq_fn(key, tmp_entry->key))) {
- V3_Free(tmp_entry->value);
- tmp_entry->value = value;
- return -1;
+ tmp_entry->value -= value;
+ return -1;
}
tmp_entry = tmp_entry->next;
}
/*****************************************************************************/
/* returns value associated with key */
-void * hashtable_search(struct hashtable * htable, void * key) {
+addr_t hashtable_search(struct hashtable * htable, addr_t key) {
struct hash_entry * cursor;
uint_t hash_value;
uint_t index;
cursor = cursor->next;
}
- return NULL;
+ return (addr_t)NULL;
}
/*****************************************************************************/
/* returns value associated with key */
-void * hashtable_remove(struct hashtable * htable, void * key) {
+addr_t hashtable_remove(struct hashtable * htable, addr_t key, int free_key) {
/* TODO: consider compacting the table when the load factor drops enough,
* or provide a 'compact' method. */
struct hash_entry * cursor;
struct hash_entry ** entry_ptr;
- void * value;
+ addr_t value;
uint_t hash_value;
uint_t index;
htable->entry_count--;
value = cursor->value;
- freekey(cursor->key);
+ if (free_key) {
+ freekey((void *)(cursor->key));
+ }
V3_Free(cursor);
return value;
entry_ptr = &(cursor->next);
cursor = cursor->next;
}
- return NULL;
+ return (addr_t)NULL;
}
/*****************************************************************************/
/* destroy */
-void hashtable_destroy(struct hashtable * htable, int free_values) {
+void hashtable_destroy(struct hashtable * htable, int free_values, int free_keys) {
uint_t i;
struct hash_entry * cursor;;
struct hash_entry **table = htable->table;
tmp = cursor;
cursor = cursor->next;
- freekey(tmp->key);
- V3_Free(tmp->value);
+ if (free_keys) {
+ freekey((void *)(tmp->key));
+ }
+ V3_Free((void *)(tmp->value));
V3_Free(tmp);
}
}
tmp = cursor;
cursor = cursor->next;
-
- freekey(tmp->key);
+
+ if (free_keys) {
+ freekey((void *)(tmp->key));
+ }
V3_Free(tmp);
}
}
}
-void * hashtable_get_iter_key(struct hashtable_iter * iter) {
+addr_t hashtable_get_iter_key(struct hashtable_iter * iter) {
return iter->entry->key;
}
-void * hashtable_get_iter_value(struct hashtable_iter * iter) {
+addr_t hashtable_get_iter_value(struct hashtable_iter * iter) {
return iter->entry->value;
}
* If you want the value, read it before you remove:
* beware memory leaks if you don't.
* Returns zero if end of iteration. */
-int hashtable_iterator_remove(struct hashtable_iter * iter) {
+int hashtable_iterator_remove(struct hashtable_iter * iter, int free_key) {
struct hash_entry * remember_entry;
struct hash_entry * remember_parent;
int ret;
/* itr->e is now outside the hashtable */
remember_entry = iter->entry;
iter->htable->entry_count--;
- freekey(remember_entry->key);
-
+ if (free_key) {
+ freekey((void *)(remember_entry->key));
+ }
+
/* Advance the iterator, correcting the parent */
remember_parent = iter->parent;
ret = hashtable_iterator_advance(iter);
/* returns zero if not found */
int hashtable_iterator_search(struct hashtable_iter * iter,
- struct hashtable * htable, void * key) {
+ struct hashtable * htable, addr_t key) {
struct hash_entry * entry;
struct hash_entry * parent;
uint_t hash_value;
