promise: stash the whole future_value

[model-checker.git] / promise.cc

diff --git a/promise.cc b/promise.cc
index 8519feef5e678726b1ea2369e48a35e0d95631bd..86c3c584f12ba884d190c792b10f459e225c8330 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -4,6 +4,8 @@
 #include "promise.h"
 #include "model.h"
 #include "schedule.h"
+#include "action.h"
+#include "threads-model.h"
 
 /**
  * @brief Promise constructor
@@ -12,8 +14,7 @@
  */
 Promise::Promise(ModelAction *read, struct future_value fv) :
        num_available_threads(0),
-       value(fv.value),
-       expiration(fv.expiration),
+       fv(fv),
        read(read),
        write(NULL)
 {
@@ -75,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, id_to_int(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);