action: we don't need special cases for lock/join anymore

[c11tester.git] / promise.cc

diff --git a/promise.cc b/promise.cc
index 23b92cd4186a59bb7a5b7c411668501afc4447e7..26a1095f4440a4b65d80dd67917da2f423ab28fe 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -101,10 +101,16 @@ 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 ", 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");
 }
 
@@ -140,3 +146,23 @@ 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);
+}