X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.cc;h=e38696ea4d119fd4d159656d3b3eed74443d8f3c;hb=82df62c2b0805848b87bb71df5b66a4a66f8e25d;hp=fdd45791f40657556f344c96b579ade87bc90736;hpb=82357a7b7cc6e7395609894a8c8a705aa5af7e4e;p=model-checker.git

diff --git a/promise.cc b/promise.cc
index fdd4579..e38696e 100644
--- a/promise.cc
+++ b/promise.cc
@@ -59,7 +59,7 @@ bool Promise::thread_is_available(thread_id_t tid) const
 /** @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());
+	model_print("Promised value %#" PRIx64 ", read from thread %d, available threads to resolve: ", value, id_to_int(read->get_tid()));
 	for (unsigned int i = 0; i < available_thread.size(); i++)
 		if (available_thread[i])
 			model_print("[%d]", i);
@@ -78,10 +78,23 @@ bool Promise::has_failed() const
 }
 
 /**
- * @param write A store which could satisfy this Promise
- * @return True if the store can satisfy this Promise; false otherwise
+ * @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 *write) const
+bool Promise::is_compatible(const ModelAction *act) const
 {
-	return thread_is_available(write->get_tid());
+	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);
 }