move work_list (thrd_func_list) from history.h to execution.h, and fix the memory...

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index fff5712629057311811bebde6401a42f57bf56db..dd8f13d8c14a9527eddc19e4f17b1146966863c3 100644 (file)
--- a/history.h
+++ b/history.h
@@ -1,39 +1,32 @@
 #include "stl-model.h"
 #include "common.h"
 #include "hashtable.h"
-#include "modeltypes.h"
-
-/* forward declaration */
-class ModelAction;
-
-typedef ModelList<ModelAction *> action_mlist_t;
+#include "threads-model.h"
 
 class ModelHistory {
 public:
        ModelHistory();
-       
+       ~ModelHistory();
+
        void enter_function(const uint32_t func_id, thread_id_t tid);
        void exit_function(const uint32_t func_id, thread_id_t tid);
 
-        uint32_t get_func_counter() { return func_id; }
-        void incr_func_counter() { func_id++; }
+       uint32_t get_func_counter() { return func_counter; }
+       void incr_func_counter() { func_counter++; }
 
-        HashTable<const char *, uint32_t, uintptr_t, 4> * getFuncMap() { return &func_map; }
-       HashTable<uint32_t, action_mlist_t *, uintptr_t, 4> * getFuncHistory() { return &func_history; }
+       void add_func_atomic(ModelAction *act, thread_id_t tid);
+
+       HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncMap() { return &func_map; }
+       ModelVector<FuncNode *> * getFuncAtomics() { return &func_atomics; }
 
        void print();
 
+       MEMALLOC
 private:
-       uint32_t func_id;
-
-        /* map function names to integer ids */ 
-        HashTable<const char *, uint32_t, uintptr_t, 4> func_map;
+       uint32_t func_counter;
 
-       HashTable<uint32_t, action_mlist_t *, uintptr_t, 4> func_history;
+       /* map function names to integer ids */ 
+       HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> func_map;
 
-       /* work_list stores a list of function ids for each thread
-        * SnapList<uint32_t> is intended to be used as a stack storing
-        * the functions that thread i has entered and yet to exit from 
-        */
-       HashTable<thread_id_t, SnapList<uint32_t> *, uintptr_t, 4> work_list;
+       ModelVector<FuncNode *> func_atomics;
 };