Need to free memory

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index db52f4ead88a3d9fde098273c573fce1fc7b2560..5773d79d846d79e09df531cf238cc5295ad7de28 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -9,7 +9,10 @@
 #include "history.h"
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
-typedef HashTable<FuncInst *, ModelAction *, uintptr_t, 0> inst_act_map_t;
+
+typedef enum edge_type {
+       IN_EDGE, OUT_EDGE, BI_EDGE
+} edge_type_t;
 
 class FuncNode {
 public:
@@ -32,16 +35,13 @@ public:
 
        void update_tree(action_list_t * act_list);
        void update_inst_tree(func_inst_list_t * inst_list);
-
        void update_predicate_tree(action_list_t * act_list);
-       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 generate_predicate(Predicate ** curr_pred, FuncInst * next_inst, SnapVector<struct half_pred_expr *> * half_pred_expressions);
-       bool amend_predicate_expr(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act);
+       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; }
+       SnapList<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);
@@ -56,6 +56,9 @@ public:
        void update_inst_act_map(thread_id_t tid, ModelAction * read_act);
        inst_act_map_t * get_inst_act_map(thread_id_t tid);
 
+       void add_out_edge(FuncNode * other);
+       ModelList<FuncNode *> * get_out_edges() { return &out_edges; }
+
        void print_predicate_tree();
        void print_val_loc_map();
        void print_last_read(thread_id_t tid);
@@ -65,7 +68,6 @@ 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;
@@ -81,22 +83,38 @@ private:
        /* Possible entry atomic actions in this function */
        func_inst_list_mt entry_insts;
 
+       void infer_predicates(FuncInst * next_inst, ModelAction * next_act, HashTable<void *, ModelAction *, uintptr_t, 0> * loc_act_map, SnapVector<struct half_pred_expr *> * half_pred_expressions);
+       void generate_predicates(Predicate ** curr_pred, FuncInst * next_inst, SnapVector<struct half_pred_expr *> * half_pred_expressions);
+       bool amend_predicate_expr(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act);
+
        /* Store action_lists when calls to update_tree are deferred */
-       ModelList<action_list_t *> action_list_buffer;
+       SnapList<action_list_t *> * action_list_buffer;
 
-       /* read_locations: set of locations read by this FuncNode
-        * val_loc_map: keep track of locations that have the same values written to;
-        * loc_may_equal_map: deduced from val_loc_map;
-        */
+       /* Set of locations read by this FuncNode */
        loc_set_t * read_locations;
+
+       /* Set of locations written to by this FuncNode */
+       loc_set_t * write_locations;
+
+       /* Keeps track of locations that have the same values written to */
        HashTable<uint64_t, loc_set_t *, uint64_t, 0> * val_loc_map;
+
+       /* Keeps track of locations that may share the same value as key, deduced from val_loc_map */
        HashTable<void *, loc_set_t *, uintptr_t, 0> * loc_may_equal_map;
+
        // value_set_t * values_may_read_from;
 
-       /* run-time position in the predicate tree for each thread */
+       /* Run-time position in the predicate tree for each thread */
        ModelVector<Predicate *> predicate_tree_position;
 
+       /* A run-time map from FuncInst to ModelAction for each thread; needed by NewFuzzer */
        SnapVector<inst_act_map_t *> * thrd_inst_act_map;
+
+       /* Store the relation between this FuncNode and other FuncNodes */
+       HashTable<FuncNode *, edge_type_t, uintptr_t, 0, model_malloc, model_calloc, model_free> edge_table;
+
+       /* FuncNodes that follow this node */
+       ModelList<FuncNode *> out_edges;
 };
 
 #endif /* __FUNCNODE_H__ */