X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_hashtable.h;h=5acb89e847b2b0f5755100443c510778ff2e34de;hb=a9b0e13d3ad5cef3b5b28cc7975480523941ad97;hp=380af91a7d531a60071f4bd9ed7ee690eabbf40a;hpb=56f8088296ee4116a4811a2f4f843edd80a7748d;p=palacios.git

diff --git a/palacios/include/palacios/vmm_hashtable.h b/palacios/include/palacios/vmm_hashtable.h
index 380af91..5acb89e 100644
--- a/palacios/include/palacios/vmm_hashtable.h
+++ b/palacios/include/palacios/vmm_hashtable.h
@@ -1,7 +1,37 @@
-/* Copyright (C) 2002 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> */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
 
 
 #ifndef __VMM_HASHTABLE_H__
@@ -74,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, (addr_t)key, (addr_t)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, (addr_t)key));		\
+  static valuetype * fnname (struct hashtable * htable, keytype  key) {	\
+    return (valuetype *) (hashtable_search(htable, (addr_t)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));	\
+  static valuetype * fnname (struct hashtable * htable, keytype key) {	\
+    return (valuetype *) (hashtable_remove(htable, (addr_t)key, free_key)); \
   }
 
 
@@ -124,6 +154,11 @@ 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 */
 /* ************ */