X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=4de6f354bfbccfbedc9061538ecb48be8e69e3e2;hb=d5b200b89adb8c32e5061572cd21edd75c977c05;hp=893c812a1f39bd33f60a3b97291ffe9a525ae124;hpb=89bcfc74c2999b15984759e5b0eab4a9c46feaf3;p=model-checker.git

diff --git a/action.cc b/action.cc
index 893c812..4de6f35 100644
--- a/action.cc
+++ b/action.cc
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-#include <vector>
 
 #include "model.h"
 #include "action.h"
@@ -151,6 +150,11 @@ bool ModelAction::could_be_write() const
 	return is_write() || is_rmwr();
 }
 
+bool ModelAction::is_yield() const
+{
+	return type == THREAD_YIELD;
+}
+
 bool ModelAction::is_rmwr() const
 {
 	return type == ATOMIC_RMWR;
@@ -416,6 +420,26 @@ uint64_t ModelAction::get_write_value() const
 	return value;
 }
 
+/**
+ * @brief Get the value returned by this action
+ *
+ * For atomic reads (including RMW), an operation returns the value it read.
+ * For atomic writes, an operation returns the value it wrote. For other
+ * operations, the return value varies (sometimes is a "don't care"), but the
+ * value is simply stored in the "value" field.
+ *
+ * @return This action's return value
+ */
+uint64_t ModelAction::get_return_value() const
+{
+	if (is_read())
+		return get_reads_from_value();
+	else if (is_write())
+		return get_write_value();
+	else
+		return value;
+}
+
 /** @return The Node associated with this ModelAction */
 Node * ModelAction::get_node() const
 {
@@ -548,14 +572,6 @@ void ModelAction::print() const
 		type_str = "unknown type";
 	}
 
-	uint64_t valuetoprint;
-	if (is_read())
-		valuetoprint = get_reads_from_value();
-	else if (is_write())
-		valuetoprint = get_write_value();
-	else
-		valuetoprint = value;
-
 	switch (this->order) {
 	case std::memory_order_relaxed:
 		mo_str = "relaxed";
@@ -578,7 +594,7 @@ void ModelAction::print() const
 	}
 
 	model_print("(%4d) Thread: %-2d   Action: %-13s   MO: %7s  Loc: %14p   Value: %-#18" PRIx64,
-			seq_number, id_to_int(tid), type_str, mo_str, location, valuetoprint);
+			seq_number, id_to_int(tid), type_str, mo_str, location, get_return_value());
 	if (is_read()) {
 		if (reads_from)
 			model_print("  Rf: %-3d", reads_from->get_seq_number());
@@ -639,3 +655,17 @@ bool ModelAction::may_read_from(const Promise *promise) const
 			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
+ */
+std::mutex * ModelAction::get_mutex() const
+{
+	if (is_trylock() || is_lock() || is_unlock())
+		return (std::mutex *)get_location();
+	else if (is_wait())
+		return (std::mutex *)get_value();
+	else
+		return NULL;
+}