X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=funcinst.cc;h=30c92d2b08fc84ddefacf3622f2b81e434af5863;hp=92890d58ce07b296daa0b7bb1c0c17e717d4bb78;hb=1e3cce83f208da50a267c163841f12d491aeec86;hpb=729acbffd2562f10dd1864b010c3623faa485513

diff --git a/funcinst.cc b/funcinst.cc
index 92890d58..30c92d2b 100644
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -1,13 +1,18 @@
 #include "funcinst.h"
+#include "model.h"
 
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
-	collisions()
+	single_location(true),
+	execution_number(0),
+	associated_reads(),
+	thrd_markers()
 {
 	ASSERT(act);
 	ASSERT(func_node);
 	this->position = act->get_position();
 	this->location = act->get_location();
 	this->type = act->get_type();
+	this->order = act->get_mo();
 	this->func_node = func_node;
 }
 
@@ -19,9 +24,9 @@ FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
  */
 bool FuncInst::add_pred(FuncInst * other)
 {
-	func_inst_list_mt::iterator it;
-	for (it = predecessors.begin();it != predecessors.end();it++) {
-		FuncInst * inst = *it;
+	mllnode<FuncInst*> * it;
+	for (it = predecessors.begin();it != NULL;it=it->getNext()) {
+		FuncInst * inst = it->getVal();
 		if (inst == other)
 			return false;
 	}
@@ -32,9 +37,9 @@ bool FuncInst::add_pred(FuncInst * other)
 
 bool FuncInst::add_succ(FuncInst * other)
 {
-	func_inst_list_mt::iterator it;
-	for (it = successors.begin();it != successors.end();it++) {
-		FuncInst * inst = *it;
+	mllnode<FuncInst*>* it;
+	for (it = successors.begin();it != NULL;it=it->getNext()) {
+		FuncInst * inst = it->getVal();
 		if ( inst == other )
 			return false;
 	}
@@ -43,26 +48,81 @@ bool FuncInst::add_succ(FuncInst * other)
 	return true;
 }
 
+void FuncInst::set_associated_read(thread_id_t tid, int index, uint32_t marker, uint64_t read_val)
+{
+	int thread_id = id_to_int(tid);
+
+	if (associated_reads.size() < (uint) thread_id + 1) {
+		int old_size = associated_reads.size();
+		int new_size = thread_id + 1;
+
+		associated_reads.resize(new_size);
+		thrd_markers.resize(new_size);
+
+		for (int i = old_size; i < new_size; i++ ) {
+			associated_reads[i] = new ModelVector<uint64_t>();
+			thrd_markers[i] = new ModelVector<uint32_t>();
+		}
+	}
+
+	ModelVector<uint64_t> * read_values = associated_reads[thread_id];
+	ModelVector<uint32_t> * markers = thrd_markers[thread_id];
+	if (read_values->size() < (uint) index + 1) {
+		int old_size = read_values->size();
+
+		for (int i = old_size; i < index + 1; i++) {
+			read_values->push_back(VALUE_NONE);
+			markers->push_back(0);
+		}
+	}
+
+	(*read_values)[index] = read_val;
+	(*markers)[index] = marker;
+}
+
+uint64_t FuncInst::get_associated_read(thread_id_t tid, int index, uint32_t marker)
+{
+	int thread_id = id_to_int(tid);
+
+	if ( (*thrd_markers[thread_id])[index] == marker)
+		return (*associated_reads[thread_id])[index];
+	else
+		return VALUE_NONE;
+}
+
+/* Search the FuncInst that has the same type as act in the collision list */
 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++) {
-		FuncInst * inst = *it;
-		if ( inst->get_type() == type )
+	mllnode<FuncInst*> * it;
+	for (it = collisions.begin();it != NULL;it = it->getNext()) {
+		FuncInst * inst = it->getVal();
+		if (inst->get_type() == type)
 			return inst;
 	}
 	return NULL;
 }
 
+void FuncInst::add_to_collision(FuncInst * inst)
+{
+	collisions.push_back(inst);
+}
+
+/* Note: is_read() is equivalent to ModelAction::is_read() */
 bool FuncInst::is_read() const
 {
-	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS; /* type == ATOMIC_RMW ? */
+	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW;
 }
 
+/* Note: because of action type conversion in ModelExecution
+ * is_write() <==> pure writes (excluding rmw) */
 bool FuncInst::is_write() const
 {
-        return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT || type == NONATOMIC_WRITE;
+	return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == NONATOMIC_WRITE;
 }
 
+void FuncInst::print()
+{
+	model_print("func inst - pos: %s, loc: %p, type: %d,\n", position, location, type);
+}