#ifndef __FUNCNODE_H__
#define __FUNCNODE_H__
-#include "action.h"
-#include "funcinst.h"
-#include "hashtable.h"
#include "hashset.h"
-#include "predicate.h"
-#include "history.h"
+#include "classlist.h"
+#include "threads-model.h"
+#define MAX_DIST 10
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
inst_act_map_t * get_inst_act_map(thread_id_t tid);
void add_out_edge(FuncNode * other);
- void add_in_edge(FuncNode * other);
+ ModelList<FuncNode *> * get_out_edges() { return &out_edges; }
+ int compute_distance(FuncNode * target, int max_step = MAX_DIST);
void print_predicate_tree();
void print_val_loc_map();
/* Store action_lists when calls to update_tree are deferred */
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: look up locations that may share the same value as key;
- * 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 */
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;
- ModelList<FuncNode *> out_edges; /* FuncNodes that follow this node */
- ModelList<FuncNode *> in_edges; /* FuncNodes that comes before this node */
+
+ /* FuncNodes that follow this node */
+ ModelList<FuncNode *> out_edges;
};
#endif /* __FUNCNODE_H__ */