augment hashtable with keyset

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index c8d2265fc12a0d52d5a5fd7b7c25d41a87d8dc74..b6707f9fe6d2cd9f2343ae820080fe53f63eda79 100644 (file)
--- a/history.h
+++ b/history.h
@@ -3,12 +3,6 @@
 #include "hashtable.h"
 #include "threads-model.h"
 
-/* forward declaration */
-class ModelAction;
-
-typedef ModelList<const ModelAction *> action_mlist_t;
-typedef SnapList<uint32_t> func_id_list_t;
-
 class ModelHistory {
 public:
        ModelHistory();
@@ -22,21 +16,22 @@ public:
 
        void add_func_atomic(ModelAction *act, thread_id_t tid);
 
-       HashTable<const char *, uint32_t, uintptr_t, 4> * getFuncMap() { return &func_map; }
-       ModelVector< action_mlist_t * > * getFuncAtomics() { return &func_atomics; }
+       HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncMap() { return &func_map; }
+       ModelVector<const char *> * getFuncMapRev() { return &func_map_rev; }
+
+       ModelVector<FuncNode *> * getFuncAtomics() { return &func_atomics; }
 
+       void link_insts(func_inst_list_t * inst_list);
        void print();
+
+       MEMALLOC
 private:
        uint32_t func_counter;
 
        /* map function names to integer ids */ 
-       HashTable<const char *, uint32_t, uintptr_t, 4> func_map;
-
-       ModelVector< action_mlist_t * > func_atomics;
+       HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> func_map;
+       /* map integer ids to function names */ 
+       ModelVector<const char *> func_map_rev;
 
-       /* Work_list stores a list of function ids for each thread. 
-        * Each element in work_list is intended to be used as a stack storing
-        * the functions that thread i has entered and yet to exit from 
-        */
-       SnapVector< func_id_list_t * > work_list;
+       ModelVector<FuncNode *> func_atomics;
 };