X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_hashtable.h;h=5acb89e847b2b0f5755100443c510778ff2e34de;hb=362391accc505b29d938e9d0a21bf6a28a8cee34;hp=e64fd8ccbf4d617c33900eab461d48471a9d0190;hpb=af355c370ac80f8e19d6375cb3070213c29a92eb;p=palacios.git diff --git a/palacios/include/palacios/vmm_hashtable.h b/palacios/include/palacios/vmm_hashtable.h index e64fd8c..5acb89e 100644 --- a/palacios/include/palacios/vmm_hashtable.h +++ b/palacios/include/palacios/vmm_hashtable.h @@ -1,6 +1,39 @@ -/* Copyright (C) 2002 Christopher Clark */ +/* + 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 */ + + #ifndef __VMM_HASHTABLE_H__ #define __VMM_HASHTABLE_H__ @@ -71,18 +104,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); \ + static 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)); \ + static 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) \ + static valuetype * fnname (struct hashtable * htable, keytype key) { \ + return (valuetype *) (hashtable_remove(htable, (addr_t)key, free_key)); \ } @@ -91,10 +124,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,19 +141,24 @@ 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); +// 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); + + /* ************ */ /* ITERATOR API */ /* ************ */ @@ -147,7 +185,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 +194,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 +210,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);