X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=funcnode.h;h=9df33343da4254a7b9858c7453990559af844fec;hb=44870f54a17bd7a61a94465aec78144c689e336b;hp=6ddcbb26d328859ddc2a8a42716ecee5ff935958;hpb=a1280c133564afec30de10cc1de12a23b02a13d0;p=c11tester.git

diff --git a/funcnode.h b/funcnode.h
index 6ddcbb26..9df33343 100644
--- a/funcnode.h
+++ b/funcnode.h
@@ -1,46 +1,53 @@
 #include "action.h"
+#include "funcinst.h"
 #include "hashtable.h"
 
 class ModelAction;
 
-typedef ModelList<FuncInst *> func_inst_list_t;
-
-class FuncInst {
-public:
-	FuncInst(ModelAction *act);
-	~FuncInst();
-
-	//ModelAction * get_action() const { return action; }
-	const char * get_position() const { return position; }
-	void * get_location() const { return location; }
-	action_type get_type() const { return type; }
-
-	MEMALLOC
-private:
-	//ModelAction * const action;
-	const char * position;
-	void *location;
-	action_type type;
-};
+typedef ModelList<FuncInst *> func_inst_list_mt;
+typedef HashTable<void *, uint64_t, uintptr_t, 4, model_malloc, model_calloc, model_free> read_map_t;
 
 class FuncNode {
 public:
 	FuncNode();
 	~FuncNode();
 
-	void add_action(ModelAction *act);
+	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; }
 
-	HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncInsts() { return &func_insts; }
-	func_inst_list_t * get_inst_list() { return &inst_list; }
+	FuncInst * get_or_add_action(ModelAction *act);
+
+	HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncInstMap() { return &func_inst_map; }
+	func_inst_list_mt * get_inst_list() { return &inst_list; }
+	func_inst_list_mt * get_entry_insts() { return &entry_insts; }
+	void add_entry_inst(FuncInst * inst);
+	void link_insts(func_inst_list_t * inst_list);
+
+	void store_read(ModelAction * act, uint32_t tid);
+	uint64_t query_last_read(ModelAction * act, uint32_t tid);
+	void clear_read_map(uint32_t tid);
+
+	void print_last_read(uint32_t tid);
 
 	MEMALLOC
 private:
-	/* Use source line number as the key of hashtable
-	 *
-	 * To do: cds_atomic_compare_exchange contains three atomic operations
-	 * that are feeded with the same source line number by llvm pass
+	uint32_t func_id;
+	const char * func_name;
+
+	/* Use source line number as the key of hashtable, to check if 
+	 * atomic operation with this line number has been added or not
 	 */
-	HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_insts;
+	HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_inst_map;
+
+	/* list of all atomic actions in this function */
+	func_inst_list_mt inst_list;
+
+	/* possible entry atomic actions in this function */
+	func_inst_list_mt entry_insts;
 
-	func_inst_list_t inst_list;
+	/* Store the values read by atomic read actions per memory location for each thread */
+	ModelVector<read_map_t *> thrd_read_map;
+	ModelList<void *> read_locations;
 };