Free memory

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index 3bb615640eca3e86728675db2c366c508689d4d4..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,30 +26,48 @@ public:
 
        ModelVector<FuncNode *> * getFuncNodes() { return &func_nodes; }
        FuncNode * get_func_node(uint32_t func_id);
-//     uint64_t query_last_read(void * location, thread_id_t tid);
+       FuncNode * get_curr_func_node(thread_id_t tid);
 
-       void add_to_write_history(void * location, uint64_t write_val);
+       void update_write_history(void * location, uint64_t write_val);
        HashTable<void *, value_set_t *, uintptr_t, 4> * getWriteHistory() { return &write_history; }
-       void add_to_loc_func_nodes_map(void * location, FuncNode * node);
+       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 print_write();
+       void dump_func_node_graph();
        void print_func_node();
 
        MEMALLOC
 private:
        uint32_t func_counter;
 
-       /* map function names to integer ids */
+       /* Map function names to integer ids */
        HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> func_map;
 
-       /* map integer ids to function names */
+       /* Map integer ids to function names */
        ModelVector<const char *> func_map_rev;
 
        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;
+
+       /* Map a location to FuncNodes that may read from it */
        HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 4> loc_func_nodes_map;
+
+       /* Map a location to FuncNodes that may write to it */
+       HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 4> loc_wr_func_nodes_map;
+
+       /* Keeps track of the last function entered by each thread */
+       SnapVector<uint32_t> thrd_last_entered_func;
+
+       HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 4> loc_waiting_writes_map;
+       SnapVector<ConcretePredicate *> thrd_waiting_write;
 };
 
 #endif /* __HISTORY_H__ */