Free memory

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index fff5712629057311811bebde6401a42f57bf56db..5a3657c44c9cf19cc1075c8fd7c00194241583c4 100644 (file)
--- a/history.h
+++ b/history.h
@@ -1,39 +1,73 @@
+#ifndef __HISTORY_H__
+#define __HISTORY_H__
+
 #include "stl-model.h"
 #include "common.h"
+#include "classlist.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++; }
+
+       void resize_func_nodes(uint32_t max_func_id);
+       void process_action(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<const char *> * getFuncMapRev() { return &func_map_rev; }
+
+       ModelVector<FuncNode *> * getFuncNodes() { return &func_nodes; }
+       FuncNode * get_func_node(uint32_t func_id);
+       FuncNode * get_curr_func_node(thread_id_t tid);
 
-        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 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 print();
+       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();
+
+       MEMALLOC
 private:
-       uint32_t func_id;
+       uint32_t func_counter;
+
+       /* 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 */
+       ModelVector<const char *> func_map_rev;
+
+       ModelVector<FuncNode *> func_nodes;
 
-        /* map function names to integer ids */ 
-        HashTable<const char *, uint32_t, uintptr_t, 4> func_map;
+       /* 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<uint32_t, action_mlist_t *, uintptr_t, 4> func_history;
+       /* Map a location to FuncNodes that may read from it */
+       HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 4> loc_func_nodes_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;
+       /* 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__ */