model: bugfix - correct RR coherence for Promises

[c11tester.git] / promise.h

diff --git a/promise.h b/promise.h
index 852fe714f896dfbffc0b409fcd499058841a1ee0..c131d743aa185d2972cd2d1922fb7ac43d6c3c8d 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -8,10 +8,12 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
-#include "threads-model.h"
+#include <vector>
 
-#include "model.h"
 #include "modeltypes.h"
+#include "mymemory.h"
+
+class ModelAction;
 
 struct future_value {
        uint64_t value;
@@ -21,31 +23,27 @@ struct future_value {
 
 class Promise {
  public:
-       Promise(ModelAction *read, struct future_value fv) :
-               num_available_threads(0),
-               value(fv.value),
-               expiration(fv.expiration),
-               read(read),
-               write(NULL)
-       {
-               add_thread(fv.tid);
-               eliminate_thread(read->get_tid());
-       }
-       modelclock_t get_expiration() const { return expiration; }
+       Promise(ModelAction *read, struct future_value fv);
        ModelAction * get_action() const { return read; }
        bool eliminate_thread(thread_id_t tid);
        void add_thread(thread_id_t tid);
        bool thread_is_available(thread_id_t tid) const;
        bool has_failed() const;
-       uint64_t get_value() const { return value; }
        void set_write(const ModelAction *act) { write = act; }
        const ModelAction * get_write() const { return write; }
        int get_num_available_threads() const { return num_available_threads; }
        bool is_compatible(const ModelAction *act) const;
        bool is_compatible_exclusive(const ModelAction *act) const;
 
+       modelclock_t get_expiration() const { return fv.expiration; }
+       uint64_t get_value() const { return fv.value; }
+       struct future_value get_fv() const { return fv; }
+
        void print() const;
 
+       bool equals(const Promise *x) const { return this == x; }
+       bool equals(const ModelAction *x) const { return false; }
+
        SNAPSHOTALLOC
  private:
        /** @brief Thread ID(s) for thread(s) that potentially can satisfy this
@@ -54,8 +52,7 @@ class Promise {
 
        int num_available_threads;
 
-       const uint64_t value;
-       const modelclock_t expiration;
+       const future_value fv;
 
        /** @brief The action which reads a promised value */
        ModelAction * const read;