model: add read-acquire/fence-release support
[c11tester.git] / hashtable.h
index 2b703c595a9377c37a4e43792bba6e9d67873afd..d5c69ccba8456ad4930dcbdee93f3f5d229caca3 100644 (file)
@@ -7,6 +7,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#include "mymemory.h"
+#include "common.h"
 
 /**
  * Hashtable linked node class, for chained storage of hash table conflicts. By
  * @tparam _free   Provide your own 'free' for the table, or default to
  *                 snapshotting.
  */
-template<typename _Key, typename _Val, void * (* _malloc)(size_t), void * (* _calloc)(size_t, size_t), void (*_free)(void *)>
+template<typename _Key, typename _Val>
+
 struct hashlistnode {
        _Key key;
        _Val val;
-       struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *next;
-
-       void * operator new(size_t size) {
-               return _malloc(size);
-       }
-
-       void operator delete(void *p, size_t size) {
-               _free(p);
-       }
-
-       void * operator new[](size_t size) {
-               return _malloc(size);
-       }
-
-       void operator delete[](void *p, size_t size) {
-               _free(p);
-       }
 };
 
 /**
@@ -61,7 +48,7 @@ struct hashlistnode {
  * @tparam _free   Provide your own 'free' for the table, or default to
  *                 snapshotting.
  */
-template<typename _Key, typename _Val, typename _KeyInt, int _Shift=0, void * (* _malloc)(size_t)=malloc, void * (* _calloc)(size_t, size_t)=calloc, void (*_free)(void *)=free>
+template<typename _Key, typename _Val, typename _KeyInt, int _Shift=0, void * (* _malloc)(size_t)=snapshot_malloc, void * (* _calloc)(size_t, size_t)=snapshot_calloc, void (*_free)(void *)=snapshot_free>
        class HashTable {
  public:
        /**
@@ -73,24 +60,17 @@ template<typename _Key, typename _Val, typename _KeyInt, int _Shift=0, void * (*
         */
        HashTable(unsigned int initialcapacity=1024, double factor=0.5) {
                // Allocate space for the hash table
-               table = (struct hashlistnode<_Key,_Val, _malloc, _calloc,_free> **) _calloc(initialcapacity, sizeof(struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *));
+               table = (struct hashlistnode<_Key,_Val> *) _calloc(initialcapacity, sizeof(struct hashlistnode<_Key,_Val>));
                loadfactor = factor;
                capacity = initialcapacity;
+               capacitymask = initialcapacity - 1;
+
                threshold = (unsigned int) (initialcapacity*loadfactor);
-               mask = (capacity << _Shift)-1;
                size = 0; // Initial number of elements in the hash
        }
 
        /** Destructor */
        ~HashTable() {
-               for(unsigned int i=0;i<capacity;i++) {
-                       struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> * bin = table[i];
-                       while(bin!=NULL) {
-                               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> * next=bin->next;
-                               delete bin;
-                               bin=next;
-                       }
-               }
                _free(table);
        }
 
@@ -116,15 +96,7 @@ template<typename _Key, typename _Val, typename _KeyInt, int _Shift=0, void * (*
 
        /** Reset the table to its initial state. */
        void reset() {
-               for(unsigned int i=0;i<capacity;i++) {
-                       struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> * bin = table[i];
-                       while(bin!=NULL) {
-                               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> * next=bin->next;
-                               delete bin;
-                               bin=next;
-                       }
-               }
-               memset(table, 0, capacity*sizeof(struct hashlistnode<_Key, _Val, _malloc, _calloc, _free> *));
+               memset(table, 0, capacity*sizeof(struct hashlistnode<_Key, _Val>));
                size=0;
        }
 
@@ -133,126 +105,99 @@ template<typename _Key, typename _Val, typename _KeyInt, int _Shift=0, void * (*
                if (size > threshold)
                        resize(capacity << 1);
 
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *ptr = table[(((_KeyInt)key) & mask)>>_Shift];
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *search = ptr;
+               struct hashlistnode<_Key,_Val> *search;
 
-               while(search!=NULL) {
+               unsigned int index=((_KeyInt)key)>>_Shift;
+               do {
+                       index=index&capacitymask;
+                       search = &table[index];
                        if (search->key==key) {
                                search->val=val;
                                return;
                        }
-                       search=search->next;
-               }
-
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *newptr=(struct hashlistnode<_Key,_Val,_malloc,_calloc,_free> *)new struct hashlistnode<_Key,_Val, _malloc, _calloc, _free>;
-               newptr->key=key;
-               newptr->val=val;
-               newptr->next=ptr;
-               table[(((_KeyInt)key)&mask)>>_Shift]=newptr;
+                       index++;
+               } while(search->key);
+               
+               search->key=key;
+               search->val=val;
                size++;
        }
 
-       /** Put a key entry into the table. */
-       _Val * ensureptr(_Key key) {
-               if (size > threshold)
-                       resize(capacity << 1);
-
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *ptr = table[(((_KeyInt)key) & mask)>>_Shift];
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *search = ptr;
-
-               while(search!=NULL) {
-                       if (search->key==key) {
-                               return &search->val;
-                       }
-                       search=search->next;
-               }
-
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *newptr=(struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *)new struct hashlistnode<_Key,_Val, _malloc, _calloc, _free>;
-               newptr->key=key;
-               newptr->next=ptr;
-               table[(((_KeyInt)key)&mask)>>_Shift]=newptr;
-               size++;
-               return &newptr->val;
-       }
-
        /** Lookup the corresponding value for the given key. */
        _Val get(_Key key) {
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *search = table[(((_KeyInt)key) & mask)>>_Shift];
+               struct hashlistnode<_Key,_Val> *search;
 
-               while(search!=NULL) {
+               unsigned int index=((_KeyInt)key)>>_Shift;
+               do {
+                       index=index&capacitymask;
+                       search = &table[index];
                        if (search->key==key) {
                                return search->val;
                        }
-                       search=search->next;
-               }
-               return (_Val)0;
-       }
-
-       /** Lookup the corresponding value for the given key. */
-       _Val * getptr(_Key key) {
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *search = table[(((_KeyInt)key) & mask)>>_Shift];
-
-               while(search!=NULL) {
-                       if (search->key==key) {
-                               return & search->val;
-                       }
-                       search=search->next;
-               }
-               return (_Val *) NULL;
+                       index++;
+               } while(search->key);
+               return (_Val) 0;
        }
 
        /** Check whether the table contains a value for the given key. */
        bool contains(_Key key) {
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *search = table[(((_KeyInt)key) & mask)>>_Shift];
+               struct hashlistnode<_Key,_Val> *search;
 
-               while(search!=NULL) {
+               unsigned int index=((_KeyInt)key)>>_Shift;
+               do {
+                       index=index&capacitymask;
+                       search = &table[index];
                        if (search->key==key) {
                                return true;
                        }
-                       search=search->next;
-               }
+                       index++;
+               } while(search->key);
                return false;
        }
 
        /** Resize the table. */
        void resize(unsigned int newsize) {
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> ** oldtable = table;
-               struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> ** newtable;
+               struct hashlistnode<_Key,_Val* oldtable = table;
+               struct hashlistnode<_Key,_Val* newtable;
                unsigned int oldcapacity = capacity;
 
-               if((newtable = (struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> **) _calloc(newsize, sizeof(struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> *))) == NULL) {
-                       printf("Calloc error %s %d\n", __FILE__, __LINE__);
+               if((newtable = (struct hashlistnode<_Key,_Val> *) _calloc(newsize, sizeof(struct hashlistnode<_Key,_Val>))) == NULL) {
+                       model_print("Calloc error %s %d\n", __FILE__, __LINE__);
                        exit(-1);
                }
-
+               
                table = newtable;          //Update the global hashtable upon resize()
                capacity = newsize;
-               threshold = (unsigned int) (newsize * loadfactor);
-               mask = (newsize << _Shift)-1;
+               capacitymask = newsize - 1;
 
-               for(unsigned int i = 0; i < oldcapacity; i++) {
-                       struct hashlistnode<_Key, _Val, _malloc, _calloc, _free> * bin = oldtable[i];
-
-                       while(bin!=NULL) {
-                               _Key key=bin->key;
-                               struct hashlistnode<_Key, _Val, _malloc, _calloc, _free> * next=bin->next;
+               threshold = (unsigned int) (newsize * loadfactor);
 
-                               unsigned int index = (((_KeyInt)key) & mask) >>_Shift;
-                               struct hashlistnode<_Key, _Val, _malloc, _calloc, _free> * tmp=newtable[index];
-                               bin->next=tmp;
-                               newtable[index]=bin;
-                               bin = next;
-                       }
+               struct hashlistnode<_Key, _Val> * bin = &oldtable[0];
+               struct hashlistnode<_Key, _Val> * lastbin = &oldtable[oldcapacity];
+               for(; bin < lastbin; bin++) {
+                       _Key key=bin->key;
+
+                       struct hashlistnode<_Key,_Val> *search;
+                       
+                       unsigned int index=((_KeyInt)key)>>_Shift;
+                       do {
+                               index=index&capacitymask;
+                               search = &table[index];
+                               index++;
+                       } while(search->key);
+
+                       search->key=key;
+                       search->val=bin->val;
                }
 
                _free(oldtable);            //Free the memory of the old hash table
        }
 
  private:
-       struct hashlistnode<_Key,_Val, _malloc, _calloc, _free> **table;
+       struct hashlistnode<_Key,_Val*table;
        unsigned int capacity;
-       _KeyInt mask;
        unsigned int size;
+       unsigned int capacitymask;
        unsigned int threshold;
        double loadfactor;
 };