reworked the hash table implementation

[palacios.git] / palacios / include / palacios / vmm_hashtable.h

diff --git a/palacios/include/palacios/vmm_hashtable.h b/palacios/include/palacios/vmm_hashtable.h
index e64fd8c..9e81e4f 100644 (file)
--- a/palacios/include/palacios/vmm_hashtable.h
+++ b/palacios/include/palacios/vmm_hashtable.h
@@ -71,18 +71,18 @@ ulong_t hash_buffer(uchar_t * msg, uint_t length);
 
 
 #define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype)            \
-  int fnname (struct hashtable * htable, keytype * key, valuetype * value) { \
-    return hashtable_insert(htable, key, value);                       \
+  int fnname (struct hashtable * htable, keytype key, valuetype value) { \
+    return hashtable_insert(htable, (addr_t)key, (addr_t)value);               \
   }
 
 #define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype)            \
-  valuetype * fnname (struct hashtable * htable, keytype * key) {      \
-    return (valuetype *) (hashtable_search(htable, key));              \
+  valuetype * fnname (struct hashtable * htable, keytype  key) {       \
+    return (valuetype *) (hashtable_search(htable, (addr_t)key));              \
   }
 
-#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype)            \
-  valuetype * fnname (struct hashtable * htable, keytype * key) {      \
-    return (valuetype *) (hashtable_remove(htable, key));              \
+#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype, free_key)  \
+  valuetype * fnname (struct hashtable * htable, keytype key) {        \
+    return (valuetype *) (hashtable_remove(htable, (addr_t)key, free_key));    \
   }
 
 
@@ -91,10 +91,10 @@ ulong_t hash_buffer(uchar_t * msg, uint_t length);
 
 
 struct hashtable * create_hashtable(uint_t min_size,
-                                   uint_t (*hashfunction) (void * key),
-                                   int (*key_eq_fn) (void * key1, void * key2));
+                                   uint_t (*hashfunction) (addr_t key),
+                                   int (*key_eq_fn) (addr_t key1, addr_t key2));
 
-void hashtable_destroy(struct hashtable * htable, int free_values);
+void hashtable_destroy(struct hashtable * htable, int free_values, int free_keys);
 
 /*
  * returns non-zero for successful insertion
@@ -108,16 +108,16 @@ void hashtable_destroy(struct hashtable * htable, int free_values);
  * entries is reversed.
  * If in doubt, remove before insert.
  */
-int hashtable_insert(struct hashtable * htable, void * key, void * value);
+int hashtable_insert(struct hashtable * htable, addr_t key, addr_t value);
 
-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);
 
 
 // returns the value associated with the key, or NULL if none found
-void * hashtable_search(struct hashtable * htable, void * key);
+addr_t hashtable_search(struct hashtable * htable, addr_t key);
 
 // returns the value associated with the key, or NULL if none found
-void * hashtable_remove(struct hashtable * htable, void * key);
+addr_t hashtable_remove(struct hashtable * htable, addr_t key, int free_key);
 
 uint_t hashtable_count(struct hashtable * htable);
 
@@ -147,7 +147,7 @@ struct hashtable_iter * create_hashtable_iterator(struct hashtable * htable);
 
 /* - return the value of the (key,value) pair at the current position */
 //extern inline 
-void * hashtable_get_iter_key(struct hashtable_iter * iter);
+addr_t  hashtable_get_iter_key(struct hashtable_iter * iter);
 /* {
    return iter->entry->key;
    }
@@ -156,7 +156,7 @@ void * hashtable_get_iter_key(struct hashtable_iter * iter);
 
 /* value - return the value of the (key,value) pair at the current position */
 //extern inline 
-void * hashtable_get_iter_value(struct hashtable_iter * iter);
+addr_t hashtable_get_iter_value(struct hashtable_iter * iter);
 /* {
    return iter->entry->value;
    }
@@ -172,13 +172,13 @@ int hashtable_iterator_advance(struct hashtable_iter * iter);
  *          removing. ie: beware memory leaks!
  *          returns zero if advanced to end of table 
  */
-int hashtable_iterator_remove(struct hashtable_iter * iter);
+int hashtable_iterator_remove(struct hashtable_iter * iter, int free_key);
 
 
 /* search - overwrite the supplied iterator, to point to the entry
  *          matching the supplied key.
  *          returns zero if not found. */
-int hashtable_iterator_search(struct hashtable_iter * iter, struct hashtable * htable, void * key);
+int hashtable_iterator_search(struct hashtable_iter * iter, struct hashtable * htable, addr_t key);