augment hashtable with keyset

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index b42c34b1ca99884e82a836bd016e0ceb7421c570..b6707f9fe6d2cd9f2343ae820080fe53f63eda79 100644 (file)
--- a/history.h
+++ b/history.h
@@ -3,8 +3,6 @@
 #include "hashtable.h"
 #include "threads-model.h"
 
-typedef SnapList<uint32_t> func_id_list_t;
-
 class ModelHistory {
 public:
        ModelHistory();
@@ -18,9 +16,12 @@ public:
 
        void add_func_atomic(ModelAction *act, thread_id_t tid);
 
-       HashTable<const char *, uint32_t, uintptr_t, 4> * getFuncMap() { return &func_map; }
+       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
@@ -28,15 +29,9 @@ private:
        uint32_t func_counter;
 
        /* map function names to integer ids */ 
-       HashTable<const char *, uint32_t, uintptr_t, 4> func_map;
+       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;
 
        ModelVector<FuncNode *> func_atomics;
-
-       /* 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 
-        */
-
-       /* todo: move work_list to execution.cc to avoid seg fault */
-       SnapVector< func_id_list_t * > work_list;
 };