X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=c96949bc906cc02a9ca3cb50af761a92feda94c7;hb=f291abaf7a05ebdc5981072212b55265dafc1c4a;hp=dc980dbcdaaeb81c5e8a70939c1f4259ea48e3a7;hpb=d9a2373dc7c9678df935643da4d719ff6bad7897;p=c11tester.git

diff --git a/action.cc b/action.cc
index dc980dbc..c96949bc 100644
--- a/action.cc
+++ b/action.cc
@@ -5,19 +5,17 @@
 #include "clockvector.h"
 #include "common.h"
 
-ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value)
+ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value) :
+	type(type),
+	order(order),
+	location(loc),
+	value(value),
+	reads_from(NULL),
+	cv(NULL)
 {
 	Thread *t = thread_current();
-	ModelAction *act = this;
-
-	act->type = type;
-	act->order = order;
-	act->location = loc;
-	act->tid = t->get_id();
-	act->value = value;
-	act->seq_number = model->get_next_seq_num();
-
-	cv = NULL;
+	this->tid = t->get_id();
+	this->seq_number = model->get_next_seq_num();
 }
 
 ModelAction::~ModelAction()
@@ -26,22 +24,27 @@ ModelAction::~ModelAction()
 		delete cv;
 }
 
-bool ModelAction::is_read()
+bool ModelAction::is_read() const
 {
 	return type == ATOMIC_READ;
 }
 
-bool ModelAction::is_write()
+bool ModelAction::is_write() const
 {
-	return type == ATOMIC_WRITE;
+	return type == ATOMIC_WRITE || type == ATOMIC_INIT;
 }
 
-bool ModelAction::is_rmw()
+bool ModelAction::is_rmw() const
 {
 	return type == ATOMIC_RMW;
 }
 
-bool ModelAction::is_acquire()
+bool ModelAction::is_initialization() const
+{
+	return type == ATOMIC_INIT;
+}
+
+bool ModelAction::is_acquire() const
 {
 	switch (order) {
 	case memory_order_acquire:
@@ -53,7 +56,7 @@ bool ModelAction::is_acquire()
 	}
 }
 
-bool ModelAction::is_release()
+bool ModelAction::is_release() const
 {
 	switch (order) {
 	case memory_order_release:
@@ -65,17 +68,17 @@ bool ModelAction::is_release()
 	}
 }
 
-bool ModelAction::is_seqcst()
+bool ModelAction::is_seqcst() const
 {
 	return order==memory_order_seq_cst;
 }
 
-bool ModelAction::same_var(ModelAction *act)
+bool ModelAction::same_var(const ModelAction *act) const
 {
 	return location == act->location;
 }
 
-bool ModelAction::same_thread(ModelAction *act)
+bool ModelAction::same_thread(const ModelAction *act) const
 {
 	return tid == act->tid;
 }
@@ -90,7 +93,7 @@ bool ModelAction::same_thread(ModelAction *act)
  *  @return tells whether we have to explore a reordering.
  */
 
-bool ModelAction::is_synchronizing(ModelAction *act)
+bool ModelAction::is_synchronizing(const ModelAction *act) const
 {
 	//Same thread can't be reordered
 	if (same_thread(act))
@@ -115,7 +118,7 @@ bool ModelAction::is_synchronizing(ModelAction *act)
 	return false;
 }
 
-void ModelAction::create_cv(ModelAction *parent)
+void ModelAction::create_cv(const ModelAction *parent)
 {
 	ASSERT(cv == NULL);
 
@@ -125,15 +128,27 @@ void ModelAction::create_cv(ModelAction *parent)
 		cv = new ClockVector(NULL, this);
 }
 
-void ModelAction::read_from(ModelAction *act)
+void ModelAction::read_from(const ModelAction *act)
 {
 	ASSERT(cv);
 	if (act->is_release() && this->is_acquire())
 		cv->merge(act->cv);
+	reads_from = act;
 	value = act->value;
 }
 
-void ModelAction::print(void)
+/**
+ * Check whether 'this' happens before act, according to the memory-model's
+ * happens before relation. This is checked via the ClockVector constructs.
+ * @return true if this action's thread has synchronized with act's thread
+ * since the execution of act, false otherwise.
+ */
+bool ModelAction::happens_before(const ModelAction *act) const
+{
+	return act->cv->synchronized_since(this);
+}
+
+void ModelAction::print(void) const
 {
 	const char *type_str;
 	switch (this->type) {
@@ -155,12 +170,17 @@ void ModelAction::print(void)
 	case ATOMIC_RMW:
 		type_str = "atomic rmw";
 		break;
+	case ATOMIC_INIT:
+		type_str = "init atomic";
+		break;
 	default:
 		type_str = "unknown type";
 	}
 
-	printf("(%3d) Thread: %-2d    Action: %-13s    MO: %d    Loc: %14p    Value: %d",
+	printf("(%3d) Thread: %-2d    Action: %-13s    MO: %d    Loc: %14p    Value: %-4d",
 			seq_number, id_to_int(tid), type_str, order, location, value);
+	if (reads_from)
+		printf(" Rf: %d", reads_from->get_seq_number());
 	if (cv) {
 		printf("\t");
 		cv->print();