X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.cc;h=69197cbac818b8f8dc01ad75d1d109df61474783;hb=5bd87a4163897f385459b8744f3d6e322b9f5d3e;hp=3b2aa960f967bb389d48b24fe61e0d4f62664471;hpb=c49d1c1de40847e0133b61137422005ec1cc69fd;p=model-checker.git

diff --git a/promise.cc b/promise.cc
index 3b2aa96..69197cb 100644
--- a/promise.cc
+++ b/promise.cc
@@ -1,3 +1,6 @@
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
 #include "promise.h"
 #include "model.h"
 #include "schedule.h"
@@ -13,15 +16,56 @@
 bool Promise::eliminate_thread(thread_id_t tid)
 {
 	unsigned int id = id_to_int(tid);
-	if (id >= eliminated_thread.size())
-		eliminated_thread.resize(id + 1, false);
-	if (eliminated_thread[id])
+	if (!thread_is_available(tid))
 		return false;
 
-	eliminated_thread[id] = true;
+	available_thread[id] = false;
+	num_available_threads--;
 	return has_failed();
 }
 
+/**
+ * Add a thread which may resolve this promise
+ *
+ * @param tid The thread ID
+ */
+void Promise::add_thread(thread_id_t tid)
+{
+	unsigned int id = id_to_int(tid);
+	if (id >= available_thread.size())
+		available_thread.resize(id + 1, false);
+	if (!available_thread[id]) {
+		available_thread[id] = true;
+		num_available_threads++;
+	}
+}
+
+/**
+ * Check if a thread is available for resolving this promise. That is, the
+ * thread must have been previously marked for resolving this promise, and it
+ * cannot have been eliminated due to synchronization, etc.
+ *
+ * @param tid Thread ID of the thread to check
+ * @return True if the thread is available; false otherwise
+ */
+bool Promise::thread_is_available(thread_id_t tid) const
+{
+	unsigned int id = id_to_int(tid);
+	if (id >= available_thread.size())
+		return false;
+	return available_thread[id];
+}
+
+/** @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, read->get_tid());
+	for (unsigned int i = 0; i < available_thread.size(); i++)
+		if (available_thread[i])
+			model_print("[%d]", i);
+	model_print("\n");
+}
+
 /**
  * Check if this promise has failed. A promise can fail when all threads which
  * could possibly satisfy the promise have been eliminated.
@@ -30,12 +74,27 @@ bool Promise::eliminate_thread(thread_id_t tid)
  */
 bool Promise::has_failed() const
 {
-	unsigned int size = eliminated_thread.size();
-	int promise_tid = id_to_int(read->get_tid());
-	for (unsigned int i = 1; i < model->get_num_threads(); i++) {
-		if ((i >= size || !eliminated_thread[i]) && ((int)i != promise_tid) && model->is_enabled(int_to_id(i))) {
-			return false;
-		}
-	}
-	return true;
+	return num_available_threads == 0;
+}
+
+/**
+ * @brief Check if an action's thread and location are compatible for resolving
+ * this promise
+ * @param act The action to check against
+ * @return True if we are compatible; false otherwise
+ */
+bool Promise::is_compatible(const ModelAction *act) const
+{
+	return thread_is_available(act->get_tid()) && read->same_var(act);
+}
+
+/**
+ * @brief Check if an action's thread and location are compatible for resolving
+ * this promise, and that the promise is thread-exclusive
+ * @param act The action to check against
+ * @return True if we are compatible and exclusive; false otherwise
+ */
+bool Promise::is_compatible_exclusive(const ModelAction *act) const
+{
+	return get_num_available_threads() == 1 && is_compatible(act);
 }