Change initialize a bit

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index 4457750e961ee69c076ee7b00d91bf98c2f842c3..431f978ea3f54e1053e682aadece744b9ed0ca44 100644 (file)
--- a/history.h
+++ b/history.h
@@ -1,13 +1,12 @@
 #ifndef __HISTORY_H__
 #define __HISTORY_H__
 
-#include "stl-model.h"
 #include "common.h"
+#include "classlist.h"
 #include "hashtable.h"
-#include "hashset.h"
 #include "threads-model.h"
 
-typedef HashSet<uint64_t, uint64_t, 0, model_malloc, model_calloc, model_free> write_set_t;
+#define INIT_SEQ_NUMBER 0xffffffff
 
 class ModelHistory {
 public:
@@ -28,23 +27,69 @@ 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, 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);
+       SnapVector<FuncNode *> * getWrFuncNodes(void * location);
 
-       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; }
+
+       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_node(thread_id_t self_id, thread_id_t waiting_for_id, FuncNode * target_node);
+
+       void set_new_exec_flag();
+       void dump_func_node_graph();
+       void print_func_node();
+       void print_waiting_threads();
 
        MEMALLOC
 private:
        uint32_t func_counter;
+       modelclock_t last_seq_number;
 
-       /* 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;
-       HashTable<void *, write_set_t *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_history;
+
+       /* Map a location to a set of values that have been written to it */
+       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;
+
+       /* Map a location to FuncNodes that may write to it */
+       HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_wr_func_nodes_map;
+
+       HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 0> * loc_waiting_writes_map;
+
+       /* 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;
+
+       bool skip_action(ModelAction * act);
+       void monitor_waiting_thread(uint32_t func_id, thread_id_t tid);
+       void monitor_waiting_thread_counter(thread_id_t tid);
+
 };
 
-#endif /* __HISTORY_H__ */
+#endif /* __HISTORY_H__ */