X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=funcinst.cc;h=7e0446ffec149e9c778345c6ca2790ca48916cec;hp=2875489189329dc95362d5079b3db7f994df4f43;hb=9ade2b8c5ec2fc4bd6a556a37cccf896912367bf;hpb=54210d33af73ae7c74f2d416ab0e7bd472379e12

diff --git a/funcinst.cc b/funcinst.cc
index 28754891..7e0446ff 100644
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -1,17 +1,26 @@
 #include "funcinst.h"
 
-FuncInst::FuncInst(ModelAction *act) :
+FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
 	collisions()
 {
 	ASSERT(act);
+	ASSERT(func_node);
 	this->position = act->get_position();
 	this->location = act->get_location();
 	this->type = act->get_type();
+	this->func_node = func_node;
 }
 
-bool FuncInst::add_pred(FuncInst * other) {
+/* @param other Preceding FuncInst in the same execution trace
+ * Add other to predecessors if it has been added
+ *
+ * @return false: other is already in predecessors
+ *         true : other is added to precedessors
+ */
+bool FuncInst::add_pred(FuncInst * other)
+{
 	func_inst_list_mt::iterator it;
-	for (it = predecessors.begin(); it != predecessors.end(); it++) {
+	for (it = predecessors.begin();it != predecessors.end();it++) {
 		FuncInst * inst = *it;
 		if (inst == other)
 			return false;
@@ -21,9 +30,10 @@ bool FuncInst::add_pred(FuncInst * other) {
 	return true;
 }
 
-bool FuncInst::add_succ(FuncInst * other) {
+bool FuncInst::add_succ(FuncInst * other)
+{
 	func_inst_list_mt::iterator it;
-	for (it = successors.begin(); it != successors.end(); it++) {
+	for (it = successors.begin();it != successors.end();it++) {
 		FuncInst * inst = *it;
 		if ( inst == other )
 			return false;
@@ -33,14 +43,20 @@ bool FuncInst::add_succ(FuncInst * other) {
 	return true;
 }
 
-FuncInst * FuncInst::search_in_collision(ModelAction *act) {
+FuncInst * FuncInst::search_in_collision(ModelAction *act)
+{
 	action_type type = act->get_type();
 
 	func_inst_list_mt::iterator it;
-	for (it = collisions.begin(); it != collisions.end(); it++) {
+	for (it = collisions.begin();it != collisions.end();it++) {
 		FuncInst * inst = *it;
 		if ( inst->get_type() == type )
 			return inst;
 	}
 	return NULL;
 }
+
+bool FuncInst::is_read() const
+{
+	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS;
+}