X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=promise.cc;h=a98403bbcf10569a91c2929bd17c420f4a3dc5f6;hp=8519feef5e678726b1ea2369e48a35e0d95631bd;hb=98b2b23d2c1ab9784bd9501ab77bb3aea1983599;hpb=1ef66fffe44c297326b1043cab978789b1071704

diff --git a/promise.cc b/promise.cc
index 8519feef..a98403bb 100644
--- a/promise.cc
+++ b/promise.cc
@@ -2,25 +2,54 @@
 #include <inttypes.h>
 
 #include "promise.h"
-#include "model.h"
+#include "execution.h"
 #include "schedule.h"
+#include "action.h"
+#include "threads-model.h"
 
 /**
  * @brief Promise constructor
+ * @param execution The execution which is creating this Promise
  * @param read The read which reads from a promised future value
  * @param fv The future value that is promised
  */
-Promise::Promise(ModelAction *read, struct future_value fv) :
+Promise::Promise(const ModelExecution *execution, ModelAction *read, struct future_value fv) :
+	execution(execution),
 	num_available_threads(0),
-	value(fv.value),
-	expiration(fv.expiration),
-	read(read),
+	num_was_available_threads(0),
+	fv(fv),
+	readers(1, read),
 	write(NULL)
 {
 	add_thread(fv.tid);
 	eliminate_thread(read->get_tid());
 }
 
+/**
+ * Add a reader that reads from this Promise. Must be added in an order
+ * consistent with execution order.
+ *
+ * @param reader The ModelAction that reads from this promise. Must be a read.
+ * @return True if this new reader has invalidated the promise; false otherwise
+ */
+bool Promise::add_reader(ModelAction *reader)
+{
+	readers.push_back(reader);
+	return eliminate_thread(reader->get_tid());
+}
+
+/**
+ * Access a reader that read from this Promise. Readers must be inserted in
+ * order by execution order, so they can be returned in this order.
+ *
+ * @param i The index of the reader to return
+ * @return The i'th reader of this Promise
+ */
+ModelAction * Promise::get_reader(unsigned int i) const
+{
+	return i < readers.size() ? readers[i] : NULL;
+}
+
 /**
  * Eliminate a thread which no longer can satisfy this promise. Once all
  * enabled threads have been eliminated, this promise is unresolvable.
@@ -54,6 +83,12 @@ void Promise::add_thread(thread_id_t tid)
 		available_thread[id] = true;
 		num_available_threads++;
 	}
+	if (id >= was_available_thread.size())
+		was_available_thread.resize(id + 1, false);
+	if (!was_available_thread[id]) {
+		was_available_thread[id] = true;
+		num_was_available_threads++;
+	}
 }
 
 /**
@@ -72,13 +107,40 @@ bool Promise::thread_is_available(thread_id_t tid) const
 	return available_thread[id];
 }
 
+bool Promise::thread_was_available(thread_id_t tid) const
+{
+	unsigned int id = id_to_int(tid);
+	if (id >= was_available_thread.size())
+		return false;
+	return was_available_thread[id];
+}
+
+/**
+ * @brief Get an upper bound on the number of available threads
+ *
+ * Gets an upper bound on the number of threads in the available threads set,
+ * useful for iterating over "thread_is_available()".
+ *
+ * @return The upper bound
+ */
+unsigned int Promise::max_available_thread_idx() const
+{
+	return available_thread.size();
+}
+
 /** @brief Print debug info about the Promise */
 void Promise::print() const
 {
-	model_print("Promised value %#" PRIx64 ", read from thread %d, available threads to resolve: ", value, id_to_int(read->get_tid()));
+	model_print("Promised value %#" PRIx64 ", first read from thread %d, available threads to resolve: ",
+			fv.value, id_to_int(get_reader(0)->get_tid()));
+	bool failed = true;
 	for (unsigned int i = 0; i < available_thread.size(); i++)
-		if (available_thread[i])
+		if (available_thread[i]) {
 			model_print("[%d]", i);
+			failed = false;
+		}
+	if (failed)
+		model_print("(none)");
 	model_print("\n");
 }
 
@@ -101,7 +163,7 @@ bool Promise::has_failed() const
  */
 bool Promise::is_compatible(const ModelAction *act) const
 {
-	return thread_is_available(act->get_tid()) && read->same_var(act);
+	return thread_is_available(act->get_tid()) && get_reader(0)->same_var(act);
 }
 
 /**
@@ -114,3 +176,29 @@ bool Promise::is_compatible_exclusive(const ModelAction *act) const
 {
 	return get_num_available_threads() == 1 && is_compatible(act);
 }
+
+/**
+ * @brief Check if a store's value matches this Promise
+ * @param write The store to check
+ * @return True if the store's written value matches this Promise
+ */
+bool Promise::same_value(const ModelAction *write) const
+{
+	return get_value() == write->get_write_value();
+}
+
+/**
+ * @brief Check if a ModelAction's location matches this Promise
+ * @param act The ModelAction to check
+ * @return True if the action's location matches this Promise
+ */
+bool Promise::same_location(const ModelAction *act) const
+{
+	return get_reader(0)->same_var(act);
+}
+
+/** @brief Get this Promise's index within the execution's promise array */
+int Promise::get_index() const
+{
+	return execution->get_promise_number(this);
+}