mymemory: enforce that user allocations come from user context

[c11tester.git] / promise.cc

diff --git a/promise.cc b/promise.cc
index 69197cbac818b8f8dc01ad75d1d109df61474783..26a1095f4440a4b65d80dd67917da2f423ab28fe 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -4,6 +4,48 @@
 #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),
+       readers(1, read),
+       write(NULL)
+{
+       add_thread(fv.tid);
+       eliminate_thread(read->get_tid());
+}
+
+/**
+ * Add a reader that reads from this Promise. Must be added in an order
+ * consistent with execution order.
+ *
+ * @param reader The ModelAction that reads from this promise. Must be a read.
+ * @return True if this new reader has invalidated the promise; false otherwise
+ */
+bool Promise::add_reader(ModelAction *reader)
+{
+       readers.push_back(reader);
+       return eliminate_thread(reader->get_tid());
+}
+
+/**
+ * Access a reader that read from this Promise. Readers must be inserted in
+ * order by execution order, so they can be returned in this order.
+ *
+ * @param i The index of the reader to return
+ * @return The i'th reader of this Promise
+ */
+ModelAction * Promise::get_reader(unsigned int i) const
+{
+       return i < readers.size() ? readers[i] : NULL;
+}
 
 /**
  * Eliminate a thread which no longer can satisfy this promise. Once all
@@ -59,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 ", read from thread %d, available threads to resolve: ", value, read->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");
 }
 
@@ -85,7 +133,7 @@ bool Promise::has_failed() const
  */
 bool Promise::is_compatible(const ModelAction *act) const
 {
-       return thread_is_available(act->get_tid()) && read->same_var(act);
+       return thread_is_available(act->get_tid()) && get_reader(0)->same_var(act);
 }
 
 /**
@@ -98,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);
+}