model: bugfix - correct RR coherence for Promises

[c11tester.git] / promise.h

diff --git a/promise.h b/promise.h
index 9fd6552d06bbe3746767376e9ddb270516b4437c..c131d743aa185d2972cd2d1922fb7ac43d6c3c8d 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -8,55 +8,55 @@
 #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;
        modelclock_t expiration;
+       thread_id_t tid;
 };
 
 class Promise {
  public:
-       Promise(ModelAction *act, struct future_value fv) :
-               value(fv.value),
-               expiration(fv.expiration),
-               read(act),
-               write(NULL)
-       {
-               eliminate_thread(act->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);
-
-       /**
-        * Check if a thread has already been eliminated from resolving this
-        * promise
-        * @param tid Thread ID of the thread to check
-        * @return True if the thread is already eliminated; false otherwise
-        */
-       bool thread_is_eliminated(thread_id_t tid) const
-       {
-               unsigned int id = id_to_int(tid);
-               if (id >= eliminated_thread.size())
-                       return false;
-               return eliminated_thread[id];
-       }
-
+       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() { return write; }
+       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:
-       std::vector<bool> eliminated_thread;
-       const uint64_t value;
-       const modelclock_t expiration;
+       /** @brief Thread ID(s) for thread(s) that potentially can satisfy this
+        *  promise */
+       std::vector< bool, SnapshotAlloc<bool> > available_thread;
+
+       int num_available_threads;
+
+       const future_value fv;
+
+       /** @brief The action which reads a promised value */
        ModelAction * const read;
+
        const ModelAction *write;
 };