update FuncNodes when there is a write

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index 62a3bc504d4fd7d18438a4b4093d080b76401480..6e08fc26d40d62582bbf567519f16f6696c2160d 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -6,19 +6,21 @@
 #include "hashtable.h"
 #include "hashset.h"
 #include "predicate.h"
+#include "history.h"
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
-typedef HashTable<void *, uint64_t, uintptr_t, 4, model_malloc, model_calloc, model_free> read_map_t;
+typedef HashTable<void *, uint64_t, uintptr_t, 4> read_map_t;
 
 class FuncNode {
 public:
-       FuncNode();
+       FuncNode(ModelHistory * history);
        ~FuncNode();
 
        uint32_t get_func_id() { return func_id; }
        const char * get_func_name() { return func_name; }
        void set_func_id(uint32_t id) { func_id = id; }
        void set_func_name(const char * name) { func_name = name; }
+       void set_new_exec_flag();
 
        void add_inst(ModelAction *act);
        FuncInst * get_inst(ModelAction *act);
@@ -36,19 +38,31 @@ public:
        void clear_read_map(uint32_t tid);
 
        /* TODO: generate EQUALITY or NULLITY predicate based on write_history in history.cc */
-       void update_predicate_tree(action_list_t * act_list, HashTable<ModelAction *, FuncInst *, uintptr_t, 4> * act_inst_map);
-       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, HashTable<FuncInst *, uint64_t, uintptr_t, 4> * read_val_map, HashTable<void *, FuncInst *, uintptr_t, 4>* loc_inst_map);
-       void print_predicate_tree();
+       void update_predicate_tree(action_list_t * act_list);
+       void deep_update(Predicate * pred);
+       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, HashTable<FuncInst *, ModelAction *, uintptr_t, 0>* inst_act_map, SnapVector<Predicate *> * unset_predicates);
+
+       void incr_exit_count() { exit_count++; }
+       uint32_t get_exit_count() { return exit_count; }
+
+       ModelList<action_list_t *> * get_action_list_buffer() { return &action_list_buffer; }
+
+       void add_to_val_loc_map(uint64_t val, void * loc);
+       void add_to_val_loc_map(value_set_t * values, void * loc);
 
+       void print_predicate_tree();
        void print_last_read(uint32_t tid);
 
        MEMALLOC
 private:
        uint32_t func_id;
        const char * func_name;
+       ModelHistory * history;
        bool predicate_tree_initialized;
        Predicate * predicate_tree_entry;       // a dummy node whose children are the real entries
 
+       uint32_t exit_count;
+
        /* Use source line number as the key of hashtable, to check if
         * atomic operation with this line number has been added or not
         */
@@ -61,8 +75,13 @@ private:
        func_inst_list_mt entry_insts;
 
        /* Store the values read by atomic read actions per memory location for each thread */
-       ModelVector<read_map_t *> thrd_read_map;
-       HashTable<FuncInst *, Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> predicate_tree_backedges;
+       //ModelVector<read_map_t *> thrd_read_map;
+
+       /* store action_lists when calls to update_tree are deferred */
+       ModelList<action_list_t *> action_list_buffer;
+
+       loc_set_t * read_locations;
+       HashTable<uint64_t, loc_set_t *, uint64_t, 0> * val_loc_map;
 };
 
 #endif /* __FUNCNODE_H__ */