promise: stash the whole future_value

[model-checker.git] / promise.cc

diff --git a/promise.cc b/promise.cc
index fdd45791f40657556f344c96b579ade87bc90736..86c3c584f12ba884d190c792b10f459e225c8330 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -4,6 +4,23 @@
 #include "promise.h"
 #include "model.h"
 #include "schedule.h"
+#include "action.h"
+#include "threads-model.h"
+
+/**
+ * @brief Promise constructor
+ * @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) :
+       num_available_threads(0),
+       fv(fv),
+       read(read),
+       write(NULL)
+{
+       add_thread(fv.tid);
+       eliminate_thread(read->get_tid());
+}
 
 /**
  * Eliminate a thread which no longer can satisfy this promise. Once all
@@ -59,7 +76,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: ", fv.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 +95,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 *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(const ModelAction *write) const
+bool Promise::is_compatible_exclusive(const ModelAction *act) const
 {
-       return thread_is_available(write->get_tid());
+       return get_num_available_threads() == 1 && is_compatible(act);
 }