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 03a8985292aa65cd97a56dc00fa3213fa86ae762..dd8f13d8c14a9527eddc19e4f17b1146966863c3 100644 (file)
--- a/history.h
+++ b/history.h
@@ -3,24 +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 HistoryNode {
-public: 
-       HistoryNode(ModelAction *act);
-       ~HistoryNode();
-
-       ModelAction * get_action() const { return action; }
-       const char * get_position() const { return position; }
-private:
-       ModelAction * const action;
-       const char * position;
-};
-
 class ModelHistory {
 public:
        ModelHistory();
@@ -29,26 +11,22 @@ public:
        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_counter; }
-        void incr_func_counter() { func_counter++; }
+       uint32_t get_func_counter() { return func_counter; }
+       void incr_func_counter() { func_counter++; }
 
        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<FuncNode *> * getFuncAtomics() { return &func_atomics; }
 
        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;
+       /* 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. 
-        * 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;
 };