Free memory

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index e85aa81a18ce4e4d4c6979ce2291c154c624726d..5a3657c44c9cf19cc1075c8fd7c00194241583c4 100644 (file)
--- a/history.h
+++ b/history.h
@@ -3,8 +3,8 @@
 
 #include "stl-model.h"
 #include "common.h"
+#include "classlist.h"
 #include "hashtable.h"
-#include "hashset.h"
 #include "threads-model.h"
 
 class ModelHistory {
@@ -26,12 +26,18 @@ public:
 
        ModelVector<FuncNode *> * getFuncNodes() { return &func_nodes; }
        FuncNode * get_func_node(uint32_t func_id);
+       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; }
        void update_loc_func_nodes_map(void * location, FuncNode * node);
        void update_loc_wr_func_nodes_map(void * location, FuncNode * node);
 
+       void add_waiting_write(ConcretePredicate * concrete);
+       void remove_waiting_write(thread_id_t tid);
+       void check_waiting_write(ModelAction * write_act);
+       SnapVector<ConcretePredicate *> * getThrdWaitingWrite() { return &thrd_waiting_write; }
+
        void set_new_exec_flag();
        void dump_func_node_graph();
        void print_func_node();
@@ -59,7 +65,9 @@ private:
 
        /* Keeps track of the last function entered by each thread */
        SnapVector<uint32_t> thrd_last_entered_func;
-       void add_edges_between(FuncNode * prev_node, FuncNode * next_node);
+
+       HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 4> loc_waiting_writes_map;
+       SnapVector<ConcretePredicate *> thrd_waiting_write;
 };
 
 #endif /* __HISTORY_H__ */