X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_hashtable.h;h=79f5f0501845e3ce80012533836ac6f53f59f0be;hb=7c9087090f06a3fdf041f650912c36b6b12d7a82;hp=5acb89e847b2b0f5755100443c510778ff2e34de;hpb=362391accc505b29d938e9d0a21bf6a28a8cee34;p=palacios.git diff --git a/palacios/include/palacios/vmm_hashtable.h b/palacios/include/palacios/vmm_hashtable.h index 5acb89e..79f5f05 100644 --- a/palacios/include/palacios/vmm_hashtable.h +++ b/palacios/include/palacios/vmm_hashtable.h @@ -97,37 +97,36 @@ struct hashtable; * */ -ulong_t hash_long(ulong_t val, uint_t bits); -ulong_t hash_buffer(uchar_t * msg, uint_t length); - - - - #define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ - static int fnname (struct hashtable * htable, keytype key, valuetype value) { \ - return hashtable_insert(htable, (addr_t)key, (addr_t)value); \ - } + static int fnname (struct hashtable * htable, keytype key, valuetype value) { \ + return v3_htable_insert(htable, (addr_t)key, (addr_t)value); \ + } #define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ - static valuetype * fnname (struct hashtable * htable, keytype key) { \ - return (valuetype *) (hashtable_search(htable, (addr_t)key)); \ - } + static valuetype * fnname (struct hashtable * htable, keytype key) { \ + return (valuetype *) (v3_htable_search(htable, (addr_t)key)); \ + } #define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype, free_key) \ - static valuetype * fnname (struct hashtable * htable, keytype key) { \ - return (valuetype *) (hashtable_remove(htable, (addr_t)key, free_key)); \ - } + static valuetype * fnname (struct hashtable * htable, keytype key) { \ + return (valuetype *) (v3_htable_remove(htable, (addr_t)key, free_key)); \ + } + +/* These cannot be inlined because they are referenced as fn ptrs */ +ulong_t v3_hash_long(ulong_t val, uint_t bits); +ulong_t v3_hash_buffer(uchar_t * msg, uint_t length); -struct hashtable * create_hashtable(uint_t min_size, + +struct hashtable * v3_create_htable(uint_t min_size, 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, int free_keys); +void v3_free_htable(struct hashtable * htable, int free_values, int free_keys); /* * returns non-zero for successful insertion @@ -141,32 +140,32 @@ void hashtable_destroy(struct hashtable * htable, int free_values, int free_keys * entries is reversed. * If in doubt, remove before insert. */ -int hashtable_insert(struct hashtable * htable, addr_t key, addr_t value); +int v3_htable_insert(struct hashtable * htable, addr_t key, addr_t value); -int hashtable_change(struct hashtable * htable, addr_t key, addr_t value, int free_value); +int v3_htable_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 -addr_t hashtable_search(struct hashtable * htable, addr_t key); +addr_t v3_htable_search(struct hashtable * htable, addr_t key); // returns the value associated with the key, or NULL if none found -addr_t hashtable_remove(struct hashtable * htable, addr_t key, int free_key); +addr_t v3_htable_remove(struct hashtable * htable, addr_t key, int free_key); -uint_t hashtable_count(struct hashtable * htable); +uint_t v3_htable_count(struct hashtable * htable); // Specialty functions for a counting hashtable -int hashtable_inc(struct hashtable * htable, addr_t key, addr_t value); -int hashtable_dec(struct hashtable * htable, addr_t key, addr_t value); +int v3_htable_inc(struct hashtable * htable, addr_t key, addr_t value); +int v3_htable_dec(struct hashtable * htable, addr_t key, addr_t value); - /* ************ */ - /* ITERATOR API */ +/* ************ */ +/* ITERATOR API */ /* ************ */ #define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ - int fnname (struct hashtable_itr * iter, struct hashtable * htable, keytype * key) { \ - return (hashtable_iterator_search(iter, htable, key)); \ - } + static int fnname (struct hashtable_itr * iter, struct hashtable * htable, keytype * key) { \ + return (v3_htable_iter_search(iter, htable, key)); \ + } @@ -174,18 +173,18 @@ int hashtable_dec(struct hashtable * htable, addr_t key, addr_t value); /* This struct is only concrete here to allow the inlining of two of the * accessor functions. */ struct hashtable_iter { - struct hashtable * htable; - struct hash_entry * entry; - struct hash_entry * parent; - uint_t index; + struct hashtable * htable; + struct hash_entry * entry; + struct hash_entry * parent; + uint_t index; }; -struct hashtable_iter * create_hashtable_iterator(struct hashtable * htable); +struct hashtable_iter * v3_create_htable_iter(struct hashtable * htable); /* - return the value of the (key,value) pair at the current position */ //extern inline -addr_t hashtable_get_iter_key(struct hashtable_iter * iter); +addr_t v3_htable_get_iter_key(struct hashtable_iter * iter); /* { return iter->entry->key; } @@ -194,7 +193,7 @@ addr_t hashtable_get_iter_key(struct hashtable_iter * iter); /* value - return the value of the (key,value) pair at the current position */ //extern inline -addr_t hashtable_get_iter_value(struct hashtable_iter * iter); +addr_t v3_htable_get_iter_value(struct hashtable_iter * iter); /* { return iter->entry->value; } @@ -203,20 +202,20 @@ addr_t hashtable_get_iter_value(struct hashtable_iter * iter); /* returns zero if advanced to end of table */ -int hashtable_iterator_advance(struct hashtable_iter * iter); +int v3_htable_iter_advance(struct hashtable_iter * iter); /* remove current element and advance the iterator to the next element * NB: if you need the value to free it, read it before * removing. ie: beware memory leaks! * returns zero if advanced to end of table */ -int hashtable_iterator_remove(struct hashtable_iter * iter, int free_key); +int v3_htable_iter_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, addr_t key); +int v3_htable_iter_search(struct hashtable_iter * iter, struct hashtable * htable, addr_t key); @@ -294,4 +293,4 @@ int hashtable_iterator_search(struct hashtable_iter * iter, struct hashtable * h * 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. -*/ + */