X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=funcnode.h;h=f4db0e86d6662cd8c43a2a51e6f7a71cd84f8432;hb=4d1d81928c3688fbcfb96ee68eab70e73f7771e5;hp=3a353fd82026bd61f9c4c398b98d2fcab4c7a770;hpb=a4e6e66dfdeb8a5e792433c0cb90c01e6c0a3f92;p=c11tester.git

diff --git a/funcnode.h b/funcnode.h
index 3a353fd8..f4db0e86 100644
--- a/funcnode.h
+++ b/funcnode.h
@@ -1,16 +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;
-typedef HashTable<FuncInst *, ModelAction *, uintptr_t, 0> inst_act_map_t;
+#define MAX_DIST 10
 
+typedef ModelList<FuncInst *> func_inst_list_mt;
 typedef enum edge_type {
 	IN_EDGE, OUT_EDGE, BI_EDGE
 } edge_type_t;
@@ -27,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; }
@@ -37,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, Predicate ** unset_predicate);
 
 	void incr_exit_count() { exit_count++; }
 	uint32_t get_exit_count() { return exit_count; }
@@ -59,19 +58,22 @@ 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();
-	void print_last_read(thread_id_t tid);
 
 	MEMALLOC
 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
@@ -84,31 +86,48 @@ 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);
+	/* Map a FuncInst to the its predicate when updating predicate trees */
+	HashTable<FuncInst *, Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_pred_map;
+
+	/* Number FuncInsts to detect loops when updating predicate trees */
+	HashTable<FuncInst *, uint32_t, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_id_map;
+
+	/* Delect read actions at the same locations when updating predicate trees */
+	HashTable<void *, ModelAction *, uintptr_t, 0, model_malloc, model_calloc, model_free> loc_act_map;
+
+	void infer_predicates(FuncInst * next_inst, ModelAction * next_act, 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 */
 	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;
-	HashTable<uint64_t, loc_set_t *, uint64_t, 0> * val_loc_map;
+
+	/* 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, 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;
+
 	// 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;
+	PredSet predicate_leaves;
 
 	/* 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 */
+
+	/* FuncNodes that follow this node */
+	ModelList<FuncNode *> out_edges;
+
+	void assign_initial_weight();
+	void update_predicate_tree_weight();
 };
 
-#endif /* __FUNCNODE_H__ */
+#endif	/* __FUNCNODE_H__ */