X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=funcnode.h;h=9e3bc69d5e2b184891e0fe5a7b5d36c59557e110;hb=fcc90758629b11f123081c80bb3c37e7ca2a4608;hp=5773d79d846d79e09df531cf238cc5295ad7de28;hpb=35ebf30f42f46d47fbec1db62acc453733dfb2e1;p=c11tester.git

diff --git a/funcnode.h b/funcnode.h
index 5773d79d..9e3bc69d 100644
--- a/funcnode.h
+++ b/funcnode.h
@@ -1,15 +1,14 @@
 #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 "hashfunction.h"
+#include "classlist.h"
+#include "threads-model.h"
 
-typedef ModelList<FuncInst *> func_inst_list_mt;
+#define MAX_DIST 10
 
+typedef ModelList<FuncInst *> func_inst_list_mt;
 typedef enum edge_type {
 	IN_EDGE, OUT_EDGE, BI_EDGE
 } edge_type_t;
@@ -26,6 +25,7 @@ public:
 	void set_new_exec_flag();
 
 	void add_inst(ModelAction *act);
+	FuncInst * create_new_inst(ModelAction *act);
 	FuncInst * get_inst(ModelAction *act);
 
 	HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncInstMap() { return &func_inst_map; }
@@ -36,7 +36,7 @@ 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);
+	bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, SnapVector<Predicate *> * unset_predicates);
 
 	void incr_exit_count() { exit_count++; }
 	uint32_t get_exit_count() { return exit_count; }
@@ -58,6 +58,7 @@ public:
 
 	void add_out_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();
@@ -68,9 +69,14 @@ private:
 	uint32_t func_id;
 	const char * func_name;
 	ModelHistory * history;
-	Predicate * predicate_tree_entry;	// a dummy node whose children are the real entries
+	Predicate * predicate_tree_entry;	// A dummy node whose children are the real entries
+	Predicate * predicate_tree_exit;	// A dummy node
+
 
 	uint32_t exit_count;
+	uint32_t marker;
+
+	void incr_marker() { marker++; }
 
 	/* Use source line number as the key of hashtable, to check if
 	 * atomic operation with this line number has been added or not
@@ -97,7 +103,7 @@ private:
 	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;
+	HashTable<uint64_t, loc_set_t *, uint64_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free, int64_hash> * 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;
@@ -107,9 +113,6 @@ private:
 	/* 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;
 
@@ -117,4 +120,4 @@ private:
 	ModelList<FuncNode *> out_edges;
 };
 
-#endif /* __FUNCNODE_H__ */
+#endif	/* __FUNCNODE_H__ */