X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.cc;h=8793337448dda45a86ade51d63e6eba2b8960c0c;hp=d5131f0b03dfc9c7c9b86c901ca4215fbfac8245;hb=c6ecd39c5c0483a5aaa370a1b4bbd07b2af77eb2;hpb=c0182a11fd62cc38f9f5cbe49960d7a9bce8d381

diff --git a/action.cc b/action.cc
index d5131f0b..87933374 100644
--- a/action.cc
+++ b/action.cc
@@ -1,23 +1,23 @@
 #include <stdio.h>
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 
 #include "model.h"
 #include "action.h"
 #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, uint64_t 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()
@@ -28,12 +28,12 @@ ModelAction::~ModelAction()
 
 bool ModelAction::is_read() const
 {
-	return type == ATOMIC_READ;
+	return type == ATOMIC_READ || type == ATOMIC_RMW;
 }
 
 bool ModelAction::is_write() const
 {
-	return type == ATOMIC_WRITE || type == ATOMIC_INIT;
+	return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT;
 }
 
 bool ModelAction::is_rmw() const
@@ -49,9 +49,9 @@ bool ModelAction::is_initialization() const
 bool ModelAction::is_acquire() const
 {
 	switch (order) {
-	case memory_order_acquire:
-	case memory_order_acq_rel:
-	case memory_order_seq_cst:
+	case std::memory_order_acquire:
+	case std::memory_order_acq_rel:
+	case std::memory_order_seq_cst:
 		return true;
 	default:
 		return false;
@@ -61,9 +61,9 @@ bool ModelAction::is_acquire() const
 bool ModelAction::is_release() const
 {
 	switch (order) {
-	case memory_order_release:
-	case memory_order_acq_rel:
-	case memory_order_seq_cst:
+	case std::memory_order_release:
+	case std::memory_order_acq_rel:
+	case std::memory_order_seq_cst:
 		return true;
 	default:
 		return false;
@@ -72,7 +72,7 @@ bool ModelAction::is_release() const
 
 bool ModelAction::is_seqcst() const
 {
-	return order==memory_order_seq_cst;
+	return order==std::memory_order_seq_cst;
 }
 
 bool ModelAction::same_var(const ModelAction *act) const
@@ -85,6 +85,15 @@ bool ModelAction::same_thread(const ModelAction *act) const
 	return tid == act->tid;
 }
 
+void ModelAction::upgrade_rmw(ModelAction * act) {
+	ASSERT(is_read());
+	ASSERT(act->is_rmw());
+	//Upgrade our type to the act's type
+	this->type=act->type;
+	this->order=act->order;
+	this->value=act->value;
+}
+
 /** The is_synchronizing method should only explore interleavings if:
  *  (1) the operations are seq_cst and don't commute or
  *  (2) the reordering may establish or break a synchronization relation.
@@ -104,7 +113,7 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const
 	// Different locations commute
 	if (!same_var(act))
 		return false;
-	
+
 	// Explore interleavings of seqcst writes to guarantee total order
 	// of seq_cst operations that don't commute
 	if (is_write() && is_seqcst() && act->is_write() && act->is_seqcst())
@@ -135,7 +144,7 @@ void ModelAction::read_from(const ModelAction *act)
 	ASSERT(cv);
 	if (act->is_release() && this->is_acquire())
 		cv->merge(act->cv);
-	value = act->value;
+	reads_from = act;
 }
 
 /**
@@ -156,6 +165,9 @@ void ModelAction::print(void) const
 	case THREAD_CREATE:
 		type_str = "thread create";
 		break;
+	case THREAD_START:
+		type_str = "thread start";
+		break;
 	case THREAD_YIELD:
 		type_str = "thread yield";
 		break;
@@ -178,8 +190,12 @@ void ModelAction::print(void) const
 		type_str = "unknown type";
 	}
 
-	printf("(%3d) Thread: %-2d    Action: %-13s    MO: %d    Loc: %14p    Value: %d",
-			seq_number, id_to_int(tid), type_str, order, location, value);
+	uint64_t valuetoprint=type==ATOMIC_READ?reads_from->value:value;
+
+	printf("(%3d) Thread: %-2d    Action: %-13s    MO: %d    Loc: %14p    Value: %-12" PRIu64,
+			seq_number, id_to_int(tid), type_str, order, location, valuetoprint);
+	if (reads_from)
+		printf(" Rf: %d", reads_from->get_seq_number());
 	if (cv) {
 		printf("\t");
 		cv->print();