Move data structures from execution.h to history.h

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index 7513524f2da80e83ddedee973c51e38332ea6fc6..f06c2e44e46cb189c34d06f870063a75a0dcd772 100644 (file)
--- a/history.h
+++ b/history.h
@@ -28,7 +28,7 @@ public:
        FuncNode * get_curr_func_node(thread_id_t tid);
 
        void update_write_history(void * location, uint64_t write_val);
-       HashTable<void *, value_set_t *, uintptr_t, 4> * getWriteHistory() { return write_history; }
+       HashTable<void *, value_set_t *, uintptr_t, 0> * getWriteHistory() { return write_history; }
        void update_loc_rd_func_nodes_map(void * location, FuncNode * node);
        void update_loc_wr_func_nodes_map(void * location, FuncNode * node);
        SnapVector<FuncNode *> * getRdFuncNodes(void * location);
@@ -42,7 +42,7 @@ public:
        WaitObj * getWaitObj(thread_id_t tid);
        void add_waiting_thread(thread_id_t self_id, thread_id_t waiting_for_id, FuncNode * target_node, int dist);
        void remove_waiting_thread(thread_id_t tid);
-       void stop_waiting_for(thread_id_t self_id, thread_id_t waiting_for_id, FuncNode * target_node);
+       void stop_waiting_for_node(thread_id_t self_id, thread_id_t waiting_for_id, FuncNode * target_node);
 
        SnapVector<inst_act_map_t *> * getThrdInstActMap(uint32_t func_id);
 
@@ -64,7 +64,7 @@ private:
        ModelVector<FuncNode *> func_nodes;
 
        /* Map a location to a set of values that have been written to it */
-       HashTable<void *, value_set_t *, uintptr_t, 4> * write_history;
+       HashTable<void *, value_set_t *, uintptr_t, 0> * write_history;
 
        /* Map a location to FuncNodes that may read from it */
        HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_rd_func_nodes_map;
@@ -73,6 +73,20 @@ private:
        HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_wr_func_nodes_map;
 
        HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 0> * loc_waiting_writes_map;
+
+       /* Keeps track of atomic actions that thread i has performed in some
+        * function. Index of SnapVector is thread id. SnapList simulates
+        * the call stack.
+        */
+       SnapVector< SnapList<action_list_t *> *> * thrd_func_act_lists;
+
+       /* thrd_func_list stores a list of function ids for each thread.
+        * Each element in thrd_func_list stores the functions that
+        * thread i has entered and yet to exit from
+        */
+       SnapVector<func_id_list_t> * thrd_func_list;
+       SnapVector<uint32_t> * thrd_last_entered_func;
+
        /* The write values each paused thread is waiting for */
        SnapVector<ConcretePredicate *> * thrd_waiting_write;
        SnapVector<WaitObj *> * thrd_wait_obj;
@@ -83,6 +97,8 @@ private:
 
        bool skip_action(ModelAction * act, SnapList<ModelAction *> * curr_act_list);
        void monitor_waiting_thread(uint32_t func_id, thread_id_t tid);
+       void monitor_waiting_thread_counter(thread_id_t tid);
+
 };
 
 #endif /* __HISTORY_H__ */