X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.cc;h=8c29c533ac6e66fb9e924590f64d49c4ad4635c5;hp=bd95850579548123d24288f1c8e3a312d44b83f8;hb=f750120c93252f2b677c4b07d003fc71fcdaaa00;hpb=82f6d9ab97a87e874fb1b5dfa237266f4bfc95d1

diff --git a/action.cc b/action.cc
index bd958505..8c29c533 100644
--- a/action.cc
+++ b/action.cc
@@ -42,8 +42,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	last_fence_release(NULL),
 	node(NULL),
 	seq_number(ACTION_INITIAL_CLOCK),
-	cv(NULL),
-	sleep_flag(false)
+	cv(NULL)
 {
 	/* References to NULL atomic variables can end up here */
 	ASSERT(loc || type == ATOMIC_FENCE);
@@ -52,6 +51,39 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	this->tid = t->get_id();
 }
 
+
+/**
+ * @brief Construct a new ModelAction
+ *
+ * @param type The type of action
+ * @param order The memory order of this action. A "don't care" for non-ATOMIC
+ * actions (e.g., THREAD_* or MODEL_* actions).
+ * @param loc The location that this action acts upon
+ * @param value (optional) A value associated with the action (e.g., the value
+ * read or written). Defaults to a given macro constant, for debugging purposes.
+ * @param size (optional) The Thread in which this action occurred. If NULL
+ * (default), then a Thread is assigned according to the scheduler.
+ */
+ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
+		uint64_t value, int size) :
+	type(type),
+	order(order),
+	original_order(order),
+	location(loc),
+	value(value),
+	reads_from(NULL),
+	last_fence_release(NULL),
+	node(NULL),
+	seq_number(ACTION_INITIAL_CLOCK),
+	cv(NULL)
+{
+	/* References to NULL atomic variables can end up here */
+	ASSERT(loc);
+	this->size = size;
+	Thread *t = thread_current();
+	this->tid = t->get_id();
+}
+
 /** @brief ModelAction destructor */
 ModelAction::~ModelAction()
 {
@@ -67,6 +99,10 @@ ModelAction::~ModelAction()
 		delete cv; */
 }
 
+int ModelAction::getSize() const {
+  return size;
+}
+
 void ModelAction::copy_from_new(ModelAction *newaction)
 {
 	seq_number = newaction->seq_number;
@@ -145,7 +181,7 @@ bool ModelAction::is_uninitialized() const
 
 bool ModelAction::is_read() const
 {
-	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMW;
+	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW;
 }
 
 bool ModelAction::is_write() const
@@ -165,7 +201,12 @@ bool ModelAction::is_yield() const
 
 bool ModelAction::is_rmwr() const
 {
-	return type == ATOMIC_RMWR;
+	return type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS;
+}
+
+bool ModelAction::is_rmwrcas() const
+{
+	return type == ATOMIC_RMWRCAS;
 }
 
 bool ModelAction::is_rmw() const
@@ -545,6 +586,7 @@ const char * ModelAction::get_type_str() const
 		case ATOMIC_RMW: return "atomic rmw";
 		case ATOMIC_FENCE: return "fence";
 		case ATOMIC_RMWR: return "atomic rmwr";
+		case ATOMIC_RMWRCAS: return "atomic rmwrcas";
 		case ATOMIC_RMWC: return "atomic rmwc";
 		case ATOMIC_INIT: return "init atomic";
 		case ATOMIC_LOCK: return "lock";
@@ -552,8 +594,8 @@ const char * ModelAction::get_type_str() const
 		case ATOMIC_TRYLOCK: return "trylock";
 		case ATOMIC_WAIT: return "wait";
 		case ATOMIC_NOTIFY_ONE: return "notify one";
-	  case ATOMIC_NOTIFY_ALL: return "notify all";
-	  case ATOMIC_ANNOTATION: return "annotation";
+		case ATOMIC_NOTIFY_ALL: return "notify all";
+		case ATOMIC_ANNOTATION: return "annotation";
 		default: return "unknown type";
 	};
 }
@@ -609,19 +651,6 @@ unsigned int ModelAction::hash() const
 	return hash;
 }
 
-/**
- * @brief Checks the NodeStack to see if a ModelAction is in our may-read-from set
- * @param write The ModelAction to check for
- * @return True if the ModelAction is found; false otherwise
- */
-bool ModelAction::may_read_from(const ModelAction *write) const
-{
-	for (int i = 0; i < node->get_read_from_past_size(); i++)
-		if (node->get_read_from_past(i) == write)
-			return true;
-	return false;
-}
-
 /**
  * Only valid for LOCK, TRY_LOCK, UNLOCK, and WAIT operations.
  * @return The mutex operated on by this action, if any; otherwise NULL