model: bugfix - correct RR coherence for Promises

[c11tester.git] / promise.h

diff --git a/promise.h b/promise.h
index ea40df0112b183b515258877af1ce20cb606b30d..c131d743aa185d2972cd2d1922fb7ac43d6c3c8d 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -8,41 +8,56 @@
 #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, uint64_t value, modelclock_t expiration) :
-       value(value), expiration(expiration), read(act), write(NULL)
-       { 
-               increment_threads(act->get_tid());
-       }
-       modelclock_t get_expiration() const {return expiration;}
+       Promise(ModelAction *read, struct future_value fv);
        ModelAction * get_action() const { return read; }
-       bool increment_threads(thread_id_t tid);
-
-       bool has_sync_thread(thread_id_t tid) { 
-               unsigned int id=id_to_int(tid); 
-               if (id>=synced_thread.size()) {
-                       return false;
-               }
-               return synced_thread[id];
-       }
-
-       bool check_promise();
-       uint64_t get_value() const { return value; }
+       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;
        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> synced_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;
+
+       const ModelAction *write;
 };
 
 #endif