promise: move constructor out of header

[c11tester.git] / promise.h

diff --git a/promise.h b/promise.h
index 0bf62d6b6a6bb1358383cd772ac0c5c9cd6d04a0..20aee036f99c3a6adad194b353846a524404ef1e 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -6,22 +6,52 @@
 
 #ifndef __PROMISE_H__
 #define __PROMISE_H__
+
 #include <inttypes.h>
+#include "threads-model.h"
 
+#include "model.h"
+#include "modeltypes.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);
-       const ModelAction * get_action() { return read; }
-       int increment_threads() { return ++numthreads; }
-       uint64_t get_value() { return value; }
-       
+       Promise(ModelAction *read, struct future_value fv);
+       modelclock_t get_expiration() const { return expiration; }
+       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;
+
+       void print() const;
+
+       SNAPSHOTALLOC
  private:
-       uint64_t value;
-       ModelAction *read;
-       unsigned int numthreads;
+       /** @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 uint64_t value;
+       const modelclock_t expiration;
+
+       /** @brief The action which reads a promised value */
+       ModelAction * const read;
+
+       const ModelAction *write;
 };
 
 #endif