X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=action.cc;h=08cacd89227f880c1bb391a83f799283c5de4e03;hp=757b3d1d2fcc53bf1ed86a711785a84f808d1883;hb=f5305a99cba598d0de55358df103439831dd1eb2;hpb=68b6b3ecad7edcaed6547d4d2be3eb974dfc98d6

diff --git a/action.cc b/action.cc
index 757b3d1..08cacd8 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"
@@ -12,6 +11,12 @@
 
 #define ACTION_INITIAL_CLOCK 0
 
+/** A special value to represent a successful trylock */
+#define VALUE_TRYSUCCESS 1
+
+/** A special value to represent a failed trylock */
+#define VALUE_TRYFAILED 0
+
 /**
  * @brief Construct a new ModelAction
  *
@@ -78,6 +83,11 @@ bool ModelAction::is_thread_start() const
 	return type == THREAD_START;
 }
 
+bool ModelAction::is_thread_join() const
+{
+	return type == THREAD_JOIN;
+}
+
 bool ModelAction::is_relseq_fixup() const
 {
 	return type == MODEL_FIXUP_RELSEQ;
@@ -151,6 +161,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;
@@ -371,11 +386,9 @@ void ModelAction::create_cv(const ModelAction *parent)
 		cv = new ClockVector(NULL, this);
 }
 
-void ModelAction::set_try_lock(bool obtainedlock) {
-	if (obtainedlock)
-		value = VALUE_TRYSUCCESS;
-	else
-		value = VALUE_TRYFAILED;
+void ModelAction::set_try_lock(bool obtainedlock)
+{
+	value = obtainedlock ? VALUE_TRYSUCCESS : VALUE_TRYFAILED;
 }
 
 /**
@@ -416,6 +429,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 +581,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 +603,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());
@@ -587,7 +612,7 @@ void ModelAction::print() const
 			if (idx >= 0)
 				model_print("  Rf: P%-2d", idx);
 			else
-				model_print("  RF: P? ");
+				model_print("  Rf: P? ");
 		} else
 			model_print("  Rf: ?  ");
 	}
@@ -609,7 +634,52 @@ unsigned int ModelAction::hash() const
 	hash ^= seq_number << 5;
 	hash ^= id_to_int(tid) << 6;
 
-	if (is_read() && reads_from)
-		hash ^= reads_from->get_seq_number();
+	if (is_read()) {
+	       if (reads_from)
+		       hash ^= reads_from->get_seq_number();
+	       else if (reads_from_promise)
+		       hash ^= model->get_promise_number(reads_from_promise);
+	       hash ^= get_reads_from_value();
+	}
 	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;
+}
+
+/**
+ * @brief Checks the NodeStack to see if a Promise is in our may-read-from set
+ * @param promise The Promise to check for
+ * @return True if the Promise is found; false otherwise
+ */
+bool ModelAction::may_read_from(const Promise *promise) const
+{
+	for (int i = 0; i < node->get_read_from_promise_size(); i++)
+		if (node->get_read_from_promise(i) == promise)
+			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;
+}