X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.cc;h=3a38384721cd3dfdc59b25f59440b432cf62c87b;hb=130a35155171503883aaf18e57f8957ce63d06e8;hp=c1f1c5c07782ffd74374d7f8cbe52613d2099fdc;hpb=875ebf8e11b4bdd702604785837b6b91b748900d;p=model-checker.git

diff --git a/promise.cc b/promise.cc
index c1f1c5c..3a38384 100644
--- a/promise.cc
+++ b/promise.cc
@@ -2,17 +2,19 @@
 #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),
 	fv(fv),
 	readers(1, read),
@@ -98,13 +100,32 @@ bool Promise::thread_is_available(thread_id_t tid) const
 	return 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 ", first read from thread %d, available threads to resolve: ", fv.value, id_to_int(get_reader(0)->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");
 }
 
@@ -160,3 +181,9 @@ 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);
+}